diff --git a/jsconfig.json b/jsconfig.json
index 49f83b2180..e28e5526f3 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -9,6 +9,7 @@
       "@block/*": ["./packages/block/*"],
       "@bookmark/*": ["./packages/bookmark/*"],
       "@common/*": ["./packages/common/*"],
+      "@legacy/*": ["./packages/legacy/*"],
       "@dpos/*": ["./packages/dpos/*"],
       "@network/*": ["./packages/network/*"],
       "@settings/*": ["./packages/settings/*"],
@@ -16,7 +17,6 @@
       "@transaction/*": ["./packages/transaction/*"],
       "@updater/*": ["./packages/updater/*"],
       "@wallet/*": ["./packages/wallet/*"],
-      "@legacy/*": ["./packages/legacy/*"],
       "@views/*": ["./packages/views/*"],
       "@shared/*": ["./packages/views/shared/*"],
       "@basics/*": ["./packages/views/basics/*"],
diff --git a/packages/block/store/reducer.test.js b/packages/block/store/reducer.test.js
index 0b800a26b2..0346eb884f 100644
--- a/packages/block/store/reducer.test.js
+++ b/packages/block/store/reducer.test.js
@@ -1,4 +1,4 @@
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import actionTypes from './actionTypes';
 import blocksReducer from './reducer';
 
diff --git a/packages/bookmark/list/list.js b/packages/bookmark/list/list.js
index 9b30537ef1..7240f8fd92 100644
--- a/packages/bookmark/list/list.js
+++ b/packages/bookmark/list/list.js
@@ -9,7 +9,7 @@ import Tooltip from '@basics/tooltip/tooltip';
 import { truncateAddress } from '@wallet/utilities/account';
 import { Input } from '@basics/inputs';
 import { PrimaryButton, TertiaryButton } from '@basics/buttons';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import Box from '@basics/box';
 import BoxHeader from '@basics/box/header';
 import BoxContent from '@basics/box/content';
@@ -163,13 +163,13 @@ export class BookmarksList extends React.Component {
                   onClick={e => this.onRowClick(e, bookmark)}
                   key={bookmark.address}
                   className={`${styles.row} ${editedAddress === bookmark.address ? styles.editing : ''} ${bookmark.disabled ? styles.disabled : ''} bookmark-list-row`}
-                  to={`${routes.account.path}?address=${bookmark.address}`}
+                  to={`${routes.explorer.path}?address=${bookmark.address}`}
                 >
                   <div className={styles.avatarAndDescriptionWrapper}>
                     {
                       token.active === tokenMap.LSK.key
                         ? (
-                          <AccountVisual
+                          <WalletVisual
                             className={styles.avatar}
                             address={bookmark.address}
                           />
diff --git a/packages/bookmark/store/action.js b/packages/bookmark/store/action.js
index 8ca4d043a8..9ad6694f18 100644
--- a/packages/bookmark/store/action.js
+++ b/packages/bookmark/store/action.js
@@ -11,9 +11,9 @@ export const bookmarksRetrieved = () => (dispatch) => {
   getFromStorage('bookmarks', emptyBookmarks, (data) => {
     const bookmarks = {
       BTC: data.BTC,
-      LSK: data.LSK.map(account => ({
-        ...account,
-        disabled: validateAddress('LSK', account.address) === 1,
+      LSK: data.LSK.map(wallet => ({
+        ...wallet,
+        disabled: validateAddress('LSK', wallet.address) === 1,
       })),
     };
     dispatch({
@@ -23,13 +23,13 @@ export const bookmarksRetrieved = () => (dispatch) => {
   });
 };
 
-export const bookmarkAdded = ({ account, token = tokenMap.LSK.key }) => ({
-  data: { account, token },
+export const bookmarkAdded = ({ wallet, token = tokenMap.LSK.key }) => ({
+  data: { wallet, token },
   type: actionTypes.bookmarkAdded,
 });
 
-export const bookmarkUpdated = ({ account, token = tokenMap.LSK.key }) => ({
-  data: { account, token },
+export const bookmarkUpdated = ({ wallet, token = tokenMap.LSK.key }) => ({
+  data: { wallet, token },
   type: actionTypes.bookmarkUpdated,
 });
 
diff --git a/packages/bookmark/store/action.test.js b/packages/bookmark/store/action.test.js
index e046dd48ff..e267a115d6 100644
--- a/packages/bookmark/store/action.test.js
+++ b/packages/bookmark/store/action.test.js
@@ -1,7 +1,7 @@
 import { tokenMap } from '@token/configuration/tokens';
 import { getFromStorage } from '@common/utilities/localJSONStorage';
 import { emptyBookmarks } from '@bookmark/utilities/bookmarks';
-import accounts from '@tests/constants/accounts';
+import wallets from '@tests/constants/wallets';
 import actionTypes from './actionTypes';
 import {
   bookmarksRetrieved,
@@ -16,11 +16,11 @@ jest.mock('@common/utilities/localJSONStorage', () => ({
 
 describe('actions: boomarks', () => {
   const data = {
-    account: {
-      address: accounts.genesis.summary.address,
-      publicKey: accounts.genesis.summary.publicKey,
-      balance: accounts.genesis.balance,
-      title: accounts.genesis.summary.address,
+    wallet: {
+      address: wallets.genesis.summary.address,
+      publicKey: wallets.genesis.summary.publicKey,
+      balance: wallets.genesis.balance,
+      title: wallets.genesis.summary.address,
     },
     token: tokenMap.LSK.key,
   };
@@ -53,27 +53,27 @@ describe('actions: boomarks', () => {
     });
   });
 
-  it('should create an action to add a bookmark account', () => {
+  it('should create an action to add a bookmark wallet', () => {
     const expectedAction = {
       data,
       type: actionTypes.bookmarkAdded,
     };
     expect(bookmarkAdded(data)).toEqual(expectedAction);
-    expect(bookmarkAdded({ account: data.account })).toEqual(expectedAction);
+    expect(bookmarkAdded({ wallet: data.wallet })).toEqual(expectedAction);
   });
 
-  it('should create an action to update a bookmark account', () => {
+  it('should create an action to update a bookmark wallet', () => {
     const expectedAction = {
       data,
       type: actionTypes.bookmarkUpdated,
     };
     expect(bookmarkUpdated(data)).toEqual(expectedAction);
-    expect(bookmarkUpdated({ account: data.account })).toEqual(expectedAction);
+    expect(bookmarkUpdated({ wallet: data.wallet })).toEqual(expectedAction);
   });
 
-  it('should create an action to remove a bookmark account', () => {
+  it('should create an action to remove a bookmark wallet', () => {
     const removedData = {
-      address: accounts.genesis.summary.address,
+      address: wallets.genesis.summary.address,
       token: tokenMap.LSK.key,
     };
     const expectedAction = {
@@ -81,6 +81,6 @@ describe('actions: boomarks', () => {
       type: actionTypes.bookmarkRemoved,
     };
     expect(bookmarkRemoved(removedData)).toEqual(expectedAction);
-    expect(bookmarkRemoved({ address: accounts.genesis.summary.address })).toEqual(expectedAction);
+    expect(bookmarkRemoved({ address: wallets.genesis.summary.address })).toEqual(expectedAction);
   });
 });
diff --git a/packages/bookmark/store/middleware.test.js b/packages/bookmark/store/middleware.test.js
index 00d878ba49..04b8b483ee 100644
--- a/packages/bookmark/store/middleware.test.js
+++ b/packages/bookmark/store/middleware.test.js
@@ -1,5 +1,5 @@
 import * as localJSONStorage from '@common/utilities/localJSONStorage';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import actionTypes from './actionTypes';
 import bookmarksMiddleware from './middleware';
 
diff --git a/packages/bookmark/store/reducer.js b/packages/bookmark/store/reducer.js
index 1657c967d2..9063a7477d 100644
--- a/packages/bookmark/store/reducer.js
+++ b/packages/bookmark/store/reducer.js
@@ -10,18 +10,18 @@ const bookmarks = (state = emptyBookmarks, action) => {
         ...state,
         [action.data.token]: [
           {
-            ...action.data.account,
-            title: action.data.account.title.trim(),
+            ...action.data.wallet,
+            title: action.data.wallet.title.trim(),
           },
           ...state[action.data.token],
         ],
       };
 
     case actionTypes.bookmarkUpdated: {
-      const { account, token } = action.data;
+      const { wallet, token } = action.data;
       const tokenBookmarks = state[token];
       const indexOfBookmark = getIndexOfBookmark(state, {
-        address: account.address,
+        address: wallet.address,
         token,
       });
       return (indexOfBookmark !== -1
@@ -31,9 +31,9 @@ const bookmarks = (state = emptyBookmarks, action) => {
             ...tokenBookmarks.slice(0, indexOfBookmark),
             {
               ...tokenBookmarks[indexOfBookmark],
-              address: account.address,
-              title: account.title.trim(),
-              publicKey: account.publicKey,
+              address: wallet.address,
+              title: wallet.title.trim(),
+              publicKey: wallet.publicKey,
             },
             ...tokenBookmarks.slice(indexOfBookmark + 1),
           ],
diff --git a/packages/bookmark/store/reducer.test.js b/packages/bookmark/store/reducer.test.js
index 406db38e1c..1f55c34618 100644
--- a/packages/bookmark/store/reducer.test.js
+++ b/packages/bookmark/store/reducer.test.js
@@ -1,112 +1,112 @@
 import {
   bookmarkAdded, bookmarkUpdated, bookmarkRemoved,
 } from '@common/store/actions';
-import accounts from '@tests/constants/accounts';
+import wallets from '@tests/constants/wallets';
 import actionTypes from './actionTypes';
 import bookmarks from './reducer';
 
 // eslint-disable-next-line camelcase
-const { genesis, delegate, empty_account } = accounts;
+const { genesis, delegate, empty_wallet } = wallets;
 
 describe('Reducer: bookmarks(state, action)', () => {
-  const account = {
+  const wallet = {
     address: genesis.summary.address,
     title: genesis.summary.address,
     publicKey: genesis.summary.publicKey,
   };
-  const account2 = {
+  const wallet2 = {
     address: delegate.summary.address,
     title: genesis.summary.address,
     publicKey: delegate.summary.publicKey,
   };
 
-  it(`should return accounts with added account if action.type is ${actionTypes.bookmarkAdded}`, () => {
-    const account3 = {
-      address: empty_account.summary.address,
-      title: empty_account.summary.address,
-      publicKey: empty_account.summary.publicKey,
+  it(`should return wallets with added wallet if action.type is ${actionTypes.bookmarkAdded}`, () => {
+    const wallet3 = {
+      address: empty_wallet.summary.address,
+      title: empty_wallet.summary.address,
+      publicKey: empty_wallet.summary.publicKey,
     };
 
-    const state = { LSK: [account, account2], BTC: [] };
-    const action = bookmarkAdded({ account: account3, token: 'BTC' });
+    const state = { LSK: [wallet, wallet2], BTC: [] };
+    const action = bookmarkAdded({ wallet: wallet3, token: 'BTC' });
     const changedState = bookmarks(state, action);
-    expect(changedState.LSK[0]).toEqual(account);
-    expect(changedState.LSK[1]).toEqual(account2);
-    expect(changedState.BTC[0]).toMatchObject(account3);
+    expect(changedState.LSK[0]).toEqual(wallet);
+    expect(changedState.LSK[1]).toEqual(wallet2);
+    expect(changedState.BTC[0]).toMatchObject(wallet3);
   });
 
-  it(`should return accounts with added account and trimmed title if action.type is ${actionTypes.bookmarkAdded}`, () => {
-    const account3 = {
-      address: empty_account.summary.address,
-      title: empty_account.summary.address,
-      publicKey: empty_account.summary.publicKey,
+  it(`should return wallets with added wallet and trimmed title if action.type is ${actionTypes.bookmarkAdded}`, () => {
+    const wallet3 = {
+      address: empty_wallet.summary.address,
+      title: empty_wallet.summary.address,
+      publicKey: empty_wallet.summary.publicKey,
     };
 
-    const state = { LSK: [account, account2], BTC: [] };
+    const state = { LSK: [wallet, wallet2], BTC: [] };
     const action = bookmarkAdded({
-      account: {
-        ...account3,
-        title: `     ${account3.title}    `,
+      wallet: {
+        ...wallet3,
+        title: `     ${wallet3.title}    `,
       },
       token: 'BTC',
     });
     const changedState = bookmarks(state, action);
-    expect(changedState.LSK[0]).toEqual(account);
-    expect(changedState.LSK[1]).toEqual(account2);
-    expect(changedState.BTC[0]).toMatchObject(account3);
+    expect(changedState.LSK[0]).toEqual(wallet);
+    expect(changedState.LSK[1]).toEqual(wallet2);
+    expect(changedState.BTC[0]).toMatchObject(wallet3);
   });
 
-  it(`should return accounts with updated account if action.type is ${actionTypes.bookmarkUpdated}`, () => {
-    const updatedAccount = {
+  it(`should return wallets with updated wallet if action.type is ${actionTypes.bookmarkUpdated}`, () => {
+    const updatedWallet = {
       address: delegate.summary.address,
       title: 'bob',
       publicKey: delegate.summary.publicKey,
     };
 
-    const state = { LSK: [account, account2], BTC: [] };
-    const action = bookmarkUpdated({ account: updatedAccount });
+    const state = { LSK: [wallet, wallet2], BTC: [] };
+    const action = bookmarkUpdated({ wallet: updatedWallet });
 
     const changedState = bookmarks(state, action);
 
-    expect(changedState.LSK[0]).toEqual(account);
-    expect(changedState.LSK[1]).toEqual(updatedAccount);
+    expect(changedState.LSK[0]).toEqual(wallet);
+    expect(changedState.LSK[1]).toEqual(updatedWallet);
   });
 
-  it(`should return accounts with updated account and trimmed title if action.type is ${actionTypes.bookmarkUpdated}`, () => {
-    const updatedAccount = {
+  it(`should return wallets with updated wallet and trimmed title if action.type is ${actionTypes.bookmarkUpdated}`, () => {
+    const updatedWallet = {
       address: delegate.summary.address,
       title: 'bob',
       publicKey: delegate.summary.publicKey,
     };
 
-    const state = { LSK: [account, account2], BTC: [] };
+    const state = { LSK: [wallet, wallet2], BTC: [] };
     const action = bookmarkUpdated({
-      account: {
-        ...updatedAccount,
+      wallet: {
+        ...updatedWallet,
         title: '     bob     ',
       },
     });
 
     const changedState = bookmarks(state, action);
 
-    expect(changedState.LSK[0]).toEqual(account);
-    expect(changedState.LSK[1]).toEqual(updatedAccount);
+    expect(changedState.LSK[0]).toEqual(wallet);
+    expect(changedState.LSK[1]).toEqual(updatedWallet);
   });
 
-  it(`should return accounts without deleted account if action.type is ${actionTypes.bookmarkRemoved}`, () => {
-    const state = { LSK: [account, account2] };
-    const action = bookmarkRemoved({ address: account2.address, token: 'LSK' });
+  it(`should return wallets without deleted wallet if action.type is ${actionTypes.bookmarkRemoved}`, () => {
+    const state = { LSK: [wallet, wallet2] };
+    const action = bookmarkRemoved({ address: wallet2.address, token: 'LSK' });
 
     const changedState = bookmarks(state, action);
 
-    expect(changedState.LSK[0]).toEqual(account);
+    expect(changedState.LSK[0]).toEqual(wallet);
     expect(changedState.LSK[1]).toEqual(undefined);
   });
 
   it('should return validated bookmarks if action.type = actionType.bookmarksRetrieved', () => {
     const action = {
       type: actionTypes.bookmarksRetrieved,
-      data: { LSK: [account, account2], BTC: [] },
+      data: { LSK: [wallet, wallet2], BTC: [] },
     };
 
     let state;
diff --git a/packages/common/store/actions/urlProcessor.test.js b/packages/common/store/actions/urlProcessor.test.js
index 8f28709d61..99e693627d 100644
--- a/packages/common/store/actions/urlProcessor.test.js
+++ b/packages/common/store/actions/urlProcessor.test.js
@@ -1,5 +1,5 @@
 import * as accounts from '@wallet/utilities/api';
-import mockAccounts from '@tests/constants/accounts';
+import mockAccounts from '@tests/constants/wallets';
 import setVotesByLaunchProtocol from './urlProcessor';
 
 jest.mock('@wallet/utilities/api', () => ({
diff --git a/packages/common/store/middlewares/hwManager.test.js b/packages/common/store/middlewares/hwManager.test.js
index 3ec86144ac..8c4529e345 100644
--- a/packages/common/store/middlewares/hwManager.test.js
+++ b/packages/common/store/middlewares/hwManager.test.js
@@ -1,7 +1,7 @@
 import { toast } from 'react-toastify';
 import { subscribeToDeviceConnected, subscribeToDeviceDisconnected } from '@wallet/utilities/hwManager';
 import { addSearchParamsToUrl } from '@screens/router/searchParams';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import actionTypes from '../actions/actionTypes';
 import hwManagerMiddleware from './hwManager';
 
diff --git a/packages/common/store/reducers/index.js b/packages/common/store/reducers/index.js
index 16d5040067..9e5ef1c96b 100644
--- a/packages/common/store/reducers/index.js
+++ b/packages/common/store/reducers/index.js
@@ -1,4 +1,4 @@
-export { default as account } from '@wallet/store/reducer';
+export { default as wallet } from '@wallet/store/reducer';
 export { default as blocks } from '@block/store/reducer';
 export { default as bookmarks } from '@bookmark/store/reducer';
 export { default as network } from '@network/store/reducer';
diff --git a/packages/common/store/selectors.js b/packages/common/store/selectors.js
index e8e2eda24a..566afdf634 100644
--- a/packages/common/store/selectors.js
+++ b/packages/common/store/selectors.js
@@ -1,24 +1,24 @@
-const selectAccount = state => state.account;
+const selectAccount = state => state.wallet;
 const selectActiveToken = state => state.settings.token.active;
-const selectAddress = state => state.account.info[state.settings.token.active].address;
+const selectAddress = state => state.wallet.info[state.settings.token.active].address;
 const selectLSKAddress = state =>
-  (state.account.info ? state.account.info.LSK.summary.address : undefined);
+  (state.wallet.info ? state.wallet.info.LSK.summary.address : undefined);
 const selectBTCAddress = state =>
-  (state.account.info ? state.account.info.BTC.summary.address : undefined);
-const selectPublicKey = state => state.account.info[state.settings.token.active].publicKey;
+  (state.wallet.info ? state.wallet.info.BTC.summary.address : undefined);
+const selectPublicKey = state => state.wallet.info[state.settings.token.active].publicKey;
 const selectTransactions = state => state.transactions;
 const selectActiveTokenAccount = (state) => {
-  if (!state.account.info) {
+  if (!state.wallet.info) {
     return {};
   }
   return {
-    ...state.account.info[state.settings.token.active],
+    ...state.wallet.info[state.settings.token.active],
     passphrase: state.passphrase,
     hwInfo: state.hwInfo,
   };
 };
 const selectAccountBalance = state => (
-  state.account.info ? state.account.info[state.settings.token.active].summary.balance : undefined);
+  state.wallet.info ? state.wallet.info[state.settings.token.active].summary.balance : undefined);
 const selectBookmarks = state => state.bookmarks[state.settings.token.active];
 const selectBookmark = (state, address) =>
   state.bookmarks[state.settings.token.active].find(item => (item.address === address));
diff --git a/packages/common/utilities/login.test.js b/packages/common/utilities/login.test.js
index 3f9701204c..b5bc690c3c 100644
--- a/packages/common/utilities/login.test.js
+++ b/packages/common/utilities/login.test.js
@@ -1,4 +1,4 @@
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import { validateUrl, shouldAutoLogIn, addHttp } from './login';
 
 describe('Login', () => {
diff --git a/packages/common/utilities/validators.test.js b/packages/common/utilities/validators.test.js
index 5d958dbb66..e139e130d9 100644
--- a/packages/common/utilities/validators.test.js
+++ b/packages/common/utilities/validators.test.js
@@ -1,6 +1,6 @@
 import networks from '@network/configuration/networks';
 import i18n from '@setup/i18n/i18n';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import {
   validateAddress,
   validateLSKPublicKey,
diff --git a/packages/dpos/detail/info/warnPunishedDelegate/warnPunishedDelegate.js b/packages/dpos/detail/info/warnPunishedDelegate/warnPunishedDelegate.js
index 071c05195e..a977615a57 100644
--- a/packages/dpos/detail/info/warnPunishedDelegate/warnPunishedDelegate.js
+++ b/packages/dpos/detail/info/warnPunishedDelegate/warnPunishedDelegate.js
@@ -21,7 +21,7 @@ const WarnPunishedDelegate = ({
   const theme = useTheme();
 
   useEffect(() => {
-    if (history.location.pathname !== routes.account.path) {
+    if (history.location.pathname !== routes.explorer.path) {
       FlashMessageHolder.deleteMessage('WarnPunishedDelegate');
     }
   }, [history.location.pathname]);
diff --git a/packages/dpos/store/actions/voting.js b/packages/dpos/store/actions/voting.js
index c9b27779f0..9209256358 100644
--- a/packages/dpos/store/actions/voting.js
+++ b/packages/dpos/store/actions/voting.js
@@ -49,10 +49,10 @@ export const voteEdited = data => async (dispatch, getState) => {
     if (vote.username) {
       return vote;
     }
-    const account = (await getAccount({
+    const wallet = (await getAccount({
       network, params: { address: vote.address },
     }, settings.token.active)) || {};
-    const username = account.dpos?.delegate?.username ?? '';
+    const username = wallet.dpos?.delegate?.username ?? '';
 
     return { ...vote, username };
   }));
@@ -77,20 +77,20 @@ export const votesSubmitted = ({ fee, votes }) =>
   async (dispatch, getState) => {
     const state = getState();
     // @todo Fix this by #3898
-    const activeAccount = {
-      ...state.account.info.LSK,
-      hwInfo: isEmpty(state.account.hwInfo) ? undefined : state.account.hwInfo,
-      passphrase: state.account.passphrase,
+    const activeWallet = {
+      ...state.wallet.info.LSK,
+      hwInfo: isEmpty(state.wallet.hwInfo) ? undefined : state.wallet.hwInfo,
+      passphrase: state.wallet.passphrase,
     };
 
     const [error, tx] = await to(create({
       network: state.network,
-      account: activeAccount,
+      wallet: activeWallet,
       transactionObject: {
         fee,
         votes,
-        nonce: activeAccount.sequence.nonce,
-        senderPublicKey: activeAccount.summary.publicKey,
+        nonce: activeWallet.sequence.nonce,
+        senderPublicKey: activeWallet.summary.publicKey,
         moduleAssetId: MODULE_ASSETS_NAME_ID_MAP.voteDelegate,
       },
     }, tokenMap.LSK.key));
@@ -111,12 +111,12 @@ export const votesSubmitted = ({ fee, votes }) =>
   };
 
 /**
- * Fetches the list of votes of the host account.
+ * Fetches the list of votes of the host wallet.
  */
 export const votesRetrieved = () =>
   async (dispatch, getState) => {
-    const { account, network } = getState();
-    const address = account.info[tokenMap.LSK.key].summary.address;
+    const { wallet, network } = getState();
+    const address = wallet.info[tokenMap.LSK.key].summary.address;
     try {
       const votes = await getVotes({ network, params: { address } });
       dispatch({
@@ -127,7 +127,7 @@ export const votesRetrieved = () =>
       dispatch({
         type: actionTypes.votesRetrieved,
         data: {
-          account: {},
+          wallet: {},
         },
       });
     }
diff --git a/packages/dpos/store/actions/voting.test.js b/packages/dpos/store/actions/voting.test.js
index 3f8c87e661..efb30a78cf 100644
--- a/packages/dpos/store/actions/voting.test.js
+++ b/packages/dpos/store/actions/voting.test.js
@@ -1,11 +1,11 @@
-import { loginTypes } from '@views/configuration';
+import loginTypes from '@wallet/configuration/loginTypes';
 import networks from '@network/configuration/networks';
 import * as transactionApi from '@transaction/utilities/api';
 import * as delegateApi from '@dpos/utilities/api';
 import * as accountApi from '@wallet/utilities/api';
 import * as hwManager from '@transaction/utilities/hwManager';
 import sampleVotes from '@tests/constants/votes';
-import accounts from '@tests/constants/accounts';
+import wallets from '@tests/constants/wallets';
 import actionTypes from './actionTypes';
 import {
   voteEdited,
@@ -42,7 +42,7 @@ describe('actions: voting', () => {
         },
       },
     },
-    account: {
+    wallet: {
       loginType: 0,
       info: {
         LSK: {
@@ -71,7 +71,7 @@ describe('actions: voting', () => {
 
   describe('voteEdited', () => {
     it('should create an action to add data to toggle the vote status for any given delegate', async () => {
-      accountApi.getAccount.mockResolvedValue({ data: accounts.genesis });
+      accountApi.getAccount.mockResolvedValue({ data: wallets.genesis });
       const data = [{
         address: 'dummy',
         amount: 1e10,
diff --git a/packages/dpos/utilities/api/index.test.js b/packages/dpos/utilities/api/index.test.js
index 18d496f132..9288863928 100644
--- a/packages/dpos/utilities/api/index.test.js
+++ b/packages/dpos/utilities/api/index.test.js
@@ -1,6 +1,6 @@
 import http from '@common/utilities/api/http';
 import ws, { subscribe, unsubscribe } from '@common/utilities/api/ws';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 
 import * as delegate from './index';
 
diff --git a/packages/legacy/detail/info/accountMigration/accountMigration.test.js b/packages/legacy/detail/info/accountMigration/accountMigration.test.js
deleted file mode 100644
index 33570d0e80..0000000000
--- a/packages/legacy/detail/info/accountMigration/accountMigration.test.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import React from 'react';
-import { mount } from 'enzyme';
-import { truncateAddress } from '@wallet/utilities/account';
-import accounts from '@tests/constants/accounts';
-import AccountMigration from './index';
-
-describe('AccountMigration component', () => {
-  const props = {
-    account: accounts.empty_account,
-    showBalance: true,
-  };
-
-  it('should render properly', () => {
-    const wrapper = mount(<AccountMigration {...props} />);
-    const html = wrapper.html();
-    expect(html).toContain(accounts.empty_account.legacy.address);
-    expect(html).toContain(truncateAddress(accounts.empty_account.summary.address, 'medium'));
-    expect(html).toContain('98,970,000 LSK');
-  });
-
-  it('should not render balance', () => {
-    const wrapper = mount(<AccountMigration {...props} showBalance={false} />);
-    const html = wrapper.html();
-    expect(html).toContain(accounts.empty_account.legacy.address, 'medium');
-    expect(html).toContain(truncateAddress(accounts.empty_account.summary.address, 'medium'));
-  });
-});
diff --git a/packages/legacy/detail/info/accountMigration/index.js b/packages/legacy/detail/info/accountMigration/index.js
deleted file mode 100644
index 0af0e99259..0000000000
--- a/packages/legacy/detail/info/accountMigration/index.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import React from 'react';
-import { withTranslation } from 'react-i18next';
-import CopyToClipboard from '@basics/copyToClipboard';
-import Icon from '@basics/icon';
-import LiskAmount from '@shared/liskAmount';
-import AccountVisualWithAddress from '@wallet/detail/info/accountVisual/accountVisualWithAddress';
-import { tokenMap } from '@token/configuration/tokens';
-import styles from './index.css';
-
-const token = tokenMap.LSK.key;
-
-const AccountMigration = ({ t, account, showBalance }) => (
-  <div className={styles.accountContainer}>
-    <div>
-      <h5>{t('Old account')}</h5>
-      <div className={styles.addressContainer}>
-        <AccountVisualWithAddress address={account.legacy?.address} truncate={false} />
-        <CopyToClipboard type="icon" value={account.legacy?.address} copyClassName={styles.copyIcon} />
-      </div>
-      {showBalance && (
-        <p>
-          <span>{`${t('Balance')}: `}</span>
-          <LiskAmount val={Number(account.legacy?.balance)} token={token} />
-        </p>
-      )}
-    </div>
-    <Icon name="arrowRightWithStroke" className={`${styles.arrow} ${!showBalance && styles.noBalance}`} />
-    <div>
-      <h5>{t('New account')}</h5>
-      <div className={styles.addressContainer}>
-        <AccountVisualWithAddress address={account.summary?.address} truncate="medium" />
-        <CopyToClipboard type="icon" value={account.summary?.address} copyClassName={styles.copyIcon} />
-      </div>
-      {showBalance && (
-        <p>
-          <span>{`${t('Balance')}: `}</span>
-          <LiskAmount val={Number(account.token?.balance)} token={token} />
-        </p>
-      )}
-    </div>
-  </div>
-);
-
-export default withTranslation()(AccountMigration);
diff --git a/packages/legacy/detail/info/accountMigration/index.css b/packages/legacy/detail/info/walletMigration/index.css
similarity index 100%
rename from packages/legacy/detail/info/accountMigration/index.css
rename to packages/legacy/detail/info/walletMigration/index.css
diff --git a/packages/legacy/detail/info/walletMigration/index.js b/packages/legacy/detail/info/walletMigration/index.js
new file mode 100644
index 0000000000..3284986fce
--- /dev/null
+++ b/packages/legacy/detail/info/walletMigration/index.js
@@ -0,0 +1,47 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import CopyToClipboard from '@basics/copyToClipboard';
+import Icon from '@basics/icon';
+import LiskAmount from '@shared/liskAmount';
+import WalletVisualWithAddress from '@wallet/detail/identity/walletVisual/walletVisualWithAddress';
+import { tokenMap } from '@token/configuration/tokens';
+import styles from './index.css';
+
+const token = tokenMap.LSK.key;
+
+const WalletMigration = ({ wallet, showBalance }) => {
+  const { t } = useTranslation();
+  return (
+    <div className={styles.accountContainer}>
+      <div>
+        <h5>{t('Old account')}</h5>
+        <div className={styles.addressContainer}>
+          <WalletVisualWithAddress address={wallet.legacy?.address} truncate={false} />
+          <CopyToClipboard type="icon" value={wallet.legacy?.address} copyClassName={styles.copyIcon} />
+        </div>
+        {showBalance && (
+          <p>
+            <span>{`${t('Balance')}: `}</span>
+            <LiskAmount val={Number(wallet.legacy?.balance)} token={token} />
+          </p>
+        )}
+      </div>
+      <Icon name="arrowRightWithStroke" className={`${styles.arrow} ${!showBalance && styles.noBalance}`} />
+      <div>
+        <h5>{t('New account')}</h5>
+        <div className={styles.addressContainer}>
+          <WalletVisualWithAddress address={wallet.summary?.address} truncate="medium" />
+          <CopyToClipboard type="icon" value={wallet.summary?.address} copyClassName={styles.copyIcon} />
+        </div>
+        {showBalance && (
+          <p>
+            <span>{`${t('Balance')}: `}</span>
+            <LiskAmount val={Number(wallet.token?.balance)} token={token} />
+          </p>
+        )}
+      </div>
+    </div>
+  );
+};
+
+export default WalletMigration;
diff --git a/packages/legacy/detail/info/walletMigration/walletMigration.test.js b/packages/legacy/detail/info/walletMigration/walletMigration.test.js
new file mode 100644
index 0000000000..d4bc215a36
--- /dev/null
+++ b/packages/legacy/detail/info/walletMigration/walletMigration.test.js
@@ -0,0 +1,27 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import { truncateAddress } from '@wallet/utilities/account';
+import wallets from '@tests/constants/wallets';
+import WalletMigration from './index';
+
+describe('WalletMigration component', () => {
+  const props = {
+    wallet: wallets.empty_wallet,
+    showBalance: true,
+  };
+
+  it('should render properly', () => {
+    const wrapper = mount(<WalletMigration {...props} />);
+    const html = wrapper.html();
+    expect(html).toContain(wallets.empty_wallet.legacy.address);
+    expect(html).toContain(truncateAddress(wallets.empty_wallet.summary.address, 'medium'));
+    expect(html).toContain('98,970,000 LSK');
+  });
+
+  it('should not render balance', () => {
+    const wrapper = mount(<WalletMigration {...props} showBalance={false} />);
+    const html = wrapper.html();
+    expect(html).toContain(wallets.empty_wallet.legacy.address, 'medium');
+    expect(html).toContain(truncateAddress(wallets.empty_wallet.summary.address, 'medium'));
+  });
+});
diff --git a/packages/settings/setters/selectors/currencySelector.js b/packages/settings/setters/selectors/currencySelector.js
index 84c54783d5..4086226f7b 100644
--- a/packages/settings/setters/selectors/currencySelector.js
+++ b/packages/settings/setters/selectors/currencySelector.js
@@ -1,11 +1,13 @@
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 import { toast } from 'react-toastify';
 import Select from '@basics/inputs/select';
 import settingConstants from '@settings/configuration/settingConstants';
 import useSettings from '@settings/hooks/useSettings';
 import Piwik from '@common/utilities/piwik';
 
-function CurrencySelector({ t }) {
+function CurrencySelector() {
+  const { t } = useTranslation();
   const { currency, toggleSetting } = useSettings(
     settingConstants.keys.currency,
   );
diff --git a/packages/transaction/detail/info/multiSignatureReview/index.js b/packages/transaction/detail/info/multiSignatureReview/index.js
index cf95df1b13..eb13259a25 100644
--- a/packages/transaction/detail/info/multiSignatureReview/index.js
+++ b/packages/transaction/detail/info/multiSignatureReview/index.js
@@ -4,7 +4,7 @@ import { tokenMap } from '@token/configuration/tokens';
 import { toRawLsk } from '@token/utilities/lsk';
 import { truncateAddress } from '@wallet/utilities/account';
 import LiskAmount from '@shared/liskAmount';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 
 import styles from './styles.css';
 
@@ -25,7 +25,7 @@ const getAccountRoleText = (accountRole, t) => {
 const Member = ({ member, i, t }) => (
   <div className={`${styles.memberInfo} member-info`}>
     <p className={styles.memberInfoIndex}>{`${i + 1}.`}</p>
-    <AccountVisual address={member.address} />
+    <WalletVisual address={member.address} />
     <div className={styles.memberDetails}>
       <p className={styles.memberTitle}>
         {member.name || truncateAddress(member.address)}
diff --git a/packages/transaction/detail/info/transactionInfo/index.js b/packages/transaction/detail/info/transactionInfo/index.js
index 08157dcbeb..9ba6e1c06e 100644
--- a/packages/transaction/detail/info/transactionInfo/index.js
+++ b/packages/transaction/detail/info/transactionInfo/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { withTranslation } from 'react-i18next';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import LiskAmount from '@shared/liskAmount';
 import { tokenMap } from '@token/configuration/tokens';
 import { MODULE_ASSETS_NAME_ID_MAP } from '@transaction/configuration/moduleAssets';
@@ -35,7 +35,7 @@ const Members = ({ members, t }) => (
           className={styles.memberInfo}
           key={i + 1}
         >
-          <AccountVisual address={member.address} />
+          <WalletVisual address={member.address} />
           <div className={styles.memberDetails}>
             <p className={styles.memberTitle}>
               {member.address}
diff --git a/packages/transaction/detail/info/transactionInfo/reclaim.js b/packages/transaction/detail/info/transactionInfo/reclaim.js
index 8d602d3ce0..c1199a19e2 100644
--- a/packages/transaction/detail/info/transactionInfo/reclaim.js
+++ b/packages/transaction/detail/info/transactionInfo/reclaim.js
@@ -1,12 +1,12 @@
 import React from 'react';
-import AccountMigration from '@legacy/detail/info/accountMigration';
+import WalletMigration from '@legacy/detail/info/walletMigration';
 import LiskAmount from '@shared/liskAmount';
 import { tokenMap } from '@token/configuration/tokens';
 
 const Reclaim = ({ account, t }) => (
   <>
     <section>
-      <AccountMigration account={account.info.LSK} showBalance={false} />
+      <WalletMigration wallet={account.info.LSK} showBalance={false} />
     </section>
     <section>
       <label>{t('Balance to reclaim')}</label>
diff --git a/packages/transaction/detail/info/transactionInfo/registerDelegate.js b/packages/transaction/detail/info/transactionInfo/registerDelegate.js
index 625551c2c2..fb61f4bee1 100644
--- a/packages/transaction/detail/info/transactionInfo/registerDelegate.js
+++ b/packages/transaction/detail/info/transactionInfo/registerDelegate.js
@@ -1,13 +1,13 @@
 import React from 'react';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import styles from './transactionInfo.css';
 
 const RegisterDelegate = ({ account, username, t }) => (
   <section>
     <label className="username-label">{t('Your username')}</label>
     <div className={styles.userInformation}>
-      <AccountVisual
-        className={styles.accountVisual}
+      <WalletVisual
+        className={styles.walletVisual}
         address={account.summary?.address}
         size={25}
       />
diff --git a/packages/transaction/detail/info/transactionInfo/send.js b/packages/transaction/detail/info/transactionInfo/send.js
index 824f6221e1..398a9ad153 100644
--- a/packages/transaction/detail/info/transactionInfo/send.js
+++ b/packages/transaction/detail/info/transactionInfo/send.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import LiskAmount from '@shared/liskAmount';
 import { toRawLsk } from '@token/utilities/lsk';
 import styles from './transactionInfo.css';
@@ -11,7 +11,7 @@ const Send = ({
     <section>
       <label>{t('Recipient')}</label>
       <label className="recipient-value">
-        <AccountVisual address={fields.recipient.address} size={25} />
+        <WalletVisual address={fields.recipient.address} size={25} />
         <label className={`${styles.information} recipient-confirm`}>
           {fields.recipient.title || fields.recipient.address}
         </label>
diff --git a/packages/transaction/detail/info/transactionInfo/unlockBalance.js b/packages/transaction/detail/info/transactionInfo/unlockBalance.js
index 7fef19a4a0..4c0c90a4f1 100644
--- a/packages/transaction/detail/info/transactionInfo/unlockBalance.js
+++ b/packages/transaction/detail/info/transactionInfo/unlockBalance.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import LiskAmount from '@shared/liskAmount';
 import { tokenMap } from '@token/configuration/tokens';
 import styles from './transactionInfo.css';
@@ -9,7 +9,7 @@ const UnlockBalance = ({ account, t, transaction = {} }) => (
     <section className={styles.sender}>
       <label>{t('Sender')}</label>
       <label>
-        <AccountVisual address={account.summary.address} size={25} />
+        <WalletVisual address={account.summary.address} size={25} />
         <label className={`${styles.address} address-label`}>
           {account.summary.address}
         </label>
diff --git a/packages/transaction/detail/info/transactionResult/multisignature.test.js b/packages/transaction/detail/info/transactionResult/multisignature.test.js
index f32f2ce73f..2e791de779 100644
--- a/packages/transaction/detail/info/transactionResult/multisignature.test.js
+++ b/packages/transaction/detail/info/transactionResult/multisignature.test.js
@@ -4,7 +4,7 @@ import copyToClipboard from 'copy-to-clipboard';
 import * as txUtils from '@transaction/utilities/transaction';
 import routes from '@screens/router/routes';
 import { txStatusTypes } from '@transaction/configuration/txStatus';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import Multisignature, { FullySignedActions, PartiallySignedActions } from './multisignature';
 
 jest.mock('copy-to-clipboard');
diff --git a/packages/transaction/detail/info/transactionResult/regular.test.js b/packages/transaction/detail/info/transactionResult/regular.test.js
index 7e2623f2b2..c2eafe2c13 100644
--- a/packages/transaction/detail/info/transactionResult/regular.test.js
+++ b/packages/transaction/detail/info/transactionResult/regular.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { mount } from 'enzyme';
 import routes from '@screens/router/routes';
 import { txStatusTypes } from '@transaction/configuration/txStatus';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import Regular from './regular';
 
 describe('TransactionResult Regular', () => {
diff --git a/packages/transaction/detail/info/transactionResult/transactionResult.test.js b/packages/transaction/detail/info/transactionResult/transactionResult.test.js
index bfe4b39bf1..04dbe436c0 100644
--- a/packages/transaction/detail/info/transactionResult/transactionResult.test.js
+++ b/packages/transaction/detail/info/transactionResult/transactionResult.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { txStatusTypes } from '@transaction/configuration/txStatus';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import TransactionResult from './transactionResult';
 import Regular from './regular';
 import Multisignature from './multisignature';
diff --git a/packages/transaction/detail/info/transactionSignature/transactionSignature.test.js b/packages/transaction/detail/info/transactionSignature/transactionSignature.test.js
index d29584175a..1913f40448 100644
--- a/packages/transaction/detail/info/transactionSignature/transactionSignature.test.js
+++ b/packages/transaction/detail/info/transactionSignature/transactionSignature.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { secondPassphraseRemoved } from '@common/store/actions';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import TransactionSignature from './transactionSignature';
 
 jest.mock('@common/store/actions', () => ({
diff --git a/packages/transaction/detail/info/transactionSummary/transactionSummary.js b/packages/transaction/detail/info/transactionSummary/transactionSummary.js
index 7ecb1731a2..21a5c5e473 100644
--- a/packages/transaction/detail/info/transactionSummary/transactionSummary.js
+++ b/packages/transaction/detail/info/transactionSummary/transactionSummary.js
@@ -11,7 +11,7 @@ import styles from './transactionSummary.css';
 
 const TransactionSummary = ({
   title, children, confirmButton, cancelButton,
-  account, t, fee, secondPassphraseStored,
+  wallet, t, fee, secondPassphraseStored,
   classNames, token, footerClassName,
 }) => {
   const tooltip = {
@@ -29,10 +29,10 @@ const TransactionSummary = ({
         </BoxHeader>
       )}
       <BoxContent className={`${styles.content} summary-content`}>
-        {account.loginType
+        {wallet.loginType
           ? (
             <Illustration
-              name={account.loginType}
+              name={wallet.loginType}
               className={styles.illustrationWrapper}
             />
           )
@@ -56,7 +56,7 @@ const TransactionSummary = ({
         confirmButton={confirmButton}
         cancelButton={cancelButton}
         footerClassName={footerClassName}
-        account={account}
+        account={wallet}
         secondPassphraseStored={secondPassphraseStored}
         t={t}
       />
diff --git a/packages/transaction/detail/info/transactionSummary/transactionSummary.test.js b/packages/transaction/detail/info/transactionSummary/transactionSummary.test.js
index 9d7aa24acf..171b610419 100644
--- a/packages/transaction/detail/info/transactionSummary/transactionSummary.test.js
+++ b/packages/transaction/detail/info/transactionSummary/transactionSummary.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { mount } from 'enzyme';
-import accounts from '@tests/constants/accounts';
+import wallets from '@tests/constants/wallets';
 import TransactionSummary from './transactionSummary';
 
 describe('TransactionSummary', () => {
@@ -9,7 +9,7 @@ describe('TransactionSummary', () => {
   beforeEach(() => {
     props = {
       title: 'mock title',
-      account: accounts.genesis,
+      wallet: wallets.genesis,
       token: 'LSK',
       confirmButton: {
         label: 'Confirm',
@@ -32,10 +32,10 @@ describe('TransactionSummary', () => {
     const createTransaction = jest.fn();
     const wrapper = mount(<TransactionSummary {... {
       ...props,
-      account: {
-        ...props.account,
+      wallet: {
+        ...props.wallet,
         summary: {
-          ...props.account.summary,
+          ...props.wallet.summary,
           isMultisignature: true,
         },
       },
diff --git a/packages/transaction/detail/info/transactionTypeFigure/index.js b/packages/transaction/detail/info/transactionTypeFigure/index.js
index 3a758214a8..122393e760 100644
--- a/packages/transaction/detail/info/transactionTypeFigure/index.js
+++ b/packages/transaction/detail/info/transactionTypeFigure/index.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { MODULE_ASSETS_NAME_ID_MAP, MODULE_ASSETS_MAP } from '@transaction/configuration/moduleAssets';
 import { tokenMap } from '@token/configuration/tokens';
 import { validateAddress } from '@common/utilities/validators';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import Icon from '@basics/icon';
 import styles from './transactionTypeFigure.css';
 
@@ -11,7 +11,7 @@ const TransactionTypeFigure = ({
 }) => {
   const renderAvatar = () => {
     if (validateAddress(tokenMap.LSK.key, address) === 0) {
-      return <AccountVisual address={address} size={avatarSize} />;
+      return <WalletVisual address={address} size={avatarSize} />;
     }
     return null;
   };
diff --git a/packages/transaction/detail/manager/transactionResult/index.js b/packages/transaction/detail/manager/transactionResult/index.js
index 939fa591b6..3f8ca0d156 100644
--- a/packages/transaction/detail/manager/transactionResult/index.js
+++ b/packages/transaction/detail/manager/transactionResult/index.js
@@ -10,9 +10,9 @@ const mapStateToProps = state => ({
   activeToken: state.settings.token.active,
   transactions: state.transactions,
   account: {
-    ...state.account.info[state.settings.token.active],
-    passphrase: state.account.passphrase,
-    hwInfo: state.account.hwInfo,
+    ...state.wallet.info[state.settings.token.active],
+    passphrase: state.wallet.passphrase,
+    hwInfo: state.wallet.hwInfo,
   },
   network: state.network.networks[state.settings.token.active],
 });
diff --git a/packages/transaction/detail/manager/transactionSignature/index.js b/packages/transaction/detail/manager/transactionSignature/index.js
index 7efd22b441..0f5af1f9f0 100644
--- a/packages/transaction/detail/manager/transactionSignature/index.js
+++ b/packages/transaction/detail/manager/transactionSignature/index.js
@@ -8,7 +8,7 @@ import TransactionSignature from '../../info/transactionSignature/transactionSig
 
 const mapStateToProps = state => ({
   transactions: state.transactions,
-  account: state.account,
+  account: state.wallet,
 });
 
 const dispatchToProps = {
diff --git a/packages/transaction/detail/manager/transactionSummary/index.js b/packages/transaction/detail/manager/transactionSummary/index.js
index 475ccdfb93..718f53b679 100644
--- a/packages/transaction/detail/manager/transactionSummary/index.js
+++ b/packages/transaction/detail/manager/transactionSummary/index.js
@@ -8,8 +8,8 @@ import TransactionSummary from '../../info/transactionSummary/transactionSummary
 const mapStateToProps = state => ({
   token: state.settings.token.active,
   transactions: state.transactions,
-  account: {
-    ...state.account.info[state.settings.token.active],
+  wallet: {
+    ...state.wallet.info[state.settings.token.active],
     passphrase: state.passphrase,
     hwInfo: state.hwInfo,
   },
diff --git a/packages/transaction/list/row/voteItem/index.js b/packages/transaction/list/row/voteItem/index.js
index 76c5fc181d..d7ff67f8ac 100644
--- a/packages/transaction/list/row/voteItem/index.js
+++ b/packages/transaction/list/row/voteItem/index.js
@@ -23,7 +23,7 @@ const token = tokenMap.LSK.key;
 const VoteItem = ({
   vote, address, title, truncate,
 }) => {
-  const accountPath = routes.account.path;
+  const accountPath = routes.explorer.path;
   return (
     <span className={`${styles.container} vote-item-address`}>
       <Link
diff --git a/packages/transaction/list/transactionsTable/transactionRow.js b/packages/transaction/list/transactionsTable/transactionRow.js
index c2d4689537..a2edaa6f5e 100644
--- a/packages/transaction/list/transactionsTable/transactionRow.js
+++ b/packages/transaction/list/transactionsTable/transactionRow.js
@@ -9,7 +9,7 @@ import Icon from '@basics/icon';
 import Tooltip from '@basics/tooltip/tooltip';
 import DialogLink from '@basics/dialog/link';
 import LiskAmount from '@shared/liskAmount';
-import AccountVisualWithAddress from '@wallet/detail/info/accountVisual/accountVisualWithAddress';
+import WalletVisualWithAddress from '@wallet/detail/identity/walletVisual/walletVisualWithAddress';
 import styles from './transactionsTable.css';
 
 const roundSize = 103;
@@ -23,7 +23,7 @@ const TransactionRow = ({
     data={{ transactionId: data.id, token: tokenMap.LSK.key }}
   >
     <span className={`${grid['col-xs-3']} transaction-row-sender`}>
-      <AccountVisualWithAddress
+      <WalletVisualWithAddress
         address={data.sender.address}
         transactionSubject="sender"
         moduleAssetId={data.moduleAssetId}
@@ -31,7 +31,7 @@ const TransactionRow = ({
       />
     </span>
     <span className={`${grid['col-xs-3']} transaction-row-recipient`}>
-      <AccountVisualWithAddress
+      <WalletVisualWithAddress
         address={data.asset.recipient?.address}
         transactionSubject="recipient"
         moduleAssetId={data.moduleAssetId}
diff --git a/packages/transaction/manage/transactionPriority/reducer.js b/packages/transaction/manage/transactionPriority/reducer.js
index 5ab756ed9f..cd3297b361 100644
--- a/packages/transaction/manage/transactionPriority/reducer.js
+++ b/packages/transaction/manage/transactionPriority/reducer.js
@@ -16,11 +16,11 @@ const initialFee = {
   feedback: '',
 };
 
-const getInitialState = account => ({
+const getInitialState = wallet => ({
   fee: initialFee,
   minFee: initialFee,
   maxAmount: {
-    value: account.token?.balance,
+    value: wallet.token?.balance,
     error: false,
     feedback: '',
   },
@@ -41,7 +41,7 @@ const reducer = (state, action) => {
       return { ...state, minFee: action.payload.response };
 
     case actionTypes.setMaxAmount: {
-      const balance = action.payload.account.token?.balance;
+      const balance = action.payload.wallet.token?.balance;
       const token = action.payload.token;
       const availableBalance = calculateAvailableBalance(balance, token);
       const result = {
diff --git a/packages/transaction/manage/transactionPriority/reducer.test.js b/packages/transaction/manage/transactionPriority/reducer.test.js
index 89615a7ba0..ce5d13af4e 100644
--- a/packages/transaction/manage/transactionPriority/reducer.test.js
+++ b/packages/transaction/manage/transactionPriority/reducer.test.js
@@ -27,7 +27,7 @@ describe('useTransactionFeeCalculation.reducer', () => {
     const state = { maxAmount: { feedback: '', error: false, value: 0 } };
     const newState = reducer(state, {
       type: actionTypes.setMaxAmount,
-      payload: { token: 'LSK', response: 1, account: { token: { balance: 200000000 } } },
+      payload: { token: 'LSK', response: 1, wallet: { token: { balance: 200000000 } } },
     });
     const expectedState = { maxAmount: { ...state.maxAmount, value: 195000000 } };
 
diff --git a/packages/transaction/manage/transactionPriority/useTransactionFeeCalculation.js b/packages/transaction/manage/transactionPriority/useTransactionFeeCalculation.js
index 2099b0ebdd..477a5d90e1 100644
--- a/packages/transaction/manage/transactionPriority/useTransactionFeeCalculation.js
+++ b/packages/transaction/manage/transactionPriority/useTransactionFeeCalculation.js
@@ -26,48 +26,48 @@ export const normalizeVotesForTx = votes =>
  *
  * @param {object} data
  * @param {string} data.token - Option of LSK and BTC
- * @param {object} data.account - Active account info
+ * @param {object} data.wallet - Active wallet info
  * @param {object} data.selectedPriority - Selected priority info
  * @param {object} data.transaction - Raw transaction payload
  * @param {array} data.priorityOptions - Array of priority configs for High, Mid, Low
  * @returns {object}
  */
 const useTransactionFeeCalculation = ({
-  token, account, selectedPriority, transaction, priorityOptions,
+  token, wallet, selectedPriority, transaction, priorityOptions,
 }) => {
   const network = useSelector(state => state.network);
-  const [state, dispatch] = useReducer(reducer, account, getInitialState);
+  const [state, dispatch] = useReducer(reducer, wallet, getInitialState);
 
   const calculateTransactionFees = async (params) => {
     const fee = await getTransactionFee(params, token);
-    dispatch({ type: actionTypes.setFee, payload: { response: fee, account, token } });
+    dispatch({ type: actionTypes.setFee, payload: { response: fee, wallet, token } });
 
     const minFee = await getTransactionFee({
       ...params,
       selectedPriority: priorityOptions[0],
     }, token);
 
-    dispatch({ type: actionTypes.setMinFee, payload: { response: minFee, account, token } });
+    dispatch({ type: actionTypes.setMinFee, payload: { response: minFee, wallet, token } });
 
     const maxAmountFee = await getTransactionFee({
       ...params,
-      transaction: { ...params.transaction, amount: account.token?.balance },
+      transaction: { ...params.transaction, amount: wallet.token?.balance },
     }, token);
 
     dispatch({
       type: actionTypes.setMaxAmount,
-      payload: { response: maxAmountFee, account, token },
+      payload: { response: maxAmountFee, wallet, token },
     });
   };
 
   useEffect(() => {
     calculateTransactionFees({
       token,
-      account,
+      wallet,
       network,
       transaction,
       selectedPriority,
-      numberOfSignatures: getNumberOfSignatures(account, transaction),
+      numberOfSignatures: getNumberOfSignatures(wallet, transaction),
     });
   }, [
     transaction.amount,
diff --git a/packages/transaction/manage/transactionPriority/useTransactionFeeCalculation.test.js b/packages/transaction/manage/transactionPriority/useTransactionFeeCalculation.test.js
index 179eeacec9..2befa07c2a 100644
--- a/packages/transaction/manage/transactionPriority/useTransactionFeeCalculation.test.js
+++ b/packages/transaction/manage/transactionPriority/useTransactionFeeCalculation.test.js
@@ -1,13 +1,13 @@
 import { renderHook } from '@testing-library/react-hooks';
-import accounts from '@tests/constants/accounts';
+import wallets from '@tests/constants/wallets';
 import useTransactionFeeCalculation from './useTransactionFeeCalculation';
 
 describe('useTransactionFeeCalculation', () => {
   const props = {
     token: 'LSK',
-    account: {
-      ...accounts.genesis,
-      summary: { ...accounts.genesis.summary, isMultisignature: true },
+    wallet: {
+      ...wallets.genesis,
+      summary: { ...wallets.genesis.summary, isMultisignature: true },
       keys: {
         numberOfSignatures: 10,
         optionalKeys: [],
@@ -18,8 +18,8 @@ describe('useTransactionFeeCalculation', () => {
     selectedPriority: { value: 1, selectedIndex: 0 },
     transaction: {
       moduleAssetId: '2:0',
-      recipientAddress: accounts.genesis.summary.address,
-      senderPublicKey: accounts.genesis.summary.publicKey,
+      recipientAddress: wallets.genesis.summary.address,
+      senderPublicKey: wallets.genesis.summary.publicKey,
       amount: '100000000',
       fee: '1000',
       nonce: 1,
diff --git a/packages/transaction/store/action.js b/packages/transaction/store/action.js
index a14b46d6c2..2a6b51d83d 100644
--- a/packages/transaction/store/action.js
+++ b/packages/transaction/store/action.js
@@ -41,7 +41,7 @@ export const pendingTransactionAdded = data => ({
  * for Dashboard and Wallet components
  *
  * @param {Object} params - Object with all params.
- * @param {String} params.address - address of the account to fetch the transactions for
+ * @param {String} params.address - address of the wallet to fetch the transactions for
  * @param {Number} params.limit - amount of transactions to fetch
  * @param {Number} params.offset - index of the first transaction
  * @param {Object} params.filters - object with filters for the filer dropdown
@@ -103,20 +103,20 @@ export const resetTransactionResult = () => ({
 // eslint-disable-next-line max-statements
 export const transactionCreated = data => async (dispatch, getState) => {
   const {
-    account, settings, network,
+    wallet, settings, network,
   } = getState();
   const activeToken = settings.token.active;
-  const hwInfo = isEmpty(account.hwInfo) ? undefined : account.hwInfo; // @todo remove this by #3898
+  const hwInfo = isEmpty(wallet.hwInfo) ? undefined : wallet.hwInfo; // @todo remove this by #3898
 
   const [error, tx] = await to(create({
     transactionObject: {
       ...data,
       moduleAssetId: MODULE_ASSETS_NAME_ID_MAP.transfer,
     },
-    account: {
-      ...account.info[activeToken],
+    wallet: {
+      ...wallet.info[activeToken],
       hwInfo,
-      passphrase: account.passphrase,
+      passphrase: wallet.passphrase,
     },
     network,
   }, activeToken));
@@ -142,26 +142,26 @@ export const transactionCreated = data => async (dispatch, getState) => {
  */
 export const transactionDoubleSigned = () => async (dispatch, getState) => {
   const {
-    transactions, network, account, settings,
+    transactions, network, wallet, settings,
   } = getState();
   const keyPair = extractKeyPair({
-    passphrase: account.secondPassphrase,
+    passphrase: wallet.secondPassphrase,
     enableCustomDerivationPath: false,
   });
-  const activeAccount = {
-    ...account.info[settings.token.active],
-    passphrase: account.secondPassphrase,
+  const activeWallet = {
+    ...wallet.info[settings.token.active],
+    passphrase: wallet.secondPassphrase,
     summary: {
-      ...account.info[settings.token.active].summary,
+      ...wallet.info[settings.token.active].summary,
       ...keyPair,
     },
   };
   const transformedTx = transformTransaction(transactions.signedTransaction);
   const [signedTx, err] = await signMultisigTransaction(
     transformedTx,
-    activeAccount,
+    activeWallet,
     {
-      data: activeAccount,
+      data: activeWallet,
     },
     signatureCollectionStatus.partiallySigned,
     network,
@@ -192,7 +192,7 @@ export const transactionDoubleSigned = () => async (dispatch, getState) => {
 export const transactionBroadcasted = transaction =>
   // eslint-disable-next-line max-statements
   async (dispatch, getState) => {
-    const { network, settings, account } = getState();
+    const { network, settings, wallet } = getState();
     const activeToken = settings.token.active;
     const serviceUrl = network.networks[activeToken].serviceUrl;
 
@@ -217,7 +217,7 @@ export const transactionBroadcasted = transaction =>
 
       if (activeToken === tokenMap.LSK.key) {
         const transformedTransaction = transformTransaction(transaction);
-        if (transformedTransaction.sender.address === account.info.LSK.summary.address) {
+        if (transformedTransaction.sender.address === wallet.info.LSK.summary.address) {
           dispatch(pendingTransactionAdded({ ...transformedTransaction, isPending: true }));
         }
       }
@@ -239,18 +239,18 @@ export const multisigTransactionSigned = ({
   rawTransaction, sender,
 }) => async (dispatch, getState) => {
   const {
-    network, account,
+    network, wallet,
   } = getState();
-  const activeAccount = {
-    ...account.info.LSK,
-    passphrase: account.passphrase,
-    hwInfo: account.hwInfo,
+  const activeWallet = {
+    ...wallet.info.LSK,
+    passphrase: wallet.passphrase,
+    hwInfo: wallet.hwInfo,
   };
   const txStatus = getTransactionSignatureStatus(sender.data, rawTransaction);
 
   const [tx, error] = await signMultisigTransaction(
     rawTransaction,
-    activeAccount,
+    activeWallet,
     sender,
     txStatus,
     network,
diff --git a/packages/transaction/store/actions.test.js b/packages/transaction/store/actions.test.js
index c377521086..f3eabc0530 100644
--- a/packages/transaction/store/actions.test.js
+++ b/packages/transaction/store/actions.test.js
@@ -1,10 +1,11 @@
-import { loginTypes } from '@views/configuration';
+import loginTypes from '@wallet/configuration/loginTypes';
 import * as hwManager from '@transaction/utilities/hwManager';
 import httpApi from '@common/utilities/api/http';
 import * as transactionUtils from '@transaction/utilities/transaction';
 import { getState } from '@fixtures/transactions';
 import { sampleTransaction } from '@tests/constants/transactions';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
+import commonActionTypes from '@common/store/actions/actionTypes';
 import actionTypes from './actionTypes';
 import {
   emptyTransactionsData,
@@ -57,7 +58,7 @@ describe('actions: transactions', () => {
 
       // Assert
       expect(dispatch).toHaveBeenNthCalledWith(1, {
-        type: actionTypes.loadingStarted,
+        type: commonActionTypes.loadingStarted,
         data: actionTypes.transactionsRetrieved,
       });
       expect(dispatch).toHaveBeenNthCalledWith(2, {
@@ -65,7 +66,7 @@ describe('actions: transactions', () => {
         data: expectedAction,
       });
       expect(dispatch).toHaveBeenNthCalledWith(3, {
-        type: actionTypes.loadingFinished,
+        type: commonActionTypes.loadingFinished,
         data: actionTypes.transactionsRetrieved,
       });
     });
@@ -92,7 +93,7 @@ describe('actions: transactions', () => {
 
       // Assert
       expect(dispatch).toHaveBeenNthCalledWith(1, {
-        type: actionTypes.loadingStarted,
+        type: commonActionTypes.loadingStarted,
         data: actionTypes.transactionsRetrieved,
       });
       expect(dispatch).toHaveBeenNthCalledWith(2, {
@@ -100,7 +101,7 @@ describe('actions: transactions', () => {
         data: expectedAction,
       });
       expect(dispatch).toHaveBeenNthCalledWith(3, {
-        type: actionTypes.loadingFinished,
+        type: commonActionTypes.loadingFinished,
         data: actionTypes.transactionsRetrieved,
       });
     });
@@ -117,7 +118,7 @@ describe('actions: transactions', () => {
       expect(httpApi).rejects.toThrow(transactionError);
       expect(dispatch).toHaveBeenCalledTimes(3);
       expect(dispatch).toHaveBeenNthCalledWith(1, {
-        type: actionTypes.loadingStarted,
+        type: commonActionTypes.loadingStarted,
         data: actionTypes.transactionsRetrieved,
       });
       expect(dispatch).toHaveBeenNthCalledWith(2, {
@@ -125,7 +126,7 @@ describe('actions: transactions', () => {
         data: { error: transactionError },
       });
       expect(dispatch).toHaveBeenNthCalledWith(3, {
-        type: actionTypes.loadingFinished,
+        type: commonActionTypes.loadingFinished,
         data: actionTypes.transactionsRetrieved,
       });
     });
@@ -172,23 +173,24 @@ describe('actions: transactions', () => {
 
   describe('transactionCreated', () => {
     const state = getState();
+
     const activeAccount = {
-      ...state.account.info.LSK,
+      ...state.wallet.info.LSK,
       hwInfo: {
         deviceModel: 'Ledger Nano S',
       },
-      passphrase: state.account.passphrase,
+      passphrase: state.wallet.passphrase,
     };
     const getStateWithHW = () => ({
       ...state,
-      account: {
+      wallet: {
         info: {
           LSK: activeAccount,
         },
         hwInfo: {
           deviceModel: 'Ledger Nano S',
         },
-        passphrase: state.account.passphrase,
+        passphrase: state.wallet.passphrase,
       },
     });
 
@@ -233,14 +235,14 @@ describe('actions: transactions', () => {
   });
 
   describe('transactionDoubleSigned', () => {
-    const { network, account, settings } = getState();
+    const { network, wallet, settings } = getState();
     const getStateWithTx = () => ({
       network,
-      account: {
-        ...account,
+      wallet: {
+        ...wallet,
         secondPassphrase: accounts.genesis.passphrase,
         info: {
-          ...account.info,
+          ...wallet.info,
           LSK: accounts.multiSig,
         },
       },
@@ -357,14 +359,14 @@ describe('actions: transactions', () => {
   });
 
   describe('multisigTransactionSigned', () => {
-    const { network, account, settings } = getState();
+    const { network, wallet, settings } = getState();
     const getStateWithTx = () => ({
       network,
-      account: {
-        ...account,
+      wallet: {
+        ...wallet,
         secondPassphrase: accounts.multiSig.passphrase,
         info: {
-          ...account.info,
+          ...wallet.info,
           LSK: accounts.multiSig,
         },
       },
diff --git a/packages/transaction/utilities/api/lsk.js b/packages/transaction/utilities/api/lsk.js
index ff0f4db5f7..bb68fd291e 100644
--- a/packages/transaction/utilities/api/lsk.js
+++ b/packages/transaction/utilities/api/lsk.js
@@ -312,14 +312,14 @@ export const getTransactionFee = async ({
 // eslint-disable-next-line max-statements
 export const create = async ({
   network,
-  account,
+  wallet,
   transactionObject,
 }) => {
   const {
     summary: { publicKey, isMultisignature, privateKey },
     keys,
     sequence,
-  } = account;
+  } = wallet;
   const networkIdentifier = Buffer.from(network.networks.LSK.networkIdentifier, 'hex');
 
   const { moduleAssetId, ...rawTransaction } = transactionObject;
@@ -333,7 +333,7 @@ export const create = async ({
     === MODULE_ASSETS_NAME_ID_MAP.registerMultisignatureGroup;
 
   const result = await sign(
-    account, schema, transaction, network, networkIdentifier,
+    wallet, schema, transaction, network, networkIdentifier,
     isMultisignature, isMultiSignatureRegistration, keys, publicKey,
     moduleAssetId, rawTransaction, privateKey,
   );
diff --git a/packages/transaction/utilities/api/lsk.test.js b/packages/transaction/utilities/api/lsk.test.js
index db7736a746..cd837d6111 100644
--- a/packages/transaction/utilities/api/lsk.test.js
+++ b/packages/transaction/utilities/api/lsk.test.js
@@ -4,7 +4,7 @@ import { getTxAmount } from '@transaction/utilities/transaction';
 import { getState } from '@fixtures/transactions';
 import * as delegates from '@dpos/utilities/api';
 import http from '@common/utilities/api/http';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import {
   getTransaction,
   getTransactions,
diff --git a/packages/transaction/utilities/hwManager/hwManager.test.js b/packages/transaction/utilities/hwManager/hwManager.test.js
index afbb1e84b0..72eca9997f 100644
--- a/packages/transaction/utilities/hwManager/hwManager.test.js
+++ b/packages/transaction/utilities/hwManager/hwManager.test.js
@@ -1,5 +1,5 @@
 import * as communication from '@libs/hwManager/communication';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import {
   signTransactionByHW,
 } from './index';
diff --git a/packages/transaction/utilities/hwManager/index.js b/packages/transaction/utilities/hwManager/index.js
index 697efa17b7..89e9dad9ad 100644
--- a/packages/transaction/utilities/hwManager/index.js
+++ b/packages/transaction/utilities/hwManager/index.js
@@ -5,22 +5,22 @@ import { signTransaction } from '@libs/hwManager/communication';
  * This function is used for sign a send hardware wallet transaction.
  */
 const signTransactionByHW = async (
-  account,
+  wallet,
   networkIdentifier,
   transactionObject,
   transactionBytes,
   keys,
 ) => {
   const data = {
-    deviceId: account.hwInfo.deviceId,
-    index: account.hwInfo.derivationIndex,
+    deviceId: wallet.hwInfo.deviceId,
+    index: wallet.hwInfo.derivationIndex,
     networkIdentifier,
     transactionBytes,
   };
 
   try {
     const signature = await signTransaction(data);
-    return updateTransactionSignatures(account, transactionObject, signature, keys);
+    return updateTransactionSignatures(wallet, transactionObject, signature, keys);
   } catch (error) {
     throw new Error(error);
   }
diff --git a/packages/transaction/utilities/transaction.js b/packages/transaction/utilities/transaction.js
index 57a278eca1..ae587b0c1f 100644
--- a/packages/transaction/utilities/transaction.js
+++ b/packages/transaction/utilities/transaction.js
@@ -483,12 +483,12 @@ const signUsingPrivateKey = (schema, transaction, networkIdentifier, privateKey)
 
 // eslint-disable-next-line max-statements
 const signUsingHW = async (
-  schema, transaction, account, networkIdentifier, network, keys, rawTransaction,
+  schema, transaction, wallet, networkIdentifier, network, keys, rawTransaction,
   isMultiSignatureRegistration,
 ) => {
   const signingBytes = transactions.getSigningBytes(schema, transaction);
   const [error, signedTransaction] = await to(signTransactionByHW(
-    account,
+    wallet,
     networkIdentifier,
     transaction,
     signingBytes,
@@ -507,8 +507,8 @@ const signUsingHW = async (
     ...transactionKeys.mandatoryKeys.sort(),
     ...transactionKeys.optionalKeys.sort(),
   ];
-  const senderIndex = members.indexOf(account.summary.publicKey);
-  const isSender = rawTransaction.senderPublicKey === account.summary.publicKey;
+  const senderIndex = members.indexOf(wallet.summary.publicKey);
+  const isSender = rawTransaction.senderPublicKey === wallet.summary.publicKey;
 
   if (isMultiSignatureRegistration && isSender && senderIndex > -1) {
     const signatures = Array.from(Array(members.length + 1).keys()).map((index) => {
@@ -524,13 +524,13 @@ const signUsingHW = async (
 };
 
 export const sign = async (
-  account, schema, transaction, network, networkIdentifier,
+  wallet, schema, transaction, network, networkIdentifier,
   isMultisignature, isMultiSignatureRegistration, keys, publicKey,
   moduleAssetId, rawTransaction, privateKey,
 ) => {
-  if (!isEmpty(account.hwInfo)) {
+  if (!isEmpty(wallet.hwInfo)) {
     const signedTx = await signUsingHW(
-      schema, transaction, account, networkIdentifier, network, keys, rawTransaction,
+      schema, transaction, wallet, networkIdentifier, network, keys, rawTransaction,
       isMultiSignatureRegistration,
     );
     return signedTx;
diff --git a/packages/transaction/utilities/transaction.test.js b/packages/transaction/utilities/transaction.test.js
index e507254978..3d7c3ccb2b 100644
--- a/packages/transaction/utilities/transaction.test.js
+++ b/packages/transaction/utilities/transaction.test.js
@@ -1,7 +1,7 @@
 import { MODULE_ASSETS_NAME_ID_MAP } from '@transaction/configuration/moduleAssets';
 import { splitModuleAndAssetIds } from '@transaction/utilities/moduleAssets';
 import { getAddressFromBase32Address } from '@wallet/utilities/account';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import {
   getTxAmount,
   transformTransaction,
diff --git a/packages/views/basics/autoSuggest/autoSuggest.test.js b/packages/views/basics/autoSuggest/autoSuggest.test.js
index 5bee280213..c04087081e 100644
--- a/packages/views/basics/autoSuggest/autoSuggest.test.js
+++ b/packages/views/basics/autoSuggest/autoSuggest.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { keyCodes } from '@views/configuration';
 import { tokenMap } from '@token/configuration/tokens';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import AutoSuggest from './index';
 
 describe('Recipient Input', () => {
@@ -41,7 +41,7 @@ describe('Recipient Input', () => {
     // eslint-disable-next-line react/display-name
     renderItem: item => (
       <>
-        <AccountVisual address={item.address} size={25} />
+        <WalletVisual address={item.address} size={25} />
         <span>{item.title}</span>
         <span>{item.address}</span>
       </>
@@ -71,7 +71,7 @@ describe('Recipient Input', () => {
     props.selectedItem.address = '12345L';
     props.selectedItem.title = 'John Cena';
     wrapper = mount(<AutoSuggest {...props} />);
-    expect(wrapper).toContainMatchingElement('AccountVisual');
+    expect(wrapper).toContainMatchingElement('WalletVisual');
   });
 
   it('should select an account from the available list', () => {
diff --git a/packages/views/basics/demo.js b/packages/views/basics/demo.js
index 6de271377a..a3e09b03b1 100644
--- a/packages/views/basics/demo.js
+++ b/packages/views/basics/demo.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import AccountVisualDemo from '@wallet/detail/info/accountVisual/demo';
+import WalletVisualDemo from '@wallet/detail/identity/walletVisual/demo';
 import AutoSuggestDemo from './autoSuggest/demo';
 import CalendarDemo from './calendar/demo';
 import IllustrationDemo from './illustration/demo';
@@ -31,7 +31,7 @@ const WithTableOfContents = ({
 
 const ToolboxDemo = () => (
   <WithTableOfContents>
-    <AccountVisualDemo />
+    <WalletVisualDemo />
     <AutoSuggestDemo />
     <CalendarDemo />
     <IllustrationDemo />
diff --git a/packages/views/basics/dialog/holder.js b/packages/views/basics/dialog/holder.js
index d34d97bceb..bc5c3daae6 100644
--- a/packages/views/basics/dialog/holder.js
+++ b/packages/views/basics/dialog/holder.js
@@ -19,7 +19,7 @@ const DialogHolder = ({ history }) => {
   const settings = useSelector(state => state.settings);
   const networkIsSet = useSelector(state => !!state.network.name);
   const isAuthenticated = useSelector(state =>
-    (state.account.info && state.account.info[settings.token.active]));
+    (state.wallet.info && state.wallet.info[settings.token.active]));
 
   const backdropRef = useRef();
   const [dismissed, setDismissed] = useState(false);
diff --git a/packages/views/basics/dialog/holder.test.js b/packages/views/basics/dialog/holder.test.js
index 75b811259f..83f2d3333c 100644
--- a/packages/views/basics/dialog/holder.test.js
+++ b/packages/views/basics/dialog/holder.test.js
@@ -34,7 +34,7 @@ describe('Dialog Holder Component', () => {
         active: 'LSK',
       },
     },
-    account: {
+    wallet: {
       info: {
         LSK: 'some data',
       },
diff --git a/packages/views/basics/icon/index.js b/packages/views/basics/icon/index.js
index 8233b5070f..34687208ea 100644
--- a/packages/views/basics/icon/index.js
+++ b/packages/views/basics/icon/index.js
@@ -114,8 +114,8 @@ import darkMode from '../../../../setup/react/assets/images/icons/dark-mode.svg'
 import lightMode from '../../../../setup/react/assets/images/icons/light-mode.svg';
 import blocksMonitor from '../../../../setup/react/assets/images/icons/blocks.svg';
 import blocksMonitorActive from '../../../../setup/react/assets/images/icons/blocksActive.svg';
-import accountsMonitor from '../../../../setup/react/assets/images/icons/accountsMonitor.svg';
-import accountsMonitorActive from '../../../../setup/react/assets/images/icons/accountsMonitorActive.svg';
+import walletsMonitor from '../../../../setup/react/assets/images/icons/walletsMonitor.svg';
+import walletsMonitorActive from '../../../../setup/react/assets/images/icons/walletsMonitorActive.svg';
 import transactions from '../../../../setup/react/assets/images/icons/transactions.svg';
 import transactionsDark from '../../../../setup/react/assets/images/icons/transactions-dark.svg';
 import transactionsMonitor from '../../../../setup/react/assets/images/icons/transactionsMonitor.svg';
@@ -329,8 +329,8 @@ export const icons = {
   lightMode,
   blocksMonitor,
   blocksMonitorActive,
-  accountsMonitor,
-  accountsMonitorActive,
+  walletsMonitor,
+  walletsMonitorActive,
   transactions,
   transactionsDark,
   transactionsMonitor,
diff --git a/packages/views/basics/table/table.test.js b/packages/views/basics/table/table.test.js
index 6fa0ecadf6..a845bd7fa2 100644
--- a/packages/views/basics/table/table.test.js
+++ b/packages/views/basics/table/table.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { mount } from 'enzyme';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import Table from './index';
 
 describe('Table', () => {
diff --git a/packages/views/screens/managers/bookmarks/addBookmark/addBookmark.test.js b/packages/views/screens/managers/bookmarks/addBookmark/addBookmark.test.js
index 4f49201718..763640068b 100644
--- a/packages/views/screens/managers/bookmarks/addBookmark/addBookmark.test.js
+++ b/packages/views/screens/managers/bookmarks/addBookmark/addBookmark.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { mount } from 'enzyme';
 import * as bitcoin from 'bitcoinjs-lib';
 import { tokenMap, tokenKeys } from '@token/configuration/tokens';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import AddBookmark from './addBookmark';
 
 describe('Add a new bookmark component', () => {
diff --git a/packages/views/screens/managers/bookmarks/addBookmark/fields.js b/packages/views/screens/managers/bookmarks/addBookmark/fields.js
index c1dea5f1d5..915985e78e 100644
--- a/packages/views/screens/managers/bookmarks/addBookmark/fields.js
+++ b/packages/views/screens/managers/bookmarks/addBookmark/fields.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import { Input } from '@basics/inputs';
 import styles from './addBookmark.css';
 
@@ -40,9 +40,8 @@ const Fields = ({
             status={status[index].feedback === '' ? 'ok' : 'error'}
           />
           {field.name === 'address' ? (
-            <AccountVisual
+            <WalletVisual
               className={styles.avatar}
-              // placeholder={status[index].isInvalid || !status[index].value}
               address={status[index].value}
               size={25}
             />
diff --git a/packages/views/screens/managers/dashboard/dashboard.js b/packages/views/screens/managers/dashboard/dashboard.js
index 3e5bff4106..8134ad6b77 100644
--- a/packages/views/screens/managers/dashboard/dashboard.js
+++ b/packages/views/screens/managers/dashboard/dashboard.js
@@ -39,8 +39,8 @@ const getOnboardingSlides = (t) => [
   },
 ];
 
-const Dashboard = ({ account, t }) => {
-  const isLoggedIn = !!account?.summary?.address;
+const Dashboard = ({ wallet, t }) => {
+  const isLoggedIn = !!wallet?.summary?.address;
   const OnboardingBannerName = 'dashboardOnboarding';
 
   return (
diff --git a/packages/views/screens/managers/dashboard/index.js b/packages/views/screens/managers/dashboard/index.js
index 791d88f6cf..733c945f1a 100644
--- a/packages/views/screens/managers/dashboard/index.js
+++ b/packages/views/screens/managers/dashboard/index.js
@@ -18,7 +18,7 @@ const mapStateToProps = state => ({
     state.transactions.confirmed,
   ),
   pendingTransactions: state.transactions.pending,
-  account: getActiveTokenAccount(state),
+  wallet: getActiveTokenAccount(state),
   loading: state.loading.length > 0,
   settings: state.settings,
 });
diff --git a/packages/views/screens/managers/dashboard/infoBanner/infoBanner.js b/packages/views/screens/managers/dashboard/infoBanner/infoBanner.js
index e9147a4062..3578996d03 100644
--- a/packages/views/screens/managers/dashboard/infoBanner/infoBanner.js
+++ b/packages/views/screens/managers/dashboard/infoBanner/infoBanner.js
@@ -16,7 +16,7 @@ const InfoBanner = ({
   t,
 }) => {
   const [visibility, setVisibility] = useState(!localStorage.getItem(name) && show);
-  const isLoggedIn = useSelector(state => (state.account && state.account.passphrase));
+  const isLoggedIn = useSelector(state => (state.wallet && state.wallet.passphrase));
 
   const handleClose = () => {
     localStorage.setItem(name, true);
diff --git a/packages/views/screens/managers/dashboard/onboarding/onboarding.js b/packages/views/screens/managers/dashboard/onboarding/onboarding.js
index 0df481c7c8..672b06a33a 100644
--- a/packages/views/screens/managers/dashboard/onboarding/onboarding.js
+++ b/packages/views/screens/managers/dashboard/onboarding/onboarding.js
@@ -11,7 +11,7 @@ const Onboarding = ({
 }) => {
   const [currentSlide, setCurrentSlide] = useState(0);
   const [visibility, setVisibility] = useState(!localStorage.getItem(name) ? 'visible' : 'hidden');
-  const isLoggedIn = useSelector(state => (state.account && state.account.passphrase));
+  const isLoggedIn = useSelector(state => (state.wallet && state.wallet.passphrase));
 
   const handleClose = () => {
     localStorage.setItem(name, true);
diff --git a/packages/views/screens/managers/dashboard/recentTransactions/index.js b/packages/views/screens/managers/dashboard/recentTransactions/index.js
index bc746d7c4d..0880f1cbfc 100644
--- a/packages/views/screens/managers/dashboard/recentTransactions/index.js
+++ b/packages/views/screens/managers/dashboard/recentTransactions/index.js
@@ -9,7 +9,7 @@ export default withData({
     apiUtil: (network, { token, ...params }) => getTransactions({ network, params }, token),
     getApiParams: (state) => {
       const token = state.settings.token.active;
-      const address = state.account.info ? state.account.info[token].summary.address : '';
+      const address = state.wallet.info ? state.wallet.info[token].summary.address : '';
       return {
         token,
         address,
diff --git a/packages/views/screens/managers/dashboard/recentTransactions/transactionRow.js b/packages/views/screens/managers/dashboard/recentTransactions/transactionRow.js
index 1e3d9bfeaf..f834727a39 100644
--- a/packages/views/screens/managers/dashboard/recentTransactions/transactionRow.js
+++ b/packages/views/screens/managers/dashboard/recentTransactions/transactionRow.js
@@ -2,7 +2,7 @@ import React from 'react';
 import grid from 'flexboxgrid/dist/flexboxgrid.css';
 import { useSelector } from 'react-redux';
 import TransactionTypeFigure from '@transaction/detail/info/transactionTypeFigure';
-import TransactionAddress from '@wallet/detail/info/accountVisual/transactionAddress';
+import TransactionAddress from '@wallet/detail/identity/walletVisual/transactionAddress';
 import TransactionAmount from '@transaction/detail/info/transactionAmount';
 import DialogLink from '@basics/dialog/link';
 import styles from './recentTransactions.css';
diff --git a/packages/views/screens/managers/editVote/editVote.css b/packages/views/screens/managers/editVote/editVote.css
index a3fa893ee9..6e6d470340 100644
--- a/packages/views/screens/managers/editVote/editVote.css
+++ b/packages/views/screens/managers/editVote/editVote.css
@@ -24,7 +24,7 @@
     padding: 0 0 var(--horizontal-padding-l) 0;
   }
 
-  & .accountInfo {
+  & .walletInfo {
     color: var(--color-ink-blue);
     border: var(--balance-border);
     box-shadow: var(--balance-shadow);
diff --git a/packages/views/screens/managers/editVote/getMaxAmount.test.js b/packages/views/screens/managers/editVote/getMaxAmount.test.js
index ad54fba191..4ab0332b12 100644
--- a/packages/views/screens/managers/editVote/getMaxAmount.test.js
+++ b/packages/views/screens/managers/editVote/getMaxAmount.test.js
@@ -1,4 +1,4 @@
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import getMaxAmount from './getMaxAmount';
 
 const account = {
diff --git a/packages/views/screens/managers/editVote/index.js b/packages/views/screens/managers/editVote/index.js
index 77ed3a9cb6..841810d6e7 100644
--- a/packages/views/screens/managers/editVote/index.js
+++ b/packages/views/screens/managers/editVote/index.js
@@ -44,7 +44,7 @@ const AddVote = ({
 }) => {
   const dispatch = useDispatch();
   const { account, network, voting } = useSelector(state => state);
-  const host = useSelector(state => state.account.info.LSK.summary.address);
+  const host = useSelector(state => state.wallet.info.LSK.summary.address);
   const address = selectSearchParamValue(history.location.search, 'address');
   const start = selectSearchParamValue(history.location.search, 'start');
   const end = selectSearchParamValue(history.location.search, 'end');
@@ -91,7 +91,7 @@ const AddVote = ({
           <BoxInfoText>
             <span>{titles.description}</span>
           </BoxInfoText>
-          <BoxInfoText className={styles.accountInfo}>
+          <BoxInfoText className={styles.walletInfo}>
             <p className={styles.balanceTitle}>{t('Available balance for voting')}</p>
             <div className={styles.balanceDetails}>
               <span className={styles.lskValue}>
diff --git a/packages/views/screens/managers/hwWalletLogin/requestPin.test.js b/packages/views/screens/managers/hwWalletLogin/requestPin.test.js
index 164f8781d4..eaeb05eac5 100644
--- a/packages/views/screens/managers/hwWalletLogin/requestPin.test.js
+++ b/packages/views/screens/managers/hwWalletLogin/requestPin.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import * as hwManager from '@wallet/utilities/hwManager';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import RequestPin from './requestPin';
 
 jest.mock('@wallet/utilities/hwManager');
diff --git a/packages/views/screens/managers/hwWalletLogin/selectAccount/accountCard.js b/packages/views/screens/managers/hwWalletLogin/selectAccount/accountCard.js
index fc57343529..8546fed228 100644
--- a/packages/views/screens/managers/hwWalletLogin/selectAccount/accountCard.js
+++ b/packages/views/screens/managers/hwWalletLogin/selectAccount/accountCard.js
@@ -3,7 +3,7 @@ import { withTranslation } from 'react-i18next';
 import { tokenMap } from '@token/configuration/tokens';
 import { truncateAddress } from '@wallet/utilities/account';
 import { TertiaryButton } from '@basics/buttons';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import LiskAmount from '@shared/liskAmount';
 import { Input } from '@basics/inputs';
 import Icon from '@basics/icon';
@@ -35,7 +35,7 @@ const AccountCard = ({
     >
       <div className={styles.content}>
         <div>
-          <AccountVisual
+          <WalletVisual
             address={account.summary?.address || ''}
             size={40}
           />
diff --git a/packages/views/screens/managers/lockedBalance/form/balanceTable.test.js b/packages/views/screens/managers/lockedBalance/form/balanceTable.test.js
index 50a68fa43b..ed4c9bef6d 100644
--- a/packages/views/screens/managers/lockedBalance/form/balanceTable.test.js
+++ b/packages/views/screens/managers/lockedBalance/form/balanceTable.test.js
@@ -4,7 +4,7 @@ import {
   calculateBalanceLockedInVotes,
   calculateUnlockableBalance,
 } from '@wallet/utilities/account';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import BalanceTable from './balanceTable';
 
 describe('unlock transaction Status', () => {
diff --git a/packages/views/screens/managers/lockedBalance/form/index.js b/packages/views/screens/managers/lockedBalance/form/index.js
index 9bfceea001..085885c179 100644
--- a/packages/views/screens/managers/lockedBalance/form/index.js
+++ b/packages/views/screens/managers/lockedBalance/form/index.js
@@ -16,13 +16,13 @@ import BalanceTable from './balanceTable';
 const moduleAssetId = MODULE_ASSETS_NAME_ID_MAP.unlockToken;
 
 const LockedBalance = (props) => {
-  const account = useSelector(state => getActiveTokenAccount(state));
+  const wallet = useSelector(state => getActiveTokenAccount(state));
   const token = useSelector(state => state.settings.token.active);
   const network = useSelector(state => state.network);
   const currentBlockHeight = useSelector(selectCurrentBlockHeight);
   const lockedInVotes = useSelector(state => calculateBalanceLockedInVotes(state.voting));
   const unlockableBalance = calculateUnlockableBalance(
-    account.dpos?.unlocking, currentBlockHeight,
+    wallet.dpos?.unlocking, currentBlockHeight,
   );
   const [customFee, setCustomFee] = useState();
   const [
@@ -34,14 +34,14 @@ const LockedBalance = (props) => {
     network,
     selectedPriority,
     token,
-    account,
+    wallet,
     priorityOptions,
     transaction: {
       moduleAssetId,
-      senderPublicKey: account.summary?.publicKey,
-      nonce: account.sequence?.nonce,
-      passphrase: account.passphrase,
-      unlockObjects: getUnlockableUnlockObjects(account.dpos?.unlocking, currentBlockHeight),
+      senderPublicKey: wallet.summary?.publicKey,
+      nonce: wallet.sequence?.nonce,
+      passphrase: wallet.passphrase,
+      unlockObjects: getUnlockableUnlockObjects(wallet.dpos?.unlocking, currentBlockHeight),
     },
   });
 
@@ -58,7 +58,7 @@ const LockedBalance = (props) => {
         lockedInVotes={lockedInVotes}
         unlockableBalance={unlockableBalance}
         currentBlockHeight={currentBlockHeight}
-        account={account}
+        account={wallet}
       />
       <TransactionPriority
         token={token}
diff --git a/packages/views/screens/managers/lockedBalance/form/lockedBalance.test.js b/packages/views/screens/managers/lockedBalance/form/lockedBalance.test.js
index 9759c94207..635da7dec4 100644
--- a/packages/views/screens/managers/lockedBalance/form/lockedBalance.test.js
+++ b/packages/views/screens/managers/lockedBalance/form/lockedBalance.test.js
@@ -6,7 +6,7 @@ import * as hwManager from '@transaction/utilities/hwManager';
 import { create } from '@transaction/utilities/api';
 import useTransactionPriority from '@transaction/manage/transactionPriority/useTransactionPriority';
 import useTransactionFeeCalculation from '@transaction/manage/transactionPriority/useTransactionFeeCalculation';
-import accounts from '@tests/constants/accounts';
+import wallets from '@tests/constants/wallets';
 import flushPromises from '@tests/unit-test-utils/flushPromises';
 import LockedBalance from './index';
 
@@ -58,11 +58,11 @@ describe('Unlock LSK modal', () => {
   ];
 
   const store = {
-    account: {
-      ...accounts.genesis,
+    wallet: {
+      ...wallets.genesis,
       info: {
         LSK: {
-          ...accounts.genesis,
+          ...wallets.genesis,
           dpos: {
             unlocking: initUnlocking,
             sentVotes: initVotes,
diff --git a/packages/views/screens/managers/lockedBalance/status/index.js b/packages/views/screens/managers/lockedBalance/status/index.js
index cc3c83c664..57865a26fe 100644
--- a/packages/views/screens/managers/lockedBalance/status/index.js
+++ b/packages/views/screens/managers/lockedBalance/status/index.js
@@ -6,9 +6,9 @@ import Status from './status';
 const mapStateToProps = state => ({
   transactions: state.transactions,
   account: {
-    ...state.account.info[state.settings.token.active],
-    hwInfo: state.account.hwInfo,
-    passphrase: state.account.passphrase,
+    ...state.wallet.info[state.settings.token.active],
+    hwInfo: state.wallet.hwInfo,
+    passphrase: state.wallet.passphrase,
   },
 });
 
diff --git a/packages/views/screens/managers/lockedBalance/status/status.test.js b/packages/views/screens/managers/lockedBalance/status/status.test.js
index 1e411811f4..e116be3dc3 100644
--- a/packages/views/screens/managers/lockedBalance/status/status.test.js
+++ b/packages/views/screens/managers/lockedBalance/status/status.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import TransactionResult from '@transaction/detail/manager/transactionResult';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import Status from './status';
 
 describe('unlock transaction Status', () => {
diff --git a/packages/views/screens/managers/lockedBalance/summary/index.js b/packages/views/screens/managers/lockedBalance/summary/index.js
index 5d7c35bed3..86da9968de 100644
--- a/packages/views/screens/managers/lockedBalance/summary/index.js
+++ b/packages/views/screens/managers/lockedBalance/summary/index.js
@@ -6,7 +6,7 @@ import { balanceUnlocked } from '@common/store/actions';
 import Summary from './summary';
 
 const mapStateToProps = state => ({
-  account: getActiveTokenAccount(state),
+  wallet: getActiveTokenAccount(state),
   network: state.network,
   currentBlockHeight: state.blocks.latestBlocks[0].height,
 });
diff --git a/packages/views/screens/managers/lockedBalance/summary/summary.js b/packages/views/screens/managers/lockedBalance/summary/summary.js
index a42a5f48c9..bd58117258 100644
--- a/packages/views/screens/managers/lockedBalance/summary/summary.js
+++ b/packages/views/screens/managers/lockedBalance/summary/summary.js
@@ -15,15 +15,15 @@ const Summary = ({
   rawTransaction,
   prevStep,
   nextStep,
-  account,
+  wallet,
   t,
 }) => {
   const transaction = {
-    nonce: account.sequence.nonce,
+    nonce: wallet.sequence.nonce,
     fee: fromRawLsk(rawTransaction.selectedFee),
     asset: {
       unlockObjects: getUnlockableUnlockObjects(
-        account.dpos?.unlocking, currentBlockHeight,
+        wallet.dpos?.unlocking, currentBlockHeight,
       ),
     },
   };
@@ -49,14 +49,14 @@ const Summary = ({
       title={t('Unlock LSK summary')}
       confirmButton={onConfirmAction}
       cancelButton={onCancelAction}
-      fee={!account.summary.isMultisignature && rawTransaction.selectedFee.value}
+      fee={!wallet.summary.isMultisignature && rawTransaction.selectedFee.value}
       classNames={`${styles.box} ${styles.summaryContainer}`}
     >
       <TransactionInfo
         moduleAssetId={moduleAssetId}
         transaction={transaction}
-        account={account}
-        isMultisignature={account.summary.isMultisignature}
+        account={wallet}
+        isMultisignature={wallet.summary.isMultisignature}
       />
     </TransactionSummary>
   );
diff --git a/packages/views/screens/managers/lockedBalance/summary/summary.test.js b/packages/views/screens/managers/lockedBalance/summary/summary.test.js
index fb8b753977..54f628bc0c 100644
--- a/packages/views/screens/managers/lockedBalance/summary/summary.test.js
+++ b/packages/views/screens/managers/lockedBalance/summary/summary.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { mount } from 'enzyme';
-import accounts from '@tests/constants/accounts';
+import wallets from '@tests/constants/wallets';
 import Summary from './summary';
 
 describe('Locked balance Summary', () => {
@@ -13,7 +13,7 @@ describe('Locked balance Summary', () => {
     nextStep: jest.fn(),
     prevStep: jest.fn(),
     t: key => key,
-    account: accounts.genesis,
+    wallet: wallets.genesis,
   };
 
   afterEach(() => {
diff --git a/packages/views/screens/managers/login/login.test.js b/packages/views/screens/managers/login/login.test.js
index 324bfeade5..bc59779688 100644
--- a/packages/views/screens/managers/login/login.test.js
+++ b/packages/views/screens/managers/login/login.test.js
@@ -6,7 +6,7 @@ import { mountWithRouterAndStore } from '@common/utilities/testHelpers';
 import routes from '@screens/router/routes';
 import { defaultDerivationPath } from '@common/utilities/explicitBipKeyDerivation';
 import { settingsUpdated } from '@common/store/actions';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import Login from './login';
 
 jest.mock('@basics/flashMessage/holder', () => ({
diff --git a/packages/views/screens/managers/monitor/accounts/index.js b/packages/views/screens/managers/monitor/accounts/index.js
deleted file mode 100644
index 3e60d262f3..0000000000
--- a/packages/views/screens/managers/monitor/accounts/index.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import React from 'react';
-import { compose } from 'redux';
-import { withTranslation } from 'react-i18next';
-
-import withData from '@common/utilities/withData';
-import { getAccounts } from '@wallet/utilities/api';
-import { getNetworkStatus } from '@network/utilities/api';
-import Box from '@basics/box';
-import BoxHeader from '@basics/box/header';
-import BoxContent from '@basics/box/content';
-import Table from '@basics/table';
-import { DEFAULT_LIMIT } from '@views/configuration';
-import styles from './accounts.css';
-import header from './tableHeader';
-import AccountRow from './accountRow';
-
-export const AccountsPure = ({
-  accounts,
-  networkStatus,
-  t,
-}) => {
-  /* istanbul ignore next */
-  const handleLoadMore = () => {
-    accounts.loadData({ offset: accounts.meta.count + accounts.meta.offset });
-  };
-  const supply = networkStatus.data.supply;
-  const canLoadMore = accounts.meta ? accounts.meta.count === DEFAULT_LIMIT : false;
-
-  return (
-    <Box main isLoading={accounts.isLoading} className="accounts-box">
-      <BoxHeader>
-        <h1>{t('All accounts')}</h1>
-      </BoxHeader>
-      <BoxContent className={styles.content}>
-        <Table
-          data={accounts.data}
-          isLoading={accounts.isLoading}
-          row={AccountRow}
-          loadData={handleLoadMore}
-          header={header(t)}
-          additionalRowProps={{ supply }}
-          error={accounts.error}
-          canLoadMore={canLoadMore}
-        />
-      </BoxContent>
-    </Box>
-  );
-};
-
-export default compose(
-  withData(
-    {
-      accounts: {
-        apiUtil: (network, params) => getAccounts({
-          network,
-          params: {
-            ...params,
-            limit: DEFAULT_LIMIT,
-            offset: params.offset || 0,
-            sort: 'balance:desc',
-          },
-        }),
-        defaultData: [],
-        autoload: true,
-        transformResponse: (response, accounts, urlSearchParams) => (
-          urlSearchParams.offset
-            ? [...accounts, ...response.data]
-            : response.data
-        ),
-      },
-      networkStatus: {
-        apiUtil: network => getNetworkStatus({ network }),
-        defaultData: {},
-        autoload: true,
-        transformResponse: response => response,
-      },
-    },
-  ),
-  withTranslation(),
-)(AccountsPure);
diff --git a/packages/views/screens/managers/monitor/blockDetails/blockDetails.js b/packages/views/screens/managers/monitor/blockDetails/blockDetails.js
index 54e68e1793..29b96b0a72 100644
--- a/packages/views/screens/managers/monitor/blockDetails/blockDetails.js
+++ b/packages/views/screens/managers/monitor/blockDetails/blockDetails.js
@@ -13,7 +13,7 @@ import LabeledValue from '@basics/labeledValue';
 import LiskAmount from '@shared/liskAmount';
 import TransactionsTable from '@transaction/list/transactionsTable';
 import { truncateAddress } from '@wallet/utilities/account';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import styles from './blockDetails.css';
 
 const Generator = ({
@@ -23,9 +23,9 @@ const Generator = ({
     return (
       <Link
         className={styles.generator}
-        to={`${routes.account.path}?address=${generatorAddress}`}
+        to={`${routes.explorer.path}?address=${generatorAddress}`}
       >
-        <AccountVisual
+        <WalletVisual
           className={styles.avatar}
           address={generatorAddress}
           size={30}
diff --git a/packages/views/screens/managers/monitor/delegates/delegates.test.js b/packages/views/screens/managers/monitor/delegates/delegates.test.js
index 4ee8378460..77877d0916 100644
--- a/packages/views/screens/managers/monitor/delegates/delegates.test.js
+++ b/packages/views/screens/managers/monitor/delegates/delegates.test.js
@@ -3,7 +3,7 @@ import { mount } from 'enzyme';
 import { Provider } from 'react-redux';
 import fakeStore from '@tests/unit-test-utils/fakeStore';
 import delegatesList from '@tests/constants/delegates';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import Delegates from './delegates';
 
 const activeDelegates = delegatesList.map(item => ({ ...item, publicKey: item.account.publicKey }));
diff --git a/packages/views/screens/managers/monitor/delegates/delegatesTable/dataColumns.js b/packages/views/screens/managers/monitor/delegates/delegatesTable/dataColumns.js
index efef0626cc..697041d1ee 100644
--- a/packages/views/screens/managers/monitor/delegates/delegatesTable/dataColumns.js
+++ b/packages/views/screens/managers/monitor/delegates/delegatesTable/dataColumns.js
@@ -5,7 +5,7 @@ import { fromRawLsk } from '@token/utilities/lsk';
 import { truncateAddress } from '@wallet/utilities/account';
 import Tooltip from '@basics/tooltip/tooltip';
 import Icon from '@basics/icon';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import { DEFAULT_STANDBY_THRESHOLD } from '@dpos/configuration/delegates';
 import {
   getDelegateDetailsClass,
@@ -86,7 +86,7 @@ export const DelegateDetails = ({
         </Tooltip>
 
         <div className={`${styles.delegateDetails}`}>
-          <AccountVisual address={data.address} />
+          <WalletVisual address={data.address} />
           <div>
             <p className={styles.delegateName}>
               {data.username}
diff --git a/packages/views/screens/managers/monitor/delegates/delegatesTable/delegateRow.js b/packages/views/screens/managers/monitor/delegates/delegatesTable/delegateRow.js
index 8dbee132f9..512de77875 100644
--- a/packages/views/screens/managers/monitor/delegates/delegatesTable/delegateRow.js
+++ b/packages/views/screens/managers/monitor/delegates/delegatesTable/delegateRow.js
@@ -57,7 +57,7 @@ const DelegateRow = ({
   return (
     <Link
       className={`${className} delegate-row ${styles.tableRow}`}
-      to={`${routes.account.path}?address=${data.address}`}
+      to={`${routes.explorer.path}?address=${data.address}`}
     >
       <DelegateDetails
         t={t}
diff --git a/packages/views/screens/managers/monitor/delegates/latestVotes/voteRow.js b/packages/views/screens/managers/monitor/delegates/latestVotes/voteRow.js
index 938bcdd82f..63e30d69b1 100644
--- a/packages/views/screens/managers/monitor/delegates/latestVotes/voteRow.js
+++ b/packages/views/screens/managers/monitor/delegates/latestVotes/voteRow.js
@@ -4,7 +4,7 @@ import grid from 'flexboxgrid/dist/flexboxgrid.css';
 import gridVisibility from 'flexboxgrid-helpers/dist/flexboxgrid-helpers.min.css';
 
 import DateTimeFromTimestamp from '@basics/timestamp';
-import AccountVisualWithAddress from '@wallet/detail/info/accountVisual/accountVisualWithAddress';
+import WalletVisualWithAddress from '@wallet/detail/identity/walletVisual/walletVisualWithAddress';
 import DialogLink from '@basics/dialog/link';
 import VoteItem from '@transaction/list/row/voteItem';
 import styles from '../delegates.css';
@@ -58,7 +58,7 @@ const VoteRow = ({
       data={{ transactionId: data.id, token: 'LSK' }}
     >
       <span className={grid['col-xs-4']}>
-        <AccountVisualWithAddress
+        <WalletVisualWithAddress
           address={data.sender.address}
           transactionSubject="senderId"
           transactionType={3}
diff --git a/packages/views/screens/managers/monitor/delegates/overview/forger.js b/packages/views/screens/managers/monitor/delegates/overview/forger.js
index 025e36f710..3e8da6a7c0 100644
--- a/packages/views/screens/managers/monitor/delegates/overview/forger.js
+++ b/packages/views/screens/managers/monitor/delegates/overview/forger.js
@@ -2,15 +2,15 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 
 import routes from '@screens/router/routes';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import styles from './overview.css';
 
 const Forger = ({ forger }) => (
   <div className={`${styles.forger} forger-item`}>
-    <Link to={`${routes.account.path}?address=${forger.address}`}>
-      <AccountVisual
+    <Link to={`${routes.explorer.path}?address=${forger.address}`}>
+      <WalletVisual
         address={forger.address}
-        className={styles.accountVisual}
+        className={styles.walletVisual}
       />
       <span>{forger.username}</span>
     </Link>
diff --git a/packages/views/screens/managers/monitor/delegates/overview/overview.css b/packages/views/screens/managers/monitor/delegates/overview/overview.css
index 88062efef9..99b3b109bd 100644
--- a/packages/views/screens/managers/monitor/delegates/overview/overview.css
+++ b/packages/views/screens/managers/monitor/delegates/overview/overview.css
@@ -102,7 +102,7 @@
   }
 }
 
-.accountVisual {
+.walletVisual {
   max-height: 40px;
 }
 
diff --git a/packages/views/screens/managers/monitor/wallets/index.js b/packages/views/screens/managers/monitor/wallets/index.js
new file mode 100644
index 0000000000..01bc312210
--- /dev/null
+++ b/packages/views/screens/managers/monitor/wallets/index.js
@@ -0,0 +1,4 @@
+import React from 'react';
+import WalletManager from '@wallet/list/manager';
+
+export default props => <WalletManager {...props} />;
diff --git a/packages/views/screens/managers/monitor/accounts/index.test.js b/packages/views/screens/managers/monitor/wallets/index.test.js
similarity index 91%
rename from packages/views/screens/managers/monitor/accounts/index.test.js
rename to packages/views/screens/managers/monitor/wallets/index.test.js
index d9f9c58481..687e1ccc5f 100644
--- a/packages/views/screens/managers/monitor/accounts/index.test.js
+++ b/packages/views/screens/managers/monitor/wallets/index.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
-import accounts from '@tests/constants/accounts';
-import { AccountsPure } from './index';
+import accounts from '@tests/constants/wallets';
+import WalletsMonitor from './index';
 
 const accountsApiResponse = Object.values(accounts);
 describe('Top Accounts Monitor Page', () => {
@@ -49,7 +49,7 @@ describe('Top Accounts Monitor Page', () => {
     },
   };
 
-  const setup = properties => mount(<AccountsPure {...properties} />);
+  const setup = properties => mount(<WalletsMonitor {...properties} />);
 
   afterEach(() => {
     jest.clearAllMocks();
diff --git a/packages/views/screens/managers/monitor/wallets/monitor.js b/packages/views/screens/managers/monitor/wallets/monitor.js
new file mode 100644
index 0000000000..19cfab7f40
--- /dev/null
+++ b/packages/views/screens/managers/monitor/wallets/monitor.js
@@ -0,0 +1,20 @@
+import React from 'react';
+
+import Box from '@basics/box';
+import BoxHeader from '@basics/box/header';
+import BoxContent from '@basics/box/content';
+import WalletListRepeater from '@wallet/list/repeater';
+import styles from './wallets.css';
+
+const WalletsMonitor = ({ wallets, t, ...restProps }) => (
+  <Box main isLoading={wallets.isLoading} className="accounts-box">
+    <BoxHeader>
+      <h1>{t('All accounts')}</h1>
+    </BoxHeader>
+    <BoxContent className={styles.content}>
+      <WalletListRepeater wallets={wallets} t={t} {...restProps} />
+    </BoxContent>
+  </Box>
+);
+
+export default WalletsMonitor;
diff --git a/packages/views/screens/managers/monitor/wallets/wallets.css b/packages/views/screens/managers/monitor/wallets/wallets.css
new file mode 100644
index 0000000000..4094f5014f
--- /dev/null
+++ b/packages/views/screens/managers/monitor/wallets/wallets.css
@@ -0,0 +1,4 @@
+.content {
+  padding: 0 !important;
+  counter-reset: section;
+}
diff --git a/packages/views/screens/managers/multiSignature/form/form.js b/packages/views/screens/managers/multiSignature/form/form.js
index 2ab39192c0..ac8983c6ac 100644
--- a/packages/views/screens/managers/multiSignature/form/form.js
+++ b/packages/views/screens/managers/multiSignature/form/form.js
@@ -133,7 +133,7 @@ const Editor = ({
     network,
     selectedPriority,
     token,
-    account,
+    wallet: account,
     priorityOptions,
     transaction: {
       moduleAssetId,
diff --git a/packages/views/screens/managers/multiSignature/form/form.test.js b/packages/views/screens/managers/multiSignature/form/form.test.js
index 98404d5255..83434228b5 100644
--- a/packages/views/screens/managers/multiSignature/form/form.test.js
+++ b/packages/views/screens/managers/multiSignature/form/form.test.js
@@ -5,7 +5,7 @@ import { act } from 'react-dom/test-utils';
 import { getTransactionBaseFees, getTransactionFee } from '@transaction/utilities/api';
 import useTransactionFeeCalculation from '@transaction/manage/transactionPriority/useTransactionFeeCalculation';
 import { fromRawLsk } from '@token/utilities/lsk';
-import accounts from '@tests/constants/accounts';
+import wallets from '@tests/constants/wallets';
 
 import Form, { validateState } from './form';
 
@@ -39,7 +39,7 @@ describe('Multisignature editor component', () => {
   let wrapper;
   const props = {
     t: v => v,
-    account: accounts.genesis,
+    account: wallets.genesis,
     nextStep: jest.fn(),
   };
 
@@ -87,11 +87,11 @@ describe('Multisignature editor component', () => {
   it('props.nextStep is called when the CTA is clicked', () => {
     wrapper.find('input.input-with-dropdown-input').at(0).simulate(
       'change',
-      { target: { value: accounts.genesis.summary.publicKey } },
+      { target: { value: wallets.genesis.summary.publicKey } },
     );
     wrapper.find('input.input-with-dropdown-input').at(1).simulate(
       'change',
-      { target: { value: accounts.delegate.summary.publicKey } },
+      { target: { value: wallets.delegate.summary.publicKey } },
     );
     act(() => { wrapper.update(); });
     wrapper.find('.confirm-button').at(0).simulate('click');
@@ -101,7 +101,7 @@ describe('Multisignature editor component', () => {
 
 describe('validateState', () => {
   it('should return error if signature are less than mandatory members', () => {
-    const pbk = accounts.genesis.summary.publicKey;
+    const pbk = wallets.genesis.summary.publicKey;
     const params = {
       mandatoryKeys: [pbk, pbk, pbk],
       optionalKeys: [],
@@ -113,7 +113,7 @@ describe('validateState', () => {
   });
 
   it('should return error if signatures are more than all members', () => {
-    const pbk = accounts.genesis.summary.publicKey;
+    const pbk = wallets.genesis.summary.publicKey;
     const params = {
       mandatoryKeys: [pbk, pbk, pbk],
       optionalKeys: [],
@@ -125,7 +125,7 @@ describe('validateState', () => {
   });
 
   it('should return error if optional members are practically mandatory', () => {
-    const pbk = accounts.genesis.summary.publicKey;
+    const pbk = wallets.genesis.summary.publicKey;
     const params = {
       mandatoryKeys: [pbk, pbk, pbk],
       optionalKeys: [pbk],
@@ -137,7 +137,7 @@ describe('validateState', () => {
   });
 
   it('should return error if optional members never get to sign', () => {
-    const pbk = accounts.genesis.summary.publicKey;
+    const pbk = wallets.genesis.summary.publicKey;
     const params = {
       mandatoryKeys: [pbk, pbk, pbk],
       optionalKeys: [pbk],
@@ -149,7 +149,7 @@ describe('validateState', () => {
   });
 
   it('should return error if there are only optional members', () => {
-    const pbk = accounts.genesis.summary.publicKey;
+    const pbk = wallets.genesis.summary.publicKey;
     const params = {
       mandatoryKeys: [],
       optionalKeys: [pbk, pbk, pbk],
@@ -161,7 +161,7 @@ describe('validateState', () => {
   });
 
   it('should return error if the number of signature is equal to optional and mandatory members', () => {
-    const pbk = accounts.genesis.summary.publicKey;
+    const pbk = wallets.genesis.summary.publicKey;
     const params = {
       mandatoryKeys: [pbk, pbk, pbk],
       optionalKeys: [pbk, pbk, pbk],
@@ -173,7 +173,7 @@ describe('validateState', () => {
   });
 
   it('should return error if there are more than 64 members', () => {
-    const pbk = accounts.genesis.summary.publicKey;
+    const pbk = wallets.genesis.summary.publicKey;
     const params = {
       mandatoryKeys: new Array(65).fill(pbk),
       optionalKeys: [],
@@ -184,7 +184,7 @@ describe('validateState', () => {
     expect(validateState(params).messages).toContain(error);
   });
   it('should return error if there are duplicate public keys', () => {
-    const pbk = accounts.genesis.summary.publicKey;
+    const pbk = wallets.genesis.summary.publicKey;
     const params = {
       mandatoryKeys: new Array(2).fill(pbk),
       optionalKeys: [],
diff --git a/packages/views/screens/managers/multiSignature/status/status.test.js b/packages/views/screens/managers/multiSignature/status/status.test.js
index 7652f799c1..38d32956f6 100644
--- a/packages/views/screens/managers/multiSignature/status/status.test.js
+++ b/packages/views/screens/managers/multiSignature/status/status.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import TransactionResult from '@transaction/detail/manager/transactionResult';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import Status from './status';
 
 describe('Multisignature status component', () => {
diff --git a/packages/views/screens/managers/multiSignature/summary/summary.test.js b/packages/views/screens/managers/multiSignature/summary/summary.test.js
index 38c56a331e..1e4b85c162 100644
--- a/packages/views/screens/managers/multiSignature/summary/summary.test.js
+++ b/packages/views/screens/managers/multiSignature/summary/summary.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import * as hwManager from '@transaction/utilities/hwManager';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import Summary from './summary';
 
 const mockTransaction = {
diff --git a/packages/views/screens/managers/multisigAccountDetails/multisigAccountDetails.js b/packages/views/screens/managers/multisigAccountDetails/multisigAccountDetails.js
index 950af7d235..a67014969a 100644
--- a/packages/views/screens/managers/multisigAccountDetails/multisigAccountDetails.js
+++ b/packages/views/screens/managers/multisigAccountDetails/multisigAccountDetails.js
@@ -8,7 +8,7 @@ import BoxContent from '@basics/box/content';
 import BoxInfoText from '@basics/box/infoText';
 import Dialog from '@basics/dialog/dialog';
 import Tooltip from '@basics/tooltip/tooltip';
-import Members from '@wallet/detail/info/multisignatureMembers';
+import Members from '@wallet/detail/identity/multisignatureMembers';
 
 import styles from './styles.css';
 
diff --git a/packages/views/screens/managers/reclaimBalance/index.css b/packages/views/screens/managers/reclaimBalance/index.css
index 4d12046bd4..b9e02f0955 100644
--- a/packages/views/screens/managers/reclaimBalance/index.css
+++ b/packages/views/screens/managers/reclaimBalance/index.css
@@ -63,7 +63,7 @@
   padding: 20px;
 }
 
-.accountMigrationContainer {
+.walletMigrationContainer {
   border-bottom: 1px solid var(--color-periwinkle-blue);
   margin-bottom: 30px;
 }
diff --git a/packages/views/screens/managers/reclaimBalance/modal/status/index.js b/packages/views/screens/managers/reclaimBalance/modal/status/index.js
index aadeee26f0..c858bfb869 100644
--- a/packages/views/screens/managers/reclaimBalance/modal/status/index.js
+++ b/packages/views/screens/managers/reclaimBalance/modal/status/index.js
@@ -4,13 +4,13 @@ import { withTranslation } from 'react-i18next';
 import Status from './status';
 
 const mapStateToProps = state => ({
-  isMigrated: state.account.info.LSK.summary.isMigrated,
+  isMigrated: state.wallet.info.LSK.summary.isMigrated,
   transactions: state.transactions,
   network: state.network,
   account: {
-    ...state.account.info[state.settings.token.active],
-    hwInfo: state.account.hwInfo,
-    passphrase: state.account.passphrase,
+    ...state.wallet.info[state.settings.token.active],
+    hwInfo: state.wallet.hwInfo,
+    passphrase: state.wallet.passphrase,
   },
 });
 
diff --git a/packages/views/screens/managers/reclaimBalance/modal/status/status.test.js b/packages/views/screens/managers/reclaimBalance/modal/status/status.test.js
index 7d4a1eb48a..3b75726236 100644
--- a/packages/views/screens/managers/reclaimBalance/modal/status/status.test.js
+++ b/packages/views/screens/managers/reclaimBalance/modal/status/status.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import TransactionResult from '@transaction/detail/manager/transactionResult';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import Status from './status';
 
 describe('Status', () => {
diff --git a/packages/views/screens/managers/reclaimBalance/modal/summary/index.js b/packages/views/screens/managers/reclaimBalance/modal/summary/index.js
index a84c92db76..4abb57de34 100644
--- a/packages/views/screens/managers/reclaimBalance/modal/summary/index.js
+++ b/packages/views/screens/managers/reclaimBalance/modal/summary/index.js
@@ -7,7 +7,7 @@ import { balanceReclaimed } from '@wallet/store/action';
 import Summary from './summary';
 
 const mapStateToProps = state => ({
-  account: state.account,
+  account: state.wallet,
   network: state.network,
 });
 
diff --git a/packages/views/screens/managers/reclaimBalance/modal/summary/summary.js b/packages/views/screens/managers/reclaimBalance/modal/summary/summary.js
index 0a15c348a0..4c176b24ce 100644
--- a/packages/views/screens/managers/reclaimBalance/modal/summary/summary.js
+++ b/packages/views/screens/managers/reclaimBalance/modal/summary/summary.js
@@ -21,7 +21,7 @@ const Summary = ({
     network,
     selectedPriority,
     token: tokenMap.LSK.key,
-    account: account.info.LSK,
+    wallet: account.info.LSK,
     priorityOptions,
     transaction: {
       moduleAssetId: MODULE_ASSETS_NAME_ID_MAP.reclaimLSK,
diff --git a/packages/views/screens/managers/reclaimBalance/modal/summary/summary.test.js b/packages/views/screens/managers/reclaimBalance/modal/summary/summary.test.js
index f7c61445d4..8e11661c1d 100644
--- a/packages/views/screens/managers/reclaimBalance/modal/summary/summary.test.js
+++ b/packages/views/screens/managers/reclaimBalance/modal/summary/summary.test.js
@@ -8,7 +8,7 @@ import { tokenMap } from '@token/configuration/tokens';
 import useTransactionFeeCalculation from '@transaction/manage/transactionPriority/useTransactionFeeCalculation';
 import { truncateAddress } from '@wallet/utilities/account';
 import * as hwManager from '@transaction/utilities/hwManager';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import flushPromises from '@tests/unit-test-utils/flushPromises';
 import Summary from './summary';
 
diff --git a/packages/views/screens/managers/reclaimBalance/reclaim.js b/packages/views/screens/managers/reclaimBalance/reclaim.js
index 01221cd620..c9152f424b 100644
--- a/packages/views/screens/managers/reclaimBalance/reclaim.js
+++ b/packages/views/screens/managers/reclaimBalance/reclaim.js
@@ -4,7 +4,7 @@ import { useSelector } from 'react-redux';
 import Tooltip from '@basics/tooltip/tooltip';
 import { PrimaryButton } from '@basics/buttons';
 import DialogLink from '@basics/dialog/link';
-import AccountMigration from '@legacy/detail/info/accountMigration';
+import WalletMigration from '@legacy/detail/info/walletMigration';
 import { hasEnoughBalanceForReclaim } from '@wallet/utilities/account';
 import { fromRawLsk } from '@token/utilities/lsk';
 import { balanceNeededForReclaim } from '@wallet/configuration/account';
@@ -12,8 +12,8 @@ import { selectActiveTokenAccount } from '@common/store/selectors';
 import styles from './index.css';
 
 const Reclaim = ({ t }) => {
-  const account = useSelector(selectActiveTokenAccount);
-  const hasEnoughBalance = hasEnoughBalanceForReclaim(Number(account.token?.balance));
+  const wallet = useSelector(selectActiveTokenAccount);
+  const hasEnoughBalance = hasEnoughBalanceForReclaim(Number(wallet.token?.balance));
 
   return (
     <div className={`${styles.container} ${styles.reclaim}`}>
@@ -24,8 +24,8 @@ const Reclaim = ({ t }) => {
         {t('We kindly ask you to transfer your balance to the new account.')}
       </p>
       <section className={styles.box}>
-        <div className={styles.accountMigrationContainer}>
-          <AccountMigration account={account} showBalance />
+        <div className={styles.walletMigrationContainer}>
+          <WalletMigration wallet={wallet} showBalance />
         </div>
         <div>
           <h5 className={styles.listHeading}>{t('You will be able to:')}</h5>
diff --git a/packages/views/screens/managers/reclaimBalance/reclaim.test.js b/packages/views/screens/managers/reclaimBalance/reclaim.test.js
index 3d0b0d2a5d..e9e3a630e0 100644
--- a/packages/views/screens/managers/reclaimBalance/reclaim.test.js
+++ b/packages/views/screens/managers/reclaimBalance/reclaim.test.js
@@ -2,7 +2,7 @@ import { mountWithRouterAndStore } from '@common/utilities/testHelpers';
 import { truncateAddress } from '@wallet/utilities/account';
 import { addSearchParamsToUrl } from '@screens/router/searchParams';
 import { tokenMap } from '@token/configuration/tokens';
-import accounts from '@tests/constants/accounts';
+import wallets from '@tests/constants/wallets';
 import Reclaim from './reclaim';
 import styles from './index.css';
 
@@ -13,10 +13,10 @@ jest.mock('@screens/router/searchParams', () => ({
 describe('Reclaim balance screen', () => {
   let props;
   const state = {
-    account: {
+    wallet: {
       passphrase: 'test',
       info: {
-        LSK: accounts.non_migrated,
+        LSK: wallets.non_migrated,
       },
     },
     settings: { token: { active: tokenMap.LSK.key } },
@@ -34,8 +34,8 @@ describe('Reclaim balance screen', () => {
   it('should render legacy and new addresses', () => {
     const wrapper = mountWithRouterAndStore(Reclaim, props, {}, state);
     const html = wrapper.html();
-    expect(html).toContain(accounts.non_migrated.legacy.address);
-    expect(html).toContain(truncateAddress(accounts.non_migrated.summary.address, 'medium'));
+    expect(html).toContain(wallets.non_migrated.legacy.address);
+    expect(html).toContain(truncateAddress(wallets.non_migrated.summary.address, 'medium'));
   });
 
   it('Opens send modal', () => {
diff --git a/packages/views/screens/managers/register/backupPassphrase.js b/packages/views/screens/managers/register/backupPassphrase.js
index 52df97ba29..2936f8e71a 100644
--- a/packages/views/screens/managers/register/backupPassphrase.js
+++ b/packages/views/screens/managers/register/backupPassphrase.js
@@ -2,7 +2,7 @@ import { withTranslation } from 'react-i18next';
 import React from 'react';
 import grid from 'flexboxgrid/dist/flexboxgrid.css';
 import { PrimaryButton, TertiaryButton } from '@basics/buttons';
-import PassphraseBackup from '@wallet/detail/info/passphraseBackup';
+import PassphraseBackup from '@wallet/detail/identity/passphraseBackup';
 import registerStyles from './register.css';
 
 const BackupPassphrase = ({
diff --git a/packages/views/screens/managers/register/chooseAvatar.js b/packages/views/screens/managers/register/chooseAvatar.js
index 74756d6dcb..e55214123a 100644
--- a/packages/views/screens/managers/register/chooseAvatar.js
+++ b/packages/views/screens/managers/register/chooseAvatar.js
@@ -4,7 +4,7 @@ import { Link } from 'react-router-dom';
 import grid from 'flexboxgrid/dist/flexboxgrid.css';
 import routes from '@screens/router/routes';
 import { PrimaryButton, TertiaryButton } from '@basics/buttons';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import registerStyles from './register.css';
 import styles from './chooseAvatar.css';
 
@@ -87,7 +87,7 @@ class ChooseAvatar extends React.Component {
                 onClick={() => handleSelectAvatar(account)}
                 key={key}
               >
-                <AccountVisual
+                <WalletVisual
                   address={account.address}
                   size={64}
                 />
diff --git a/packages/views/screens/managers/register/chooseAvatar.test.js b/packages/views/screens/managers/register/chooseAvatar.test.js
index e0140f4732..e2c86a997e 100644
--- a/packages/views/screens/managers/register/chooseAvatar.test.js
+++ b/packages/views/screens/managers/register/chooseAvatar.test.js
@@ -30,7 +30,7 @@ describe('Register Process - Choose Avatar', () => {
   });
 
   it('Should render with five avatars', () => {
-    expect(wrapper).to.have.exactly(5).descendants('AccountVisual');
+    expect(wrapper).to.have.exactly(5).descendants('WalletVisual');
   });
 
   it('Should animate avatars when confirm is clicked', () => {
@@ -43,7 +43,7 @@ describe('Register Process - Choose Avatar', () => {
     const randomAvatar = Math.floor(Math.random() * 5);
     const confirmButton = wrapper.find('Button').at(1);
     expect(confirmButton.prop('disabled'));
-    wrapper.find('AccountVisual').at(randomAvatar).simulate('click');
+    wrapper.find('WalletVisual').at(randomAvatar).simulate('click');
     expect(props.handleSelectAvatar).to.have.been.calledWith(accounts[randomAvatar]);
 
     wrapper.setProps({
diff --git a/packages/views/screens/managers/register/confirmPassphrase.js b/packages/views/screens/managers/register/confirmPassphrase.js
index ecef2e5c75..7d820e6a8c 100644
--- a/packages/views/screens/managers/register/confirmPassphrase.js
+++ b/packages/views/screens/managers/register/confirmPassphrase.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { withTranslation } from 'react-i18next';
 import grid from 'flexboxgrid/dist/flexboxgrid.css';
-import PassphraseRenderer from '@wallet/detail/info/passphraseRenderer';
+import PassphraseRenderer from '@wallet/detail/identity/passphraseRenderer';
 import registerStyles from './register.css';
 import styles from './confirmPassphrase.css';
 
diff --git a/packages/views/screens/managers/register/index.js b/packages/views/screens/managers/register/index.js
index 994abb1553..d249c5c154 100644
--- a/packages/views/screens/managers/register/index.js
+++ b/packages/views/screens/managers/register/index.js
@@ -5,7 +5,7 @@ import { withTranslation } from 'react-i18next';
 import Register from './register';
 
 const mapStateToProps = state => ({
-  account: state.account,
+  account: state.wallet,
   token: state.settings.token,
 });
 
diff --git a/packages/views/screens/managers/registerDelegate/form/form.js b/packages/views/screens/managers/registerDelegate/form/form.js
index 3690a1dbdc..db42022634 100644
--- a/packages/views/screens/managers/registerDelegate/form/form.js
+++ b/packages/views/screens/managers/registerDelegate/form/form.js
@@ -42,7 +42,7 @@ const SelectNameAndFee = ({
     network,
     selectedPriority,
     token,
-    account,
+    wallet: account,
     priorityOptions,
     transaction: {
       moduleAssetId,
diff --git a/packages/views/screens/managers/registerDelegate/form/form.test.js b/packages/views/screens/managers/registerDelegate/form/form.test.js
index fa28f284ee..5b407165f8 100644
--- a/packages/views/screens/managers/registerDelegate/form/form.test.js
+++ b/packages/views/screens/managers/registerDelegate/form/form.test.js
@@ -5,7 +5,7 @@ import * as delegatesApi from '@dpos/utilities/api';
 import { getTransactionBaseFees, getTransactionFee, create } from '@transaction/utilities/api';
 import { fromRawLsk } from '@token/utilities/lsk';
 import * as hwManager from '@transaction/utilities/hwManager';
-import accounts from '@tests/constants/accounts';
+import wallets from '@tests/constants/wallets';
 import flushPromises from '@tests/unit-test-utils/flushPromises';
 import SelectNameAndFee from './form';
 
@@ -41,7 +41,7 @@ describe('SelectNameAndFee', () => {
 
   const props = {
     account: {
-      ...accounts.genesis,
+      ...wallets.genesis,
       delegate: {},
     },
     prevState: {},
diff --git a/packages/views/screens/managers/registerDelegate/status/status.test.js b/packages/views/screens/managers/registerDelegate/status/status.test.js
index 341e77ea1c..b0b4284088 100644
--- a/packages/views/screens/managers/registerDelegate/status/status.test.js
+++ b/packages/views/screens/managers/registerDelegate/status/status.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import Status from './status';
 
 describe('Delegate Registration Status', () => {
diff --git a/packages/views/screens/managers/registerDelegate/summary/summary.test.js b/packages/views/screens/managers/registerDelegate/summary/summary.test.js
index 65ccd77cf6..c80bb4fcf2 100644
--- a/packages/views/screens/managers/registerDelegate/summary/summary.test.js
+++ b/packages/views/screens/managers/registerDelegate/summary/summary.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { mountWithRouterAndStore } from '@common/utilities/testHelpers';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import Summary from './summary';
 
 describe('Delegate Registration Summary', () => {
diff --git a/packages/views/screens/managers/request/index.js b/packages/views/screens/managers/request/index.js
index 26ffed33ea..b019cd9777 100644
--- a/packages/views/screens/managers/request/index.js
+++ b/packages/views/screens/managers/request/index.js
@@ -35,7 +35,7 @@ Request.defaultProps = {
 export default connect(
   state => ({
     token: state.settings.token.active,
-    account: state.account,
+    account: state.wallet,
   }),
   {},
 )(withTranslation()(Request));
diff --git a/packages/views/screens/managers/request/request.test.js b/packages/views/screens/managers/request/request.test.js
index 596ac89e8d..6a0aa823ff 100644
--- a/packages/views/screens/managers/request/request.test.js
+++ b/packages/views/screens/managers/request/request.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { tokenMap } from '@token/configuration/tokens';
 import { mountWithRouter } from '@common/utilities/testHelpers';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import Request from '.';
 
 jest.mock('@shared/converter', () => (
diff --git a/packages/views/screens/managers/request/requestLsk.test.js b/packages/views/screens/managers/request/requestLsk.test.js
index fd8ed9fc99..10cc8bb913 100644
--- a/packages/views/screens/managers/request/requestLsk.test.js
+++ b/packages/views/screens/managers/request/requestLsk.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { mountWithRouter } from '@common/utilities/testHelpers';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import Request from './requestLsk';
 
 jest.mock('@shared/converter', () => (
diff --git a/packages/views/screens/managers/send/form/bookmarkAutoSuggest.js b/packages/views/screens/managers/send/form/bookmarkAutoSuggest.js
index a415b9d5de..3dd2f9654f 100644
--- a/packages/views/screens/managers/send/form/bookmarkAutoSuggest.js
+++ b/packages/views/screens/managers/send/form/bookmarkAutoSuggest.js
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { validateAddress } from '@common/utilities/validators';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import AutoSuggest from '@basics/autoSuggest';
 import styles from './form.css';
 
@@ -80,16 +80,16 @@ class BookmarkAutoSuggest extends React.Component {
         selectedItem={recipient}
         onSelectItem={this.onSelectedAccount}
         renderIcon={() => (
-          <AccountVisual
+          <WalletVisual
             address={recipient.address}
             placeholder={!(recipient.address.length && !recipient.error)}
             size={25}
-            className={styles.recipientAccountVisual}
+            className={styles.recipientWalletVisual}
           />
         )}
         renderItem={bookmark => (
           <>
-            <AccountVisual address={bookmark.address} size={25} />
+            <WalletVisual address={bookmark.address} size={25} />
             <span>{bookmark.title}</span>
             <span>{bookmark.address}</span>
           </>
diff --git a/packages/views/screens/managers/send/form/form.css b/packages/views/screens/managers/send/form/form.css
index 1082d04091..5a6e32173b 100644
--- a/packages/views/screens/managers/send/form/form.css
+++ b/packages/views/screens/managers/send/form/form.css
@@ -158,7 +158,7 @@
   transition: opacity var(--animation-speed-fast) linear;
 }
 
-.recipientAccountVisual {
+.recipientWalletVisual {
   margin-left: -4px;
   margin-top: 4px;
 }
diff --git a/packages/views/screens/managers/send/form/form.test.js b/packages/views/screens/managers/send/form/form.test.js
index 1554653a11..29627c2535 100644
--- a/packages/views/screens/managers/send/form/form.test.js
+++ b/packages/views/screens/managers/send/form/form.test.js
@@ -5,7 +5,7 @@ import { tokenMap } from '@token/configuration/tokens';
 import { getTransactionBaseFees, getTransactionFee } from '@transaction/utilities/api';
 import useTransactionFeeCalculation from '@transaction/manage/transactionPriority/useTransactionFeeCalculation';
 import { fromRawLsk } from '@token/utilities/lsk';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import flushPromises from '@tests/unit-test-utils/flushPromises';
 import Form from './form';
 
diff --git a/packages/views/screens/managers/send/form/formBtc.js b/packages/views/screens/managers/send/form/formBtc.js
index 096509d92e..31203b4b05 100644
--- a/packages/views/screens/managers/send/form/formBtc.js
+++ b/packages/views/screens/managers/send/form/formBtc.js
@@ -22,7 +22,7 @@ const FormBtc = (props) => {
     network,
     selectedPriority,
     token,
-    account,
+    wallet: account,
     priorityOptions,
     transaction: {
       amount: toRawLsk(amount.value),
diff --git a/packages/views/screens/managers/send/form/formBtc.test.js b/packages/views/screens/managers/send/form/formBtc.test.js
index 1281636a38..14e8c7ac28 100644
--- a/packages/views/screens/managers/send/form/formBtc.test.js
+++ b/packages/views/screens/managers/send/form/formBtc.test.js
@@ -9,7 +9,7 @@ import {
   getTransactionFee,
   getTransactionBaseFees,
 } from '@transaction/utilities/api';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import flushPromises from '@tests/unit-test-utils/flushPromises';
 import Form from './formBtc';
 
diff --git a/packages/views/screens/managers/send/form/formLsk.js b/packages/views/screens/managers/send/form/formLsk.js
index 6f4f44b2b3..8f79c90c86 100644
--- a/packages/views/screens/managers/send/form/formLsk.js
+++ b/packages/views/screens/managers/send/form/formLsk.js
@@ -33,7 +33,7 @@ const FormLsk = (props) => {
     network,
     selectedPriority,
     token,
-    account,
+    wallet: account,
     priorityOptions,
     transaction: {
       moduleAssetId,
diff --git a/packages/views/screens/managers/send/index.test.js b/packages/views/screens/managers/send/index.test.js
index 7f1c4fd946..ee8595dc74 100644
--- a/packages/views/screens/managers/send/index.test.js
+++ b/packages/views/screens/managers/send/index.test.js
@@ -1,6 +1,6 @@
 import { getTransactionBaseFees, getTransactionFee } from '@transaction/utilities/api';
 import { mountWithRouter } from '@common/utilities/testHelpers';
-import accounts from '@tests/constants/accounts';
+import wallets from '@tests/constants/wallets';
 import Send from './index';
 
 jest.mock('@transaction/utilities/api');
@@ -20,8 +20,8 @@ getTransactionFee.mockResolvedValue({
 const props = {
   settings: { currency: 'USD' },
   settingsUpdated: () => {},
-  account: {
-    token: { balance: accounts.genesis.balance },
+  wallet: {
+    token: { balance: wallets.genesis.balance },
   },
   t: v => v,
   prevState: {
diff --git a/packages/views/screens/managers/send/status/status.test.js b/packages/views/screens/managers/send/status/status.test.js
index c110e661fb..ff9d9300ef 100644
--- a/packages/views/screens/managers/send/status/status.test.js
+++ b/packages/views/screens/managers/send/status/status.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import TransactionResult from '@transaction/detail/manager/transactionResult';
 import DialogLink from '@basics/dialog/link';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import Status from './status';
 
 describe('unlock transaction Status', () => {
diff --git a/packages/views/screens/managers/send/summary/summary.test.js b/packages/views/screens/managers/send/summary/summary.test.js
index f3fd63b4d3..ea8558ba24 100644
--- a/packages/views/screens/managers/send/summary/summary.test.js
+++ b/packages/views/screens/managers/send/summary/summary.test.js
@@ -4,7 +4,7 @@ import { tokenMap } from '@token/configuration/tokens';
 import { toRawLsk } from '@token/utilities/lsk';
 import { formatAmountBasedOnLocale } from '@common/utilities/formattedNumber';
 import i18n from '@setup/i18n/i18n';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import Summary from './summary';
 
 describe('Summary', () => {
diff --git a/packages/views/screens/managers/settings/settings.test.js b/packages/views/screens/managers/settings/settings.test.js
index ab34391c71..d3f3bfd9f6 100644
--- a/packages/views/screens/managers/settings/settings.test.js
+++ b/packages/views/screens/managers/settings/settings.test.js
@@ -1,7 +1,7 @@
 /* eslint-disable */
 import React from 'react';
 import Settings from './settings';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import { mountWithRouter } from '@common/utilities/testHelpers';
 
 describe('Setting', () => {
diff --git a/packages/views/screens/managers/signMessage/messageSignature/index.test.js b/packages/views/screens/managers/signMessage/messageSignature/index.test.js
index d298ed2728..7f563eeaad 100644
--- a/packages/views/screens/managers/signMessage/messageSignature/index.test.js
+++ b/packages/views/screens/managers/signMessage/messageSignature/index.test.js
@@ -1,19 +1,19 @@
 import React from 'react';
 import { mount } from 'enzyme';
-import { loginTypes } from '@views/configuration';
+import loginTypes from '@wallet/configuration/loginTypes';
 import * as hwManager from '@wallet/utilities/hwManager';
-import accounts from '@tests/constants/accounts';
+import wallets from '@tests/constants/wallets';
 import MessageSignature from '.';
 
 jest.mock('@wallet/utilities/hwManager');
 
 describe('Sign Message: Status', () => {
-  const accountWithPassphrase = {
-    ...accounts.genesis,
+  const walletWithPassphrase = {
+    ...wallets.genesis,
     loginType: loginTypes.passphrase.code,
   };
-  const accountWithHW = {
-    ...accounts.genesis,
+  const walletWithHW = {
+    ...wallets.genesis,
     loginType: loginTypes.ledger,
     hwInfo: {
       deviceModel: 'Ledger Nano S',
@@ -22,7 +22,7 @@ describe('Sign Message: Status', () => {
 
   describe('Using Passphrase', () => {
     const props = {
-      account: accountWithPassphrase,
+      account: walletWithPassphrase,
       message: 'Random message',
       t: v => v,
       isNext: true,
@@ -48,7 +48,7 @@ describe('Sign Message: Status', () => {
 
   describe('Using hardware wallet', () => {
     const props = {
-      account: accountWithHW,
+      account: walletWithHW,
       message: 'Random message',
       t: (str, data) => {
         if (!data) return str;
diff --git a/packages/views/screens/managers/signMessage/signMessage.test.js b/packages/views/screens/managers/signMessage/signMessage.test.js
index 7a48cd2049..8a4326bd5b 100644
--- a/packages/views/screens/managers/signMessage/signMessage.test.js
+++ b/packages/views/screens/managers/signMessage/signMessage.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import SignMessage from './signMessage';
 
 describe('Sign Message Component', () => {
diff --git a/packages/views/screens/managers/signMessage/status/index.test.js b/packages/views/screens/managers/signMessage/status/index.test.js
index 870f883a58..38fdd6cb8b 100644
--- a/packages/views/screens/managers/signMessage/status/index.test.js
+++ b/packages/views/screens/managers/signMessage/status/index.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import Status from '.';
 
 describe('Sign Message: Status', () => {
diff --git a/packages/views/screens/managers/signMultiSignTransaction/status/index.js b/packages/views/screens/managers/signMultiSignTransaction/status/index.js
index 4e59f95f6a..ecff8ae4ad 100644
--- a/packages/views/screens/managers/signMultiSignTransaction/status/index.js
+++ b/packages/views/screens/managers/signMultiSignTransaction/status/index.js
@@ -7,9 +7,9 @@ import Status from './status';
 const mapStateToProps = state => ({
   transactions: state.transactions,
   account: {
-    ...state.account.info[state.settings.token.active],
-    hwInfo: state.account.hwInfo,
-    passphrase: state.account.passphrase,
+    ...state.wallet.info[state.settings.token.active],
+    hwInfo: state.wallet.hwInfo,
+    passphrase: state.wallet.passphrase,
   },
 });
 
diff --git a/packages/views/screens/managers/signMultiSignTransaction/status/share.test.js b/packages/views/screens/managers/signMultiSignTransaction/status/share.test.js
index 002770d137..11f08d6d93 100644
--- a/packages/views/screens/managers/signMultiSignTransaction/status/share.test.js
+++ b/packages/views/screens/managers/signMultiSignTransaction/status/share.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import TransactionResult from '@transaction/detail/manager/transactionResult';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import Status from './status';
 
 describe('Sign Multisignature Tx Status component', () => {
diff --git a/packages/views/screens/managers/signMultiSignTransaction/summary/index.js b/packages/views/screens/managers/signMultiSignTransaction/summary/index.js
index df74076fe7..65aa4ae309 100644
--- a/packages/views/screens/managers/signMultiSignTransaction/summary/index.js
+++ b/packages/views/screens/managers/signMultiSignTransaction/summary/index.js
@@ -22,7 +22,7 @@ const apis = {
 
 const mapStateToProps = state => ({
   account: {
-    ...state.account.info.LSK,
+    ...state.wallet.info.LSK,
     passphrase: state.passphrase,
     hwInfo: state.hwInfo,
   },
diff --git a/packages/views/screens/managers/signMultiSignTransaction/summary/summary.test.js b/packages/views/screens/managers/signMultiSignTransaction/summary/summary.test.js
index 3293c5baa0..edb00ed601 100644
--- a/packages/views/screens/managers/signMultiSignTransaction/summary/summary.test.js
+++ b/packages/views/screens/managers/signMultiSignTransaction/summary/summary.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { MODULE_ASSETS_NAME_ID_MAP } from '@transaction/configuration/moduleAssets';
 import { removeSearchParamsFromUrl } from '@screens/router/searchParams';
-import accounts from '@tests/constants/accounts';
+import wallets from '@tests/constants/wallets';
 import Summary from './summary';
 
 jest.mock('@screens/router/searchParams', () => ({
@@ -22,29 +22,29 @@ describe('Sign Multisignature Tx Review component', () => {
       moduleAssetId: MODULE_ASSETS_NAME_ID_MAP.transfer,
       nonce: '158',
       sender: {
-        address: accounts.multiSig.summary.address,
+        address: wallets.multiSig.summary.address,
       },
       fee: '1000000',
       signatures: [
-        accounts.multiSig.summary.publicKey,
+        wallets.multiSig.summary.publicKey,
         '',
         '',
       ],
       asset: {
-        mandatoryKeys: accounts.multiSig.keys.mandatoryKeys,
-        optionalKeys: accounts.multiSig.keys.optionalKeys,
-        numberOfSignatures: accounts.multiSig.keys.numberOfSignatures,
+        mandatoryKeys: wallets.multiSig.keys.mandatoryKeys,
+        optionalKeys: wallets.multiSig.keys.optionalKeys,
+        numberOfSignatures: wallets.multiSig.keys.numberOfSignatures,
         recipient: {
-          address: accounts.genesis.summary.address,
+          address: wallets.genesis.summary.address,
         },
       },
     },
-    account: accounts.genesis,
+    account: wallets.genesis,
     networkIdentifier: 'sample_identifier',
     nextStep: jest.fn(),
     history: {},
     error: undefined,
-    senderAccount: { data: accounts.multiSig },
+    senderAccount: { data: wallets.multiSig },
   };
 
   beforeEach(() => {
@@ -54,7 +54,7 @@ describe('Sign Multisignature Tx Review component', () => {
   it('Should call props.nextStep passing the signed transaction', () => {
     wrapper = mount(<Summary {...props} />);
     const signatures = props.transaction.signatures;
-    signatures[1] = accounts.genesis.summary.publicKey;
+    signatures[1] = wallets.genesis.summary.publicKey;
     wrapper.find('button.sign').simulate('click');
     expect(props.nextStep).toHaveBeenCalledWith(expect.objectContaining({
       rawTransaction: expect.anything(),
diff --git a/packages/views/screens/managers/transactionDetails/components/components.js b/packages/views/screens/managers/transactionDetails/components/components.js
index cebcb3ffd4..30ebeb3be5 100644
--- a/packages/views/screens/managers/transactionDetails/components/components.js
+++ b/packages/views/screens/managers/transactionDetails/components/components.js
@@ -12,10 +12,10 @@ import TransactionTypeFigure from '@transaction/detail/info/transactionTypeFigur
 import DateTimeFromTimestamp from '@basics/timestamp';
 import DiscreetMode from '@shared/discreetMode';
 import LiskAmount from '@shared/liskAmount';
-import MultiSignatureMembers, { SignedAndRemainingMembers } from '@wallet/detail/info/multisignatureMembers';
+import MultiSignatureMembers, { SignedAndRemainingMembers } from '@wallet/detail/identity/multisignatureMembers';
 import Tooltip from '@basics/tooltip/tooltip';
 import { extractAddressFromPublicKey, truncateAddress, calculateRemainingAndSignedMembers } from '@wallet/utilities/account';
-import AccountInfo from '@wallet/detail/info/accountInfo';
+import WalletInfo from './walletInfo';
 
 import { Context } from '../transactionDetails';
 import styles from './styles.css';
@@ -67,7 +67,7 @@ export const Sender = () => {
   const senderLabel = getModuleAssetSenderLabel()[transaction.moduleAssetId];
 
   return (
-    <AccountInfo
+    <WalletInfo
       className={`${styles.value} ${styles.sender}`}
       name={delegateName}
       token={activeToken}
@@ -85,7 +85,7 @@ export const Recipient = ({ t }) => {
   } = useContext(Context);
 
   return (
-    <AccountInfo
+    <WalletInfo
       className={`${styles.value} ${styles.recipient}`}
       token={activeToken}
       network={network}
diff --git a/packages/views/screens/managers/transactionDetails/components/styles.css b/packages/views/screens/managers/transactionDetails/components/styles.css
index 5f8de9396a..4be251bd17 100644
--- a/packages/views/screens/managers/transactionDetails/components/styles.css
+++ b/packages/views/screens/managers/transactionDetails/components/styles.css
@@ -125,7 +125,7 @@
   align-items: flex-start;
 }
 
-.accountInfo {
+.walletInfo {
   display: flex;
 }
 
diff --git a/packages/views/screens/managers/transactionDetails/components/transactionVotes.test.js b/packages/views/screens/managers/transactionDetails/components/transactionVotes.test.js
index 905bd77682..5cce753aea 100644
--- a/packages/views/screens/managers/transactionDetails/components/transactionVotes.test.js
+++ b/packages/views/screens/managers/transactionDetails/components/transactionVotes.test.js
@@ -1,8 +1,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import { TransactionVotesComp } from './transactionVotes';
-// import { Context } from '../transactionDetails';
 
 jest.mock('react', () => ({
   ...jest.requireActual('react'),
diff --git a/packages/views/screens/managers/transactionDetails/components/accountInfo.js b/packages/views/screens/managers/transactionDetails/components/walletInfo.js
similarity index 77%
rename from packages/views/screens/managers/transactionDetails/components/accountInfo.js
rename to packages/views/screens/managers/transactionDetails/components/walletInfo.js
index b88b01b7f3..7a7cf01032 100644
--- a/packages/views/screens/managers/transactionDetails/components/accountInfo.js
+++ b/packages/views/screens/managers/transactionDetails/components/walletInfo.js
@@ -3,11 +3,11 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import routes from '@screens/router/routes';
 import { validateAddress } from '@common/utilities/validators';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 
 import styles from './styles.css';
 
-const AccountInfo = ({
+const WalletInfo = ({
   name = '',
   label,
   address,
@@ -16,12 +16,12 @@ const AccountInfo = ({
   addressClass,
   className,
 }) => {
-  const addressLink = `${routes.account.path}?address=${address}`;
+  const addressLink = `${routes.explorer.path}?address=${address}`;
   return (
-    <div className={`${styles.accountInfo} ${className}`}>
+    <div className={`${styles.walletInfo} ${className}`}>
       <p className={styles.label}>{label}</p>
       <div className={styles.addressRow}>
-        <AccountVisual className={styles.avatar} address={address} size={25} />
+        <WalletVisual className={styles.avatar} address={address} size={25} />
         { validateAddress(token, address, network) === 0
           ? (
             <Link
@@ -44,11 +44,11 @@ const AccountInfo = ({
   );
 };
 
-AccountInfo.propTypes = {
+WalletInfo.propTypes = {
   address: PropTypes.string.isRequired,
   label: PropTypes.string.isRequired,
   addressClass: PropTypes.string,
   name: PropTypes.string,
 };
 
-export default AccountInfo;
+export default WalletInfo;
diff --git a/packages/views/screens/managers/transactionDetails/components/accountInfo.test.js b/packages/views/screens/managers/transactionDetails/components/walletInfo.test.js
similarity index 70%
rename from packages/views/screens/managers/transactionDetails/components/accountInfo.test.js
rename to packages/views/screens/managers/transactionDetails/components/walletInfo.test.js
index beafb4adac..50b4b92de2 100644
--- a/packages/views/screens/managers/transactionDetails/components/accountInfo.test.js
+++ b/packages/views/screens/managers/transactionDetails/components/walletInfo.test.js
@@ -1,12 +1,12 @@
 import React from 'react';
 import { mount } from 'enzyme';
-import accounts from '@tests/constants/accounts';
-import AccountInfo from '@wallet/detail/info/accountInfo';
+import wallets from '@tests/constants/wallets';
+import WalletInfo from './walletInfo';
 
-describe('TxDetail AccountInfo', () => {
+describe('TxDetail WalletInfo', () => {
   const props = {
     label: 'Label test',
-    address: accounts.genesis.summary.address,
+    address: wallets.genesis.summary.address,
     token: 'LSK',
     network: {
       name: 'Mainnet',
@@ -14,21 +14,21 @@ describe('TxDetail AccountInfo', () => {
   };
 
   it('Should render with address and label passed as props', () => {
-    const wrapper = mount(<AccountInfo {...props} />);
+    const wrapper = mount(<WalletInfo {...props} />);
     expect(wrapper.find('.label').text()).toEqual(props.label);
     expect(wrapper.find('.address').first().text()).toEqual(props.address);
   });
 
   it('Should render with invalid address and label passed as props', () => {
     const newProps = { ...props, address: 'invalid_address' };
-    const wrapper = mount(<AccountInfo {...newProps} />);
+    const wrapper = mount(<WalletInfo {...newProps} />);
     expect(wrapper.find('.label').text()).toEqual('Label test');
     expect(wrapper.find('.address').first().text()).toEqual('invalid_address');
   });
 
   it('Should render the name if passed', () => {
     const namedProps = { ...props, address: 'invalid_address', name: 'genesis' };
-    const wrapper = mount(<AccountInfo {...namedProps} />);
+    const wrapper = mount(<WalletInfo {...namedProps} />);
     expect(wrapper.text().indexOf('genesis')).not.toEqual(-1);
   });
 });
diff --git a/packages/views/screens/managers/transactionDetails/transactionDetails.test.js b/packages/views/screens/managers/transactionDetails/transactionDetails.test.js
index 0538c3a2a3..ac4f3088a4 100644
--- a/packages/views/screens/managers/transactionDetails/transactionDetails.test.js
+++ b/packages/views/screens/managers/transactionDetails/transactionDetails.test.js
@@ -3,7 +3,7 @@ import { mount } from 'enzyme';
 import { MODULE_ASSETS_NAME_ID_MAP } from '@transaction/configuration/moduleAssets';
 import { mountWithRouter } from '@common/utilities/testHelpers';
 import { truncateAddress } from '@wallet/utilities/account';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import TransactionDetails from './transactionDetails';
 
 const transaction = {
@@ -125,9 +125,9 @@ describe('Transaction Details Component', () => {
         { ...props, transaction },
         { id: transaction.id },
       );
-      expect(wrapper).toContainMatchingElements(2, '.accountInfo');
-      expect(wrapper.find('.accountInfo .sender-address').text()).toBe(transaction.data.sender.address);
-      expect(wrapper.find('.accountInfo .receiver-address').text()).toBe(transaction.data.asset.recipient?.address);
+      expect(wrapper).toContainMatchingElements(2, '.walletInfo');
+      expect(wrapper.find('.walletInfo .sender-address').text()).toBe(transaction.data.sender.address);
+      expect(wrapper.find('.walletInfo .receiver-address').text()).toBe(transaction.data.asset.recipient?.address);
       expect(wrapper).toContainExactlyOneMatchingElement('.tx-reference');
     });
 
@@ -217,8 +217,8 @@ describe('Transaction Details Component', () => {
         { ...props, transaction: voteTx },
         { id: transaction.id },
       );
-      expect(wrapper).toContainExactlyOneMatchingElement('.accountInfo');
-      expect(wrapper.find('.accountInfo .label').text()).toBe('Voter');
+      expect(wrapper).toContainExactlyOneMatchingElement('.walletInfo');
+      expect(wrapper.find('.walletInfo .label').text()).toBe('Voter');
     });
   });
 
@@ -256,7 +256,7 @@ describe('Transaction Details Component', () => {
         { ...props, transaction: delegateRegTx },
         { id: transaction.id },
       );
-      expect(wrapper).toContainExactlyOneMatchingElement('.accountInfo');
+      expect(wrapper).toContainExactlyOneMatchingElement('.walletInfo');
       expect(wrapper.find('.hasName').contains('testUsername')).toBe(true);
     });
   });
diff --git a/packages/views/screens/managers/verifyMessage/result.js b/packages/views/screens/managers/verifyMessage/result.js
index b29d16f4d7..0742c37ea1 100644
--- a/packages/views/screens/managers/verifyMessage/result.js
+++ b/packages/views/screens/managers/verifyMessage/result.js
@@ -4,11 +4,11 @@ import { PrimaryButton } from '@basics/buttons';
 import BoxFooter from '@basics/box/footer';
 import Illustration from '@basics/illustration';
 import routes from '@screens/router/routes';
-import styles from './verifyMessage.css';
 import useVerifyMessageValidator from '../../../../wallet/utilities/hooks/useVerifyMessageValidator';
+import styles from './verifyMessage.css';
 
 export default function Result({ inputs, history, t }) {
-  const isCorrect = useVerifyMessageValidator(inputs)
+  const isCorrect = useVerifyMessageValidator(inputs);
   const closeModal = () => {
     history.push(routes.wallet.path);
   };
diff --git a/packages/views/screens/managers/verifyMessage/verifyMessage.test.js b/packages/views/screens/managers/verifyMessage/verifyMessage.test.js
index 7e60c69ead..ce59060682 100644
--- a/packages/views/screens/managers/verifyMessage/verifyMessage.test.js
+++ b/packages/views/screens/managers/verifyMessage/verifyMessage.test.js
@@ -1,5 +1,5 @@
 import { mountWithRouter } from '@common/utilities/testHelpers';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import VerifyMessage from './verifyMessage';
 
 describe('VerifyMessage Component', () => {
diff --git a/packages/views/screens/managers/votingQueue/form/form.js b/packages/views/screens/managers/votingQueue/form/form.js
index fb443ddfda..0646be6e6f 100644
--- a/packages/views/screens/managers/votingQueue/form/form.js
+++ b/packages/views/screens/managers/votingQueue/form/form.js
@@ -140,7 +140,7 @@ const Editor = ({
     network,
     selectedPriority,
     token,
-    account,
+    wallet: account,
     priorityOptions,
     transaction: {
       moduleAssetId,
diff --git a/packages/views/screens/managers/votingQueue/form/form.test.js b/packages/views/screens/managers/votingQueue/form/form.test.js
index a70f4c9a21..478180c6f0 100644
--- a/packages/views/screens/managers/votingQueue/form/form.test.js
+++ b/packages/views/screens/managers/votingQueue/form/form.test.js
@@ -5,7 +5,7 @@ import { mountWithRouter } from '@common/utilities/testHelpers';
 import { getTransactionBaseFees, getTransactionFee } from '@transaction/utilities/api';
 import useTransactionFeeCalculation from '@transaction/manage/transactionPriority/useTransactionFeeCalculation';
 import { fromRawLsk } from '@token/utilities/lsk';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import flushPromises from '@tests/unit-test-utils/flushPromises';
 import Form from './form';
 
diff --git a/packages/views/screens/managers/votingQueue/form/voteRow.js b/packages/views/screens/managers/votingQueue/form/voteRow.js
index 0dcdbc986f..7a301e243c 100644
--- a/packages/views/screens/managers/votingQueue/form/voteRow.js
+++ b/packages/views/screens/managers/votingQueue/form/voteRow.js
@@ -5,7 +5,7 @@ import { tokenMap } from '@token/configuration/tokens';
 import { voteEdited } from '@common/store/actions';
 import { fromRawLsk, toRawLsk } from '@token/utilities/lsk';
 import { truncateAddress } from '@wallet/utilities/account';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import Box from '@basics/box';
 import { SecondaryButton, TertiaryButton } from '@basics/buttons';
 import Icon from '@basics/icon';
@@ -54,7 +54,7 @@ const VoteRow = ({
   return (
     <Box className={styles.voteItemContainer}>
       <div className={`${styles.infoColumn} ${styles.delegateInfoContainer}`}>
-        <AccountVisual address={address} />
+        <WalletVisual address={address} />
         <div className={styles.delegateInfo}>
           <span className={styles.delegateUsername}>{username || ''}</span>
           <span className={styles.delegateAddress}>{truncatedAddress}</span>
diff --git a/packages/views/screens/managers/votingQueue/summary/summary.test.js b/packages/views/screens/managers/votingQueue/summary/summary.test.js
index ecc8364a1f..d650e49e0c 100644
--- a/packages/views/screens/managers/votingQueue/summary/summary.test.js
+++ b/packages/views/screens/managers/votingQueue/summary/summary.test.js
@@ -1,5 +1,5 @@
 import { mountWithRouter } from '@common/utilities/testHelpers';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import Summary from './summary';
 
 const added = {
diff --git a/packages/views/screens/managers/wallet/delegateProfile/delegateProfile.test.js b/packages/views/screens/managers/wallet/delegateProfile/delegateProfile.test.js
index 389afd9691..a5547a2769 100644
--- a/packages/views/screens/managers/wallet/delegateProfile/delegateProfile.test.js
+++ b/packages/views/screens/managers/wallet/delegateProfile/delegateProfile.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import * as reactRedux from 'react-redux';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import DelegateProfile from './delegateProfile';
 
 const { genesis, delegate } = accounts;
diff --git a/packages/views/screens/managers/wallet/delegateProfile/voterRow.js b/packages/views/screens/managers/wallet/delegateProfile/voterRow.js
index 32cb38b113..b741ae284c 100644
--- a/packages/views/screens/managers/wallet/delegateProfile/voterRow.js
+++ b/packages/views/screens/managers/wallet/delegateProfile/voterRow.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { Link } from 'react-router-dom';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import { truncateAddress } from '@wallet/utilities/account';
 import styles from './delegateProfile.css';
 
@@ -12,8 +12,8 @@ const VoterRow = ({ data = {} }) => {
       className={styles.voteRow}
       to={`account?address=${address}`}
     >
-      <AccountVisual
-        className={styles.accountVisual}
+      <WalletVisual
+        className={styles.walletVisual}
         address={address}
         size={40}
       />
diff --git a/packages/views/screens/managers/wallet/explorer.js b/packages/views/screens/managers/wallet/explorer.js
index fe85d3c1dc..8c8ee90a6e 100644
--- a/packages/views/screens/managers/wallet/explorer.js
+++ b/packages/views/screens/managers/wallet/explorer.js
@@ -1,90 +1,5 @@
 /* istanbul ignore file */
-import React, { useEffect } from 'react';
-import { compose } from 'redux';
-import { useSelector } from 'react-redux';
-import { withTranslation } from 'react-i18next';
-import withData from '@common/utilities/withData';
-import { isEmpty } from '@common/utilities/helpers';
-import { selectActiveToken, selectSettings } from '@common/store/selectors';
-import { getAccount } from '@wallet/utilities/api';
-import { selectSearchParamValue } from '@screens/router/searchParams';
-import TabsContainer from '@basics/tabs/tabsContainer/tabsContainer';
-import Overview from './overview';
-import DelegateTab from './delegateProfile';
-import VotesTab from './votes';
-import Transactions from './transactions';
+import React from 'react';
+import ExplorerManager from '@wallet/detail/manager/explorer';
 
-const Wallet = ({
-  t, account, history,
-}) => {
-  const activeToken = useSelector(selectActiveToken);
-  const { discreetMode } = useSelector(selectSettings);
-  const address = selectSearchParamValue(history.location.search, 'address');
-
-  useEffect(() => {
-    account.loadData();
-  }, [address]);
-
-  if (!account || !account.data || isEmpty(account.data)) return (<div />);
-
-  const isDelegate = account.data.summary?.isDelegate;
-
-  return (
-    <section>
-      <Overview
-        isWalletRoute={false}
-        activeToken={activeToken}
-        discreetMode={discreetMode}
-        account={account.data}
-      />
-      <TabsContainer name="main-tabs">
-        <Transactions
-          pending={[]}
-          activeToken={activeToken}
-          discreetMode={discreetMode}
-          name={t('Transactions')}
-          id="transactions"
-          address={address}
-        />
-        {activeToken !== 'BTC' ? (
-          <VotesTab
-            history={history}
-            address={address}
-            name={t('Voting')}
-            id="voting"
-          />
-        ) : null}
-        {isDelegate
-          ? (
-            <DelegateTab
-              tabClassName="delegate-statistics"
-              name={t('Delegate profile')}
-              id="delegateProfile"
-              account={account.data}
-            />
-          )
-          : null}
-      </TabsContainer>
-    </section>
-  );
-};
-
-const apis = {
-  account: {
-    apiUtil: (network, { token, ...params }) => getAccount({ network, params }, token),
-    defaultData: {},
-    getApiParams: (state, props) => ({
-      token: state.settings.token.active,
-      address: selectSearchParamValue(props.history.location.search, 'address'),
-      network: state.network,
-    }),
-    transformResponse: response => response,
-  },
-};
-
-const ComposedWallet = compose(
-  withData(apis),
-  withTranslation(),
-)(Wallet);
-
-export default ComposedWallet;
+export default props => <ExplorerManager {...props} />;
diff --git a/packages/views/screens/managers/wallet/explorerLayout.js b/packages/views/screens/managers/wallet/explorerLayout.js
new file mode 100644
index 0000000000..4bbd5a7cef
--- /dev/null
+++ b/packages/views/screens/managers/wallet/explorerLayout.js
@@ -0,0 +1,68 @@
+/* istanbul ignore file */
+import React, { useEffect } from 'react';
+import { useSelector } from 'react-redux';
+import { isEmpty } from '@common/utilities/helpers';
+import { selectActiveToken, selectSettings } from '@common/store/selectors';
+import { selectSearchParamValue } from '@screens/router/searchParams';
+import TabsContainer from '@basics/tabs/tabsContainer/tabsContainer';
+import Overview from './overview';
+import DelegateTab from './delegateProfile';
+import VotesTab from './votes';
+import Transactions from './transactions';
+
+const ExplorerLayout = ({
+  t, account, history,
+}) => {
+  const activeToken = useSelector(selectActiveToken);
+  const { discreetMode } = useSelector(selectSettings);
+  const address = selectSearchParamValue(history.location.search, 'address');
+
+  useEffect(() => {
+    account.loadData();
+  }, [address]);
+
+  if (!account || !account.data || isEmpty(account.data)) {
+    return (<div />);
+  }
+
+  const isDelegate = account.data.summary?.isDelegate;
+
+  return (
+    <section>
+      <Overview
+        isWalletRoute={false}
+        activeToken={activeToken}
+        discreetMode={discreetMode}
+        account={account.data}
+      />
+      <TabsContainer name="main-tabs">
+        <Transactions
+          pending={[]}
+          activeToken={activeToken}
+          discreetMode={discreetMode}
+          name={t('Transactions')}
+          id="transactions"
+          address={address}
+        />
+        {activeToken === 'BTC' ? null : (
+          <VotesTab
+            history={history}
+            address={address}
+            name={t('Voting')}
+            id="voting"
+          />
+        )}
+        {!isDelegate ? null : (
+          <DelegateTab
+            tabClassName="delegate-statistics"
+            name={t('Delegate profile')}
+            id="delegateProfile"
+            account={account.data}
+          />
+        )}
+      </TabsContainer>
+    </section>
+  );
+};
+
+export default ExplorerLayout;
diff --git a/packages/views/screens/managers/wallet/multiSignature/groupRow.js b/packages/views/screens/managers/wallet/multiSignature/groupRow.js
index e82fe977ec..577e5f634c 100644
--- a/packages/views/screens/managers/wallet/multiSignature/groupRow.js
+++ b/packages/views/screens/managers/wallet/multiSignature/groupRow.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import grid from 'flexboxgrid/dist/flexboxgrid.css';
 import { Link } from 'react-router-dom';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import LiskAmount from '@shared/liskAmount';
 import { regex } from '@common/configuration';
 import routes from '@screens/router/routes';
@@ -18,11 +18,11 @@ const GroupRow = ({ data, className }) => {
 
   return (
     <Link
-      to={`${routes.account.path}?address=${address}`}
+      to={`${routes.explorer.path}?address=${address}`}
       className={`${grid.row} ${className} ${styles.transactionRow} multisign-group-row`}
     >
       <span className={grid['col-xs-8']}>
-        <AccountVisual
+        <WalletVisual
           address={address}
           className={styles.avatar}
         />
diff --git a/packages/views/screens/managers/wallet/multiSignature/index.js b/packages/views/screens/managers/wallet/multiSignature/index.js
index 8dc7e3f4f6..4f991776fd 100644
--- a/packages/views/screens/managers/wallet/multiSignature/index.js
+++ b/packages/views/screens/managers/wallet/multiSignature/index.js
@@ -5,7 +5,7 @@ import MultiSignatureComponent from './multiSignature';
 import { multisignGroups, transactionsData } from './mockData';
 
 const MultiSignature = (props) => {
-  const account = useSelector(state => state.account);
+  const account = useSelector(state => state.wallet);
   const activeToken = useSelector(state => state.settings.token.active);
 
   return (
diff --git a/packages/views/screens/managers/wallet/multiSignature/multiSignature.test.js b/packages/views/screens/managers/wallet/multiSignature/multiSignature.test.js
index 44b3f897c6..2f45e95df5 100644
--- a/packages/views/screens/managers/wallet/multiSignature/multiSignature.test.js
+++ b/packages/views/screens/managers/wallet/multiSignature/multiSignature.test.js
@@ -1,5 +1,5 @@
 import { mountWithRouter } from '@common/utilities/testHelpers';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import Multisignature from './multiSignature';
 import { multisignGroups, transactionsData } from './mockData';
 
diff --git a/packages/views/screens/managers/wallet/multiSignature/transactionRow.js b/packages/views/screens/managers/wallet/multiSignature/transactionRow.js
index e8fdbd0da4..7b586a1ad4 100644
--- a/packages/views/screens/managers/wallet/multiSignature/transactionRow.js
+++ b/packages/views/screens/managers/wallet/multiSignature/transactionRow.js
@@ -3,7 +3,7 @@ import grid from 'flexboxgrid/dist/flexboxgrid.css';
 import { regex } from '@common/configuration';
 import { tokenMap } from '@token/configuration/tokens';
 import DialogLink from '@basics/dialog/link';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import Icon from '@basics/icon';
 import TransactionAmount from '@transaction/detail/info/transactionAmount';
 import styles from './multiSignature.css';
@@ -45,7 +45,7 @@ const TransactionRow = ({
           name={host === recipient.address ? 'incoming' : 'outgoing'}
           className={styles.incomingOutcomingIcon}
         />
-        <AccountVisual
+        <WalletVisual
           address={sender.address}
           className={styles.avatar}
         />
@@ -57,7 +57,7 @@ const TransactionRow = ({
         </div>
       </span>
       <span className={grid['col-xs-4']}>
-        <AccountVisual
+        <WalletVisual
           address={recipient.address}
           className={styles.avatar}
         />
diff --git a/packages/views/screens/managers/wallet/overview/overview.css b/packages/views/screens/managers/wallet/overview.css
similarity index 100%
rename from packages/views/screens/managers/wallet/overview/overview.css
rename to packages/views/screens/managers/wallet/overview.css
diff --git a/packages/views/screens/managers/wallet/overview/index.js b/packages/views/screens/managers/wallet/overview.js
similarity index 93%
rename from packages/views/screens/managers/wallet/overview/index.js
rename to packages/views/screens/managers/wallet/overview.js
index 7519b11a84..2ea8cf9b87 100644
--- a/packages/views/screens/managers/wallet/overview/index.js
+++ b/packages/views/screens/managers/wallet/overview.js
@@ -1,18 +1,19 @@
 /* eslint-disable max-statements */
 import React, { useEffect } from 'react';
 import { useSelector, connect } from 'react-redux';
+import { withRouter } from 'react-router';
 import { compose } from 'redux';
 import { withTranslation } from 'react-i18next';
 import grid from 'flexboxgrid/dist/flexboxgrid.css';
+
 import withData from '@common/utilities/withData';
 import { getTransactions } from '@transaction/utilities/api';
 import { selectTransactions } from '@common/store/selectors';
 import FlashMessageHolder from '@basics/flashMessage/holder';
 import WarnPunishedDelegate from '@dpos/detail/info/warnPunishedDelegate';
-import AccountInfo from '@wallet/detail/info/accountInfo';
-import { withRouter } from 'react-router';
-import BalanceChart from './balanceChart';
-import BalanceInfo from './balanceInfo';
+import WalletInfo from '@wallet/detail/identity/walletInfo';
+import BalanceChart from '@wallet/detail/holdings/balanceChart';
+import BalanceInfo from '@wallet/detail/holdings/balanceInfo';
 import styles from './overview.css';
 
 const mapStateToProps = (state) => ({
@@ -64,10 +65,7 @@ const Overview = ({
     state.bookmarks[activeToken].find((item) => item.address === address));
   const host = useSelector(
     (state) =>
-      (state.account
-        && state.account.info
-        && state.account.info[activeToken]
-        && state.account.info[activeToken].summary?.address)
+      (state?.wallet?.info[activeToken]?.summary?.address)
       || '',
   );
 
@@ -112,7 +110,7 @@ const Overview = ({
       <div
         className={`${grid['col-xs-6']} ${grid['col-md-3']} ${grid['col-lg-3']}`}
       >
-        <AccountInfo
+        <WalletInfo
           t={t}
           hwInfo={hwInfo}
           activeToken={activeToken}
diff --git a/packages/views/screens/managers/wallet/transactions/transactionRow.js b/packages/views/screens/managers/wallet/transactions/transactionRow.js
index 28dd167f4f..8f03ed6b72 100644
--- a/packages/views/screens/managers/wallet/transactions/transactionRow.js
+++ b/packages/views/screens/managers/wallet/transactions/transactionRow.js
@@ -7,7 +7,7 @@ import DateTimeFromTimestamp from '@basics/timestamp';
 import LiskAmount from '@shared/liskAmount';
 import TransactionTypeFigure from '@transaction/detail/info/transactionTypeFigure';
 import TransactionAmount from '@transaction/detail/info/transactionAmount';
-import TransactionAddress from '@wallet/detail/info/accountVisual/transactionAddress';
+import TransactionAddress from '@wallet/detail/identity/walletVisual/transactionAddress';
 import Spinner from '@basics/spinner';
 import DialogLink from '@basics/dialog/link';
 import TransactionAsset from './txAsset';
diff --git a/packages/views/screens/managers/wallet/transactions/transactionRow.test.js b/packages/views/screens/managers/wallet/transactions/transactionRow.test.js
index ec61432332..d283640575 100644
--- a/packages/views/screens/managers/wallet/transactions/transactionRow.test.js
+++ b/packages/views/screens/managers/wallet/transactions/transactionRow.test.js
@@ -1,5 +1,5 @@
 import { mountWithRouter } from '@common/utilities/testHelpers';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import TransactionRow from './transactionRow';
 
 describe('Single Transaction Component', () => {
diff --git a/packages/views/screens/managers/wallet/votes/index.js b/packages/views/screens/managers/wallet/votes/index.js
index 827f467061..d924c44336 100644
--- a/packages/views/screens/managers/wallet/votes/index.js
+++ b/packages/views/screens/managers/wallet/votes/index.js
@@ -28,7 +28,7 @@ const apis = {
 
 const mapStateToProps = state => ({
   sentVotes: state.voting,
-  isDelegate: state.account?.info?.LSK?.summary.isDelegate,
+  isDelegate: state.wallet?.info?.LSK?.summary.isDelegate,
 });
 
 export default compose(
diff --git a/packages/views/screens/managers/wallet/votes/voteRow.js b/packages/views/screens/managers/wallet/votes/voteRow.js
index 20da3b9044..51d265b401 100644
--- a/packages/views/screens/managers/wallet/votes/voteRow.js
+++ b/packages/views/screens/managers/wallet/votes/voteRow.js
@@ -2,7 +2,7 @@ import React from 'react';
 import grid from 'flexboxgrid/dist/flexboxgrid.css';
 import { tokenMap } from '@token/configuration/tokens';
 import { truncateAddress } from '@wallet/utilities/account';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import tableStyles from '@basics/table/table.css';
 import LiskAmount from '@shared/liskAmount';
 import DialogLink from '@basics/dialog/link';
@@ -22,12 +22,12 @@ const VoteRow = ({
         {/* Account visual */}
         <div className={grid['col-sm-5']} onClick={onClick}>
           <div className={`${styles.info}`}>
-            <AccountVisual
+            <WalletVisual
               className={`${styles.avatar}`}
               address={truncatedAddress}
               size={40}
             />
-            <div className={styles.accountInfo}>
+            <div className={styles.walletInfo}>
               <span className={`${styles.username} vote-username`}>{data.username}</span>
               <span className={`${styles.address} showOnLargeViewPort`}>{truncatedAddress}</span>
             </div>
diff --git a/packages/views/screens/managers/wallet/votes/voteRow.test.js b/packages/views/screens/managers/wallet/votes/voteRow.test.js
index cca79b2434..bfa646fcaa 100644
--- a/packages/views/screens/managers/wallet/votes/voteRow.test.js
+++ b/packages/views/screens/managers/wallet/votes/voteRow.test.js
@@ -1,7 +1,7 @@
 import { mountWithRouter } from '@common/utilities/testHelpers';
 import Spinner from '@basics/spinner';
 import DialogLink from '@basics/dialog/link';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import VoteRow from './voteRow';
 
 describe('VoteRow Component', () => {
diff --git a/packages/views/screens/managers/wallet/votes/votes.css b/packages/views/screens/managers/wallet/votes/votes.css
index 3ea37f3acd..0fb726963b 100644
--- a/packages/views/screens/managers/wallet/votes/votes.css
+++ b/packages/views/screens/managers/wallet/votes/votes.css
@@ -81,7 +81,7 @@
     margin-right: 16px;
   }
 
-  & > .accountInfo {
+  & > .walletInfo {
     display: flex;
     flex-direction: column;
     justify-content: space-evenly;
diff --git a/packages/views/screens/managers/wallet/votes/votes.js b/packages/views/screens/managers/wallet/votes/votes.js
index 812df7683d..1de77dcb48 100644
--- a/packages/views/screens/managers/wallet/votes/votes.js
+++ b/packages/views/screens/managers/wallet/votes/votes.js
@@ -27,7 +27,7 @@ const Votes = ({
   };
 
   const onRowClick = (rowAddress) => {
-    const accountAddress = `${routes.account.path}?address=${rowAddress}`;
+    const accountAddress = `${routes.explorer.path}?address=${rowAddress}`;
     history.push(accountAddress);
   };
 
diff --git a/packages/views/screens/managers/wallet/votes/votes.test.js b/packages/views/screens/managers/wallet/votes/votes.test.js
index ad283590fd..bf91536d2b 100644
--- a/packages/views/screens/managers/wallet/votes/votes.test.js
+++ b/packages/views/screens/managers/wallet/votes/votes.test.js
@@ -1,6 +1,6 @@
 import { mountWithRouter } from '@common/utilities/testHelpers';
 import routes from '@screens/router/routes';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import Votes from './votes';
 
 describe('Votes Tab Component', () => {
@@ -99,7 +99,7 @@ describe('Votes Tab Component', () => {
     wrapper = setup(customProps);
     wrapper.find('.vote-row > div').at(0).first().simulate('click');
     jest.advanceTimersByTime(300);
-    expect(props.history.push).toBeCalledWith(`${routes.account.path}?address=lsk0`);
+    expect(props.history.push).toBeCalledWith(`${routes.explorer.path}?address=lsk0`);
   });
 
   it('Should filter votes per username and show error message if no results found', () => {
diff --git a/packages/views/screens/router/routes.js b/packages/views/screens/router/routes.js
index 4637436a76..d8fc89242c 100644
--- a/packages/views/screens/router/routes.js
+++ b/packages/views/screens/router/routes.js
@@ -12,8 +12,8 @@ export default {
     isPrivate: false,
     forbiddenTokens: [],
   },
-  account: {
-    path: '/account',
+  explorer: {
+    path: '/explorer',
     searchParam: 'address',
     isPrivate: false,
     forbiddenTokens: [],
@@ -61,8 +61,8 @@ export default {
     exact: true,
     forbiddenTokens: [tokenMap.BTC.key],
   },
-  accounts: {
-    path: '/accounts',
+  wallets: {
+    path: '/wallets',
     isPrivate: false,
     forbiddenTokens: [tokenMap.BTC.key],
   },
diff --git a/packages/views/screens/router/routesMap.js b/packages/views/screens/router/routesMap.js
index 98459b36c2..46166211e8 100644
--- a/packages/views/screens/router/routesMap.js
+++ b/packages/views/screens/router/routesMap.js
@@ -7,8 +7,8 @@ import DelegatesMonitor from '@screens/managers/monitor/delegates';
 import DelegatesPerformanceModal from '@screens/managers/wallet/delegatePerformanceModal';
 import HwWalletLogin from '@screens/managers/hwWalletLogin';
 import Login from '@screens/managers/login';
-import MonitorAccounts from '@screens/managers/monitor/accounts';
-import MonitorNetwork from '@screens/managers/network';
+import MonitorWallets from '@screens/managers/monitor/wallets';
+import MonitorNetwork from '@screens/managers/monitor/network';
 import MonitorTransactions from '@screens/managers/monitor/transactions';
 import Register from '@screens/managers/register';
 import RegisterDelegate from '@screens/managers/registerDelegate';
@@ -36,7 +36,7 @@ import MultisigAccountDetails from '@screens/managers/multisigAccountDetails';
 export default {
   wallet: Wallet,
   addAccount: Login,
-  account: Explorer,
+  explorer: Explorer,
   hwWallet: HwWalletLogin,
   register: Register,
   login: Login,
@@ -44,7 +44,7 @@ export default {
   transactions: MonitorTransactions,
   blocks: Blocks,
   block: BlockDetails,
-  accounts: MonitorAccounts,
+  wallets: MonitorWallets,
   network: MonitorNetwork,
   delegates: DelegatesMonitor,
   delegatePerformance: DelegatesPerformanceModal,
diff --git a/packages/views/shared/customRoute/index.js b/packages/views/shared/customRoute/index.js
index 82ae15aeed..2d72ad49a7 100644
--- a/packages/views/shared/customRoute/index.js
+++ b/packages/views/shared/customRoute/index.js
@@ -25,10 +25,10 @@ const CustomRoute = ({
   t,
   history,
 }) => {
-  const account = useSelector(state => getActiveTokenAccount(state));
+  const wallet = useSelector(state => getActiveTokenAccount(state));
   const settings = useSelector(state => state.settings);
   const isAuthenticated = useSelector(state =>
-    (state.account.info && state.account.info[settings.token.active]));
+    (state.wallet.info && state.wallet.info[settings.token.active]));
   const isNetworkSet = useSelector(checkNetwork);
   const { search = '' } = history.location;
 
@@ -46,7 +46,7 @@ const CustomRoute = ({
     );
   }
 
-  if (account.info?.LSK?.summary?.isMigrated === false
+  if (wallet.info?.LSK?.summary?.isMigrated === false
     && history.location.pathname !== routes.reclaim.path
     && history.location.pathname !== routes.login.path
     && isAuthenticated) {
diff --git a/packages/views/shared/customRoute/index.test.js b/packages/views/shared/customRoute/index.test.js
index dd5fecd897..a7c527afe9 100644
--- a/packages/views/shared/customRoute/index.test.js
+++ b/packages/views/shared/customRoute/index.test.js
@@ -4,7 +4,7 @@ import { mount } from 'enzyme';
 import { MemoryRouter, Route } from 'react-router';
 import routes from '@screens/router/routes';
 import ReclaimBalance from '@screens/managers/reclaimBalance';
-import accounts from '@tests/constants/accounts';
+import wallets from '@tests/constants/wallets';
 import CustomRoute from './index';
 
 const Public = () => <h1>Public</h1>;
@@ -22,9 +22,9 @@ describe('CustomRoute', () => {
         active: 'LSK',
       },
     },
-    account: {
+    wallet: {
       info: {
-        LSK: accounts.genesis,
+        LSK: wallets.genesis,
       },
     },
     network: {
@@ -74,13 +74,13 @@ describe('CustomRoute', () => {
   });
 
   it('should redirect to root path if user is not authenticated', () => {
-    mockAppState.account.info = {};
+    mockAppState.wallet.info = {};
     const wrapper = isAuth({ isPrivate: true });
     expect(wrapper.find(Public).exists()).toBe(true);
   });
 
   it('should redirect to reclaim path if user is not migrated', () => {
-    mockAppState.account.info.LSK = accounts.empty_account;
+    mockAppState.wallet.info.LSK = wallets.empty_wallet;
     const wrapper = isAuth({ isPrivate: true });
     expect(wrapper.find(ReclaimBalance).exists()).toBe(true);
   });
diff --git a/packages/views/shared/discreetMode/discreetMode.js b/packages/views/shared/discreetMode/discreetMode.js
index 646cd755c4..eeb07b0154 100644
--- a/packages/views/shared/discreetMode/discreetMode.js
+++ b/packages/views/shared/discreetMode/discreetMode.js
@@ -10,14 +10,14 @@ const DiscreetMode = ({
 }) => {
   const isBlurHandledOnOtherWalletPage = useMemo(() => {
     const { search } = location;
-    const address = selectSearchParamValue(search, routes.account.searchParam);
+    const address = selectSearchParamValue(search, routes.explorer.searchParam);
     return account.info && address === account.info[token].address;
   }, [location, account.info]);
 
   const shouldEnableDiscreetMode = () => {
     if (!isDiscreetMode) return false;
     if (shouldEvaluateForOtherAccounts) {
-      if (location.pathname.includes(routes.account.path)) {
+      if (location.pathname.includes(routes.explorer.path)) {
         return isBlurHandledOnOtherWalletPage;
       }
       const { search } = location;
diff --git a/packages/views/shared/navigationBars/sideBar/index.js b/packages/views/shared/navigationBars/sideBar/index.js
index af31a6ba1f..84405329c7 100644
--- a/packages/views/shared/navigationBars/sideBar/index.js
+++ b/packages/views/shared/navigationBars/sideBar/index.js
@@ -68,7 +68,7 @@ const getWarningTime = (expireTime) => {
 
 const AutoSignOutWrapper = () => {
   const dispatch = useDispatch();
-  const expireTime = useSelector(state => state.account.expireTime);
+  const expireTime = useSelector(state => state.wallet.expireTime);
   const warningTime = getWarningTime(expireTime);
   const autoSignOut = useSelector(state => state.settings.autoLog);
   const renderAutoSignOut = autoSignOut && expireTime;
@@ -96,7 +96,7 @@ const SideBar = ({
 }) => {
   const items = menuLinks(t);
   const token = useSelector(state => state.settings.token.active);
-  const isLoggedOut = useSelector(state => !state.account.info || !state.account.info[token]);
+  const isLoggedOut = useSelector(state => !state.wallet.info || !state.wallet.info[token]);
   const sideBarExpanded = useSelector(state => state.settings.sideBarExpanded);
 
   return (
diff --git a/packages/views/shared/navigationBars/sideBar/index.test.js b/packages/views/shared/navigationBars/sideBar/index.test.js
index 03cd36c146..86fa6c1216 100644
--- a/packages/views/shared/navigationBars/sideBar/index.test.js
+++ b/packages/views/shared/navigationBars/sideBar/index.test.js
@@ -35,7 +35,7 @@ describe('SideBar', () => {
           active: 'LSK',
         },
       },
-      account: {
+      wallet: {
         info: {},
       },
       network: {
diff --git a/packages/views/shared/navigationBars/sideBar/menuLinks.js b/packages/views/shared/navigationBars/sideBar/menuLinks.js
index 7ae4814e8c..b77da21b58 100644
--- a/packages/views/shared/navigationBars/sideBar/menuLinks.js
+++ b/packages/views/shared/navigationBars/sideBar/menuLinks.js
@@ -35,10 +35,10 @@ const menuLinks = t => ([
       path: routes.blocks.path,
     },
     {
-      icon: 'accountsMonitor',
-      id: 'accounts',
+      icon: 'walletsMonitor',
+      id: 'wallets',
       label: t('Accounts'),
-      path: routes.accounts.path,
+      path: routes.wallets.path,
     },
     {
       icon: 'delegatesMonitor',
diff --git a/packages/views/shared/navigationBars/topBar/index.js b/packages/views/shared/navigationBars/topBar/index.js
index 99d03b5b2a..055d3b997e 100644
--- a/packages/views/shared/navigationBars/topBar/index.js
+++ b/packages/views/shared/navigationBars/topBar/index.js
@@ -8,7 +8,7 @@ import { accountLoggedOut, timerReset } from '@common/store/actions';
 import TopBar from './topBar';
 
 const mapStateToProps = state => ({
-  account: state.account,
+  account: state.wallet,
   network: state.network,
   token: state.settings.token,
   settings: state.settings,
diff --git a/packages/views/shared/navigationBars/topBar/search.js b/packages/views/shared/navigationBars/topBar/search.js
index 8fdd125510..27d4c8d016 100644
--- a/packages/views/shared/navigationBars/topBar/search.js
+++ b/packages/views/shared/navigationBars/topBar/search.js
@@ -5,7 +5,7 @@ import { selectSearchParamValue } from '@screens/router/searchParams';
 import routes from '@screens/router/routes';
 import Icon from '@basics/icon';
 import DialogLink from '@basics/dialog/link';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import Tooltip from '@basics/tooltip/tooltip';
 import styles from './topBar.css';
 
@@ -53,10 +53,10 @@ const Search = ({
           <span className={relevantSearchParam ? `${styles.searchContainer} ${styles.searchContainerParam}` : styles.searchContainer}>
             <Icon name={relevantSearchParam ? 'search' : 'searchInput'} className="search-icon" />
             {
-              relevantSearchParam === routes.account.searchParam && relevantSearchParamValue
+              relevantSearchParam === routes.explorer.searchParam && relevantSearchParamValue
                 && (
-                  <AccountVisual
-                    className={styles.accountVisual}
+                  <WalletVisual
+                    className={styles.walletVisual}
                     size={18}
                     address={relevantSearchParamValue}
                   />
diff --git a/packages/views/shared/navigationBars/topBar/topBar.css b/packages/views/shared/navigationBars/topBar/topBar.css
index f9a3d6cbb0..0b9342236b 100644
--- a/packages/views/shared/navigationBars/topBar/topBar.css
+++ b/packages/views/shared/navigationBars/topBar/topBar.css
@@ -63,7 +63,7 @@
       max-width: 250px;
     }
 
-    & .accountVisual {
+    & .walletVisual {
       padding-left: 10px;
     }
   }
diff --git a/packages/views/shared/navigationBars/topBar/topBar.test.js b/packages/views/shared/navigationBars/topBar/topBar.test.js
index 5ddff346fd..8e89416148 100644
--- a/packages/views/shared/navigationBars/topBar/topBar.test.js
+++ b/packages/views/shared/navigationBars/topBar/topBar.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import routes from '@screens/router/routes';
 import DialogHolder from '@basics/dialog/holder';
 import { mountWithRouter } from '@common/utilities/testHelpers';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import TopBar from './topBar';
 
 const mockInputNode = {
@@ -134,20 +134,20 @@ describe('TopBar', () => {
     expect(wrapper.find('div.searchDropdown')).not.toHaveClassName('show');
   });
 
-  it('renders searched value in the search container with AccountVisual when the url contains an account address', () => {
+  it('renders searched value in the search container with WalletVisual when the url contains an account address', () => {
     const wrapper = mountWithRouter(
       TopBar,
       {
         ...props,
         history: {
-          location: { pathname: routes.account.path, search: '?address=1L' },
+          location: { pathname: routes.explorer.path, search: '?address=1L' },
         },
       },
-      { pathname: routes.account.path },
+      { pathname: routes.explorer.path },
     );
     expect(wrapper).toContainMatchingElement('img.search-icon');
     expect(wrapper).toContainMatchingElement('span.searchedValue');
-    expect(wrapper).toContainMatchingElement('AccountVisual');
+    expect(wrapper).toContainMatchingElement('WalletVisual');
     expect(wrapper.find('div.searchDropdown')).not.toHaveClassName('show');
   });
 
@@ -157,14 +157,14 @@ describe('TopBar', () => {
       {
         ...props,
         history: {
-          location: { pathname: routes.account.path, search: '?somerandomparam=1L' },
+          location: { pathname: routes.explorer.path, search: '?somerandomparam=1L' },
         },
       },
-      { pathname: routes.account.path },
+      { pathname: routes.explorer.path },
     );
     expect(wrapper).toContainMatchingElement('img.search-icon');
     expect(wrapper).not.toContainMatchingElement('span.searchedValue');
-    expect(wrapper).not.toContainMatchingElement('AccountVisual');
+    expect(wrapper).not.toContainMatchingElement('WalletVisual');
     expect(wrapper.find('div.searchDropdown')).not.toHaveClassName('show');
   });
 
diff --git a/packages/views/shared/searchBar/searchBar.js b/packages/views/shared/searchBar/searchBar.js
index 4e14fa740d..ef46c3a089 100644
--- a/packages/views/shared/searchBar/searchBar.js
+++ b/packages/views/shared/searchBar/searchBar.js
@@ -4,8 +4,8 @@ import { keyCodes } from '@views/configuration';
 import { addSearchParamsToUrl } from '@screens/router/searchParams';
 import routes from '@screens/router/routes';
 import { Input } from '@basics/inputs';
-import Accounts from './accounts';
-import Delegates from './delegates';
+import Wallet from '@wallet/detail/identity/searchBarWallets';
+import Delegates from '@wallet/detail/identity/searchBarWallets/delegates';
 import Transactions from './transactions';
 import styles from './searchBar.css';
 import Blocks from './blocks';
@@ -55,7 +55,7 @@ class SearchBar extends React.Component {
     if (type === 'transactions') {
       addSearchParamsToUrl(this.props.history, { modal: 'transactionDetails', transactionId: value });
     } else if (type === 'delegate-account') {
-      this.props.history.push(`${routes.account.path}?${routes.account.searchParam}=${value}&tab=delegateProfile`);
+      this.props.history.push(`${routes.explorer.path}?${routes.explorer.searchParam}=${value}&tab=delegateProfile`);
     } else {
       this.props.history.push(`${routes[type].path}?${routes[type].searchParam}=${value}`);
     }
@@ -156,8 +156,8 @@ class SearchBar extends React.Component {
         {
           suggestions.data.addresses.length
             ? (
-              <Accounts
-                accounts={suggestions.data.addresses}
+              <Wallet
+                wallets={suggestions.data.addresses}
                 onSelectedRow={this.onSelectAccount}
                 rowItemIndex={rowItemIndex}
                 updateRowItemIndex={this.updateRowItemIndex}
diff --git a/packages/views/utilities/passphrase.test.js b/packages/views/utilities/passphrase.test.js
index 92f978cc68..ae28d7e352 100644
--- a/packages/views/utilities/passphrase.test.js
+++ b/packages/views/utilities/passphrase.test.js
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import { generateSeed, generatePassphraseFromSeed, isValidPassphrase } from './passphrase';
 
 if (global._bitcore) delete global._bitcore;
diff --git a/packages/views/screens/managers/wallet/overview/balanceChart/balanceChart.css b/packages/wallet/detail/holdings/balanceChart/balanceChart.css
similarity index 93%
rename from packages/views/screens/managers/wallet/overview/balanceChart/balanceChart.css
rename to packages/wallet/detail/holdings/balanceChart/balanceChart.css
index 3c8f0dca9a..662729b46d 100644
--- a/packages/views/screens/managers/wallet/overview/balanceChart/balanceChart.css
+++ b/packages/wallet/detail/holdings/balanceChart/balanceChart.css
@@ -1,3 +1,5 @@
+@import '../../../../../setup/react/app/mixins.css';
+
 .wrapper {
   display: flex;
   overflow: initial;
diff --git a/packages/views/screens/managers/wallet/overview/balanceChart/index.js b/packages/wallet/detail/holdings/balanceChart/index.js
similarity index 100%
rename from packages/views/screens/managers/wallet/overview/balanceChart/index.js
rename to packages/wallet/detail/holdings/balanceChart/index.js
diff --git a/packages/views/screens/managers/wallet/overview/balanceInfo/actionBar.js b/packages/wallet/detail/holdings/balanceInfo/actionBar.js
similarity index 100%
rename from packages/views/screens/managers/wallet/overview/balanceInfo/actionBar.js
rename to packages/wallet/detail/holdings/balanceInfo/actionBar.js
diff --git a/packages/views/screens/managers/wallet/overview/balanceInfo/actionBar.test.js b/packages/wallet/detail/holdings/balanceInfo/actionBar.test.js
similarity index 100%
rename from packages/views/screens/managers/wallet/overview/balanceInfo/actionBar.test.js
rename to packages/wallet/detail/holdings/balanceInfo/actionBar.test.js
diff --git a/packages/views/screens/managers/wallet/overview/balanceInfo/balanceInfo.css b/packages/wallet/detail/holdings/balanceInfo/balanceInfo.css
similarity index 94%
rename from packages/views/screens/managers/wallet/overview/balanceInfo/balanceInfo.css
rename to packages/wallet/detail/holdings/balanceInfo/balanceInfo.css
index 50dd2436ed..7416f9799e 100644
--- a/packages/views/screens/managers/wallet/overview/balanceInfo/balanceInfo.css
+++ b/packages/wallet/detail/holdings/balanceInfo/balanceInfo.css
@@ -1,4 +1,4 @@
-@import '../../../../../../../setup/react/app/mixins.css';
+@import '../../../../../setup/react/app/mixins.css';
 
 .wrapper {
   display: flex;
@@ -13,7 +13,7 @@
     border-bottom-right-radius: var(--border-radius-box);
     padding-left: 0;
     padding-right: 0;
-    background-image: url(../../../../../../../setup/react/assets/images/waves.png);
+    background-image: url(../../../../../setup/react/assets/images/waves.png);
     background-size: 110%;
   }
 }
diff --git a/packages/views/screens/managers/wallet/overview/balanceInfo/emptyBalanceTooltipWrapper.js b/packages/wallet/detail/holdings/balanceInfo/emptyBalanceTooltipWrapper.js
similarity index 100%
rename from packages/views/screens/managers/wallet/overview/balanceInfo/emptyBalanceTooltipWrapper.js
rename to packages/wallet/detail/holdings/balanceInfo/emptyBalanceTooltipWrapper.js
diff --git a/packages/views/screens/managers/wallet/overview/balanceInfo/index.js b/packages/wallet/detail/holdings/balanceInfo/index.js
similarity index 100%
rename from packages/views/screens/managers/wallet/overview/balanceInfo/index.js
rename to packages/wallet/detail/holdings/balanceInfo/index.js
diff --git a/packages/views/screens/managers/wallet/overview/balanceInfo/unlocking.js b/packages/wallet/detail/holdings/balanceInfo/unlocking.js
similarity index 100%
rename from packages/views/screens/managers/wallet/overview/balanceInfo/unlocking.js
rename to packages/wallet/detail/holdings/balanceInfo/unlocking.js
diff --git a/packages/wallet/detail/info/walletDetails/walletDetails.css b/packages/wallet/detail/holdings/walletDetails/walletDetails.css
similarity index 100%
rename from packages/wallet/detail/info/walletDetails/walletDetails.css
rename to packages/wallet/detail/holdings/walletDetails/walletDetails.css
diff --git a/packages/wallet/detail/info/walletDetails/walletDetails.js b/packages/wallet/detail/holdings/walletDetails/walletDetails.js
similarity index 91%
rename from packages/wallet/detail/info/walletDetails/walletDetails.js
rename to packages/wallet/detail/holdings/walletDetails/walletDetails.js
index 130ede311a..1b546be2b7 100644
--- a/packages/wallet/detail/info/walletDetails/walletDetails.js
+++ b/packages/wallet/detail/holdings/walletDetails/walletDetails.js
@@ -12,15 +12,15 @@ import Icon from '@basics/icon';
 import Converter from '@shared/converter';
 import { fromRawLsk } from '@token/utilities/lsk';
 import LiskAmount from '@shared/liskAmount';
-import LockedBalanceLink from '@screens/managers/wallet/overview/balanceInfo/unlocking';
 import DiscreetMode from '@shared/discreetMode';
+import LockedBalanceLink from '../balanceInfo/unlocking';
 import styles from './walletDetails.css';
 
 const WalletDetails = ({
-  t, account, settings, className, isWalletRoute,
+  t, wallet, settings, className, isWalletRoute,
 }) => {
   const dispatch = useDispatch();
-  const tokens = Object.entries(account.info || {}).filter(
+  const tokens = Object.entries(wallet.info || {}).filter(
     ([key, info]) => settings.token.list[key] && info,
   );
 
@@ -64,7 +64,7 @@ const WalletDetails = ({
                         isWalletRoute={isWalletRoute}
                         style={styles.lockedBalance}
                         icon="lockedBalance"
-                        account={account.info.LSK}
+                        account={wallet.info.LSK}
                       />
                     ) : null}
                   </DiscreetMode>
diff --git a/packages/wallet/detail/holdings/walletDetails/walletDetails.test.js b/packages/wallet/detail/holdings/walletDetails/walletDetails.test.js
new file mode 100644
index 0000000000..920a827ec1
--- /dev/null
+++ b/packages/wallet/detail/holdings/walletDetails/walletDetails.test.js
@@ -0,0 +1,41 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import WalletDetails from './walletDetails';
+
+describe('WalletDetails', () => {
+  let wrapper;
+
+  const props = {
+    wallet: {
+      info: {
+        LSK: {
+          balance: '100',
+          token: 'LSK',
+        },
+        BTC: {
+          balance: '20',
+          token: 'BTC',
+        },
+      },
+    },
+    settings: {
+      token: {
+        active: 'LSK',
+        list: {
+          LSK: true,
+          BTC: false,
+        },
+      },
+    },
+    t: key => key,
+  };
+
+  beforeEach(() => {
+    wrapper = mount(<WalletDetails {...props} />);
+  });
+
+  it('Should render properly', () => {
+    expect(wrapper).toContainMatchingElement('.coin-container');
+    expect(wrapper).toContainMatchingElements(1, 'section.coin-row');
+  });
+});
diff --git a/packages/wallet/detail/info/multisignatureMembers/index.js b/packages/wallet/detail/identity/multisignatureMembers/index.js
similarity index 94%
rename from packages/wallet/detail/info/multisignatureMembers/index.js
rename to packages/wallet/detail/identity/multisignatureMembers/index.js
index 720f417fe5..3b009406cb 100644
--- a/packages/wallet/detail/info/multisignatureMembers/index.js
+++ b/packages/wallet/detail/identity/multisignatureMembers/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import { truncateAddress } from '@wallet/utilities/account';
 
 import styles from './styles.css';
@@ -8,7 +8,7 @@ import styles from './styles.css';
 const Member = ({ member, i, t }) => (
   <div className={`${styles.memberInfo} member-info`}>
     {i !== undefined && <p className={styles.memberInfoIndex}>{`${i + 1}.`}</p>}
-    <AccountVisual address={member.address} />
+    <WalletVisual address={member.address} />
     <div className={styles.memberDetails}>
       <p className={`${styles.memberTitle} member-title`}>
         {member.name || truncateAddress(member.address)}
diff --git a/packages/wallet/detail/info/multisignatureMembers/styles.css b/packages/wallet/detail/identity/multisignatureMembers/styles.css
similarity index 100%
rename from packages/wallet/detail/info/multisignatureMembers/styles.css
rename to packages/wallet/detail/identity/multisignatureMembers/styles.css
diff --git a/packages/wallet/detail/info/passphraseBackup/index.js b/packages/wallet/detail/identity/passphraseBackup/index.js
similarity index 100%
rename from packages/wallet/detail/info/passphraseBackup/index.js
rename to packages/wallet/detail/identity/passphraseBackup/index.js
diff --git a/packages/wallet/detail/info/passphraseBackup/index.test.js b/packages/wallet/detail/identity/passphraseBackup/index.test.js
similarity index 92%
rename from packages/wallet/detail/info/passphraseBackup/index.test.js
rename to packages/wallet/detail/identity/passphraseBackup/index.test.js
index 8b125c442f..b97fc7c299 100644
--- a/packages/wallet/detail/info/passphraseBackup/index.test.js
+++ b/packages/wallet/detail/identity/passphraseBackup/index.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { mount } from 'enzyme';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import PassphraseBackup from '.';
 
 describe('PassphraseBackup', () => {
diff --git a/packages/wallet/detail/info/passphraseBackup/passphraseBackup.css b/packages/wallet/detail/identity/passphraseBackup/passphraseBackup.css
similarity index 100%
rename from packages/wallet/detail/info/passphraseBackup/passphraseBackup.css
rename to packages/wallet/detail/identity/passphraseBackup/passphraseBackup.css
diff --git a/packages/wallet/detail/info/passphraseRenderer/index.js b/packages/wallet/detail/identity/passphraseRenderer/index.js
similarity index 100%
rename from packages/wallet/detail/info/passphraseRenderer/index.js
rename to packages/wallet/detail/identity/passphraseRenderer/index.js
diff --git a/packages/wallet/detail/info/passphraseRenderer/passphraseRenderer.css b/packages/wallet/detail/identity/passphraseRenderer/passphraseRenderer.css
similarity index 100%
rename from packages/wallet/detail/info/passphraseRenderer/passphraseRenderer.css
rename to packages/wallet/detail/identity/passphraseRenderer/passphraseRenderer.css
diff --git a/packages/views/shared/searchBar/delegates.js b/packages/wallet/detail/identity/searchBarWallets/delegates.js
similarity index 88%
rename from packages/views/shared/searchBar/delegates.js
rename to packages/wallet/detail/identity/searchBarWallets/delegates.js
index 3a20b8367c..65d7950a63 100644
--- a/packages/views/shared/searchBar/delegates.js
+++ b/packages/wallet/detail/identity/searchBarWallets/delegates.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import Highlighter from 'react-highlight-words';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import { truncateAddress } from '@wallet/utilities/account';
-import styles from './accountsAndDeletegates.css';
+import styles from './walletsAndDeletegates.css';
 
 const Delegates = ({
   delegates, onSelectedRow, t, rowItemIndex, updateRowItemIndex, searchTextValue,
@@ -21,8 +21,8 @@ const Delegates = ({
           onClick={() => onSelectedRow(delegate.summary.address)}
           onMouseEnter={updateRowItemIndex}
         >
-          <AccountVisual address={delegate.summary.address} />
-          <div className={styles.accountInformation}>
+          <WalletVisual address={delegate.summary.address} />
+          <div className={styles.walletInformation}>
             <div>
               <span className={`${styles.delegateName} delegate-name`}>
                 <Highlighter
diff --git a/packages/views/shared/searchBar/delegates.test.js b/packages/wallet/detail/identity/searchBarWallets/delegates.test.js
similarity index 100%
rename from packages/views/shared/searchBar/delegates.test.js
rename to packages/wallet/detail/identity/searchBarWallets/delegates.test.js
diff --git a/packages/views/shared/searchBar/accounts.js b/packages/wallet/detail/identity/searchBarWallets/index.js
similarity index 65%
rename from packages/views/shared/searchBar/accounts.js
rename to packages/wallet/detail/identity/searchBarWallets/index.js
index 2b018b268d..9df1c951c6 100644
--- a/packages/views/shared/searchBar/accounts.js
+++ b/packages/wallet/detail/identity/searchBarWallets/index.js
@@ -1,12 +1,12 @@
 import React from 'react';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import { truncateAddress } from '@wallet/utilities/account';
-import styles from './accountsAndDeletegates.css';
+import styles from './walletsAndDeletegates.css';
 
-const Accounts = ({
-  accounts, onSelectedRow, t, rowItemIndex, updateRowItemIndex,
+const Wallets = ({
+  wallets, onSelectedRow, t, rowItemIndex, updateRowItemIndex,
 }) => {
-  const isDelegate = accounts.some(account => account.summary?.isDelegate);
+  const isDelegate = wallets.some(wallet => wallet.summary?.isDelegate);
 
   return (
     <div className={`${styles.wrapper} accounts`}>
@@ -15,36 +15,36 @@ const Accounts = ({
       </header>
       <div className={`${styles.content} account-content`}>
         {
-        accounts.map((account, index) => (
+        wallets.map((wallet, index) => (
           <div
             key={index}
             data-index={index}
             className={`${styles.accountRow} ${rowItemIndex === index ? styles.active : ''} account-row`}
-            onClick={() => onSelectedRow(account.summary?.address)}
+            onClick={() => onSelectedRow(wallet.summary?.address)}
             onMouseEnter={updateRowItemIndex}
           >
-            <AccountVisual address={account.summary?.address} />
-            <div className={styles.accountInformation}>
+            <WalletVisual address={wallet.summary?.address} />
+            <div className={styles.walletInformation}>
               {
                 isDelegate
                   ? (
                     <>
                       <div>
                         <span className={`${styles.accountTitle} account-title`}>
-                          {account.dpos.delegate.username}
+                          {wallet.dpos.delegate.username}
                         </span>
                       </div>
                       <span className={`${styles.accountSubtitle} hideOnLargeViewPort`}>
-                        {truncateAddress(account.summary?.address)}
+                        {truncateAddress(wallet.summary?.address)}
                       </span>
                       <span className={`${styles.accountSubtitle} showOnLargeViewPort`}>
-                        {account.summary?.address}
+                        {wallet.summary?.address}
                       </span>
                     </>
                   )
                   : (
                     <span className={`${styles.accountTitle} account-title`}>
-                      {account.summary?.address}
+                      {wallet.summary?.address}
                     </span>
                   )
               }
@@ -54,8 +54,8 @@ const Accounts = ({
                 ? (
                   <span className={`${styles.tag} tag`}>
                     {
-                      account.dpos
-                        ? t('Delegate #{{rank}}', { rank: account.dpos.delegate.rank })
+                      wallet.dpos
+                        ? t('Delegate #{{rank}}', { rank: wallet.dpos.delegate.rank })
                         : '-'
                     }
                   </span>
@@ -70,4 +70,4 @@ const Accounts = ({
   );
 };
 
-export default Accounts;
+export default Wallets;
diff --git a/packages/views/shared/searchBar/accounts.test.js b/packages/wallet/detail/identity/searchBarWallets/searchBarWallets.test.js
similarity index 84%
rename from packages/views/shared/searchBar/accounts.test.js
rename to packages/wallet/detail/identity/searchBarWallets/searchBarWallets.test.js
index 1bece90bca..7ceed28b85 100644
--- a/packages/views/shared/searchBar/accounts.test.js
+++ b/packages/wallet/detail/identity/searchBarWallets/searchBarWallets.test.js
@@ -1,20 +1,20 @@
 import React from 'react';
 import { mount } from 'enzyme';
-import Accounts from './accounts';
+import SearchBarWallets from './index';
 
-describe('Accounts', () => {
+describe('SearchBarWallets', () => {
   let wrapper;
 
   const props = {
     t: v => v,
-    accounts: [],
+    wallets: [],
     onSelectedRow: jest.fn(),
     rowItemIndex: 0,
     updateRowItemIndex: jest.fn(),
   };
 
   beforeEach(() => {
-    wrapper = mount(<Accounts {...props} />);
+    wrapper = mount(<SearchBarWallets {...props} />);
   });
 
   it('should render properly empty accounts', () => {
@@ -26,7 +26,7 @@ describe('Accounts', () => {
 
   it('should render properly delegate accounts', () => {
     const newProps = { ...props };
-    newProps.accounts = [
+    newProps.wallets = [
       {
         summary: {
           address: 'lskdwsyfmcko6mcd357446yatromr9vzgu7eb8y99',
@@ -41,7 +41,7 @@ describe('Accounts', () => {
         },
       },
     ];
-    wrapper = mount(<Accounts {...newProps} />);
+    wrapper = mount(<SearchBarWallets {...newProps} />);
     expect(wrapper).toContainMatchingElement('.accounts');
     expect(wrapper).toContainMatchingElement('.accounts-header');
     expect(wrapper).toContainMatchingElement('.account-content');
@@ -50,7 +50,7 @@ describe('Accounts', () => {
 
   it('should render properly with accounts data', () => {
     const newProps = { ...props };
-    newProps.accounts = [
+    newProps.wallets = [
       {
         summary: {
           address: 'lskdwsyfmcko6mcd357446yatromr9vzgu7eb8y99',
@@ -64,7 +64,7 @@ describe('Accounts', () => {
         },
       },
     ];
-    wrapper = mount(<Accounts {...newProps} />);
+    wrapper = mount(<SearchBarWallets {...newProps} />);
 
     expect(wrapper).toContainMatchingElement('.accounts');
     expect(wrapper).toContainMatchingElement('.accounts-header');
@@ -74,7 +74,7 @@ describe('Accounts', () => {
 
   it('should call onClick function on selected row', () => {
     const newProps = { ...props };
-    newProps.accounts = [
+    newProps.wallets = [
       {
         summary: {
           address: 'lskdwsyfmcko6mcd357446yatromr9vzgu7eb8y99',
@@ -82,7 +82,7 @@ describe('Accounts', () => {
         },
       },
     ];
-    wrapper = mount(<Accounts {...newProps} />);
+    wrapper = mount(<SearchBarWallets {...newProps} />);
 
     wrapper.find('.account-row').at(0).simulate('click');
     expect(props.onSelectedRow).toBeCalled();
diff --git a/packages/views/shared/searchBar/accountsAndDeletegates.css b/packages/wallet/detail/identity/searchBarWallets/walletsAndDeletegates.css
similarity index 98%
rename from packages/views/shared/searchBar/accountsAndDeletegates.css
rename to packages/wallet/detail/identity/searchBarWallets/walletsAndDeletegates.css
index 7322283685..b5ca6b93e5 100644
--- a/packages/views/shared/searchBar/accountsAndDeletegates.css
+++ b/packages/wallet/detail/identity/searchBarWallets/walletsAndDeletegates.css
@@ -42,7 +42,7 @@
   align-items: flex-start;
   margin: 0;
 
-  & .accountInformation {
+  & .walletInformation {
     height: auto;
     display: flex;
     flex-direction: column;
diff --git a/packages/wallet/detail/info/accountInfo/actionBar.js b/packages/wallet/detail/identity/walletInfo/actionBar.js
similarity index 99%
rename from packages/wallet/detail/info/accountInfo/actionBar.js
rename to packages/wallet/detail/identity/walletInfo/actionBar.js
index 2c3e7dcbaa..98bf42dcf6 100644
--- a/packages/wallet/detail/info/accountInfo/actionBar.js
+++ b/packages/wallet/detail/identity/walletInfo/actionBar.js
@@ -7,7 +7,7 @@ import Icon from '@basics/icon';
 import CopyToClipboard from '@basics/copyToClipboard';
 import Tooltip from '@basics/tooltip/tooltip';
 import DialogLink from '@basics/dialog/link';
-import styles from './accountInfo.css';
+import styles from './walletInfo.css';
 
 const BookmarkIcon = ({ bookmark }) => (
   <Icon
diff --git a/packages/wallet/detail/info/accountInfo/identity.js b/packages/wallet/detail/identity/walletInfo/identity.js
similarity index 98%
rename from packages/wallet/detail/info/accountInfo/identity.js
rename to packages/wallet/detail/identity/walletInfo/identity.js
index 7481817d8b..5fa0e6db3f 100644
--- a/packages/wallet/detail/info/accountInfo/identity.js
+++ b/packages/wallet/detail/identity/walletInfo/identity.js
@@ -3,7 +3,7 @@ import React from 'react';
 import { truncateAddress } from '@wallet/utilities/account';
 import Tooltip from '@basics/tooltip/tooltip';
 import CopyToClipboard from '@basics/copyToClipboard';
-import styles from './accountInfo.css';
+import styles from './walletInfo.css';
 
 const Legacy = ({ legacyAddress }) => (
   <div className={styles.legacy}>
diff --git a/packages/wallet/detail/info/accountInfo/index.js b/packages/wallet/detail/identity/walletInfo/index.js
similarity index 86%
rename from packages/wallet/detail/info/accountInfo/index.js
rename to packages/wallet/detail/identity/walletInfo/index.js
index 02fb0cd44d..549e22216d 100644
--- a/packages/wallet/detail/info/accountInfo/index.js
+++ b/packages/wallet/detail/identity/walletInfo/index.js
@@ -1,13 +1,13 @@
 import React, { useState } from 'react';
-import AccountVisual from '@wallet/detail/info/accountVisual';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
 import Box from '@basics/box';
 import BoxContent from '@basics/box/content';
 import Icon from '@basics/icon';
-import styles from './accountInfo.css';
+import styles from './walletInfo.css';
 import Identity from './identity';
 import ActionBar from './actionBar';
 
-const AccountInfo = ({
+const WalletInfo = ({
   address, t, activeToken, hwInfo, account, username, bookmark, isMultisignature, host,
 }) => {
   const [showFullAddress, setShowFullAddress] = useState(false);
@@ -15,10 +15,10 @@ const AccountInfo = ({
 
   return (
     <Box className={styles.wrapper}>
-      <BoxContent className={`${styles.content} ${styles[activeToken]}`}>
+      <BoxContent className={`${styles.content} ${styles.token}`}>
         <h2 className={styles.title}>{t('Wallet address')}</h2>
         <div className={`${styles.info} ${showFullAddress ? styles.showFullAddress : ''}`}>
-          <AccountVisual
+          <WalletVisual
             address={address}
             size={40}
           />
@@ -55,4 +55,4 @@ const AccountInfo = ({
   );
 };
 
-export default AccountInfo;
+export default WalletInfo;
diff --git a/packages/wallet/detail/info/accountInfo/accountInfo.css b/packages/wallet/detail/identity/walletInfo/walletInfo.css
similarity index 98%
rename from packages/wallet/detail/info/accountInfo/accountInfo.css
rename to packages/wallet/detail/identity/walletInfo/walletInfo.css
index a0a7c63d11..09332bc50f 100644
--- a/packages/wallet/detail/info/accountInfo/accountInfo.css
+++ b/packages/wallet/detail/identity/walletInfo/walletInfo.css
@@ -5,13 +5,9 @@
     height: 200px;
     position: relative;
 
-    &.LSK {
+    &.token {
       background-color: var(--color-ultramarine-blue);
     }
-
-    &.BTC {
-      background-color: var(--color-btc);
-    }
   }
 
   & .title {
diff --git a/packages/wallet/detail/info/accountVisual/demo.js b/packages/wallet/detail/identity/walletVisual/demo.js
similarity index 90%
rename from packages/wallet/detail/info/accountVisual/demo.js
rename to packages/wallet/detail/identity/walletVisual/demo.js
index 88f9f822b9..9a45ec7644 100644
--- a/packages/wallet/detail/info/accountVisual/demo.js
+++ b/packages/wallet/detail/identity/walletVisual/demo.js
@@ -3,14 +3,14 @@ import Waypoint from 'react-waypoint';
 import { extractAddressFromPassphrase } from '@wallet/utilities/account';
 import { generatePassphraseFromSeed } from '@views/utilities/passphrase';
 import DemoRenderer from '@basics/demoRenderer';
-import AccountVisual from '.';
+import WalletVisual from '.';
 
 /**
  * Ignored the unit test coverage of this component
  * since it's developed for demonstration purpose only
  */
 /* istanbul ignore next */
-const AccountVisualDemo = () => {
+const WalletVisualDemo = () => {
   const loadMore = (acc) => {
     const offset = acc.length;
     const bytes = [];
@@ -34,7 +34,7 @@ const AccountVisualDemo = () => {
 
   return (
     <div>
-      <h2>AccountVisual</h2>
+      <h2>WalletVisual</h2>
       <div style={{ whiteSpace: 'no-break' }}>
         {accounts.map(account => (
           <DemoRenderer
@@ -49,7 +49,7 @@ const AccountVisualDemo = () => {
               fontSize: 14,
             }}
           >
-            <AccountVisual size={size} address={account} />
+            <WalletVisual size={size} address={account} />
           </DemoRenderer>
         ))}
       </div>
@@ -61,4 +61,4 @@ const AccountVisualDemo = () => {
   );
 };
 
-export default AccountVisualDemo;
+export default WalletVisualDemo;
diff --git a/packages/wallet/detail/info/accountVisual/gradients.js b/packages/wallet/detail/identity/walletVisual/gradients.js
similarity index 100%
rename from packages/wallet/detail/info/accountVisual/gradients.js
rename to packages/wallet/detail/identity/walletVisual/gradients.js
diff --git a/packages/wallet/detail/info/accountVisual/index.js b/packages/wallet/detail/identity/walletVisual/index.js
similarity index 97%
rename from packages/wallet/detail/info/accountVisual/index.js
rename to packages/wallet/detail/identity/walletVisual/index.js
index 0d7b9d922a..8674e1137c 100644
--- a/packages/wallet/detail/info/accountVisual/index.js
+++ b/packages/wallet/detail/identity/walletVisual/index.js
@@ -5,7 +5,7 @@ import generateUniqueId from '@views/utilities/generateUniqueId';
 import { tokenMap } from '@token/configuration/tokens';
 import { validateAddress } from '@common/utilities/validators';
 import { Gradients, gradientSchemes } from './gradients';
-import styles from './accountVisual.css';
+import styles from './walletVisual.css';
 
 const round = num => Math.round((num + Number.EPSILON) * 100) / 100;
 
@@ -181,7 +181,7 @@ function replaceUrlByHashOnScheme(uniqueSvgUrlHash, gradientScheme) {
   };
 }
 
-class AccountVisual extends React.Component {
+class WalletVisual extends React.Component {
   constructor(props) {
     super(props);
     this.uniqueSvgUrlHash = generateUniqueId();
@@ -240,7 +240,7 @@ class AccountVisual extends React.Component {
 
     return (
       <div style={{ height: size, width: size }} className={`${styles.wrapper} ${className}`}>
-        <svg height={size} width={size} className={styles.accountVisual}>
+        <svg height={size} width={size} className={styles.walletVisual}>
           <Gradients scheme={gradientsSchemesUrlsHashed} />
           {shapes.map((shape, i) => (
             <shape.component {...shape.props} key={i} />
@@ -251,8 +251,8 @@ class AccountVisual extends React.Component {
   }
 }
 
-AccountVisual.defaultProps = {
+WalletVisual.defaultProps = {
   size: 40,
 };
 
-export default AccountVisual;
+export default WalletVisual;
diff --git a/packages/wallet/detail/info/accountVisual/index.test.js b/packages/wallet/detail/identity/walletVisual/index.test.js
similarity index 89%
rename from packages/wallet/detail/info/accountVisual/index.test.js
rename to packages/wallet/detail/identity/walletVisual/index.test.js
index 363b5f3b59..a5e881ca1c 100644
--- a/packages/wallet/detail/info/accountVisual/index.test.js
+++ b/packages/wallet/detail/identity/walletVisual/index.test.js
@@ -1,11 +1,11 @@
 import React from 'react';
 import { mount } from 'enzyme';
-import accounts from '@tests/constants/accounts';
-import AccountVisual from './index';
+import accounts from '@tests/constants/wallets';
+import WalletVisual from './index';
 
-describe.skip('AccountVisual', () => {
+describe.skip('WalletVisual', () => {
   it('should create account visual of an address', () => {
-    const wrapper = mount(<AccountVisual address="lsks6uckwnap7s72ov3edddwgxab5e89t6uy8gjt6" />);
+    const wrapper = mount(<WalletVisual address="lsks6uckwnap7s72ov3edddwgxab5e89t6uy8gjt6" />);
 
     // should render an svg element
     expect(wrapper.find('svg')).toHaveLength(1);
@@ -44,7 +44,7 @@ describe.skip('AccountVisual', () => {
   });
 
   it('should be able to create account visual that contains a rectangle', () => {
-    const wrapper = mount(<AccountVisual address={accounts.delegate.address} />);
+    const wrapper = mount(<WalletVisual address={accounts.delegate.address} />);
     expect(wrapper.find('rect').getDOMNode().getAttribute('x')).toEqual('11');
     expect(wrapper.find('rect').getDOMNode().getAttribute('y')).toEqual('9');
     expect(wrapper.find('rect').getDOMNode().getAttribute('height')).toEqual('16.56');
diff --git a/packages/wallet/detail/info/accountVisual/transactionAddress/index.js b/packages/wallet/detail/identity/walletVisual/transactionAddress/index.js
similarity index 100%
rename from packages/wallet/detail/info/accountVisual/transactionAddress/index.js
rename to packages/wallet/detail/identity/walletVisual/transactionAddress/index.js
diff --git a/packages/wallet/detail/info/accountVisual/transactionAddress/transactionAddress.css b/packages/wallet/detail/identity/walletVisual/transactionAddress/transactionAddress.css
similarity index 100%
rename from packages/wallet/detail/info/accountVisual/transactionAddress/transactionAddress.css
rename to packages/wallet/detail/identity/walletVisual/transactionAddress/transactionAddress.css
diff --git a/packages/wallet/detail/info/accountVisual/accountVisual.css b/packages/wallet/detail/identity/walletVisual/walletVisual.css
similarity index 94%
rename from packages/wallet/detail/info/accountVisual/accountVisual.css
rename to packages/wallet/detail/identity/walletVisual/walletVisual.css
index 7a7b8ddc06..7e91e1ca24 100644
--- a/packages/wallet/detail/info/accountVisual/accountVisual.css
+++ b/packages/wallet/detail/identity/walletVisual/walletVisual.css
@@ -4,7 +4,7 @@
   transition: transform ease-in-out 500ms;
 }
 
-.accountVisual {
+.walletVisual {
   border-radius: 100%;
   overflow: hidden;
   display: inline-block;
diff --git a/packages/wallet/detail/info/accountVisual/accountVisualWithAddress/index.js b/packages/wallet/detail/identity/walletVisual/walletVisualWithAddress/index.js
similarity index 87%
rename from packages/wallet/detail/info/accountVisual/accountVisualWithAddress/index.js
rename to packages/wallet/detail/identity/walletVisual/walletVisualWithAddress/index.js
index f14c06c210..357c45217a 100644
--- a/packages/wallet/detail/info/accountVisual/accountVisualWithAddress/index.js
+++ b/packages/wallet/detail/identity/walletVisual/walletVisualWithAddress/index.js
@@ -8,10 +8,10 @@ import { MODULE_ASSETS_NAME_ID_MAP, MODULE_ASSETS_MAP } from '@transaction/confi
 import { truncateAddress } from '@wallet/utilities/account';
 import { getModuleAssetTitle } from '@transaction/utilities/moduleAssets';
 import Icon from '@basics/icon';
-import AccountVisual from '@wallet/detail/info/accountVisual';
-import styles from './accountVisualWithAddress.css';
+import WalletVisual from '@wallet/detail/identity/walletVisual';
+import styles from './walletVisualWithAddress.css';
 
-const AccountVisualWithAddress = ({
+const WalletVisualWithAddress = ({
   bookmarks, showBookmarkedAddress, token, address,
   transactionSubject, moduleAssetId, size, truncate,
 }) => {
@@ -46,7 +46,7 @@ const AccountVisualWithAddress = ({
         </>
       ) : (
         <>
-          <AccountVisual address={address} size={size} />
+          <WalletVisual address={address} size={size} />
           <span className={`${styles.addressValue}`}>
             {truncate ? truncatedAddress : transformedAddress}
           </span>
@@ -56,7 +56,7 @@ const AccountVisualWithAddress = ({
   );
 };
 
-AccountVisualWithAddress.propTypes = {
+WalletVisualWithAddress.propTypes = {
   address: PropTypes.string.isRequired,
   bookmarks: PropTypes.shape().isRequired,
   showBookmarkedAddress: PropTypes.bool,
@@ -66,7 +66,7 @@ AccountVisualWithAddress.propTypes = {
   moduleAssetId: PropTypes.string,
 };
 
-AccountVisualWithAddress.defaultProps = {
+WalletVisualWithAddress.defaultProps = {
   address: '',
   showBookmarkedAddress: false,
   size: 32,
@@ -82,4 +82,4 @@ const mapStateToProps = state => ({
 export default compose(
   connect(mapStateToProps),
   withTranslation(),
-)(AccountVisualWithAddress);
+)(WalletVisualWithAddress);
diff --git a/packages/wallet/detail/info/accountVisual/accountVisualWithAddress/accountVisualWithAddress.css b/packages/wallet/detail/identity/walletVisual/walletVisualWithAddress/walletVisualWithAddress.css
similarity index 100%
rename from packages/wallet/detail/info/accountVisual/accountVisualWithAddress/accountVisualWithAddress.css
rename to packages/wallet/detail/identity/walletVisual/walletVisualWithAddress/walletVisualWithAddress.css
diff --git a/packages/wallet/detail/info/accountVisual/accountVisualWithAddress/accountVisualWithAddress.test.js b/packages/wallet/detail/identity/walletVisual/walletVisualWithAddress/walletVisualWithAddress.test.js
similarity index 72%
rename from packages/wallet/detail/info/accountVisual/accountVisualWithAddress/accountVisualWithAddress.test.js
rename to packages/wallet/detail/identity/walletVisual/walletVisualWithAddress/walletVisualWithAddress.test.js
index 815d9e29e2..e1164c36bd 100644
--- a/packages/wallet/detail/info/accountVisual/accountVisualWithAddress/accountVisualWithAddress.test.js
+++ b/packages/wallet/detail/identity/walletVisual/walletVisualWithAddress/walletVisualWithAddress.test.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import { mount } from 'enzyme';
-import AccountVisualWithAddress from '.';
+import WalletVisualWithAddress from '.';
 
-describe('AccountVisualWithAddress component', () => {
+describe('WalletVisualWithAddress component', () => {
   const props = {
     showBookmarkedAddress: true,
     transactionSubject: 'senderId',
@@ -16,7 +16,7 @@ describe('AccountVisualWithAddress component', () => {
   };
 
   it('should show bookmarked name if address is bookmarked', () => {
-    const wrapper = mount(<AccountVisualWithAddress {...props} />);
+    const wrapper = mount(<WalletVisualWithAddress {...props} />);
     expect(wrapper.find('.addressValue').at(0)).toHaveText('BM');
   });
 });
diff --git a/packages/wallet/detail/info/walletDetails/walletDetails.test.js b/packages/wallet/detail/info/walletDetails/walletDetails.test.js
index 7afa2e1c3d..73bad39d31 100644
--- a/packages/wallet/detail/info/walletDetails/walletDetails.test.js
+++ b/packages/wallet/detail/info/walletDetails/walletDetails.test.js
@@ -1,13 +1,13 @@
 import React from 'react';
 import { mount } from 'enzyme';
-import WalletDetails from './walletDetails';
+import WalletDetails from '../../holdings/walletDetails/walletDetails';
 
 describe('WalletDetails', () => {
   let wrapper;
 
   const props = {
     location: { search: '' },
-    account: {
+    wallet: {
       info: {
         LSK: {
           balance: '100',
diff --git a/packages/wallet/detail/manager/explorer/index.js b/packages/wallet/detail/manager/explorer/index.js
new file mode 100644
index 0000000000..1c8b3241f3
--- /dev/null
+++ b/packages/wallet/detail/manager/explorer/index.js
@@ -0,0 +1,25 @@
+/* istanbul ignore file */
+import { compose } from 'redux';
+import { withTranslation } from 'react-i18next';
+import withData from '@common/utilities/withData';
+import { getAccount } from '@wallet/utilities/api';
+import { selectSearchParamValue } from '@screens/router/searchParams';
+import ExplorerLayout from '@screens/managers/wallet/explorerLayout';
+
+const apis = {
+  account: {
+    apiUtil: (network, { token, ...params }) => getAccount({ network, params }, token),
+    defaultData: {},
+    getApiParams: (state, props) => ({
+      token: state.settings.token.active,
+      address: selectSearchParamValue(props.history.location.search, 'address'),
+      network: state.network,
+    }),
+    transformResponse: response => response,
+  },
+};
+
+export default compose(
+  withData(apis),
+  withTranslation(),
+)(ExplorerLayout);
diff --git a/packages/wallet/detail/manager/walletDetails/index.js b/packages/wallet/detail/manager/walletDetails/index.js
index 43fe256ef8..621ea3bd8e 100644
--- a/packages/wallet/detail/manager/walletDetails/index.js
+++ b/packages/wallet/detail/manager/walletDetails/index.js
@@ -1,10 +1,10 @@
 // istanbul ignore file
 import { connect } from 'react-redux';
 import { withTranslation } from 'react-i18next';
-import WalletDetails from '../../info/walletDetails/walletDetails';
+import WalletDetails from '../../holdings/walletDetails/walletDetails';
 
 const mapStateToProps = state => ({
-  account: state.account,
+  wallet: state.wallet,
   settings: state.settings,
 });
 
diff --git a/packages/wallet/list/manager.js b/packages/wallet/list/manager.js
new file mode 100644
index 0000000000..b20e144267
--- /dev/null
+++ b/packages/wallet/list/manager.js
@@ -0,0 +1,38 @@
+import { compose } from 'redux';
+import { withTranslation } from 'react-i18next';
+
+import withData from '@common/utilities/withData';
+import WalletsMonitor from '@screens/managers/monitor/wallets/monitor';
+import { getAccounts } from '@wallet/utilities/api';
+import { getNetworkStatus } from '@network/utilities/api';
+import { DEFAULT_LIMIT } from '@views/configuration';
+
+export default compose(
+  withData({
+    wallets: {
+      apiUtil: (network, params) => getAccounts({
+        network,
+        params: {
+          ...params,
+          limit: DEFAULT_LIMIT,
+          offset: params.offset || 0,
+          sort: 'balance:desc',
+        },
+      }),
+      defaultData: [],
+      autoload: true,
+      transformResponse: (response, accounts, urlSearchParams) => (
+        urlSearchParams.offset
+          ? [...accounts, ...response.data]
+          : response.data
+      ),
+    },
+    networkStatus: {
+      apiUtil: network => getNetworkStatus({ network }),
+      defaultData: {},
+      autoload: true,
+      transformResponse: response => response,
+    },
+  }),
+  withTranslation(),
+)(WalletsMonitor);
diff --git a/packages/wallet/list/repeater/index.js b/packages/wallet/list/repeater/index.js
new file mode 100644
index 0000000000..f51f7b70a5
--- /dev/null
+++ b/packages/wallet/list/repeater/index.js
@@ -0,0 +1,34 @@
+import React from 'react';
+
+import WalletRow from '@wallet/list/row';
+import Table from '@basics/table';
+import { DEFAULT_LIMIT } from '@views/configuration';
+import header from './tableHeader';
+
+const WalletTable = ({
+  wallets,
+  networkStatus,
+  t,
+}) => {
+  /* istanbul ignore next */
+  const handleLoadMore = () => {
+    wallets.loadData({ offset: wallets.meta.count + wallets.meta.offset });
+  };
+  const supply = networkStatus.data.supply;
+  const canLoadMore = wallets.meta ? wallets.meta.count === DEFAULT_LIMIT : false;
+
+  return (
+    <Table
+      data={wallets.data}
+      isLoading={wallets.isLoading}
+      row={WalletRow}
+      loadData={handleLoadMore}
+      header={header(t)}
+      additionalRowProps={{ supply }}
+      error={wallets.error}
+      canLoadMore={canLoadMore}
+    />
+  );
+};
+
+export default WalletTable;
diff --git a/packages/views/screens/managers/monitor/accounts/tableHeader.js b/packages/wallet/list/repeater/tableHeader.js
similarity index 100%
rename from packages/views/screens/managers/monitor/accounts/tableHeader.js
rename to packages/wallet/list/repeater/tableHeader.js
diff --git a/packages/views/screens/managers/monitor/accounts/accountRow.js b/packages/wallet/list/row/index.js
similarity index 89%
rename from packages/views/screens/managers/monitor/accounts/accountRow.js
rename to packages/wallet/list/row/index.js
index 09c92976e3..925fe88d41 100644
--- a/packages/views/screens/managers/monitor/accounts/accountRow.js
+++ b/packages/wallet/list/row/index.js
@@ -7,8 +7,8 @@ import routes from '@screens/router/routes';
 import { tokenMap } from '@token/configuration/tokens';
 // import { formatAmountBasedOnLocale } from '@common/utilities/formattedNumber';
 import LiskAmount from '@shared/liskAmount';
-import AccountVisualWithAddress from '@wallet/detail/info/accountVisual/accountVisualWithAddress';
-import styles from './accounts.css';
+import WalletVisualWithAddress from '@wallet/detail/identity/walletVisual/walletVisualWithAddress';
+import styles from './wallet.css';
 
 const getOwnerName = (account) => {
   const delegateUsername = account.summary?.username ? account.summary?.username : '';
@@ -33,13 +33,13 @@ const getOwnerName = (account) => {
 const AccountRow = ({ data, className }) => (
   <Link
     className={`${grid.row} ${className} accounts-row`}
-    to={`${routes.account.path}?address=${data.summary?.address}`}
+    to={`${routes.explorer.path}?address=${data.summary?.address}`}
   >
     <span className={`${grid['col-xs-1']} ${grid['col-md-1']} ${styles.counter}`}>
       {data.rank}
     </span>
     <span className={`${grid['col-xs-3']} ${grid['col-md-5']}`}>
-      <AccountVisualWithAddress
+      <WalletVisualWithAddress
         address={data.summary?.address}
         transactionSubject="address"
         showBookmarkedAddress
diff --git a/packages/views/screens/managers/monitor/accounts/accounts.css b/packages/wallet/list/row/wallet.css
similarity index 65%
rename from packages/views/screens/managers/monitor/accounts/accounts.css
rename to packages/wallet/list/row/wallet.css
index b5ca3c5992..d6b792ffdb 100644
--- a/packages/views/screens/managers/monitor/accounts/accounts.css
+++ b/packages/wallet/list/row/wallet.css
@@ -1,8 +1,3 @@
-.content {
-  padding: 0 !important;
-  counter-reset: section;
-}
-
 .counter::before {
   counter-increment: section;
   content: "#" counter(section);
diff --git a/packages/wallet/manage/passphraseInput/passphraseInput.test.js b/packages/wallet/manage/passphraseInput/passphraseInput.test.js
index 6c6962a53e..50ac9d5c4b 100644
--- a/packages/wallet/manage/passphraseInput/passphraseInput.test.js
+++ b/packages/wallet/manage/passphraseInput/passphraseInput.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { keyCodes } from '@views/configuration';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import PassphraseInput from '.';
 
 describe('passphraseInput', () => {
diff --git a/packages/wallet/manage/signInTooltipWrapper/index.js b/packages/wallet/manage/signInTooltipWrapper/index.js
index 2ffdb51bff..04fe8bfbbf 100644
--- a/packages/wallet/manage/signInTooltipWrapper/index.js
+++ b/packages/wallet/manage/signInTooltipWrapper/index.js
@@ -5,7 +5,7 @@ import { withRouter } from 'react-router-dom';
 import SignInTooltipWrapper from './signInTooltipWrapper';
 
 const mapStateToProps = state => ({
-  account: state.account,
+  account: state.wallet,
 });
 
 export default withRouter(connect(mapStateToProps)(withTranslation()(SignInTooltipWrapper)));
diff --git a/packages/wallet/store/action.js b/packages/wallet/store/action.js
index cbf5e1f34a..2870c61e45 100644
--- a/packages/wallet/store/action.js
+++ b/packages/wallet/store/action.js
@@ -69,7 +69,7 @@ const getAccounts = async ({ network, params }) =>
  */
 export const accountDataUpdated = tokensTypes =>
   async (dispatch, getState) => {
-    const { network, settings, account } = getState();
+    const { network, settings, wallet } = getState();
 
     // Get the list of tokens that are enabled in settings
     const activeTokens = tokensTypes === 'enabled'
@@ -79,7 +79,7 @@ export const accountDataUpdated = tokensTypes =>
 
     // Collect their addresses to send to the API
     const params = activeTokens.reduce((acc, token) => {
-      acc[token] = { publicKey: account.info[token].summary.publicKey };
+      acc[token] = { publicKey: wallet.info[token].summary.publicKey };
       return acc;
     }, {});
 
@@ -88,8 +88,8 @@ export const accountDataUpdated = tokensTypes =>
     if (info) {
       // Uninitialized account don't have a public key stored on the blockchain.
       // but we already have it on the Redux store.
-      info.LSK.summary.publicKey = account.info.LSK.summary.publicKey;
-      info.LSK.summary.privateKey = account.info.LSK.summary.privateKey;
+      info.LSK.summary.publicKey = wallet.info.LSK.summary.publicKey;
+      info.LSK.summary.privateKey = wallet.info.LSK.summary.privateKey;
       dispatch({
         type: actionTypes.accountUpdated,
         data: info,
@@ -198,10 +198,10 @@ export const balanceUnlocked = data => async (dispatch, getState) => {
   const state = getState();
   const currentBlockHeight = selectCurrentBlockHeight(state);
   // @todo Fix this by #3898
-  const activeAccount = {
-    ...state.account.info.LSK,
-    hwInfo: isEmpty(state.account.hwInfo) ? undefined : state.account.hwInfo,
-    passphrase: state.account.passphrase,
+  const activeWallet = {
+    ...state.wallet.info.LSK,
+    hwInfo: isEmpty(state.wallet.hwInfo) ? undefined : state.wallet.hwInfo,
+    passphrase: state.wallet.passphrase,
   };
 
   //
@@ -210,14 +210,14 @@ export const balanceUnlocked = data => async (dispatch, getState) => {
   const [error, tx] = await to(
     create({
       network: state.network,
-      account: activeAccount,
+      wallet: activeWallet,
       transactionObject: {
         moduleAssetId: MODULE_ASSETS_NAME_ID_MAP.unlockToken,
-        senderPublicKey: activeAccount.summary.publicKey,
-        nonce: activeAccount.sequence?.nonce,
+        senderPublicKey: activeWallet.summary.publicKey,
+        nonce: activeWallet.sequence?.nonce,
         fee: `${toRawLsk(parseFloat(data.selectedFee))}`,
         unlockObjects: getUnlockableUnlockObjects(
-          activeAccount.dpos?.unlocking, currentBlockHeight,
+          activeWallet.dpos?.unlocking, currentBlockHeight,
         ),
       },
     }, tokenMap.LSK.key),
@@ -244,10 +244,10 @@ export const delegateRegistered = ({ fee, username }) => async (dispatch, getSta
   // Collect data
   //
   const state = getState();
-  const activeAccount = {
-    ...state.account.info.LSK,
-    hwInfo: isEmpty(state.account.hwInfo) ? undefined : state.account.hwInfo,
-    passphrase: state.account.passphrase,
+  const activeWallet = {
+    ...state.wallet.info.LSK,
+    hwInfo: isEmpty(state.wallet.hwInfo) ? undefined : state.wallet.hwInfo,
+    passphrase: state.wallet.passphrase,
   };
 
   //
@@ -256,10 +256,10 @@ export const delegateRegistered = ({ fee, username }) => async (dispatch, getSta
   const [error, tx] = await to(
     create({
       network: state.network,
-      account: activeAccount,
+      wallet: activeWallet,
       transactionObject: {
-        senderPublicKey: activeAccount.summary.publicKey,
-        nonce: activeAccount.sequence?.nonce,
+        senderPublicKey: activeWallet.summary.publicKey,
+        nonce: activeWallet.sequence?.nonce,
         fee: toRawLsk(parseFloat(fee.value)),
         username,
         moduleAssetId: MODULE_ASSETS_NAME_ID_MAP.registerDelegate,
@@ -293,10 +293,10 @@ export const multisigGroupRegistered = ({
   // Collect data
   //
   const state = getState();
-  const activeAccount = {
-    ...state.account.info.LSK,
-    hwInfo: isEmpty(state.account.hwInfo) ? undefined : state.account.hwInfo,
-    passphrase: state.account.passphrase,
+  const activeWallet = {
+    ...state.wallet.info.LSK,
+    hwInfo: isEmpty(state.wallet.hwInfo) ? undefined : state.wallet.hwInfo,
+    passphrase: state.wallet.passphrase,
   };
 
   //
@@ -305,15 +305,15 @@ export const multisigGroupRegistered = ({
   const [error, tx] = await to(
     create({
       network: state.network,
-      account: activeAccount,
+      wallet: activeWallet,
       transactionObject: {
         mandatoryKeys,
         optionalKeys,
         numberOfSignatures,
         moduleAssetId: MODULE_ASSETS_NAME_ID_MAP.registerMultisignatureGroup,
         fee: toRawLsk(fee),
-        nonce: activeAccount.sequence.nonce,
-        senderPublicKey: activeAccount.summary.publicKey,
+        nonce: activeWallet.sequence.nonce,
+        senderPublicKey: activeWallet.summary.publicKey,
       },
     }, tokenMap.LSK.key),
   );
@@ -339,10 +339,10 @@ export const balanceReclaimed = ({ fee }) => async (dispatch, getState) => {
   // Collect data
   //
   const state = getState();
-  const activeAccount = {
-    ...state.account.info.LSK,
-    hwInfo: isEmpty(state.account.hwInfo) ? undefined : state.account.hwInfo,
-    passphrase: state.account.passphrase,
+  const activeWallet = {
+    ...state.wallet.info.LSK,
+    hwInfo: isEmpty(state.wallet.hwInfo) ? undefined : state.wallet.hwInfo,
+    passphrase: state.wallet.passphrase,
   };
 
   //
@@ -351,11 +351,11 @@ export const balanceReclaimed = ({ fee }) => async (dispatch, getState) => {
   const [error, tx] = await to(
     create({
       network: state.network,
-      account: activeAccount,
+      wallet: activeWallet,
       transactionObject: {
         moduleAssetId: MODULE_ASSETS_NAME_ID_MAP.reclaimLSK,
         fee: toRawLsk(fee.value),
-        amount: activeAccount.legacy.balance,
+        amount: activeWallet.legacy.balance,
         keys: { numberOfSignatures: 0 },
       },
     }, tokenMap.LSK.key),
diff --git a/packages/wallet/store/action.test.js b/packages/wallet/store/action.test.js
index 9725bdca2b..5cbb215db0 100644
--- a/packages/wallet/store/action.test.js
+++ b/packages/wallet/store/action.test.js
@@ -4,7 +4,7 @@ import * as accountApi from '@wallet/utilities/api';
 import { extractKeyPair } from '@wallet/utilities/account';
 import { create } from '@transaction/utilities/api';
 import { defaultDerivationPath } from '@common/utilities/explicitBipKeyDerivation';
-import accounts from '@tests/constants/accounts';
+import wallets from '@tests/constants/wallets';
 import * as networkActions from '@network/store/action';
 import actionTypes from './actionTypes';
 import {
@@ -115,13 +115,13 @@ describe('actions: account', () => {
             list: { LSK: true },
           },
         },
-        account: {
-          passphrase: accounts.genesis.passphrase,
+        wallet: {
+          passphrase: wallets.genesis.passphrase,
           info: {
             LSK: {
               summary: {
-                address: accounts.genesis.summary.address,
-                publicKey: accounts.genesis.summary.publicKey,
+                address: wallets.genesis.summary.address,
+                publicKey: wallets.genesis.summary.publicKey,
                 balance: 0,
               },
             },
@@ -133,8 +133,8 @@ describe('actions: account', () => {
     it('should call account API methods on newBlockCreated action when online', async () => {
       accountApi.getAccount.mockResolvedValue({
         summary: {
-          address: accounts.genesis.summary.address,
-          publicKey: accounts.genesis.summary.publicKey,
+          address: wallets.genesis.summary.address,
+          publicKey: wallets.genesis.summary.publicKey,
           balance: 10e8,
         },
         token: {
@@ -163,8 +163,8 @@ describe('actions: account', () => {
     it('gets the active token from the token list in settings when token types is enabled', async () => {
       accountApi.getAccount.mockResolvedValue({
         summary: {
-          address: accounts.genesis.summary.address,
-          publicKey: accounts.genesis.summary.publicKey,
+          address: wallets.genesis.summary.address,
+          publicKey: wallets.genesis.summary.publicKey,
           balance: 10e8,
         },
         token: {
@@ -186,7 +186,7 @@ describe('actions: account', () => {
     const {
       passphrase,
       summary: { address, publicKey },
-    } = accounts.genesis;
+    } = wallets.genesis;
 
     beforeEach(() => {
       state = {
@@ -271,10 +271,10 @@ describe('actions: account', () => {
 
   describe('balanceUnlocked', () => {
     const state = {
-      account: {
-        passphrase: accounts.genesis.passphrase,
+      wallet: {
+        passphrase: wallets.genesis.passphrase,
         info: {
-          LSK: accounts.genesis,
+          LSK: wallets.genesis,
         },
       },
       network: {},
@@ -294,11 +294,11 @@ describe('actions: account', () => {
       await balanceUnlocked(params)(dispatch, getState);
       expect(create).toHaveBeenCalledWith({
         network: state.network,
-        account: state.account.info.LSK,
+        wallet: state.wallet.info.LSK,
         transactionObject: {
           moduleAssetId: '5:2',
-          senderPublicKey: accounts.genesis.summary.publicKey,
-          nonce: accounts.genesis.sequence?.nonce,
+          senderPublicKey: wallets.genesis.summary.publicKey,
+          nonce: wallets.genesis.sequence?.nonce,
           fee: '10000000',
           unlockObjects: [{}],
         },
@@ -325,10 +325,10 @@ describe('actions: account', () => {
 
   describe('delegateRegistered', () => {
     const state = {
-      account: {
-        passphrase: accounts.delegate_candidate.passphrase,
+      wallet: {
+        passphrase: wallets.delegate_candidate.passphrase,
         info: {
-          LSK: accounts.delegate_candidate,
+          LSK: wallets.delegate_candidate,
         },
       },
       network: {},
@@ -348,10 +348,10 @@ describe('actions: account', () => {
       await delegateRegistered(params)(dispatch, getState);
       expect(create).toHaveBeenCalledWith({
         network: state.network,
-        account: state.account.info.LSK,
+        wallet: state.wallet.info.LSK,
         transactionObject: {
-          senderPublicKey: accounts.delegate_candidate.summary.publicKey,
-          nonce: accounts.delegate_candidate.sequence.nonce,
+          senderPublicKey: wallets.delegate_candidate.summary.publicKey,
+          nonce: wallets.delegate_candidate.sequence.nonce,
           fee: 10000000,
           username: params.username,
           moduleAssetId: '5:0',
@@ -379,10 +379,10 @@ describe('actions: account', () => {
 
   describe('multisigGroupRegistered', () => {
     const state = {
-      account: {
-        passphrase: accounts.multiSig_candidate.passphrase,
+      wallet: {
+        passphrase: wallets.multiSig_candidate.passphrase,
         info: {
-          LSK: accounts.multiSig_candidate,
+          LSK: wallets.multiSig_candidate,
         },
       },
       network: {},
@@ -404,15 +404,15 @@ describe('actions: account', () => {
       await multisigGroupRegistered(params)(dispatch, getState);
       expect(create).toHaveBeenCalledWith({
         network: state.network,
-        account: state.account.info.LSK,
+        wallet: state.wallet.info.LSK,
         transactionObject: {
           moduleAssetId: '4:0',
           fee: 10000000,
           mandatoryKeys: params.mandatoryKeys,
           optionalKeys: params.optionalKeys,
           numberOfSignatures: params.numberOfSignatures,
-          nonce: accounts.multiSig_candidate.sequence.nonce,
-          senderPublicKey: accounts.multiSig_candidate.summary.publicKey,
+          nonce: wallets.multiSig_candidate.sequence.nonce,
+          senderPublicKey: wallets.multiSig_candidate.summary.publicKey,
         },
       }, 'LSK');
       expect(dispatch).toHaveBeenCalledWith({
@@ -437,10 +437,10 @@ describe('actions: account', () => {
 
   describe('balanceReclaimed', () => {
     const state = {
-      account: {
-        passphrase: accounts.non_migrated.passphrase,
+      wallet: {
+        passphrase: wallets.non_migrated.passphrase,
         info: {
-          LSK: accounts.non_migrated,
+          LSK: wallets.non_migrated,
         },
       },
       network: {},
@@ -456,7 +456,7 @@ describe('actions: account', () => {
       await balanceReclaimed({ fee: { value: '0,1' } })(dispatch, getState);
       expect(create).toHaveBeenCalledWith({
         network: state.network,
-        account: state.account.info.LSK,
+        wallet: state.wallet.info.LSK,
         transactionObject: {
           moduleAssetId: '1000:0',
           fee: 100000000,
diff --git a/packages/wallet/store/middleware.test.js b/packages/wallet/store/middleware.test.js
index 7faa2609ec..cc63f01f41 100644
--- a/packages/wallet/store/middleware.test.js
+++ b/packages/wallet/store/middleware.test.js
@@ -3,17 +3,17 @@ import {
   votesRetrieved, emptyTransactionsData, networkSelected, networkStatusUpdated,
 } from '@common/store/actions';
 
-import actionTypes from '@common/store/actions/actionTypes';
+import commonActionTypes from '@common/store/actions/actionTypes';
+import blockActionTypes from '@block/store/actionTypes';
+import settingsActionTypes from '@settings/store/actionTypes';
+import transactionActionTypes from '@transaction/store/actionTypes';
 import { MODULE_ASSETS_NAME_ID_MAP } from '@transaction/configuration/moduleAssets';
 import routes from '@screens/router/routes';
 import { tokenMap } from '@token/configuration/tokens';
 import * as transactionApi from '@transaction/utilities/api';
 import { getAutoLogInData } from '@common/utilities/login';
 import history from '@common/utilities/history';
-import blockActionTypes from '@block/store/actionTypes';
-import transactionActionTypes from '@transaction/store/actionTypes';
-import walletActionTypes from '../store/actionTypes';
-import settingsActionTypes from '@settings/store/actionTypes';
+import walletActionTypes from './actionTypes';
 import middleware from './middleware';
 
 jest.mock('@common/utilities/history');
@@ -44,7 +44,7 @@ jest.mock('@token/utilities/lsk');
 
 const liskAPIClientMock = 'DUMMY_LISK_API_CLIENT';
 const storeCreatedAction = {
-  type: actionTypes.storeCreated,
+  type: commonActionTypes.storeCreated,
 };
 
 const transactions = [
@@ -115,7 +115,7 @@ const network = {
   },
 };
 
-const account = {
+const wallet = {
   info: {
     LSK: {
       summary: {
@@ -138,13 +138,13 @@ const settings = {
 
 const defaultState = {
   network,
-  account,
+  wallet,
   transactions: {
     pending: [{
       id: 12498250891724098,
     }],
     confirmed: [],
-    account: {
+    wallet: {
       summary: {
         address: 'lskgonvfdxt3m6mm7jaeojrj5fnxx7vwmkxq72v79',
         balance: 0,
@@ -183,7 +183,7 @@ describe('Account middleware', () => {
     });
     it('should not pass the action to next middleware', () => {
       const actionNewBlockCreatedAction = {
-        type: actionTypes.newBlockCreated,
+        type: blockActionTypes.newBlockCreated,
         data: {
           block: {
             numberOfTransactions: 0,
@@ -199,7 +199,7 @@ describe('Account middleware', () => {
   describe('on settingsRetrieved', () => {
     it('should set the network from the settings', () => {
       const accountLoggedOutAction = {
-        type: actionTypes.settingsRetrieved,
+        type: settingsActionTypes.settingsRetrieved,
       };
       middleware(store)(next)(accountLoggedOutAction);
       expect(networkSelected).toHaveBeenCalledWith(settings.network);
@@ -208,7 +208,7 @@ describe('Account middleware', () => {
 
     it('should set the network from defaults if no value stored in the settings', () => {
       const accountLoggedOutAction = {
-        type: actionTypes.settingsRetrieved,
+        type: settingsActionTypes.settingsRetrieved,
       };
 
       const noNetworkState = {
@@ -317,7 +317,7 @@ describe('Account middleware', () => {
       store.getState = () => ({
         ...state,
         account: {
-          ...state.account,
+          ...state.wallet,
           info: {
             LSK: { summary: { address: '123456L' } },
             BTC: { summary: { address: '123456L' } },
@@ -325,7 +325,7 @@ describe('Account middleware', () => {
         },
       });
       const accountSettingsUpdatedAction = {
-        type: actionTypes.settingsUpdated,
+        type: settingsActionTypes.settingsUpdated,
         data: { token: 'LSK' },
       };
       middleware(store)(next)(accountSettingsUpdatedAction);
@@ -344,7 +344,7 @@ describe('Account middleware', () => {
   describe('on accountSettingsRetrieved', () => {
     it('Account Setting Retrieve Sucessfull', async () => {
       const accountSettingsRetrievedAction = {
-        type: actionTypes.settingsRetrieved,
+        type: settingsActionTypes.settingsRetrieved,
         data: { token: 'LSK' },
       };
       getAutoLogInData.mockImplementation(() => ({
@@ -369,7 +369,7 @@ describe('Account middleware', () => {
       });
 
       const accountSettingsRetrievedAction = {
-        type: actionTypes.settingsRetrieved,
+        type: settingsActionTypes.settingsRetrieved,
         data: { token: 'LSK' },
       };
       getAutoLogInData.mockImplementation(() => ({
@@ -388,7 +388,7 @@ describe('Account middleware', () => {
   describe('on accountUpdated', () => {
     it('should not redirect to the reclaim screen if the account is migrated', async () => {
       const action = {
-        type: actionTypes.accountLoggedIn,
+        type: walletActionTypes.accountLoggedIn,
         data: { info: { LSK: { summary: { isMigrated: true } } } },
       };
       middleware(store)(next)(action);
@@ -405,7 +405,7 @@ describe('Account middleware', () => {
     });
     it('should not redirect to the reclaim screen if the account is migrated with actionUpdate', async () => {
       const action = {
-        type: actionTypes.accountUpdated,
+        type: walletActionTypes.accountUpdated,
         data: { info: { LSK: { summary: { isMigrated: true } } } },
       };
       middleware(store)(next)(action);
diff --git a/packages/wallet/store/reducer.test.js b/packages/wallet/store/reducer.test.js
index 3528f5c338..8a5524fc57 100644
--- a/packages/wallet/store/reducer.test.js
+++ b/packages/wallet/store/reducer.test.js
@@ -1,6 +1,6 @@
-import accounts from '@tests/constants/accounts';
+import wallets from '@tests/constants/wallets';
 import actionTypes from './actionTypes';
-import account from './reducer';
+import wallet from './reducer';
 
 describe('Reducer: account(state, action)', () => {
   let state;
@@ -10,7 +10,7 @@ describe('Reducer: account(state, action)', () => {
       passphrase,
       publicKey,
       address,
-    } = accounts.genesis;
+    } = wallets.genesis;
     state = {
       balance: 0,
       passphrase,
@@ -29,19 +29,19 @@ describe('Reducer: account(state, action)', () => {
         },
       },
     };
-    const changedAccount = account(state, action);
-    expect(changedAccount).toEqual({
+    const changedWallet = wallet(state, action);
+    expect(changedWallet).toEqual({
       ...state,
       info: action.data,
     });
   });
 
-  it('should return empty_account object if action.type = actionTypes.accountLoggedOut', () => {
+  it('should return empty_wallet object if action.type = actionTypes.accountLoggedOut', () => {
     const action = {
       type: actionTypes.accountLoggedOut,
     };
-    const changedAccount = account(state, action);
-    expect(changedAccount).toEqual({ afterLogout: true });
+    const changedWallet = wallet(state, action);
+    expect(changedWallet).toEqual({ afterLogout: true });
   });
 
   it('should return account object with changes if action.type = actionTypes.timerReset', () => {
@@ -49,8 +49,8 @@ describe('Reducer: account(state, action)', () => {
       type: actionTypes.timerReset,
       data: new Date('2021-02-09T15:37:25.880Z'),
     };
-    const changedAccount = account(state, action);
-    expect(changedAccount).toEqual({
+    const changedWallet = wallet(state, action);
+    expect(changedWallet).toEqual({
       ...state,
       expireTime: new Date('2021-02-09T15:47:25.880Z'),
     });
@@ -60,20 +60,20 @@ describe('Reducer: account(state, action)', () => {
     const action = {
       type: actionTypes.accountLoading,
     };
-    const changedAccount = account(state, action);
-    expect(changedAccount).toEqual({ loading: true });
+    const changedWallet = wallet(state, action);
+    expect(changedWallet).toEqual({ loading: true });
   });
 
   it('should reduce account when accountLoggedIn has been triggered', () => {
     const action = {
       data: {
-        delegate: accounts.delegate_candidate,
+        delegate: wallets.delegate_candidate,
         date: new Date(),
       },
       type: actionTypes.accountLoggedIn,
     };
-    const accountWithDelegateUpdated = account(state, action);
-    expect(accountWithDelegateUpdated.delegate).toEqual(accounts.delegate_candidate);
+    const accountWithDelegateUpdated = wallet(state, action);
+    expect(accountWithDelegateUpdated.delegate).toEqual(wallets.delegate_candidate);
   });
 
   it('should store the second passphrase once called with secondPassphraseStored', () => {
@@ -81,7 +81,7 @@ describe('Reducer: account(state, action)', () => {
       data: 'sample passphrase',
       type: actionTypes.secondPassphraseStored,
     };
-    const updatedState = account(state, action);
+    const updatedState = wallet(state, action);
     expect(updatedState.secondPassphrase).toEqual(action.data);
   });
 
@@ -93,7 +93,7 @@ describe('Reducer: account(state, action)', () => {
       ...state,
       secondPassphrase: 'sample passphrase',
     };
-    const updatedState = account(oldState, action);
+    const updatedState = wallet(oldState, action);
     expect(updatedState.secondPassphrase).toEqual(null);
   });
 
@@ -101,7 +101,7 @@ describe('Reducer: account(state, action)', () => {
     const action = {
       type: 'UNKNOWN',
     };
-    const changedAccount = account(state, action);
-    expect(changedAccount).toEqual(state);
+    const changedWallet = wallet(state, action);
+    expect(changedWallet).toEqual(state);
   });
 });
diff --git a/packages/wallet/utilities/account.js b/packages/wallet/utilities/account.js
index 9822af2f5d..8e6478fb1e 100644
--- a/packages/wallet/utilities/account.js
+++ b/packages/wallet/utilities/account.js
@@ -139,8 +139,8 @@ export const getAddressFromBase32Address = (data) => {
  * @returns {Object} - account details or empty object
  */
 export const getActiveTokenAccount = state => ({
-  ...state.account,
-  ...((state.account.info && state.account.info[
+  ...state.wallet,
+  ...((state.wallet.info && state.wallet.info[
     state.settings.token?.active
       ? state.settings.token.active
       : tokenMap.LSK.key
diff --git a/packages/wallet/utilities/account.test.js b/packages/wallet/utilities/account.test.js
index 717c2bf01e..e572deff96 100644
--- a/packages/wallet/utilities/account.test.js
+++ b/packages/wallet/utilities/account.test.js
@@ -1,5 +1,5 @@
 import { getCustomDerivationKeyPair } from '@common/utilities/explicitBipKeyDerivation';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import {
   extractPublicKey,
   extractPrivateKey,
diff --git a/packages/wallet/utilities/api/lsk.test.js b/packages/wallet/utilities/api/lsk.test.js
index f09575e709..4eb6d7d03b 100644
--- a/packages/wallet/utilities/api/lsk.test.js
+++ b/packages/wallet/utilities/api/lsk.test.js
@@ -1,7 +1,7 @@
 import { HTTP_CODES } from '@wallet/configuration/httpCodes';
 import http from '@common/utilities/api/http';
 import ws from '@common/utilities/api/ws';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import { getAccount, getAccounts } from './lsk';
 
 jest.mock('@common/utilities/api/http', () => jest.fn().mockReturnValue([]));
diff --git a/packages/wallet/utilities/hooks/setSecondPassphrase.test.js b/packages/wallet/utilities/hooks/setSecondPassphrase.test.js
index 1a577292d8..7bc802a820 100644
--- a/packages/wallet/utilities/hooks/setSecondPassphrase.test.js
+++ b/packages/wallet/utilities/hooks/setSecondPassphrase.test.js
@@ -1,6 +1,6 @@
 import { renderHook, act } from '@testing-library/react-hooks';
 import { useSelector } from 'react-redux';
-import accounts from '@tests/constants/accounts';
+import accounts from '@tests/constants/wallets';
 import setSecondPassphrase from './setSecondPassphrase';
 
 jest.mock('@common/store');
diff --git a/packages/wallet/utilities/hooks/useVerifyMessageValidator.js b/packages/wallet/utilities/hooks/useVerifyMessageValidator.js
index 86112588df..dd0628732e 100644
--- a/packages/wallet/utilities/hooks/useVerifyMessageValidator.js
+++ b/packages/wallet/utilities/hooks/useVerifyMessageValidator.js
@@ -1,8 +1,7 @@
 import { useMemo } from 'react';
 import verifyMessageValidator from '../verifyMessageValidator';
 
-const useVerifyMessageValidator = (inputs) => {
-  return useMemo(() => verifyMessageValidator(inputs), [inputs]);
-};
+const useVerifyMessageValidator = (inputs) =>
+  useMemo(() => verifyMessageValidator(inputs), [inputs]);
 
 export default useVerifyMessageValidator;
diff --git a/packages/wallet/utilities/hwManager/hwManager.test.js b/packages/wallet/utilities/hwManager/hwManager.test.js
index 9d1a7441f9..7d400a854a 100644
--- a/packages/wallet/utilities/hwManager/hwManager.test.js
+++ b/packages/wallet/utilities/hwManager/hwManager.test.js
@@ -1,6 +1,6 @@
 import * as communication from '@libs/hwManager/communication';
 import * as accountApi from '@wallet/utilities/api';
-import accounts from '@tests/constants/accounts';
+import wallets from '@tests/constants/wallets';
 import {
   getAccountsFromDevice,
   signMessageByHW,
@@ -30,31 +30,31 @@ describe('hwManager util', () => {
 
   describe('getAccountsFromDevice', () => {
     it('should resolve all non-empty and one empty account', async () => {
-      communication.getPublicKey.mockResolvedValueOnce(accounts.genesis.summary.publicKey);
-      communication.getPublicKey.mockResolvedValueOnce(accounts.empty_account.summary.publicKey);
-      accountApi.getAccounts.mockResolvedValueOnce({ data: [accounts.genesis] });
+      communication.getPublicKey.mockResolvedValueOnce(wallets.genesis.summary.publicKey);
+      communication.getPublicKey.mockResolvedValueOnce(wallets.empty_wallet.summary.publicKey);
+      accountApi.getAccounts.mockResolvedValueOnce({ data: [wallets.genesis] });
 
       const device = { deviceId: '1234125125' };
       const network = { name: 'Testnet', networks: {} };
 
-      const accountsOnDevice = await getAccountsFromDevice({ device, network });
+      const walletsOnDevice = await getAccountsFromDevice({ device, network });
 
-      expect(accountsOnDevice).toEqual([accounts.genesis]);
+      expect(walletsOnDevice).toEqual([wallets.genesis]);
     });
   });
 
   describe('getNewAccountByIndex', () => {
     it('should resolve one empty account using a given index', async () => {
-      communication.getPublicKey.mockResolvedValueOnce(accounts.genesis.summary.publicKey);
+      communication.getPublicKey.mockResolvedValueOnce(wallets.genesis.summary.publicKey);
 
       const device = { deviceId: '1234125125' };
 
-      const accountsOnDevice = await getNewAccountByIndex({ device, index: 11 });
+      const walletsOnDevice = await getNewAccountByIndex({ device, index: 11 });
 
-      expect(accountsOnDevice).toEqual({
+      expect(walletsOnDevice).toEqual({
         summary: {
-          publicKey: accounts.genesis.summary.publicKey,
-          address: accounts.genesis.summary.address,
+          publicKey: wallets.genesis.summary.publicKey,
+          address: wallets.genesis.summary.address,
           balance: '0',
         },
       });
@@ -64,7 +64,7 @@ describe('hwManager util', () => {
   describe('signMessageByHW', () => {
     it('should return a signature for given message', async () => {
       // Arrange
-      const account = {
+      const wallet = {
         hwInfo: {
           deviceId: '060E803263E985C022CA2C9B',
           derivationIndex: 0,
@@ -73,13 +73,13 @@ describe('hwManager util', () => {
       const message = 'hello';
 
       // Act
-      const signedMessage = await signMessageByHW({ account, message });
+      const signedMessage = await signMessageByHW({ wallet, message });
 
       // Assert
       expect(signedMessage).toEqual(signature);
       expect(communication.signMessage).toHaveBeenCalledWith({
-        deviceId: account.hwInfo.deviceId,
-        index: account.hwInfo.derivationIndex,
+        deviceId: wallet.hwInfo.deviceId,
+        index: wallet.hwInfo.derivationIndex,
         message,
       });
     });
diff --git a/packages/wallet/utilities/hwManager/index.js b/packages/wallet/utilities/hwManager/index.js
index ea1a12e7fc..dca71abebd 100644
--- a/packages/wallet/utilities/hwManager/index.js
+++ b/packages/wallet/utilities/hwManager/index.js
@@ -110,20 +110,20 @@ const updateTransactionSignatures = (
 /* eslint-disable max-statements */
 
 const signMessageByHW = async ({
-  account,
+  wallet,
   message,
 }) => {
   try {
     const signature = await signMessage({
-      deviceId: account.hwInfo.deviceId,
-      index: account.hwInfo.derivationIndex,
+      deviceId: wallet.hwInfo.deviceId,
+      index: wallet.hwInfo.derivationIndex,
       message,
     });
 
     if (!signature) {
       throw new Error(i18next.t(
         'The message signature has been canceled on your {{model}}',
-        { model: account.hwInfo.deviceModel },
+        { model: wallet.hwInfo.deviceModel },
       ));
     }
 
@@ -131,7 +131,7 @@ const signMessageByHW = async ({
   } catch (error) {
     throw new Error(i18next.t(
       'The message signature has been canceled on your {{model}}',
-      { model: account.hwInfo.deviceModel },
+      { model: wallet.hwInfo.deviceModel },
     ));
   }
 };
diff --git a/setup/config/webpack.config.js b/setup/config/webpack.config.js
index 879c935829..2d76ca4e56 100644
--- a/setup/config/webpack.config.js
+++ b/setup/config/webpack.config.js
@@ -13,13 +13,13 @@ const config = {
       '@bookmark': resolve('./packages/bookmark'),
       '@common': resolve('./packages/common'),
       '@dpos': resolve('./packages/dpos'),
+      '@legacy': resolve('./packages/legacy'),
       '@network': resolve('./packages/network'),
       '@settings': resolve('./packages/settings'),
       '@token': resolve('./packages/token'),
       '@transaction': resolve('./packages/transaction'),
       '@updater': resolve('./packages/updater'),
       '@wallet': resolve('./packages/wallet'),
-      '@legacy': resolve('./packages/legacy'),
       '@views': resolve('./packages/views'),
       '@shared': resolve('./packages/views/shared'),
       '@basics': resolve('./packages/views/basics'),
diff --git a/setup/jest.config.js b/setup/jest.config.js
index 51bc77f8b5..3a576be504 100644
--- a/setup/jest.config.js
+++ b/setup/jest.config.js
@@ -31,6 +31,7 @@ module.exports = {
     '^@bookmark(.*)$': resolve(__dirname, '../packages/bookmark/$1'),
     '^@common(.*)$': resolve(__dirname, '../packages/common/$1'),
     '^@dpos(.*)$': resolve(__dirname, '../packages/dpos/$1'),
+    '^@legacy(.*)$': resolve(__dirname, '../packages/legacy/$1'),
     '^@network(.*)$': resolve(__dirname, '../packages/network/$1'),
     '^@settings(.*)$': resolve(__dirname, '../packages/settings/$1'),
     '^@token(.*)$': resolve(__dirname, '../packages/token/$1'),
@@ -91,7 +92,7 @@ module.exports = {
     'packages/views/shared/transactionInfo/',
     'packages/views/shared/formattedNumber/stories.js',
     'packages/views/shared/header/signInHeader/signInHeader.js',
-    'packages/views/shared/accountVisualWithAddress/index.js',
+    'packages/views/shared/walletVisualWithAddress/index.js',
     'packages/views/shared/voteWeight/index.js',
     'packages/views/shared/transactionTypeFigure/index.js',
     'packages/views/shared/filterDropdownButton/textFilter.js',
@@ -191,6 +192,7 @@ module.exports = {
   setupFiles: ['<rootDir>/setup/config/setupJest.js', 'jest-canvas-mock'],
   transform: {
     '^.+\\.js$': 'babel-jest',
+    '^.+\\.svg|png|jpg|jpeg$': '<rootDir>/tests/__mocks__/imageTransform.js',
   },
   testURL: 'http://localhost',
   globals: {
diff --git a/setup/react/assets/images/icons/accountsMonitor.svg b/setup/react/assets/images/icons/walletsMonitor.svg
similarity index 100%
rename from setup/react/assets/images/icons/accountsMonitor.svg
rename to setup/react/assets/images/icons/walletsMonitor.svg
diff --git a/setup/react/assets/images/icons/accountsMonitorActive.svg b/setup/react/assets/images/icons/walletsMonitorActive.svg
similarity index 100%
rename from setup/react/assets/images/icons/accountsMonitorActive.svg
rename to setup/react/assets/images/icons/walletsMonitorActive.svg
diff --git a/tests/__mocks__/imageTransform.js b/tests/__mocks__/imageTransform.js
new file mode 100644
index 0000000000..f61ad755e0
--- /dev/null
+++ b/tests/__mocks__/imageTransform.js
@@ -0,0 +1,8 @@
+module.exports = {
+  process() {
+    return 'module.exports = {};';
+  },
+  getCacheKey() {
+    return 'svgTransform';
+  },
+};
diff --git a/tests/constants/defaultState.js b/tests/constants/defaultState.js
index b08c685201..a7171706ed 100644
--- a/tests/constants/defaultState.js
+++ b/tests/constants/defaultState.js
@@ -1,11 +1,11 @@
-import accounts from './accounts';
+import wallets from './wallets';
 import moduleAssetSchemas from './schemas';
 
 export default {
-  account: {
+  wallet: {
     info: {
       LSK: {
-        ...accounts.genesis,
+        ...wallets.genesis,
       },
       BTC: {},
     },
diff --git a/tests/constants/index.js b/tests/constants/index.js
index ef100924c7..c40dbf181c 100644
--- a/tests/constants/index.js
+++ b/tests/constants/index.js
@@ -1,4 +1,4 @@
-export { default as accounts } from './accounts';
+export { default as wallets } from './wallets';
 export { default as blocks } from './blocks';
 export { default as bookmarks } from './bookmarks';
 export { default as delegates } from './delegates';
diff --git a/tests/constants/selectors.js b/tests/constants/selectors.js
index ea8c37c402..023e5fc3c4 100644
--- a/tests/constants/selectors.js
+++ b/tests/constants/selectors.js
@@ -252,7 +252,7 @@ const ss = {
   accountsRow: '.accounts-row',
   showMoreAccountsBtn: '.accounts-box .load-more',
   signMultiSignTransactionToggle: '.signMultiSignTransaction-toggle',
-  accountInfoMsign: '.account-info-msign',
+  walletInfoMsign: '.account-info-msign',
   msignPkInput: '.msign-pk-input',
   addNewMembers: '.add-new-members',
   mandatoryToggle: '.mandatory-toggle',
diff --git a/tests/constants/accounts.js b/tests/constants/wallets.js
similarity index 98%
rename from tests/constants/accounts.js
rename to tests/constants/wallets.js
index 085021732e..bf33cf9fdf 100644
--- a/tests/constants/accounts.js
+++ b/tests/constants/wallets.js
@@ -1,4 +1,4 @@
-const accounts = {
+const wallets = {
   genesis: {
     passphrase: 'peanut hundred pen hawk invite exclude brain chunk gadget wait wrong ready',
     summary: {
@@ -41,7 +41,7 @@ const accounts = {
       },
     },
   },
-  empty_account: {
+  empty_wallet: {
     passphrase: 'stay undo beyond powder sand laptop grow gloom apology hamster primary arrive',
     summary: {
       publicKey: '197cf311f678406bc72a8edfdc3dffe6f59f49c4550a860e4b68fb20382211d0',
@@ -112,7 +112,7 @@ const accounts = {
       sentVotes: [],
     },
   },
-  send_all_account: {
+  send_all_wallet: {
     passphrase: 'oyster flush inquiry bright leopard gas replace ball hold pudding teach swear',
     summary: {
       publicKey: 'c5e64031407c3ca8d526bf7404f7c78ab60ea0792e90393a73b3b06a8c8841d4',
@@ -224,7 +224,7 @@ const accounts = {
     },
     dpos: { delegate: {} },
   },
-  account2P: {
+  wallet2P: {
     passphrase: 'steak avoid couple fog ability chalk jacket electric rifle fuel tuition van',
     summary: {
       address: 'lskwunwxqmss9w3mtuvzgbsfy665cz4eo3rd2mxdp',
@@ -294,4 +294,4 @@ const accounts = {
   },
 };
 
-export default accounts;
+export default wallets;
diff --git a/tests/cypress/features/multiSignTx.feature b/tests/cypress/features/multiSignTx.feature
index e4d085738d..8b8b67e032 100644
--- a/tests/cypress/features/multiSignTx.feature
+++ b/tests/cypress/features/multiSignTx.feature
@@ -17,7 +17,7 @@ Feature: Multisignature transaction
     Given I login as account2P on devnet
     And I wait 10 seconds
     Given I am on wallet page
-    When I click on accountInfoMsign
+    When I click on walletInfoMsign
     When I clear input multisignatureEditorInput
     And I fill 2 in multisignatureEditorInput field
     Then I enter the publicKey of account2P at input 1
@@ -80,7 +80,7 @@ Feature: Multisignature transaction
     Given I login as multiSig_candidate on devnet
     And I wait 1 seconds
     Given I am on wallet page
-    When I click on accountInfoMsign
+    When I click on walletInfoMsign
     When I clear input multisignatureEditorInput
     And I fill 2 in multisignatureEditorInput field
     When I click on addNewMembers
diff --git a/tests/fixtures/transactions.js b/tests/fixtures/transactions.js
index f0258d29bf..2d3c0b72fc 100644
--- a/tests/fixtures/transactions.js
+++ b/tests/fixtures/transactions.js
@@ -1,5 +1,5 @@
 const getState = () => ({
-  account: {
+  wallet: {
     passphrase: 'test',
     info: {
       LSK: {
diff --git a/tests/unit-test-utils/fakeStore.js b/tests/unit-test-utils/fakeStore.js
index 4cbe0b371f..719f502eab 100644
--- a/tests/unit-test-utils/fakeStore.js
+++ b/tests/unit-test-utils/fakeStore.js
@@ -1,12 +1,12 @@
 import configureStore from 'redux-mock-store';
 import { tokenMap } from '@token/configuration/tokens';
-import accounts from '../constants/accounts';
+import wallets from '../constants/wallets';
 import delegates from '../constants/delegates';
 
-const forgers = Object.values(accounts).slice(0, 9).map((account, index) => ({
+const forgers = Object.values(wallets).slice(0, 9).map((wallet, index) => ({
   username: `genesis_${index}`,
   totalVotesReceived: '100000000000',
-  address: account.summary.address,
+  address: wallet.summary.address,
   minActiveHeight: 1,
   isConsensusParticipant: true,
   nextForgingTime: 1620049927 + 10 * index,
@@ -14,7 +14,7 @@ const forgers = Object.values(accounts).slice(0, 9).map((account, index) => ({
 
 const fakeStore = configureStore();
 const defaultStore = {
-  account: {},
+  wallet: {},
   network: {
     name: 'Custom Node',
     networks: {
diff --git a/tests/unit-test-utils/genericStepDefinition.js b/tests/unit-test-utils/genericStepDefinition.js
index 8d5a7b8b6f..dff1437c4f 100644
--- a/tests/unit-test-utils/genericStepDefinition.js
+++ b/tests/unit-test-utils/genericStepDefinition.js
@@ -85,7 +85,7 @@ export default class GenericStepDefinition {
    * @param {String} expectedPublicKey - Valid publicKey
    */
   shouldBeLoggedInAs(expectedPublicKey) {
-    expect(this.store.getState().account.publicKey).to.equal(expectedPublicKey);
+    expect(this.store.getState().wallet.publicKey).to.equal(expectedPublicKey);
   }
 
   /**