diff --git a/packages/desktop/App.svelte b/packages/desktop/App.svelte
index 521611d8da0..87c0015485f 100644
--- a/packages/desktop/App.svelte
+++ b/packages/desktop/App.svelte
@@ -29,7 +29,7 @@
     import { getLocalisedMenuItems } from './lib/helpers'
     import { NotificationManager, Transition } from '@ui'
     import { TitleBar, Popup } from '@components'
-    import { Dashboard, LoginRouter, Settings, Splash } from '@views'
+    import { Dashboard, LoginRouter, Settings, Splash, OnboardingRouterView } from '@views'
     import {
         getAppRouter,
         getRouterForAppContext,
@@ -41,7 +41,6 @@
     } from '@desktop/routers'
     import { downloadNextNftInQueue, nftDownloadQueue } from '@core/nfts'
     import features from '@features/features'
-    import { OnboardingRouterView } from '@views/onboarding'
 
     appStage.set(AppStage[process.env.STAGE.toUpperCase()] ?? AppStage.ALPHA)
 
diff --git a/packages/desktop/views/dashboard/wallet/Wallet.svelte b/packages/desktop/views/dashboard/wallet/Wallet.svelte
index a2619435816..e08a03831ca 100644
--- a/packages/desktop/views/dashboard/wallet/Wallet.svelte
+++ b/packages/desktop/views/dashboard/wallet/Wallet.svelte
@@ -1,44 +1,13 @@
 <script lang="ts">
-    import { AssetList, Overflow, Pane, ReceiveAddressButton } from '@ui'
-    import { AccountSummary, AccountActivity, SendButton } from '@components'
-    import { selectedWalletAssets } from '@core/wallet'
-    import { selectedWallet } from '@core/wallet/stores'
-    import features from '@features/features'
+    import { WalletMainView } from './views'
+
+    const hasAccount: boolean = false
 </script>
 
-{#if $selectedWallet}
-    <wallet-container
-        class="w-full h-full flex flex-nowrap p-8 relative flex-1
-        bg-gray-50 dark:bg-gray-900 justify-center items-center"
-    >
-        {#key $selectedWallet?.index}
-            <div class="h-full grid grid-cols-3 gap-x-4 min-h-0 min-w-0 max-w-7xl">
-                <div class="flex flex-col space-y-4">
-                    <Pane overflow={Overflow.Visible}>
-                        {#if features?.wallet?.accountSummary?.enabled}
-                            <AccountSummary />
-                        {/if}
-                    </Pane>
-                    <Pane>
-                        <div class="flex flex-col space-y-6">
-                            {#if features?.wallet?.sendAndReceive?.enabled}
-                                <SendButton />
-                                <ReceiveAddressButton />
-                            {/if}
-                        </div>
-                    </Pane>
-                </div>
-                <Pane>
-                    {#if features?.wallet?.assets?.enabled}
-                        <AssetList assets={$selectedWalletAssets} />
-                    {/if}
-                </Pane>
-                <Pane>
-                    {#if features?.wallet?.activityHistory?.enabled}
-                        <AccountActivity />
-                    {/if}
-                </Pane>
-            </div>
-        {/key}
-    </wallet-container>
+{#if hasAccount}
+    <WalletMainView />
+{:else}
+    <div class="flex w-full h-full p-12">
+        <h1>IMPLICIT ACCOUNT</h1>
+    </div>
 {/if}
diff --git a/packages/desktop/views/dashboard/wallet/views/WalletMainView.svelte b/packages/desktop/views/dashboard/wallet/views/WalletMainView.svelte
new file mode 100644
index 00000000000..a2619435816
--- /dev/null
+++ b/packages/desktop/views/dashboard/wallet/views/WalletMainView.svelte
@@ -0,0 +1,44 @@
+<script lang="ts">
+    import { AssetList, Overflow, Pane, ReceiveAddressButton } from '@ui'
+    import { AccountSummary, AccountActivity, SendButton } from '@components'
+    import { selectedWalletAssets } from '@core/wallet'
+    import { selectedWallet } from '@core/wallet/stores'
+    import features from '@features/features'
+</script>
+
+{#if $selectedWallet}
+    <wallet-container
+        class="w-full h-full flex flex-nowrap p-8 relative flex-1
+        bg-gray-50 dark:bg-gray-900 justify-center items-center"
+    >
+        {#key $selectedWallet?.index}
+            <div class="h-full grid grid-cols-3 gap-x-4 min-h-0 min-w-0 max-w-7xl">
+                <div class="flex flex-col space-y-4">
+                    <Pane overflow={Overflow.Visible}>
+                        {#if features?.wallet?.accountSummary?.enabled}
+                            <AccountSummary />
+                        {/if}
+                    </Pane>
+                    <Pane>
+                        <div class="flex flex-col space-y-6">
+                            {#if features?.wallet?.sendAndReceive?.enabled}
+                                <SendButton />
+                                <ReceiveAddressButton />
+                            {/if}
+                        </div>
+                    </Pane>
+                </div>
+                <Pane>
+                    {#if features?.wallet?.assets?.enabled}
+                        <AssetList assets={$selectedWalletAssets} />
+                    {/if}
+                </Pane>
+                <Pane>
+                    {#if features?.wallet?.activityHistory?.enabled}
+                        <AccountActivity />
+                    {/if}
+                </Pane>
+            </div>
+        {/key}
+    </wallet-container>
+{/if}
diff --git a/packages/desktop/views/dashboard/wallet/views/index.js b/packages/desktop/views/dashboard/wallet/views/index.js
new file mode 100644
index 00000000000..365c6bc4321
--- /dev/null
+++ b/packages/desktop/views/dashboard/wallet/views/index.js
@@ -0,0 +1 @@
+export { default as WalletMainView } from './WalletMainView.svelte'
diff --git a/packages/desktop/views/index.js b/packages/desktop/views/index.js
index 307a3864975..bed2f8eb666 100644
--- a/packages/desktop/views/index.js
+++ b/packages/desktop/views/index.js
@@ -3,3 +3,4 @@ export { default as Splash } from './Splash.svelte'
 export * from './dashboard'
 export * from './login'
 export * from './update-stronghold'
+export * from './onboarding'
diff --git a/packages/shared/lib/core/router/routers/app-router.ts b/packages/shared/lib/core/router/routers/app-router.ts
index 30bb55ef85d..f041e1dda60 100644
--- a/packages/shared/lib/core/router/routers/app-router.ts
+++ b/packages/shared/lib/core/router/routers/app-router.ts
@@ -1,7 +1,5 @@
 import { get, writable } from 'svelte/store'
-
 import { profiles } from '@core/profile'
-
 import { Router } from '../classes'
 import { AppRoute, LoginRoute } from '../enums'
 import { IRouterEvent } from '../interfaces'