diff --git a/src/frontend/src/lib/components/core/NavbarWallet.svelte b/src/frontend/src/lib/components/core/NavbarWallet.svelte
index 403ac025a..183df6754 100644
--- a/src/frontend/src/lib/components/core/NavbarWallet.svelte
+++ b/src/frontend/src/lib/components/core/NavbarWallet.svelte
@@ -5,7 +5,6 @@
 	import Hr from '$lib/components/ui/Hr.svelte';
 	import Popover from '$lib/components/ui/Popover.svelte';
 	import WalletActions from '$lib/components/wallet/WalletActions.svelte';
-	import WalletIds from '$lib/components/wallet/WalletIds.svelte';
 	import WalletPicker from '$lib/components/wallet/WalletPicker.svelte';
 	import WalletTokenPicker from '$lib/components/wallet/WalletTokenPicker.svelte';
 	import WalletBalanceById from '$lib/components/wallet/balance/WalletBalanceById.svelte';
@@ -51,13 +50,11 @@
 			<WalletTotal />
 		</div>
 
-		<Hr />
-
 		<div class="picker selected-wallet">
 			<WalletPicker bind:selectedWallet />
 		</div>
 
-		<div class="picker">
+		<div class="picker token-selector">
 			<WalletTokenPicker {selectedWallet} bind:selectedToken />
 		</div>
 
@@ -68,8 +65,6 @@
 		{/if}
 
 		{#if nonNullish(selectedWallet)}
-			<WalletIds {selectedWallet} />
-
 			<div class="actions">
 				<WalletActions onreceive={openReceive} onsend={onclose} {selectedToken} {selectedWallet} />
 			</div>
@@ -105,6 +100,12 @@
 		padding: var(--padding-0_5x) 0 0;
 	}
 
+	.token-selector {
+		:global(div.picker) {
+			margin: 0 0 var(--padding-0_5x);
+		}
+	}
+
 	.picker {
 		:global(select) {
 			margin: var(--padding-0_5x) 0;
diff --git a/src/frontend/src/lib/components/wallet/balance/WalletTotal.svelte b/src/frontend/src/lib/components/wallet/balance/WalletTotal.svelte
index 082869b40..3a7a5521e 100644
--- a/src/frontend/src/lib/components/wallet/balance/WalletTotal.svelte
+++ b/src/frontend/src/lib/components/wallet/balance/WalletTotal.svelte
@@ -1,7 +1,11 @@
 <script lang="ts">
+	import { nonNullish } from '@dfinity/utils';
 	import WalletBalanceCycles from '$lib/components/wallet/balance/WalletBalanceCycles.svelte';
+	import { missionControlId } from '$lib/derived/console/account.mission-control.derived';
 	import { balance } from '$lib/derived/wallet/balance.derived';
 	import { i18n } from '$lib/stores/app/i18n.store';
+
+	let label = $derived(nonNullish($missionControlId) ? $i18n.wallet.total : undefined);
 </script>
 
-<WalletBalanceCycles balance={$balance} label={$i18n.wallet.total} />
+<WalletBalanceCycles balance={$balance} {label} />