diff --git a/packages/desktop/components/filter/Filter.svelte b/packages/desktop/components/filter/Filter.svelte
index d85b9d2466..bd68e5a360 100644
--- a/packages/desktop/components/filter/Filter.svelte
+++ b/packages/desktop/components/filter/Filter.svelte
@@ -48,7 +48,7 @@
     }
 </script>
 
-<filter-container class="block h-6 relative">
+<filter-container class="items-center relative">
     <TogglableButton icon={IconName.Filter} bind:active={filterActive} onClick={modal?.toggle} />
     {#if activeFilterCount}
         <filter-badge
diff --git a/packages/desktop/components/menus/AccountActionsMenu.svelte b/packages/desktop/components/menus/AccountActionsMenu.svelte
index 8bc3d6f027..c75830df83 100644
--- a/packages/desktop/components/menus/AccountActionsMenu.svelte
+++ b/packages/desktop/components/menus/AccountActionsMenu.svelte
@@ -11,6 +11,11 @@
 
     let menu: Menu | undefined = undefined
 
+    function onSyncAccountsClick(): void {
+        openPopup({ id: PopupId.SyncAccounts })
+        menu?.close()
+    }
+
     function onViewBalanceClick(): void {
         openPopup({ id: PopupId.BalanceBreakdown })
         menu?.close()
@@ -56,13 +61,18 @@
     let items: IMenuItem[] = []
     function setItems(account: IAccountState, nonHiddenActiveAccounts: IAccountState[], showDelete: boolean) {
         items = [
+            {
+                icon: IconName.Refresh,
+                title: localize('actions.syncAccounts'),
+                onClick: onSyncAccountsClick,
+            },
             {
                 icon: IconName.PieChart,
-                title: localize('actions.viewBalanceBreakdown'),
+                title: localize('general.balanceBreakdown'),
                 onClick: onViewBalanceClick,
             },
             {
-                icon: IconName.Sliders,
+                icon: IconName.SettingsSliders,
                 title: localize('actions.customizeAccount'),
                 onClick: onCustomiseAccountClick,
             },
diff --git a/packages/desktop/components/menus/TokenListMenu.svelte b/packages/desktop/components/menus/TokenListMenu.svelte
index b4b29f06bd..86f5029525 100644
--- a/packages/desktop/components/menus/TokenListMenu.svelte
+++ b/packages/desktop/components/menus/TokenListMenu.svelte
@@ -1,7 +1,9 @@
 <script lang="ts">
+    import { showNotification } from '@auxiliary/notification'
     import { IconName, Menu } from '@bloomwalletio/ui'
     import { localize } from '@core/i18n'
-    import { PopupId, openPopup } from '../../lib/auxiliary/popup'
+    import { refreshAccountTokensForActiveProfile } from '@core/token/actions'
+    import { PopupId, closePopup, openPopup } from '../../lib/auxiliary/popup'
 
     let menu: Menu | undefined = undefined
 
@@ -12,15 +14,45 @@
         })
         menu?.close()
     }
+
+    function refreshTokenMetadata(): void {
+        refreshAccountTokensForActiveProfile(true)
+        showNotification({
+            variant: 'success',
+            text: localize('notifications.refreshTokenMetadata.success'),
+        })
+        closePopup()
+    }
+
+    function onRefreshTokenMetadataClick(): void {
+        openPopup({
+            id: PopupId.Confirmation,
+            props: {
+                title: localize('actions.refreshTokenMetadata'),
+                hint: localize('general.refreshTokenMetadataHint'),
+                warning: true,
+                confirmText: localize('actions.reset'),
+                onConfirm: refreshTokenMetadata,
+            },
+        })
+        menu?.close()
+    }
 </script>
 
-<Menu
-    bind:this={menu}
-    items={[
-        {
-            icon: IconName.Import,
-            title: localize('general.importErc20Token'),
-            onClick: onImportErc20TokenClick,
-        },
-    ]}
-/>
+<token-list-menu>
+    <Menu
+        bind:this={menu}
+        items={[
+            {
+                icon: IconName.Import,
+                title: localize('actions.importErc20Token'),
+                onClick: onImportErc20TokenClick,
+            },
+            {
+                icon: IconName.Refresh,
+                title: localize('actions.refreshTokenMetadata'),
+                onClick: onRefreshTokenMetadataClick,
+            },
+        ]}
+    />
+</token-list-menu>
diff --git a/packages/desktop/components/popup/Popup.svelte b/packages/desktop/components/popup/Popup.svelte
index f3676a9195..152b26e511 100644
--- a/packages/desktop/components/popup/Popup.svelte
+++ b/packages/desktop/components/popup/Popup.svelte
@@ -12,6 +12,7 @@
     import AddNodePopup from './popups/AddNodePopup.svelte'
     import AddProposalPopup from './popups/AddProposalPopup.svelte'
     import AliasConfirmationPopup from './popups/AliasConfirmationPopup.svelte'
+    import BalanceBreakdownPopup from './popups/BalanceBreakdownPopup.svelte'
     import BackupStrongholdPopup from './popups/BackupStrongholdPopup.svelte'
     import BurnNativeTokensPopup from './popups/BurnNativeTokensPopup.svelte'
     import BurnNativeTokensConfirmationPopup from './popups/BurnNativeTokensConfirmationPopup.svelte'
@@ -43,7 +44,7 @@
     import SignMessagePopup from './popups/SignMessagePopup.svelte'
     import SendFlowPopup from './popups/SendFlowPopup.svelte'
     import StopVotingPopup from './popups/StopVotingPopup.svelte'
-    import BalanceBreakdownPopup from './popups/BalanceBreakdownPopup.svelte'
+    import SyncAccountsPopup from './popups/SyncAccountsPopup.svelte'
     import TestDeepLinkFormPopup from './popups/TestDeepLinkFormPopup.svelte'
     import TokenInformationPopup from './popups/TokenInformationPopup.svelte'
     import UnlockStrongholdPopup from './popups/UnlockStrongholdPopup.svelte'
@@ -51,7 +52,6 @@
     import CheckForUpdatesPopup from './popups/CheckForUpdatesPopup.svelte'
     import VoteForProposal from './popups/VoteForProposalPopup.svelte'
     import VotingPowerToZeroPopup from './popups/VotingPowerToZeroPopup.svelte'
-    import WalletFinderPopup from './popups/WalletFinderPopup.svelte'
 
     export let id: PopupId
     export let props: any
@@ -95,8 +95,10 @@
         [PopupId.AddProposal]: AddProposalPopup,
         [PopupId.AliasConfirmation]: AliasConfirmationPopup,
         [PopupId.BackupStronghold]: BackupStrongholdPopup,
-        [PopupId.BurnNativeTokens]: BurnNativeTokensPopup,
+        [PopupId.BalanceBreakdown]: BalanceBreakdownPopup,
         [PopupId.BurnNativeTokensConfirmation]: BurnNativeTokensConfirmationPopup,
+        [PopupId.BurnNativeTokens]: BurnNativeTokensPopup,
+        [PopupId.CheckForUpdates]: CheckForUpdatesPopup,
         [PopupId.Confirmation]: ConfirmationPopup,
         [PopupId.ConnectLedger]: ConnectLedgerPopup,
         [PopupId.CreateAccount]: CreateAccountPopup,
@@ -125,15 +127,13 @@
         [PopupId.SendFlow]: SendFlowPopup,
         [PopupId.SignMessage]: SignMessagePopup,
         [PopupId.StopVoting]: StopVotingPopup,
-        [PopupId.BalanceBreakdown]: BalanceBreakdownPopup,
+        [PopupId.SyncAccounts]: SyncAccountsPopup,
         [PopupId.TestDeepLinkForm]: TestDeepLinkFormPopup,
         [PopupId.TokenInformation]: TokenInformationPopup,
         [PopupId.UnlockStronghold]: UnlockStrongholdPopup,
         [PopupId.VerifyLedgerTransaction]: VerifyLedgerTransactionPopup,
-        [PopupId.CheckForUpdates]: CheckForUpdatesPopup,
         [PopupId.VoteForProposal]: VoteForProposal,
         [PopupId.VotingPowerToZero]: VotingPowerToZeroPopup,
-        [PopupId.WalletFinder]: WalletFinderPopup,
     }
 
     function onKey(event: KeyboardEvent): void {
diff --git a/packages/desktop/components/popup/popups/WalletFinderPopup.svelte b/packages/desktop/components/popup/popups/SyncAccountsPopup.svelte
similarity index 100%
rename from packages/desktop/components/popup/popups/WalletFinderPopup.svelte
rename to packages/desktop/components/popup/popups/SyncAccountsPopup.svelte
diff --git a/packages/desktop/lib/auxiliary/popup/enums/popup-id.enum.ts b/packages/desktop/lib/auxiliary/popup/enums/popup-id.enum.ts
index 02a47a9532..eb8ea62488 100644
--- a/packages/desktop/lib/auxiliary/popup/enums/popup-id.enum.ts
+++ b/packages/desktop/lib/auxiliary/popup/enums/popup-id.enum.ts
@@ -5,6 +5,7 @@ export enum PopupId {
     AddProposal = 'addProposal',
     AliasConfirmation = 'aliasConfirmation',
     BackupStronghold = 'backupStronghold',
+    BalanceBreakdown = 'balanceBreakdown',
     BurnNativeTokens = 'burnNativeTokens',
     BurnNativeTokensConfirmation = 'burnNativeTokensConfirmation',
     CheckForUpdates = 'checkForUpdates',
@@ -33,15 +34,14 @@ export enum PopupId {
     ReceiveAddress = 'receiveAddress',
     RemoveProposal = 'removeProposal',
     Revote = 'revote',
-    SignMessage = 'signMessage',
     SendFlow = 'sendFlow',
+    SignMessage = 'signMessage',
     StopVoting = 'stopVoting',
-    BalanceBreakdown = 'balanceBreakdown',
+    SyncAccounts = 'syncAccounts',
     TestDeepLinkForm = 'testDeepLinkForm',
     TokenInformation = 'tokenInformation',
     UnlockStronghold = 'unlockStronghold',
     VerifyLedgerTransaction = 'verifyLedgerTransaction',
     VoteForProposal = 'voteForProposal',
     VotingPowerToZero = 'votingPowerToZero',
-    WalletFinder = 'walletFinder',
 }
diff --git a/packages/desktop/views/dashboard/developer/Developer.svelte b/packages/desktop/views/dashboard/developer/Developer.svelte
index 2a33f1e0f2..ef57274fc9 100644
--- a/packages/desktop/views/dashboard/developer/Developer.svelte
+++ b/packages/desktop/views/dashboard/developer/Developer.svelte
@@ -8,7 +8,6 @@
         FaucetRequestButton,
         MintNativeTokenButton,
         MintNftButton,
-        RefreshTokenMetadataButton,
         TestDeepLinkButton,
     } from './components'
 </script>
@@ -43,9 +42,6 @@
                     {#if features.developerTools.deeplink.enabled}
                         <TestDeepLinkButton />
                     {/if}
-                    {#if features.developerTools.refreshTokens.enabled}
-                        <RefreshTokenMetadataButton />
-                    {/if}
                 </Pane>
             </div>
         {/key}
diff --git a/packages/desktop/views/dashboard/developer/components/RefreshTokenMetadataButton.svelte b/packages/desktop/views/dashboard/developer/components/RefreshTokenMetadataButton.svelte
deleted file mode 100644
index cf8a47d593..0000000000
--- a/packages/desktop/views/dashboard/developer/components/RefreshTokenMetadataButton.svelte
+++ /dev/null
@@ -1,35 +0,0 @@
-<script lang="ts">
-    import { OnboardingButton } from '@ui'
-    import { localize } from '@core/i18n'
-    import { showNotification } from '@auxiliary/notification'
-    import { closePopup, openPopup, PopupId } from '@desktop/auxiliary/popup'
-    import { refreshAccountTokensForActiveProfile } from '@core/token/actions'
-
-    function refreshTokenMetadata(): void {
-        refreshAccountTokensForActiveProfile(true)
-        showNotification({
-            variant: 'success',
-            text: localize('notifications.refreshTokenMetadata.success'),
-        })
-        closePopup()
-    }
-
-    function onRefreshTokenMetadataClick(): void {
-        openPopup({
-            id: PopupId.Confirmation,
-            props: {
-                title: localize('actions.refreshTokenMetadata'),
-                hint: localize('general.refreshTokenMetadataHint'),
-                warning: true,
-                confirmText: localize('actions.reset'),
-                onConfirm: refreshTokenMetadata,
-            },
-        })
-    }
-</script>
-
-<OnboardingButton
-    primaryText={localize('actions.refreshTokenMetadata')}
-    secondaryText={localize('general.refreshTokenMetadataDescription')}
-    onClick={onRefreshTokenMetadataClick}
-/>
diff --git a/packages/desktop/views/dashboard/developer/components/index.ts b/packages/desktop/views/dashboard/developer/components/index.ts
index e2fdbd9741..70d196eb86 100644
--- a/packages/desktop/views/dashboard/developer/components/index.ts
+++ b/packages/desktop/views/dashboard/developer/components/index.ts
@@ -2,5 +2,4 @@ export { default as CreateAliasButton } from './CreateAliasButton.svelte'
 export { default as FaucetRequestButton } from './FaucetRequestButton.svelte'
 export { default as MintNativeTokenButton } from './MintNativeTokenButton.svelte'
 export { default as MintNftButton } from './MintNftButton.svelte'
-export { default as RefreshTokenMetadataButton } from './RefreshTokenMetadataButton.svelte'
 export { default as TestDeepLinkButton } from './TestDeepLinkButton.svelte'
diff --git a/packages/desktop/views/dashboard/settings/Settings.svelte b/packages/desktop/views/dashboard/settings/Settings.svelte
index 548c7b66bc..fa414dc028 100644
--- a/packages/desktop/views/dashboard/settings/Settings.svelte
+++ b/packages/desktop/views/dashboard/settings/Settings.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { isLocaleLoaded } from '@core/i18n'
     import { dashboardRouter, settingsRouter } from '@core/router'
-    import { Icon } from '@ui'
+    import { IconButton, IconName } from '@bloomwalletio/ui'
     import { onDestroy } from 'svelte'
     import { SettingsViewer } from './views'
 
@@ -20,9 +20,9 @@
     })
 </script>
 
-<div class="relative h-full w-full p-8 md:bg-white md:dark:bg-gray-900 flex flex-1">
-    <button on:click={handleClose || closeSettings} class="absolute top-8 right-8">
-        <Icon icon="close" classes="text-gray-800 dark:text-white" />
-    </button>
+<div class="relative h-full w-full p-8 bg-surface dark:bg-surface-dark flex flex-1">
+    <div class="absolute top-8 right-8">
+        <IconButton icon={IconName.CrossClose} on:click={handleClose || closeSettings} />
+    </div>
     <SettingsViewer />
 </div>
diff --git a/packages/desktop/views/dashboard/settings/views/advanced/WalletFinder.svelte b/packages/desktop/views/dashboard/settings/views/advanced/WalletFinder.svelte
deleted file mode 100644
index 012a063f9b..0000000000
--- a/packages/desktop/views/dashboard/settings/views/advanced/WalletFinder.svelte
+++ /dev/null
@@ -1,16 +0,0 @@
-<script lang="ts">
-    import { Button } from '@bloomwalletio/ui'
-    import { Text } from '@ui'
-    import { localize } from '@core/i18n'
-    import { openPopup, PopupId } from '@desktop/auxiliary/popup'
-
-    function onWalletFinderClick(): void {
-        openPopup({ id: PopupId.WalletFinder })
-    }
-</script>
-
-<Text type="h4" classes="mb-3">{localize('views.settings.walletFinder.title')}</Text>
-<Text type="p" secondary classes="mb-5">{localize('views.settings.walletFinder.description')}</Text>
-<div class="flex flex-row items-center">
-    <Button on:click={onWalletFinderClick} text={localize('actions.findWallets')} />
-</div>
diff --git a/packages/desktop/views/dashboard/settings/views/advanced/advanced-settings.constant.js b/packages/desktop/views/dashboard/settings/views/advanced/advanced-settings.constant.js
index d2b898cb04..c3ff653cff 100644
--- a/packages/desktop/views/dashboard/settings/views/advanced/advanced-settings.constant.js
+++ b/packages/desktop/views/dashboard/settings/views/advanced/advanced-settings.constant.js
@@ -1,8 +1,7 @@
-import { WalletFinder, HiddenAccounts, DeveloperToggle } from '.'
+import { HiddenAccounts, DeveloperToggle } from '.'
 import { AdvancedSettingsRoute } from '@core/router'
 
 export const ADVANCED_SETTINGS = [
-    { component: WalletFinder, childRoute: AdvancedSettingsRoute.WalletFinder, requiresLogin: true },
     { component: HiddenAccounts, childRoute: AdvancedSettingsRoute.HiddenAccounts, requiresLogin: true },
     { component: DeveloperToggle, childRoute: AdvancedSettingsRoute.DeveloperToggle, requiresLogin: true },
 ]
diff --git a/packages/desktop/views/dashboard/settings/views/advanced/index.js b/packages/desktop/views/dashboard/settings/views/advanced/index.js
index 23f494ac02..568141c963 100644
--- a/packages/desktop/views/dashboard/settings/views/advanced/index.js
+++ b/packages/desktop/views/dashboard/settings/views/advanced/index.js
@@ -1,5 +1,4 @@
 export { default as DeveloperToggle } from './DeveloperToggle.svelte'
 export { default as HiddenAccounts } from './HiddenAccounts.svelte'
-export { default as WalletFinder } from './WalletFinder.svelte'
 
 export * from './advanced-settings.constant'
diff --git a/packages/desktop/views/dashboard/wallet/tab-section/TabSection.svelte b/packages/desktop/views/dashboard/wallet/tab-section/TabSection.svelte
index c478ebd129..f210d85139 100644
--- a/packages/desktop/views/dashboard/wallet/tab-section/TabSection.svelte
+++ b/packages/desktop/views/dashboard/wallet/tab-section/TabSection.svelte
@@ -1,41 +1,29 @@
 <script lang="ts">
-    import { Tabs, IconButton, IconName } from '@bloomwalletio/ui'
-    import { ActivityTab } from './activity'
-    import { PortfolioTab } from './portfolio'
+    import { Tabs } from '@bloomwalletio/ui'
+    import { Filter, TokenListMenu } from '@components'
+    import { activityFilter, activitySearchTerm } from '@core/activity'
     import { localize } from '@core/i18n'
-    import { Filter } from '@components'
     import { tokenFilter, tokenSearchTerm } from '@core/token/stores'
     import { SearchInput } from '@ui'
-    import { activityFilter, activitySearchTerm } from '@core/activity'
-    import { PopupId, openPopup } from '@desktop/auxiliary/popup'
+    import { ActivityTab } from './activity'
+    import { PortfolioTab } from './portfolio'
 
     let currentTab = 0
-
-    function onImportErc20TokenClick(): void {
-        openPopup({
-            id: PopupId.ImportErc20Token,
-            overflow: true,
-        })
-    }
 </script>
 
-<top-section class="flex flex-row justify-between px-5 py-4">
+<top-section class="flex flex-row justify-between px-5 py-4 items-center">
     <Tabs
         bind:currentTab
         tabs={[localize('views.dashboard.activity.tab'), localize('views.dashboard.portfolio.tab')]}
     />
-    <div class="flex flex-row gap-2 items-center">
+    <div class="flex flex-row gap-1 items-center">
         {#if currentTab === 0}
-            <div class="flex items-center" style="height: 36px">
-                <SearchInput bind:value={$activitySearchTerm} />
-            </div>
+            <SearchInput bind:value={$activitySearchTerm} />
             <Filter filterStore={activityFilter} />
         {:else if currentTab === 1}
-            <div class="flex items-center" style="height: 36px">
-                <SearchInput bind:value={$tokenSearchTerm} />
-            </div>
+            <SearchInput bind:value={$tokenSearchTerm} />
             <Filter filterStore={tokenFilter} />
-            <IconButton icon={IconName.Plus} on:click={onImportErc20TokenClick} />
+            <TokenListMenu />
         {/if}
     </div>
 </top-section>
diff --git a/packages/shared/src/components/inputs/TogglableButton.svelte b/packages/shared/src/components/inputs/TogglableButton.svelte
index 36dd80cf65..8833bc3443 100644
--- a/packages/shared/src/components/inputs/TogglableButton.svelte
+++ b/packages/shared/src/components/inputs/TogglableButton.svelte
@@ -11,4 +11,4 @@
     }
 </script>
 
-<IconButton {icon} size="sm" textColor={active ? 'primary' : 'secondary'} on:click={clickToggle} />
+<IconButton {icon} textColor={active ? 'primary' : 'secondary'} on:click={clickToggle} />
diff --git a/packages/shared/src/locales/en.json b/packages/shared/src/locales/en.json
index d86ccf758f..7ca8733258 100644
--- a/packages/shared/src/locales/en.json
+++ b/packages/shared/src/locales/en.json
@@ -229,10 +229,6 @@
                 "description": "Change your Bloom profile name",
                 "success": "You changed your profile name"
             },
-            "walletFinder": {
-                "title": "Wallet finder",
-                "description": "Perform an extended search of your previously used wallets"
-            },
             "hiddenAccounts": {
                 "title": "Hidden accounts",
                 "description": "Selecting this options will show wallets that were previously hidden"
@@ -761,7 +757,7 @@
             "surplusIncluded": "This transaction contains a surplus amount. Please double check this is the amount you want to send."
         },
         "walletFinder": {
-            "title": "Wallet finder",
+            "title": "Sync accounts",
             "body": "Perform a more exhaustive search of addresses to find missing balances and wallets.",
             "accountsSearched": "Accounts searched",
             "accountsFound": "Accounts found",
@@ -1114,7 +1110,7 @@
         "restart": "Restart",
         "refresh": "Refresh",
         "saveBackup": "Save backup",
-        "customizeAccount": "Customise wallet",
+        "customizeAccount": "Customise account",
         "hideAccount": "Hide account",
         "showAccount": "Unhide account",
         "deleteAccount": "Delete account",
@@ -1151,11 +1147,9 @@
         "readDocumentation": "Read the documentation",
         "visitFaq": "Visit FAQ",
         "viewDownloads" : "View downloads",
-        "viewBalanceBreakdown": "View balance breakdown",
         "showHiddenAccounts": "Show hidden accounts",
         "confirm": "Confirm",
         "hideNetworkStatistics": "Hide network statistics",
-        "findWallets": "Find wallets",
         "search": "Search",
         "searching": "Searching",
         "searchAgain": "Search again",
@@ -1189,7 +1183,11 @@
         "skipAndKeep": "Skip and keep old password",
         "addChain": "Add chain",
         "untrackToken": "Untrack token",
-        "switchAccount": "Switch account"
+        "switchAccount": "Switch account",
+        "syncAccounts": "Sync accounts",
+        "importErc20Token": "Import ERC20 token"
+
+
     },
     "general": {
         "recipient": "Recipient",
@@ -1235,7 +1233,6 @@
         "sendAssets": "Send assets",
         "sendAssetToAddress": "Send asset to an address",
         "manageAccount": "Manage account",
-        "customizeAccount": "Customize your account",
         "account": "Account",
         "amount": "Amount",
         "addAddress": "Add Address",
@@ -1330,7 +1327,6 @@
         "mintNativeTokenDescription": "Mint native token following IRC30 standard",
         "mintNftDescription": "Mint NFT following IRC27 standard",
         "faucetRequestDescription": "Request tokens from the {network} faucet",
-        "refreshTokenMetadataDescription": "Reset and refresh all token metadata",
         "refreshTokenMetadataHint" : "This will reset all your tokens' metadata including the verification status and unhide any hidden assets.",
         "excluded": "Excluded",
         "developerTools": "Developer tools",
@@ -1368,7 +1364,6 @@
         "coinType":"Coin type",
         "custom": "Custom",
         "evmAddress": "EVM address",
-        "importErc20Token": "Import ERC20 token",
         "optionalField": "{field} (optional)",
         "gifted": "Gifted",
         "connected": "Connected",
@@ -1379,6 +1374,7 @@
         "networks": "Networks",
         "ledgerDevice": "Ledger device",
         "disconnected": "Disconnected",
+        "balanceBreakdown": "Balance breakdown",
         "primary": "Primary"
     },
     "filters":{