diff --git a/packages/desktop/components/Proposals.svelte b/packages/desktop/components/Proposals.svelte
index ee131002f83..0ce668e6a44 100644
--- a/packages/desktop/components/Proposals.svelte
+++ b/packages/desktop/components/Proposals.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-    import { Filter, ProposalCard } from '@components'
-    import { SearchInput, Text } from '@ui'
+    import { ProposalCard } from '@components'
+    import { SearchInput, Text, Filter } from '@ui'
     import { FontWeight } from '@ui/enums'
 
     import { localize } from '@core/i18n'
diff --git a/packages/desktop/components/WalletActivity.svelte b/packages/desktop/components/WalletActivity.svelte
index 7706d91ac7d..30cd49d6be4 100644
--- a/packages/desktop/components/WalletActivity.svelte
+++ b/packages/desktop/components/WalletActivity.svelte
@@ -8,8 +8,7 @@
         selectedWalletActivities,
         setAsyncStatusOfWalletActivities,
     } from '@core/wallet'
-    import { ActivityTile, Text, TextInput, TogglableButton, FontWeight } from '@ui'
-    import { Filter } from '@components'
+    import { ActivityTile, Text, TextInput, TogglableButton, FontWeight, Filter } from '@ui'
     import features from '@features/features'
     import { debounce, getMonthYear } from '@core/utils'
     import VirtualList from '@sveltejs/svelte-virtual-list'
diff --git a/packages/desktop/components/buttons/popup-buttons/MintNativeTokenButton.svelte b/packages/desktop/components/buttons/popup-buttons/MintNativeTokenButton.svelte
index a90007e8b35..68a6d625988 100644
--- a/packages/desktop/components/buttons/popup-buttons/MintNativeTokenButton.svelte
+++ b/packages/desktop/components/buttons/popup-buttons/MintNativeTokenButton.svelte
@@ -6,7 +6,7 @@
     import { resetMintTokenDetails } from '@core/wallet'
 
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
-    import { TextHintVariant } from 'shared/components/enums'
+    import { TextHintVariant } from '@ui/enums'
 
     $: hasAccounts = $selectedWallet?.accountOutputs.length > 0
 
diff --git a/packages/desktop/components/buttons/popup-buttons/RefreshTokenMetadataButton.svelte b/packages/desktop/components/buttons/popup-buttons/RefreshTokenMetadataButton.svelte
index b52e926957e..4c551485c67 100644
--- a/packages/desktop/components/buttons/popup-buttons/RefreshTokenMetadataButton.svelte
+++ b/packages/desktop/components/buttons/popup-buttons/RefreshTokenMetadataButton.svelte
@@ -6,7 +6,7 @@
 
     import { showAppNotification } from '@auxiliary/notification'
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
-    import { TextHintVariant } from 'shared/components/enums'
+    import { TextHintVariant } from '@ui/enums'
 
     function refreshTokenMetadata(): void {
         refreshWalletAssetsForActiveProfile(true)
diff --git a/packages/desktop/components/index.js b/packages/desktop/components/index.js
index e8f7520e5c6..8ec7fe87ce8 100644
--- a/packages/desktop/components/index.js
+++ b/packages/desktop/components/index.js
@@ -1,5 +1,4 @@
 export * from './buttons'
-export * from './filter'
 export * from './menu-buttons'
 export * from './modals'
 export * from './panes'
diff --git a/packages/desktop/components/modals/index.js b/packages/desktop/components/modals/index.js
index 577f1a92ada..483228be2c7 100644
--- a/packages/desktop/components/modals/index.js
+++ b/packages/desktop/components/modals/index.js
@@ -1,5 +1,4 @@
 export { default as WalletActionsMenu } from './WalletActionsMenu.svelte'
 export { default as WalletSwitcherModal } from './WalletSwitcherModal.svelte'
-export { default as FilterModal } from './FilterModal.svelte'
 export { default as VestingModal } from './VestingModal.svelte'
 export { default as AccountManagementMenu } from './AccountManagementMenu.svelte'
diff --git a/packages/desktop/components/popups/AccountConfirmationPopup.svelte b/packages/desktop/components/popups/AccountConfirmationPopup.svelte
index 59772112146..f1a71414d63 100644
--- a/packages/desktop/components/popups/AccountConfirmationPopup.svelte
+++ b/packages/desktop/components/popups/AccountConfirmationPopup.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Button, KeyValueBox, Text, FontWeight, TextType } from 'shared/components'
+    import { Button, KeyValueBox, Text, FontWeight, TextType } from '@ui'
     import { localize } from '@core/i18n'
     import { checkActiveProfileAuth, getBaseToken } from '@core/profile'
     import {
diff --git a/packages/desktop/components/popups/ActivityDetailsPopup.svelte b/packages/desktop/components/popups/ActivityDetailsPopup.svelte
index ce8e6db6b6e..012d9f9b9e2 100644
--- a/packages/desktop/components/popups/ActivityDetailsPopup.svelte
+++ b/packages/desktop/components/popups/ActivityDetailsPopup.svelte
@@ -26,8 +26,8 @@
         NftActivityDetails,
         Text,
         TextType,
-    } from 'shared/components'
-    import { TextHintVariant } from 'shared/components/enums'
+    } from '@ui'
+    import { TextHintVariant } from '@ui/enums'
     import { onMount } from 'svelte'
 
     export let activityId: string
diff --git a/packages/desktop/components/popups/AddProposalPopup.svelte b/packages/desktop/components/popups/AddProposalPopup.svelte
index c846bcdff2d..cdc6388cf9b 100644
--- a/packages/desktop/components/popups/AddProposalPopup.svelte
+++ b/packages/desktop/components/popups/AddProposalPopup.svelte
@@ -8,8 +8,8 @@
     import { activeWallets, updateActiveWalletPersistedData } from '@core/profile'
     import { truncateString } from '@core/utils/string'
     import type { Auth } from '@iota/sdk/out/types'
-    import { Button, Checkbox, NodeInput, Text, TextInput, TextType } from 'shared/components'
-    import { HTMLButtonType } from 'shared/components/enums'
+    import { Button, Checkbox, NodeInput, Text, TextInput, TextType } from '@ui'
+    import { HTMLButtonType } from '@ui/enums'
 
     export let initialEventId: string
     export let initialNodeUrl: string
diff --git a/packages/desktop/components/popups/AddressHistoryPopup.svelte b/packages/desktop/components/popups/AddressHistoryPopup.svelte
index bacc94cade5..29355356d5a 100644
--- a/packages/desktop/components/popups/AddressHistoryPopup.svelte
+++ b/packages/desktop/components/popups/AddressHistoryPopup.svelte
@@ -10,7 +10,7 @@
     import { setClipboard, truncateString } from '@core/utils'
     import { AccountAddress } from '@iota/sdk/out/types'
     import VirtualList from '@sveltejs/svelte-virtual-list'
-    import { Button, FontWeight, KeyValueBox, Spinner, Text, TextType } from 'shared/components'
+    import { Button, FontWeight, KeyValueBox, Spinner, Text, TextType } from '@ui'
     import { onMount } from 'svelte'
 
     interface AddressHistory {
diff --git a/packages/desktop/components/popups/BackupStrongholdPopup.svelte b/packages/desktop/components/popups/BackupStrongholdPopup.svelte
index 3f5143b196f..e0d69c9590e 100644
--- a/packages/desktop/components/popups/BackupStrongholdPopup.svelte
+++ b/packages/desktop/components/popups/BackupStrongholdPopup.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
     import { localize } from '@core/i18n'
-    import { Button, Logo, Text, ExportStrongholdButton, TextType } from 'shared/components'
+    import { Button, Logo, Text, ExportStrongholdButton, TextType } from '@ui'
     import { closePopup } from '@auxiliary/popup'
-    import { Logo as LogoEnum } from 'shared/components/enums'
+    import { Logo as LogoEnum } from '@ui/enums'
 
     const busy = false
 
diff --git a/packages/desktop/components/popups/BalanceBreakdownPopup.svelte b/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
index d8dc27ba72e..13eac87a4c8 100644
--- a/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
+++ b/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
@@ -8,8 +8,8 @@
     import { consolidateOutputs } from '@core/wallet/actions/consolidateOutputs'
     import { getStorageDepositFromOutput } from '@core/wallet/utils/generateActivity/helper'
     import { UnlockCondition, UnlockConditionType, CommonOutput, AccountOutput } from '@iota/sdk/out/types'
-    import { BalanceSummarySection, Button, FontWeight, Text, TextType } from 'shared/components'
-    import { TextHintVariant } from 'shared/components/enums'
+    import { BalanceSummarySection, Button, FontWeight, Text, TextType } from '@ui'
+    import { TextHintVariant } from '@ui/enums'
     import features from '@features/features'
 
     interface BalanceBreakdown {
diff --git a/packages/desktop/components/popups/BalanceFinderPopup.svelte b/packages/desktop/components/popups/BalanceFinderPopup.svelte
index a446c2de8b3..f15ac841cad 100644
--- a/packages/desktop/components/popups/BalanceFinderPopup.svelte
+++ b/packages/desktop/components/popups/BalanceFinderPopup.svelte
@@ -21,19 +21,8 @@
         generateAndStoreActivitiesForAllWallets,
         refreshWalletAssetsForActiveProfile,
     } from '@core/wallet'
-    import {
-        Button,
-        FontWeight,
-        KeyValueBox,
-        Text,
-        TextHint,
-        TextType,
-        Icon,
-        Tile,
-        Spinner,
-        Checkbox,
-    } from 'shared/components'
-    import { TextHintVariant } from 'shared/components/enums'
+    import { Button, FontWeight, KeyValueBox, Text, TextHint, TextType, Icon, Tile, Spinner, Checkbox } from '@ui'
+    import { TextHintVariant } from '@ui/enums'
     import { onDestroy } from 'svelte'
     import VirtualList from '@sveltejs/svelte-virtual-list'
     import { consolidateOutputs } from '@core/wallet/actions/consolidateOutputs'
diff --git a/packages/desktop/components/popups/BurnNativeTokensConfirmationPopup.svelte b/packages/desktop/components/popups/BurnNativeTokensConfirmationPopup.svelte
index 76819f79475..14b35e915f3 100644
--- a/packages/desktop/components/popups/BurnNativeTokensConfirmationPopup.svelte
+++ b/packages/desktop/components/popups/BurnNativeTokensConfirmationPopup.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Button, Text, TextHint, FontWeight, TextType, ButtonVariant, KeyValueBox } from 'shared/components'
+    import { Button, Text, TextHint, FontWeight, TextType, ButtonVariant, KeyValueBox } from '@ui'
     import { localize } from '@core/i18n'
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import { burnAsset, formatTokenAmountBestMatch, IAsset } from '@core/wallet'
@@ -7,7 +7,7 @@
     import { handleError } from '@core/error/handlers'
     import { onMount } from 'svelte'
     import { selectedWallet } from '@core/wallet'
-    import { TextHintVariant } from 'shared/components/enums'
+    import { TextHintVariant } from '@ui/enums'
 
     export let asset: IAsset
     export let rawAmount: string
diff --git a/packages/desktop/components/popups/BurnNativeTokensPopup.svelte b/packages/desktop/components/popups/BurnNativeTokensPopup.svelte
index 848ea6897e9..20915a9d800 100644
--- a/packages/desktop/components/popups/BurnNativeTokensPopup.svelte
+++ b/packages/desktop/components/popups/BurnNativeTokensPopup.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-    import { Button, Text, TextHint, FontWeight, TextType, AssetAmountInput } from 'shared/components'
+    import { Button, Text, TextHint, FontWeight, TextType, AssetAmountInput } from '@ui'
     import { localize } from '@core/i18n'
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import { IAsset } from '@core/wallet'
-    import { TextHintVariant } from 'shared/components/enums'
+    import { TextHintVariant } from '@ui/enums'
 
     export let asset: IAsset
     export let rawAmount: string = '0'
diff --git a/packages/desktop/components/popups/CheckForUpdatesPopup.svelte b/packages/desktop/components/popups/CheckForUpdatesPopup.svelte
index 0a69a9b609d..e2b912e190b 100644
--- a/packages/desktop/components/popups/CheckForUpdatesPopup.svelte
+++ b/packages/desktop/components/popups/CheckForUpdatesPopup.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { onMount } from 'svelte'
     import { get } from 'svelte/store'
-    import { Button, KeyValueBox, Text, TextType, TextHint } from 'shared/components'
+    import { Button, KeyValueBox, Text, TextType, TextHint } from '@ui'
     import {
         appUpdateBusy,
         checkForAppUpdate,
@@ -14,7 +14,7 @@
     import { formatDate, localize } from '@core/i18n'
     import { closePopup } from '@auxiliary/popup'
     import features from '@features/features'
-    import { TextHintVariant } from 'shared/components/enums'
+    import { TextHintVariant } from '@ui/enums'
 
     let hasAutoUpdate = false
 
diff --git a/packages/desktop/components/popups/ConfirmationPopup.svelte b/packages/desktop/components/popups/ConfirmationPopup.svelte
index d7e7107a63f..3cfee100ce4 100644
--- a/packages/desktop/components/popups/ConfirmationPopup.svelte
+++ b/packages/desktop/components/popups/ConfirmationPopup.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-    import { Button, Text, TextHint, FontWeight, TextType, ButtonVariant } from 'shared/components'
+    import { Button, Text, TextHint, FontWeight, TextType, ButtonVariant } from '@ui'
     import { localize } from '@core/i18n'
     import { closePopup } from '@auxiliary/popup'
     import { handleError } from '@core/error/handlers'
     import { onMount } from 'svelte'
     import { selectedWallet } from '@core/wallet'
-    import { TextHintVariant } from 'shared/components/enums'
+    import { TextHintVariant } from '@ui/enums'
 
     export let title: string
     export let description: string = ''
diff --git a/packages/desktop/components/popups/ConnectLedgerPopup.svelte b/packages/desktop/components/popups/ConnectLedgerPopup.svelte
index 5114353f55f..c0dde8d350b 100644
--- a/packages/desktop/components/popups/ConnectLedgerPopup.svelte
+++ b/packages/desktop/components/popups/ConnectLedgerPopup.svelte
@@ -2,9 +2,9 @@
     import { localize } from '@core/i18n'
     import { LedgerConnectionState, ledgerAppName, ledgerConnectionState } from '@core/ledger'
     import { isFunction } from '@core/utils'
-    import { Button, LedgerAnimation, Text, TextHint, FontWeight, TextType } from 'shared/components'
+    import { Button, LedgerAnimation, Text, TextHint, FontWeight, TextType } from '@ui'
     import { closePopup } from '@auxiliary/popup'
-    import { TextHintVariant } from 'shared/components/enums'
+    import { TextHintVariant } from '@ui/enums'
     import { AnimationEnum } from '@auxiliary/animation'
 
     export let onCancel: () => void
diff --git a/packages/desktop/components/popups/DeepLinkErrorPopup.svelte b/packages/desktop/components/popups/DeepLinkErrorPopup.svelte
index 95b6d4b70c8..85ec624fc04 100644
--- a/packages/desktop/components/popups/DeepLinkErrorPopup.svelte
+++ b/packages/desktop/components/popups/DeepLinkErrorPopup.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
     import { localize } from '@core/i18n'
-    import { Text, Button, TextHint, FontWeight } from 'shared/components'
+    import { Text, Button, TextHint, FontWeight } from '@ui'
     import { closePopup } from '@auxiliary/popup'
-    import { TextHintVariant } from 'shared/components/enums'
+    import { TextHintVariant } from '@ui/enums'
 
     export let error: Error
 </script>
diff --git a/packages/desktop/components/popups/DeleteProfilePopup.svelte b/packages/desktop/components/popups/DeleteProfilePopup.svelte
index f608695d5c5..25b5a0f6695 100644
--- a/packages/desktop/components/popups/DeleteProfilePopup.svelte
+++ b/packages/desktop/components/popups/DeleteProfilePopup.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Button, PasswordInput, Text, ButtonVariant } from 'shared/components'
+    import { Button, PasswordInput, Text, ButtonVariant } from '@ui'
     import { isSoftwareProfile } from '@core/profile'
     import { localize } from '@core/i18n'
     import { closePopup } from '@auxiliary/popup'
diff --git a/packages/desktop/components/popups/DeleteWalletPopup.svelte b/packages/desktop/components/popups/DeleteWalletPopup.svelte
index 185d81b7e5f..eaed27674ed 100644
--- a/packages/desktop/components/popups/DeleteWalletPopup.svelte
+++ b/packages/desktop/components/popups/DeleteWalletPopup.svelte
@@ -4,7 +4,7 @@
     import { localize } from '@core/i18n'
     import { isSoftwareProfile } from '@core/profile'
     import { handleError } from '@core/error/handlers/handleError'
-    import { TextHintVariant } from 'shared/components/enums'
+    import { TextHintVariant } from '@ui/enums'
     import { selectedWallet } from '@core/wallet/stores'
     import { setStrongholdPassword } from '@core/wallet/actions'
 
diff --git a/packages/desktop/components/popups/EnableLedgerBlindSigningPopup.svelte b/packages/desktop/components/popups/EnableLedgerBlindSigningPopup.svelte
index 38221715a84..45b72448be1 100644
--- a/packages/desktop/components/popups/EnableLedgerBlindSigningPopup.svelte
+++ b/packages/desktop/components/popups/EnableLedgerBlindSigningPopup.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Text, TextType, BoxedIcon } from 'shared/components'
+    import { Text, TextType, BoxedIcon } from '@ui'
     import { Icon as IconEnum } from '@auxiliary/icon'
     import { localize } from '@core/i18n'
     import {
diff --git a/packages/desktop/components/popups/ErrorLogPopup.svelte b/packages/desktop/components/popups/ErrorLogPopup.svelte
index 331a16bfae8..5c8b794accf 100644
--- a/packages/desktop/components/popups/ErrorLogPopup.svelte
+++ b/packages/desktop/components/popups/ErrorLogPopup.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Button, Text } from 'shared/components'
+    import { Button, Text } from '@ui'
     import { errorLog } from '@core/error'
     import { localize } from '@core/i18n'
     import { closePopup } from '@auxiliary/popup'
diff --git a/packages/desktop/components/popups/FaucetRequestPopup.svelte b/packages/desktop/components/popups/FaucetRequestPopup.svelte
index aeecbb77ff5..ed5d4b62b18 100644
--- a/packages/desktop/components/popups/FaucetRequestPopup.svelte
+++ b/packages/desktop/components/popups/FaucetRequestPopup.svelte
@@ -3,7 +3,7 @@
     import { localize } from '@core/i18n'
     import { nodeInfo, nodeInfoNetworkName } from '@core/network'
     import { closePopup } from '@auxiliary/popup'
-    import { Button, Error, Text, FontWeight, TextType } from 'shared/components'
+    import { Button, Error, Text, FontWeight, TextType } from '@ui'
     import { handleError } from '@core/error/handlers/handleError'
 
     let isBusy = false
diff --git a/packages/desktop/components/popups/LedgerAppGuidePopup.svelte b/packages/desktop/components/popups/LedgerAppGuidePopup.svelte
index e5ab908e680..2d4cde07edf 100644
--- a/packages/desktop/components/popups/LedgerAppGuidePopup.svelte
+++ b/packages/desktop/components/popups/LedgerAppGuidePopup.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { LedgerAnimation, Button, Text, TextType } from 'shared/components'
+    import { LedgerAnimation, Button, Text, TextType } from '@ui'
     import { closePopup } from '@auxiliary/popup'
     import { LedgerAppName, ledgerAppName } from '@core/ledger'
     import { localize } from '@core/i18n'
diff --git a/packages/desktop/components/popups/LedgerConnectionGuidePopup.svelte b/packages/desktop/components/popups/LedgerConnectionGuidePopup.svelte
index 580ad93a934..800588a2e34 100644
--- a/packages/desktop/components/popups/LedgerConnectionGuidePopup.svelte
+++ b/packages/desktop/components/popups/LedgerConnectionGuidePopup.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { LedgerAnimation, Button, Link, Text, TextType } from 'shared/components'
+    import { LedgerAnimation, Button, Link, Text, TextType } from '@ui'
     import { openUrlInBrowser } from '@core/app'
     import { closePopup } from '@auxiliary/popup'
     import { localize } from '@core/i18n'
diff --git a/packages/desktop/components/popups/LegalUpdatePopup.svelte b/packages/desktop/components/popups/LegalUpdatePopup.svelte
index 3a2b31bfa69..125fec5300a 100644
--- a/packages/desktop/components/popups/LegalUpdatePopup.svelte
+++ b/packages/desktop/components/popups/LegalUpdatePopup.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Button, Checkbox, Text, Link } from 'shared/components'
+    import { Button, Checkbox, Text, Link } from '@ui'
     import { localize } from '@core/i18n'
     import { closePopup } from '@auxiliary/popup'
     import {
diff --git a/packages/desktop/components/popups/ManageVotingPowerPopup.svelte b/packages/desktop/components/popups/ManageVotingPowerPopup.svelte
index a7afcb16726..91f5b479fb1 100644
--- a/packages/desktop/components/popups/ManageVotingPowerPopup.svelte
+++ b/packages/desktop/components/popups/ManageVotingPowerPopup.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-    import { Button, Text, TextHint, AssetAmountInput } from 'shared/components'
-    import { HTMLButtonType, TextType, TextHintVariant } from 'shared/components/enums'
+    import { Button, Text, TextHint, AssetAmountInput } from '@ui'
+    import { HTMLButtonType, TextType, TextHintVariant } from '@ui/enums'
     import { selectedWallet } from '@core/wallet/stores'
     import { handleError } from '@core/error/handlers'
     import { setVotingPower } from '@contexts/governance/actions'
diff --git a/packages/desktop/components/popups/MintNativeTokenConfirmationPopup.svelte b/packages/desktop/components/popups/MintNativeTokenConfirmationPopup.svelte
index 19b1d9bc55a..b2f663ec554 100644
--- a/packages/desktop/components/popups/MintNativeTokenConfirmationPopup.svelte
+++ b/packages/desktop/components/popups/MintNativeTokenConfirmationPopup.svelte
@@ -11,7 +11,7 @@
         IMintTokenDetails,
     } from '@core/wallet'
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
-    import { Button, KeyValueBox, Text, FontWeight, TextType } from 'shared/components'
+    import { Button, KeyValueBox, Text, FontWeight, TextType } from '@ui'
     import { onMount } from 'svelte'
     import { selectedWallet } from '@core/wallet'
     import { handleError } from '@core/error/handlers/handleError'
diff --git a/packages/desktop/components/popups/MintNativeTokenFormPopup.svelte b/packages/desktop/components/popups/MintNativeTokenFormPopup.svelte
index c4a84803618..5ce0438d2d3 100644
--- a/packages/desktop/components/popups/MintNativeTokenFormPopup.svelte
+++ b/packages/desktop/components/popups/MintNativeTokenFormPopup.svelte
@@ -3,16 +3,7 @@
     import { localize } from '@core/i18n'
     import { setMintTokenDetails, mintTokenDetails, IMintTokenDetails } from '@core/wallet'
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
-    import {
-        Button,
-        Error,
-        NumberInput,
-        Text,
-        TextInput,
-        OptionalInput,
-        FontWeight,
-        AccountInput,
-    } from 'shared/components'
+    import { Button, Error, NumberInput, Text, TextInput, OptionalInput, FontWeight, AccountInput } from '@ui'
     import { onMount } from 'svelte'
     import { MAX_SUPPORTED_DECIMALS } from '@core/wallet/constants/max-supported-decimals.constants'
     import { handleError } from '@core/error/handlers/handleError'
diff --git a/packages/desktop/components/popups/MintNftConfirmationPopup.svelte b/packages/desktop/components/popups/MintNftConfirmationPopup.svelte
index ca257e348cd..198c39432cc 100644
--- a/packages/desktop/components/popups/MintNftConfirmationPopup.svelte
+++ b/packages/desktop/components/popups/MintNftConfirmationPopup.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { onMount } from 'svelte'
-    import { Button, Text, FontWeight, NftImageOrIconBox, Tabs, KeyValueBox, NftSize } from 'shared/components'
+    import { Button, Text, FontWeight, NftImageOrIconBox, Tabs, KeyValueBox, NftSize } from '@ui'
     import { localize } from '@core/i18n'
     import { getClient } from '@core/wallet/actions'
     import { selectedWallet } from '@core/wallet'
diff --git a/packages/desktop/components/popups/MintNftFormPopup.svelte b/packages/desktop/components/popups/MintNftFormPopup.svelte
index 3120dd51bb6..1699f369c11 100644
--- a/packages/desktop/components/popups/MintNftFormPopup.svelte
+++ b/packages/desktop/components/popups/MintNftFormPopup.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { onMount } from 'svelte'
-    import { Button, Error, FontWeight, OptionalInput, Text, TextInput, TextType, TooltipIcon } from 'shared/components'
+    import { Button, Error, FontWeight, OptionalInput, Text, TextInput, TextType, TooltipIcon } from '@ui'
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import { BaseError } from '@core/error/classes'
     import { handleError } from '@core/error/handlers/handleError'
diff --git a/packages/desktop/components/popups/NodeAuthRequiredPopup.svelte b/packages/desktop/components/popups/NodeAuthRequiredPopup.svelte
index 372894c239b..38afb636ea1 100644
--- a/packages/desktop/components/popups/NodeAuthRequiredPopup.svelte
+++ b/packages/desktop/components/popups/NodeAuthRequiredPopup.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Button, HTMLButtonType, Text, TextInput, TextType } from 'shared/components'
+    import { Button, HTMLButtonType, Text, TextInput, TextType } from '@ui'
     import type { Auth } from '@iota/sdk/out/types'
     import { handleError } from '@core/error/handlers'
     import { localize } from '@core/i18n'
diff --git a/packages/desktop/components/popups/NodeInfoPopup.svelte b/packages/desktop/components/popups/NodeInfoPopup.svelte
index 5d45dfc0c71..ba7171271ef 100644
--- a/packages/desktop/components/popups/NodeInfoPopup.svelte
+++ b/packages/desktop/components/popups/NodeInfoPopup.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { onMount } from 'svelte'
-    import { Button, Checkbox, CopyableBox, Spinner, Text } from 'shared/components'
+    import { Button, Checkbox, CopyableBox, Spinner, Text } from '@ui'
     import { formatNumber, localize } from '@core/i18n'
     import { INode } from '@core/network'
     import { closePopup } from '@auxiliary/popup'
diff --git a/packages/desktop/components/popups/PayoutDetailsPopup.svelte b/packages/desktop/components/popups/PayoutDetailsPopup.svelte
index 757a57bde59..eeaa2c39350 100644
--- a/packages/desktop/components/popups/PayoutDetailsPopup.svelte
+++ b/packages/desktop/components/popups/PayoutDetailsPopup.svelte
@@ -6,7 +6,7 @@
     import { truncateString } from '@core/utils'
     import { formatTokenAmountBestMatch } from '@core/wallet'
     import VirtualList from '@sveltejs/svelte-virtual-list'
-    import { Button, FontWeight, KeyValueBox, Text, TextType } from 'shared/components'
+    import { Button, FontWeight, KeyValueBox, Text, TextType } from '@ui'
 
     export let payout: IVestingPayout
 
diff --git a/packages/desktop/components/popups/RemoveNode.svelte b/packages/desktop/components/popups/RemoveNode.svelte
index e774cc2418c..1d6cc880b95 100644
--- a/packages/desktop/components/popups/RemoveNode.svelte
+++ b/packages/desktop/components/popups/RemoveNode.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Button, Text } from 'shared/components'
+    import { Button, Text } from '@ui'
     import { closePopup } from '@auxiliary/popup'
     import { localize } from '@core/i18n'
 
diff --git a/packages/desktop/components/popups/RemoveProposalPopup.svelte b/packages/desktop/components/popups/RemoveProposalPopup.svelte
index 9d08566b7e6..125a2920229 100644
--- a/packages/desktop/components/popups/RemoveProposalPopup.svelte
+++ b/packages/desktop/components/popups/RemoveProposalPopup.svelte
@@ -13,8 +13,8 @@
     import { localize } from '@core/i18n'
     import { updateActiveWalletPersistedData } from '@core/profile/actions'
     import { governanceRouter } from '@core/router'
-    import { Button, Text, TextHint, TextType } from 'shared/components'
-    import { ButtonVariant, TextHintVariant } from 'shared/components/enums'
+    import { Button, Text, TextHint, TextType } from '@ui'
+    import { ButtonVariant, TextHintVariant } from '@ui/enums'
 
     function onCancelClick(): void {
         closePopup()
diff --git a/packages/desktop/components/popups/RevotePopup.svelte b/packages/desktop/components/popups/RevotePopup.svelte
index 8be1dd97562..b198b80bb17 100644
--- a/packages/desktop/components/popups/RevotePopup.svelte
+++ b/packages/desktop/components/popups/RevotePopup.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-    import { Button, Text, TextHint, HTMLButtonType, TextType } from 'shared/components'
+    import { Button, Text, TextHint, HTMLButtonType, TextType } from '@ui'
     import { selectedWallet } from '@core/wallet/stores'
     import { localize } from '@core/i18n'
     import { closePopup } from '@auxiliary/popup'
     import { checkActiveProfileAuth } from '@core/profile/actions'
     import { vote } from '@contexts/governance/actions'
-    import { TextHintVariant } from 'shared/components/enums'
+    import { TextHintVariant } from '@ui/enums'
 
     $: hasGovernanceTransactionInProgress =
         $selectedWallet?.hasVotingPowerTransactionInProgress || $selectedWallet?.hasVotingTransactionInProgress
diff --git a/packages/desktop/components/popups/StopVotingPopup.svelte b/packages/desktop/components/popups/StopVotingPopup.svelte
index 852ec3a22a8..f07f9b0fcef 100644
--- a/packages/desktop/components/popups/StopVotingPopup.svelte
+++ b/packages/desktop/components/popups/StopVotingPopup.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-    import { Button, Text, TextType, TextHint } from 'shared/components'
-    import { ButtonVariant, TextHintVariant } from 'shared/components/enums'
+    import { Button, Text, TextType, TextHint } from '@ui'
+    import { ButtonVariant, TextHintVariant } from '@ui/enums'
     import { closePopup } from '@auxiliary/popup'
     import { stopVotingForProposal } from '@contexts/governance/actions'
     import { selectedProposal } from '@contexts/governance/stores'
diff --git a/packages/desktop/components/popups/TestDeepLinkFormPopup.svelte b/packages/desktop/components/popups/TestDeepLinkFormPopup.svelte
index eea270f6b83..fdc2c3f6c81 100644
--- a/packages/desktop/components/popups/TestDeepLinkFormPopup.svelte
+++ b/packages/desktop/components/popups/TestDeepLinkFormPopup.svelte
@@ -3,7 +3,7 @@
 
     import { localize } from '@core/i18n'
     import { closePopup } from '@auxiliary/popup'
-    import { Button, Text, TextInput, FontWeight, TextType } from 'shared/components'
+    import { Button, Text, TextInput, FontWeight, TextType } from '@ui'
 
     const PREFIX = process.env.APP_PROTOCOL + '://'
     let url: string = PREFIX
diff --git a/packages/desktop/components/popups/TokenInformationPopup.svelte b/packages/desktop/components/popups/TokenInformationPopup.svelte
index 0818781207c..f7b84d58b2d 100644
--- a/packages/desktop/components/popups/TokenInformationPopup.svelte
+++ b/packages/desktop/components/popups/TokenInformationPopup.svelte
@@ -23,8 +23,8 @@
         AssetActionsModal,
         MeatballMenuButton,
         Modal,
-    } from 'shared/components'
-    import { TextHintVariant } from 'shared/components/enums'
+    } from '@ui'
+    import { TextHintVariant } from '@ui/enums'
     import { MANA_ID } from '@core/network'
 
     export let asset: IAsset
diff --git a/packages/desktop/components/popups/UnlockStrongholdPopup.svelte b/packages/desktop/components/popups/UnlockStrongholdPopup.svelte
index 57cacd68881..3852ae5d43a 100644
--- a/packages/desktop/components/popups/UnlockStrongholdPopup.svelte
+++ b/packages/desktop/components/popups/UnlockStrongholdPopup.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Button, PasswordInput, Text, HTMLButtonType } from 'shared/components'
+    import { Button, PasswordInput, Text, HTMLButtonType } from '@ui'
     import { closePopup } from '@auxiliary/popup'
     import { localize } from '@core/i18n'
     import { unlockStronghold } from '@core/profile'
diff --git a/packages/desktop/components/popups/VerifyLedgerTransactionPopup.svelte b/packages/desktop/components/popups/VerifyLedgerTransactionPopup.svelte
index d35e9444b88..39c67420f70 100644
--- a/packages/desktop/components/popups/VerifyLedgerTransactionPopup.svelte
+++ b/packages/desktop/components/popups/VerifyLedgerTransactionPopup.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-    import { KeyValueBox, Text, TextHint, LedgerAnimation } from 'shared/components'
+    import { KeyValueBox, Text, TextHint, LedgerAnimation } from '@ui'
     import { localize } from '@core/i18n'
     import { formatHexString } from '@core/utils'
     import { onDestroy } from 'svelte'
     import { showInternalVerificationPopup, resetShowInternalVerificationPopup } from '@core/ledger'
-    import { TextHintVariant, TextType } from 'shared/components/enums'
+    import { TextHintVariant, TextType } from '@ui/enums'
     import { AnimationEnum } from '@auxiliary/animation'
 
     export let toAddress: string
diff --git a/packages/desktop/components/popups/VestingCollectPopup.svelte b/packages/desktop/components/popups/VestingCollectPopup.svelte
index 1be2957c0f5..023c8bdea2a 100644
--- a/packages/desktop/components/popups/VestingCollectPopup.svelte
+++ b/packages/desktop/components/popups/VestingCollectPopup.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Button, Text, FontWeight, TextType, KeyValueBox } from 'shared/components'
+    import { Button, Text, FontWeight, TextType, KeyValueBox } from '@ui'
     import { localize } from '@core/i18n'
     import { PopupId, closePopup, openPopup } from '@auxiliary/popup'
     import { selectedWalletVestingUnclaimedFunds } from '@contexts/vesting'
diff --git a/packages/desktop/components/popups/VestingRewardsFinderPopup.svelte b/packages/desktop/components/popups/VestingRewardsFinderPopup.svelte
index d0385c99e8d..d2289b958d4 100644
--- a/packages/desktop/components/popups/VestingRewardsFinderPopup.svelte
+++ b/packages/desktop/components/popups/VestingRewardsFinderPopup.svelte
@@ -24,8 +24,8 @@
         refreshWalletAssetsForActiveProfile,
     } from '@core/wallet'
     import VirtualList from '@sveltejs/svelte-virtual-list'
-    import { Button, FontWeight, KeyValueBox, Text, TextHint, TextType } from 'shared/components'
-    import { TextHintVariant } from 'shared/components/enums'
+    import { Button, FontWeight, KeyValueBox, Text, TextHint, TextType } from '@ui'
+    import { TextHintVariant } from '@ui/enums'
     import { onDestroy } from 'svelte'
 
     export let searchForBalancesOnLoad = false
diff --git a/packages/desktop/components/popups/VoteForProposalPopup.svelte b/packages/desktop/components/popups/VoteForProposalPopup.svelte
index 80fbd29ea67..90a37048b6a 100644
--- a/packages/desktop/components/popups/VoteForProposalPopup.svelte
+++ b/packages/desktop/components/popups/VoteForProposalPopup.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-    import { Button, Text, FontWeight, TextHint, TextType, KeyValueBox } from 'shared/components'
-    import { HTMLButtonType, TextHintVariant } from 'shared/components/enums'
+    import { Button, Text, FontWeight, TextHint, TextType, KeyValueBox } from '@ui'
+    import { HTMLButtonType, TextHintVariant } from '@ui/enums'
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import { selectedWallet } from '@core/wallet/stores'
     import { localize } from '@core/i18n'
diff --git a/packages/desktop/components/popups/VotingPowerToZeroPopup.svelte b/packages/desktop/components/popups/VotingPowerToZeroPopup.svelte
index 9cf9a29bec9..a8bf060dcd6 100644
--- a/packages/desktop/components/popups/VotingPowerToZeroPopup.svelte
+++ b/packages/desktop/components/popups/VotingPowerToZeroPopup.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-    import { Button, Text, TextHint } from 'shared/components'
-    import { HTMLButtonType, TextHintVariant, TextType } from 'shared/components/enums'
+    import { Button, Text, TextHint } from '@ui'
+    import { HTMLButtonType, TextHintVariant, TextType } from '@ui/enums'
     import { selectedWallet } from '@core/wallet/stores'
     import { handleError } from '@core/error/handlers'
     import { setVotingPower } from '@contexts/governance/actions'
diff --git a/packages/desktop/components/popups/WalletSwitcherPopup.svelte b/packages/desktop/components/popups/WalletSwitcherPopup.svelte
index 365c96acae2..df03643cfef 100644
--- a/packages/desktop/components/popups/WalletSwitcherPopup.svelte
+++ b/packages/desktop/components/popups/WalletSwitcherPopup.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { localize } from '@core/i18n'
-    import { Text, Button, FontWeight, TextType, WalletSelector } from 'shared/components'
+    import { Text, Button, FontWeight, TextType, WalletSelector } from '@ui'
     import { closePopup } from '@auxiliary/popup'
     import { IWalletState, setSelectedWallet } from '@core/wallet'
 
diff --git a/packages/desktop/components/popups/WithdrawFromL2Popup.svelte b/packages/desktop/components/popups/WithdrawFromL2Popup.svelte
index 0a619d09c01..a7b3922fc72 100644
--- a/packages/desktop/components/popups/WithdrawFromL2Popup.svelte
+++ b/packages/desktop/components/popups/WithdrawFromL2Popup.svelte
@@ -6,7 +6,7 @@
     import { getBaseToken, getCoinType, activeProfile, isActiveLedgerProfile, isSoftwareProfile } from '@core/profile'
     import { truncateString } from '@core/utils'
     import { formatTokenAmountPrecise, getRequiredStorageDepositForMinimalBasicOutput } from '@core/wallet'
-    import { Button, FontWeight, KeyValueBox, Spinner, Text, TextType } from 'shared/components'
+    import { Button, FontWeight, KeyValueBox, Spinner, Text, TextType } from '@ui'
     import { onMount } from 'svelte'
     import { WithdrawRequest, getLayer2WithdrawRequest } from '@core/layer-2/utils'
     import { withdrawL2Funds } from '@core/layer-2/helpers/widthdrawL2Funds'
diff --git a/packages/desktop/components/popups/send/SendConfirmationPopup.svelte b/packages/desktop/components/popups/send/SendConfirmationPopup.svelte
index 417565c950e..a3dcfa510f1 100644
--- a/packages/desktop/components/popups/send/SendConfirmationPopup.svelte
+++ b/packages/desktop/components/popups/send/SendConfirmationPopup.svelte
@@ -30,7 +30,7 @@
         Toggle,
     } from '@ui'
     import { ToggleColor } from '@ui/inputs/Toggle.svelte'
-    import { FontWeight, Tab, TextHintVariant, TextType } from 'shared/components/enums'
+    import { FontWeight, Tab, TextHintVariant, TextType } from '@ui/enums'
     import { onMount } from 'svelte'
     import { get } from 'svelte/store'
 
diff --git a/packages/desktop/lib/routers/actions/initialiseRouters.ts b/packages/desktop/lib/routers/actions/initialiseRouters.ts
index 6473f9fcb8b..452512e8793 100644
--- a/packages/desktop/lib/routers/actions/initialiseRouters.ts
+++ b/packages/desktop/lib/routers/actions/initialiseRouters.ts
@@ -10,9 +10,14 @@ import {
     SettingsRouter,
     settingsRouter,
 } from '@core/router/routers'
-import { loginRouter, LoginRouter } from '@core/router/subrouters'
-import { OnboardingRouter, onboardingRouter } from '@views/onboarding'
-import { implicitAccountCreationRouter, ImplicitAccountCreationRouter } from '@views/dashboard/wallet'
+import {
+    implicitAccountCreationRouter,
+    ImplicitAccountCreationRouter,
+    OnboardingRouter,
+    onboardingRouter,
+    loginRouter,
+    LoginRouter,
+} from '@core/router/subrouters'
 
 export function initialiseRouters(): void {
     /**
diff --git a/packages/desktop/lib/routers/actions/resetRouters.ts b/packages/desktop/lib/routers/actions/resetRouters.ts
index 135d8f2eff0..b8368d187b3 100644
--- a/packages/desktop/lib/routers/actions/resetRouters.ts
+++ b/packages/desktop/lib/routers/actions/resetRouters.ts
@@ -5,9 +5,9 @@ import {
     governanceRouter,
     loginRouter,
     settingsRouter,
+    implicitAccountCreationRouter,
+    onboardingRouter,
 } from '@core/router'
-import { implicitAccountCreationRouter } from '@views/dashboard/wallet'
-import { onboardingRouter } from '@views/onboarding'
 import { get } from 'svelte/store'
 
 export function resetRouters(): void {
diff --git a/packages/desktop/lib/routers/utils/getSubroutersForAppContext.ts b/packages/desktop/lib/routers/utils/getSubroutersForAppContext.ts
index b732f00d53e..265ac7994e9 100644
--- a/packages/desktop/lib/routers/utils/getSubroutersForAppContext.ts
+++ b/packages/desktop/lib/routers/utils/getSubroutersForAppContext.ts
@@ -1,6 +1,6 @@
 import { AppContext } from '@core/app/enums'
 import { IRouter } from '@core/router/interfaces'
-import { updateStrongholdRouter } from '@views/update-stronghold'
+import { updateStrongholdRouter } from '@core/router'
 import { get } from 'svelte/store'
 
 export function getSubroutersForAppContext(context: AppContext): IRouter[] {
diff --git a/packages/desktop/views/Splash.svelte b/packages/desktop/views/Splash.svelte
index 02efc52097d..af4bd9262aa 100644
--- a/packages/desktop/views/Splash.svelte
+++ b/packages/desktop/views/Splash.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Animation } from 'shared/components'
+    import { Animation } from '@ui'
     import { appSettings, shouldBeDarkMode } from '@core/app'
     import { AnimationEnum, AnimationRenderer } from '@auxiliary/animation'
 
diff --git a/packages/desktop/views/dashboard/Dashboard.svelte b/packages/desktop/views/dashboard/Dashboard.svelte
index 27423c37134..0e0e1904e4e 100644
--- a/packages/desktop/views/dashboard/Dashboard.svelte
+++ b/packages/desktop/views/dashboard/Dashboard.svelte
@@ -10,7 +10,7 @@
         reflectLockedStronghold,
     } from '@core/profile'
     import { appRouter, dashboardRoute } from '@core/router'
-    import { Idle } from 'shared/components'
+    import { Idle } from '@ui'
     import { stopPollingLedgerNanoStatus } from '@core/ledger'
     import { removeDisplayNotification, showAppNotification } from '@auxiliary/notification'
     import { Platform } from '@core/app'
diff --git a/packages/desktop/views/dashboard/collectibles/views/CollectiblesGalleryView.svelte b/packages/desktop/views/dashboard/collectibles/views/CollectiblesGalleryView.svelte
index dd032816e5d..95329d23b4e 100644
--- a/packages/desktop/views/dashboard/collectibles/views/CollectiblesGalleryView.svelte
+++ b/packages/desktop/views/dashboard/collectibles/views/CollectiblesGalleryView.svelte
@@ -3,7 +3,7 @@
     import { openPopup, PopupId } from '@auxiliary/popup'
     import { localize } from '@core/i18n'
     import { nftSearchTerm, queriedNfts, ownedNfts } from '@core/nfts'
-    import { FontWeight, Illustration, Text, SearchInput, NftGalleryItem, Button, ButtonSize } from 'shared/components'
+    import { FontWeight, Illustration, Text, SearchInput, NftGalleryItem, Button, ButtonSize } from '@ui'
     import VirtualList from '@sveltejs/svelte-virtual-list'
 
     let windowWidth = window.innerWidth
diff --git a/packages/desktop/views/dashboard/governance/views/ProposalDetailsView.svelte b/packages/desktop/views/dashboard/governance/views/ProposalDetailsView.svelte
index 6441dccd365..fcc16a44dde 100644
--- a/packages/desktop/views/dashboard/governance/views/ProposalDetailsView.svelte
+++ b/packages/desktop/views/dashboard/governance/views/ProposalDetailsView.svelte
@@ -36,7 +36,7 @@
     } from '@contexts/governance/utils'
     import { openPopup, PopupId } from '@auxiliary/popup'
     import { activeProfile } from '@core/profile'
-    import { TextHintVariant } from 'shared/components/enums'
+    import { TextHintVariant } from '@ui/enums'
 
     const { metadata } = $visibleSelectedWalletAssets?.[$activeProfile?.network?.id]?.baseCoin ?? {}
 
diff --git a/packages/desktop/views/dashboard/settings/views/advanced/BalanceFinder.svelte b/packages/desktop/views/dashboard/settings/views/advanced/BalanceFinder.svelte
index c7e0d9ddd43..476677a6b9e 100644
--- a/packages/desktop/views/dashboard/settings/views/advanced/BalanceFinder.svelte
+++ b/packages/desktop/views/dashboard/settings/views/advanced/BalanceFinder.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Button, Text, ButtonSize, TextType } from 'shared/components'
+    import { Button, Text, ButtonSize, TextType } from '@ui'
     import { localize } from '@core/i18n'
     import { openPopup, PopupId } from '@auxiliary/popup'
 
diff --git a/packages/desktop/views/dashboard/settings/views/advanced/DeveloperToggle.svelte b/packages/desktop/views/dashboard/settings/views/advanced/DeveloperToggle.svelte
index 4f91cc56e75..da02956f040 100644
--- a/packages/desktop/views/dashboard/settings/views/advanced/DeveloperToggle.svelte
+++ b/packages/desktop/views/dashboard/settings/views/advanced/DeveloperToggle.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { localize } from '@core/i18n'
     import { activeProfile, updateActiveProfile } from '@core/profile'
-    import { Checkbox, Text, TextType } from 'shared/components'
+    import { Checkbox, Text, TextType } from '@ui'
 
     let isDeveloperProfile = $activeProfile?.isDeveloperProfile
     $: updateActiveProfile({ isDeveloperProfile })
diff --git a/packages/desktop/views/dashboard/settings/views/advanced/HiddenWallets.svelte b/packages/desktop/views/dashboard/settings/views/advanced/HiddenWallets.svelte
index 4128181daa4..5fbf31d4a25 100644
--- a/packages/desktop/views/dashboard/settings/views/advanced/HiddenWallets.svelte
+++ b/packages/desktop/views/dashboard/settings/views/advanced/HiddenWallets.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Checkbox, Text } from 'shared/components'
+    import { Checkbox, Text } from '@ui'
     import { localize } from '@core/i18n'
     import { activeProfile, updateActiveProfile } from '@core/profile'
     import { setNextSelectedWallet } from '@core/wallet/actions'
diff --git a/packages/desktop/views/dashboard/settings/views/collectibles/RefreshNftMedia.svelte b/packages/desktop/views/dashboard/settings/views/collectibles/RefreshNftMedia.svelte
index ee796d54de0..35dbfe0becf 100644
--- a/packages/desktop/views/dashboard/settings/views/collectibles/RefreshNftMedia.svelte
+++ b/packages/desktop/views/dashboard/settings/views/collectibles/RefreshNftMedia.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Button, Text, ButtonSize, TextType } from 'shared/components'
+    import { Button, Text, ButtonSize, TextType } from '@ui'
     import { localize } from '@core/i18n'
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import {
diff --git a/packages/desktop/views/dashboard/settings/views/general/CrashReporting.svelte b/packages/desktop/views/dashboard/settings/views/general/CrashReporting.svelte
index 8faf9ab8188..8f075e5287c 100644
--- a/packages/desktop/views/dashboard/settings/views/general/CrashReporting.svelte
+++ b/packages/desktop/views/dashboard/settings/views/general/CrashReporting.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Checkbox, Text, Icon } from 'shared/components'
+    import { Checkbox, Text, Icon } from '@ui'
     import { appSettings, initAppSettings } from '@core/app'
     import { localize } from '@core/i18n'
     import { Icon as IconEnum } from '@auxiliary/icon'
diff --git a/packages/desktop/views/dashboard/settings/views/general/DeepLinks.svelte b/packages/desktop/views/dashboard/settings/views/general/DeepLinks.svelte
index 9a9dd08f22b..4854800bcc6 100644
--- a/packages/desktop/views/dashboard/settings/views/general/DeepLinks.svelte
+++ b/packages/desktop/views/dashboard/settings/views/general/DeepLinks.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Checkbox, Text } from 'shared/components'
+    import { Checkbox, Text } from '@ui'
     import { appSettings } from '@core/app'
     import { localize } from '@core/i18n'
     import { Platform } from '@core/app'
diff --git a/packages/desktop/views/dashboard/settings/views/general/Language.svelte b/packages/desktop/views/dashboard/settings/views/general/Language.svelte
index 94e078264fb..2e756085d01 100644
--- a/packages/desktop/views/dashboard/settings/views/general/Language.svelte
+++ b/packages/desktop/views/dashboard/settings/views/general/Language.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Dropdown, Text } from 'shared/components'
+    import { Dropdown, Text } from '@ui'
     import { appSettings } from '@core/app'
     import { SUPPORTED_LOCALES, localize, setLanguage } from '@core/i18n'
     import type { IDropdownItem } from '@core/utils'
diff --git a/packages/desktop/views/dashboard/settings/views/general/NetworkStatus.svelte b/packages/desktop/views/dashboard/settings/views/general/NetworkStatus.svelte
index 0e717154639..c7adae8617a 100644
--- a/packages/desktop/views/dashboard/settings/views/general/NetworkStatus.svelte
+++ b/packages/desktop/views/dashboard/settings/views/general/NetworkStatus.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Checkbox, Text } from 'shared/components'
+    import { Checkbox, Text } from '@ui'
     import { localize } from '@core/i18n'
     import { activeProfile, updateActiveProfileSettings } from '@core/profile'
 
diff --git a/packages/desktop/views/dashboard/settings/views/general/Notifications.svelte b/packages/desktop/views/dashboard/settings/views/general/Notifications.svelte
index 96d4fe89088..35198a5c946 100644
--- a/packages/desktop/views/dashboard/settings/views/general/Notifications.svelte
+++ b/packages/desktop/views/dashboard/settings/views/general/Notifications.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Checkbox, Text } from 'shared/components'
+    import { Checkbox, Text } from '@ui'
     import { appSettings } from '@core/app'
     import { localize } from '@core/i18n'
 
diff --git a/packages/desktop/views/dashboard/settings/views/general/Theme.svelte b/packages/desktop/views/dashboard/settings/views/general/Theme.svelte
index 382bb769390..02cdd1c95a5 100644
--- a/packages/desktop/views/dashboard/settings/views/general/Theme.svelte
+++ b/packages/desktop/views/dashboard/settings/views/general/Theme.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Radio, Text, Icon } from 'shared/components'
+    import { Radio, Text, Icon } from '@ui'
     import { AppTheme, appSettings, shouldBeDarkMode } from '@core/app'
     import { localize } from '@core/i18n'
     import { Icon as IconEnum } from '@auxiliary/icon'
diff --git a/packages/desktop/views/dashboard/settings/views/help/Diagnostics.svelte b/packages/desktop/views/dashboard/settings/views/help/Diagnostics.svelte
index 50524187f57..3425fe9650c 100644
--- a/packages/desktop/views/dashboard/settings/views/help/Diagnostics.svelte
+++ b/packages/desktop/views/dashboard/settings/views/help/Diagnostics.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Button, Text, ButtonSize } from 'shared/components'
+    import { Button, Text, ButtonSize } from '@ui'
     import { localize } from '@core/i18n'
     import { openPopup, PopupId } from '@auxiliary/popup'
 
diff --git a/packages/desktop/views/dashboard/settings/views/help/ErrorLog.svelte b/packages/desktop/views/dashboard/settings/views/help/ErrorLog.svelte
index 797cdd91156..873295e2d2e 100644
--- a/packages/desktop/views/dashboard/settings/views/help/ErrorLog.svelte
+++ b/packages/desktop/views/dashboard/settings/views/help/ErrorLog.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Button, Text, ButtonSize } from 'shared/components'
+    import { Button, Text, ButtonSize } from '@ui'
     import { localize } from '@core/i18n'
     import { openPopup, PopupId } from '@auxiliary/popup'
 
diff --git a/packages/desktop/views/dashboard/settings/views/help/HelpSection.svelte b/packages/desktop/views/dashboard/settings/views/help/HelpSection.svelte
index 323f7e3915d..3c1f50c4f52 100644
--- a/packages/desktop/views/dashboard/settings/views/help/HelpSection.svelte
+++ b/packages/desktop/views/dashboard/settings/views/help/HelpSection.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Button, Text, ButtonSize } from 'shared/components'
+    import { Button, Text, ButtonSize } from '@ui'
     import { localize } from '@core/i18n'
     import { openUrlInBrowser } from '@core/app'
     import { HelpAndInfoRoute } from '@core/router'
diff --git a/packages/desktop/views/dashboard/settings/views/network/ConfigureNodeList.svelte b/packages/desktop/views/dashboard/settings/views/network/ConfigureNodeList.svelte
index 5ba33de1c74..559289a1bc3 100644
--- a/packages/desktop/views/dashboard/settings/views/network/ConfigureNodeList.svelte
+++ b/packages/desktop/views/dashboard/settings/views/network/ConfigureNodeList.svelte
@@ -4,7 +4,7 @@
     import { addOfficialNodesToClientOptions as onAddOfficialNodesClick, NetworkId } from '@core/network'
     import { activeProfile } from '@core/profile'
     import { NetworkSettingsRoute } from '@core/router'
-    import { Button, ButtonSize, NodeListTable } from 'shared/components'
+    import { Button, ButtonSize, NodeListTable } from '@ui'
     import SettingsSection from '../SettingsSection.svelte'
 
     let nodesContainer: HTMLElement
diff --git a/packages/desktop/views/dashboard/settings/views/network/LocalProofOfWork.svelte b/packages/desktop/views/dashboard/settings/views/network/LocalProofOfWork.svelte
index 9d11552ffb1..5d77c99357d 100644
--- a/packages/desktop/views/dashboard/settings/views/network/LocalProofOfWork.svelte
+++ b/packages/desktop/views/dashboard/settings/views/network/LocalProofOfWork.svelte
@@ -3,7 +3,7 @@
     import { toggleLocalPowInClientOptions } from '@core/network'
     import { activeProfile } from '@core/profile'
     import { NetworkSettingsRoute } from '@core/router'
-    import { Checkbox } from 'shared/components'
+    import { Checkbox } from '@ui'
     import SettingsSection from '../SettingsSection.svelte'
 
     $: clientOptions = $activeProfile?.clientOptions
diff --git a/packages/desktop/views/dashboard/settings/views/network/NetworkInformation.svelte b/packages/desktop/views/dashboard/settings/views/network/NetworkInformation.svelte
index 71db9c1132b..b0ca98014c4 100644
--- a/packages/desktop/views/dashboard/settings/views/network/NetworkInformation.svelte
+++ b/packages/desktop/views/dashboard/settings/views/network/NetworkInformation.svelte
@@ -2,7 +2,7 @@
     import { localize } from '@core/i18n'
     import { NetworkHealth, networkStatus, NETWORK_HEALTH_COLORS, nodeInfoNetworkName } from '@core/network'
     import { NetworkSettingsRoute } from '@core/router'
-    import { Text } from 'shared/components'
+    import { Text } from '@ui'
     import SettingsSection from '../SettingsSection.svelte'
 
     $: health = $networkStatus.health ?? NetworkHealth.Disconnected
diff --git a/packages/desktop/views/dashboard/settings/views/profile/ChangeProfileName.svelte b/packages/desktop/views/dashboard/settings/views/profile/ChangeProfileName.svelte
index 0b00d565cd7..4f2f83e9b81 100644
--- a/packages/desktop/views/dashboard/settings/views/profile/ChangeProfileName.svelte
+++ b/packages/desktop/views/dashboard/settings/views/profile/ChangeProfileName.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Button, Input, Text, HTMLButtonType, ButtonSize, TextType } from 'shared/components'
+    import { Button, Input, Text, HTMLButtonType, ButtonSize, TextType } from '@ui'
     import { localize } from '@core/i18n'
     import { showAppNotification } from '@auxiliary/notification'
     import { activeProfile, updateActiveProfile, validateProfileName } from '@core/profile'
diff --git a/packages/desktop/views/dashboard/settings/views/profile/Currency.svelte b/packages/desktop/views/dashboard/settings/views/profile/Currency.svelte
index ab8c00792a9..275b0a572a2 100644
--- a/packages/desktop/views/dashboard/settings/views/profile/Currency.svelte
+++ b/packages/desktop/views/dashboard/settings/views/profile/Currency.svelte
@@ -3,7 +3,7 @@
     import { MarketCurrency } from '@core/market'
     import { activeProfile, updateActiveProfileSettings } from '@core/profile'
     import type { IDropdownItem } from '@core/utils'
-    import { Dropdown, Text } from 'shared/components'
+    import { Dropdown, Text } from '@ui'
 
     let currencyList: IDropdownItem<MarketCurrency>[]
     $: currencyList = Object.values(MarketCurrency)
diff --git a/packages/desktop/views/dashboard/settings/views/profile/DeleteProfile.svelte b/packages/desktop/views/dashboard/settings/views/profile/DeleteProfile.svelte
index 8c7029cc1b5..60315c1a842 100644
--- a/packages/desktop/views/dashboard/settings/views/profile/DeleteProfile.svelte
+++ b/packages/desktop/views/dashboard/settings/views/profile/DeleteProfile.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-    import { Button, Text, ButtonVariant, ButtonSize } from 'shared/components'
+    import { Button, Text, ButtonVariant, ButtonSize } from '@ui'
     import { localize } from '@core/i18n'
     import { openPopup, PopupId } from '@auxiliary/popup'
     import { deleteProfile } from '@contexts/settings'
-    import { TextHintVariant } from 'shared/components/enums'
+    import { TextHintVariant } from '@ui/enums'
 
     function onDeleteClick(): void {
         openPopup({
diff --git a/packages/desktop/views/dashboard/settings/views/security/AppLock.svelte b/packages/desktop/views/dashboard/settings/views/security/AppLock.svelte
index 26ea8684de6..d155172587d 100644
--- a/packages/desktop/views/dashboard/settings/views/security/AppLock.svelte
+++ b/packages/desktop/views/dashboard/settings/views/security/AppLock.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Dropdown, Text } from 'shared/components'
+    import { Dropdown, Text } from '@ui'
     import { localize } from '@core/i18n'
     import { activeProfile, DEFAULT_PERSISTED_PROFILE_OBJECT, updateActiveProfileSettings } from '@core/profile'
     import type { IDropdownItem } from '@core/utils'
diff --git a/packages/desktop/views/dashboard/settings/views/security/ChangePassword.svelte b/packages/desktop/views/dashboard/settings/views/security/ChangePassword.svelte
index 9cd88f54eac..74ed9b4a633 100644
--- a/packages/desktop/views/dashboard/settings/views/security/ChangePassword.svelte
+++ b/packages/desktop/views/dashboard/settings/views/security/ChangePassword.svelte
@@ -1,14 +1,5 @@
 <script lang="ts">
-    import {
-        Button,
-        Checkbox,
-        PasswordInput,
-        Spinner,
-        Text,
-        TextType,
-        ButtonSize,
-        HTMLButtonType,
-    } from 'shared/components'
+    import { Button, Checkbox, PasswordInput, Spinner, Text, TextType, ButtonSize, HTMLButtonType } from '@ui'
     import { localize } from '@core/i18n'
     import { MAX_STRONGHOLD_PASSWORD_LENGTH } from '@core/profile'
     import zxcvbn from 'zxcvbn'
diff --git a/packages/desktop/views/dashboard/settings/views/security/ChangePincode.svelte b/packages/desktop/views/dashboard/settings/views/security/ChangePincode.svelte
index 1f1c97f1ff5..a2afa280fbe 100644
--- a/packages/desktop/views/dashboard/settings/views/security/ChangePincode.svelte
+++ b/packages/desktop/views/dashboard/settings/views/security/ChangePincode.svelte
@@ -4,7 +4,7 @@
     import { localize } from '@core/i18n'
     import { activeProfile } from '@core/profile'
     import { PIN_LENGTH } from '@core/utils'
-    import { Button, ButtonSize, HTMLButtonType, PinInput, Text, TextType } from 'shared/components'
+    import { Button, ButtonSize, HTMLButtonType, PinInput, Text, TextType } from '@ui'
     import { get } from 'svelte/store'
 
     let currentPincode: string = ''
diff --git a/packages/desktop/views/dashboard/settings/views/security/ExportStronghold.svelte b/packages/desktop/views/dashboard/settings/views/security/ExportStronghold.svelte
index 940670c9962..8d24c2e07ad 100644
--- a/packages/desktop/views/dashboard/settings/views/security/ExportStronghold.svelte
+++ b/packages/desktop/views/dashboard/settings/views/security/ExportStronghold.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { ExportStrongholdButton, Spinner, Text, TextType } from 'shared/components'
+    import { ExportStrongholdButton, Spinner, Text, TextType } from '@ui'
     import { localize } from '@core/i18n'
 
     let isBusy: boolean = false
diff --git a/packages/desktop/views/dashboard/wallet/index.js b/packages/desktop/views/dashboard/wallet/index.js
index 84815d3c46c..a5df3d9b930 100644
--- a/packages/desktop/views/dashboard/wallet/index.js
+++ b/packages/desktop/views/dashboard/wallet/index.js
@@ -1,5 +1,3 @@
 export { default as Wallet } from './Wallet.svelte'
 
-export * from './implicit-account-creation-router'
-export * from './implicit-account-creation.enum'
 export * from './views'
diff --git a/packages/desktop/views/dashboard/wallet/views/ImplicitAccountCreationView.svelte b/packages/desktop/views/dashboard/wallet/views/ImplicitAccountCreationView.svelte
index 5c5c006345b..c49e8d38b65 100644
--- a/packages/desktop/views/dashboard/wallet/views/ImplicitAccountCreationView.svelte
+++ b/packages/desktop/views/dashboard/wallet/views/ImplicitAccountCreationView.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-    import { implicitAccountCreationRoute, ImplicitAccountCreationRoute } from '../index'
+    import { implicitAccountCreationRoute, ImplicitAccountCreationRoute } from '@core/router'
     import { InitView, AccountCreationView, FundConfirmationView, OneTimeDepositView } from '.'
-    import { Text, TextType } from 'shared/components'
+    import { Text, TextType } from '@ui'
     import { localize } from '@core/i18n'
     import { selectedWallet } from '@core/wallet'
 
diff --git a/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/AccountCreationView.svelte b/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/AccountCreationView.svelte
index de9eb2071db..654393a3b15 100644
--- a/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/AccountCreationView.svelte
+++ b/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/AccountCreationView.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Button, FontWeight, PasswordInput, Text, TextType } from 'shared/components'
+    import { Button, FontWeight, PasswordInput, Text, TextType } from '@ui'
     import { localize } from '@core/i18n'
     import { selectedWallet, selectedWalletId } from '@core/wallet'
     import { unlockStronghold, updateActiveWallet } from '@core/profile'
diff --git a/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/FundConfirmationView.svelte b/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/FundConfirmationView.svelte
index 23338b61c3e..72e36d28edb 100644
--- a/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/FundConfirmationView.svelte
+++ b/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/FundConfirmationView.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-    import { Button, FontWeight, Text, TextType } from 'shared/components'
+    import { Button, FontWeight, Text, TextType } from '@ui'
     import { localize } from '@core/i18n'
-    import { implicitAccountCreationRouter } from '../../implicit-account-creation-router'
+    import { implicitAccountCreationRouter } from '@core/router'
     import { onMount, onDestroy } from 'svelte'
 
     // TODO: Replace this with proper amount
diff --git a/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/InitView.svelte b/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/InitView.svelte
index b7fc5a99d32..d53291a7669 100644
--- a/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/InitView.svelte
+++ b/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/InitView.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-    import { Button, FontWeight, Text, TextType } from 'shared/components'
+    import { Button, FontWeight, Text, TextType } from '@ui'
     import { localize } from '@core/i18n'
-    import { implicitAccountCreationRouter, ImplicitAccountCreationRoute } from '../../index'
+    import { implicitAccountCreationRouter, ImplicitAccountCreationRoute } from '@core/router'
 
     interface IStep {
         title: string
diff --git a/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/OneTimeDepositView.svelte b/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/OneTimeDepositView.svelte
index 5b4945e782a..91601db61d0 100644
--- a/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/OneTimeDepositView.svelte
+++ b/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/OneTimeDepositView.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Button, FontWeight, Text, TextType } from 'shared/components'
+    import { Button, FontWeight, Text, TextType } from '@ui'
     import { localize } from '@core/i18n'
     import { setClipboard } from '@core/utils'
     import { selectedWallet } from '@core/wallet'
diff --git a/packages/desktop/views/login/LoginRouter.svelte b/packages/desktop/views/login/LoginRouter.svelte
index 02a8676f4ce..5c8eee2912b 100644
--- a/packages/desktop/views/login/LoginRouter.svelte
+++ b/packages/desktop/views/login/LoginRouter.svelte
@@ -3,7 +3,7 @@
     import { LoginRoute, loginRoute } from '@core/router'
     import features from '@features/features'
     import { UpdateStrongholdRouterView } from '@views'
-    import { Transition } from 'shared/components'
+    import { Transition } from '@ui'
     import { EnterPinView, LoadProfileView, SelectProfileView } from './views'
 
     $: if (features.analytics.loginRoute.enabled && $loginRoute)
diff --git a/packages/desktop/views/login/views/EnterPinView.svelte b/packages/desktop/views/login/views/EnterPinView.svelte
index 6ba016f4113..579d7d09106 100644
--- a/packages/desktop/views/login/views/EnterPinView.svelte
+++ b/packages/desktop/views/login/views/EnterPinView.svelte
@@ -16,7 +16,7 @@
     import { isValidPin } from '@core/utils'
     import features from '@features/features'
     import { Icon, PinInput, Profile, Text, TextHint } from '@ui'
-    import { TextHintVariant } from 'shared/components/enums'
+    import { TextHintVariant } from '@ui/enums'
     import { onDestroy } from 'svelte'
 
     let attempts: number = 0
diff --git a/packages/desktop/views/login/views/LoadProfileView.svelte b/packages/desktop/views/login/views/LoadProfileView.svelte
index 34c20be44ab..f242fbebff8 100644
--- a/packages/desktop/views/login/views/LoadProfileView.svelte
+++ b/packages/desktop/views/login/views/LoadProfileView.svelte
@@ -2,7 +2,7 @@
     import { AnimationEnum, AnimationRenderer } from '@auxiliary/animation'
     import { localize } from '@core/i18n'
     import { loginProgress, LOGIN_STEPS } from '@core/profile'
-    import { Animation, ProgressBar } from 'shared/components'
+    import { Animation, ProgressBar } from '@ui'
 
     let percent = 0
     let statusMessage = ''
diff --git a/packages/desktop/views/login/views/SelectProfileView.svelte b/packages/desktop/views/login/views/SelectProfileView.svelte
index 109e021357f..a3f41623c97 100644
--- a/packages/desktop/views/login/views/SelectProfileView.svelte
+++ b/packages/desktop/views/login/views/SelectProfileView.svelte
@@ -15,13 +15,12 @@
         profiles,
         removeProfileFolder,
     } from '@core/profile'
-    import { loginRouter, routerManager } from '@core/router'
+    import { loginRouter, routerManager, OnboardingRouter, onboardingRouter } from '@core/router'
     import features from '@features/features'
     import { Icon, Logo, Profile } from '@ui'
     import { Icon as IconEnum } from '@auxiliary/icon'
-    import { OnboardingRouter, onboardingRouter } from '@views/onboarding'
     import { onMount } from 'svelte'
-    import { Logo as LogoEnum } from 'shared/components/enums'
+    import { Logo as LogoEnum } from '@ui/enums'
 
     function onContinueClick(profileId: string): void {
         loadPersistedProfileIntoActiveProfile(profileId)
diff --git a/packages/desktop/views/onboarding/OnboardingRouterView.svelte b/packages/desktop/views/onboarding/OnboardingRouterView.svelte
index 934b77354a2..346fa65038c 100644
--- a/packages/desktop/views/onboarding/OnboardingRouterView.svelte
+++ b/packages/desktop/views/onboarding/OnboardingRouterView.svelte
@@ -2,8 +2,7 @@
     import { Platform } from '@core/app'
     import features from '@features/features'
     import { Transition } from '@ui'
-    import { OnboardingRoute } from './onboarding-route.enum'
-    import { onboardingRoute } from './onboarding-router'
+    import { OnboardingRoute, onboardingRoute } from '@core/router'
     import { ChooseOnboardingFlowView, CompleteOnboardingRouterView, WelcomeView } from './views'
     import { CreateProfileRouterView } from './views/create-profile'
     import { NetworkSetupRouterView } from './views/network-setup'
diff --git a/packages/desktop/views/onboarding/index.js b/packages/desktop/views/onboarding/index.js
index c82fd4f4f13..c90e04d9371 100644
--- a/packages/desktop/views/onboarding/index.js
+++ b/packages/desktop/views/onboarding/index.js
@@ -1,5 +1,3 @@
 export { default as OnboardingRouterView } from './OnboardingRouterView.svelte'
 
 export * from './views'
-export * from './onboarding-route.enum'
-export * from './onboarding-router'
diff --git a/packages/desktop/views/onboarding/views/ChooseOnboardingFlowView.svelte b/packages/desktop/views/onboarding/views/ChooseOnboardingFlowView.svelte
index 5cf733ca05f..477446a411f 100644
--- a/packages/desktop/views/onboarding/views/ChooseOnboardingFlowView.svelte
+++ b/packages/desktop/views/onboarding/views/ChooseOnboardingFlowView.svelte
@@ -7,7 +7,7 @@
     import features from '@features/features'
     import { Animation, OnboardingButton, Text } from '@ui'
     import { onMount } from 'svelte'
-    import { onboardingRouter } from '../onboarding-router'
+    import { onboardingRouter } from '@core/router'
     import { Icon as IconEnum } from '@auxiliary/icon'
     import { AnimationEnum } from '@auxiliary/animation'
 
diff --git a/packages/desktop/views/onboarding/views/WelcomeView.svelte b/packages/desktop/views/onboarding/views/WelcomeView.svelte
index bae68808458..1496f0574da 100644
--- a/packages/desktop/views/onboarding/views/WelcomeView.svelte
+++ b/packages/desktop/views/onboarding/views/WelcomeView.svelte
@@ -11,7 +11,7 @@
     import { localize } from '@core/i18n'
     import { getEnabledNetworkFromFeatureFlags, getNetworkNameFromNetworkId } from '@core/network'
     import { Animation, Button, Checkbox, Link, Text, TextType } from '@ui'
-    import { onboardingRouter } from '../onboarding-router'
+    import { onboardingRouter } from '@core/router'
     import { initialiseOnboardingProfile } from '@contexts/onboarding/actions'
     import { shouldBeDeveloperProfile } from '@contexts/onboarding/utils'
     import { AnimationEnum } from '@auxiliary/animation'
diff --git a/packages/desktop/views/onboarding/views/complete-onboarding/CompleteOnboardingRouterView.svelte b/packages/desktop/views/onboarding/views/complete-onboarding/CompleteOnboardingRouterView.svelte
index 61104694ac8..ea834e8dc19 100644
--- a/packages/desktop/views/onboarding/views/complete-onboarding/CompleteOnboardingRouterView.svelte
+++ b/packages/desktop/views/onboarding/views/complete-onboarding/CompleteOnboardingRouterView.svelte
@@ -1,9 +1,8 @@
 <script lang="ts">
     import { Platform } from '@core/app'
     import features from '@features/features'
-    import { Transition } from 'shared/components'
-    import { CompleteOnboardingRoute } from './complete-onboarding-route.enum'
-    import { completeOnboardingRoute } from './complete-onboarding-router'
+    import { Transition } from '@ui'
+    import { CompleteOnboardingRoute, completeOnboardingRoute } from '@core/router'
     import EnterNameView from './views/EnterNameView.svelte'
     import EnterPinView from './views/EnterPinView.svelte'
     import FinishOnboardingView from './views/FinishOnboardingView.svelte'
diff --git a/packages/desktop/views/onboarding/views/complete-onboarding/index.js b/packages/desktop/views/onboarding/views/complete-onboarding/index.js
index 14d07d635d6..0f24d193e9f 100644
--- a/packages/desktop/views/onboarding/views/complete-onboarding/index.js
+++ b/packages/desktop/views/onboarding/views/complete-onboarding/index.js
@@ -1,4 +1 @@
 export { default as CompleteOnboardingRouterView } from './CompleteOnboardingRouterView.svelte'
-
-export * from './complete-onboarding-route.enum'
-export * from './complete-onboarding-router'
diff --git a/packages/desktop/views/onboarding/views/complete-onboarding/views/EnterNameView.svelte b/packages/desktop/views/onboarding/views/complete-onboarding/views/EnterNameView.svelte
index ef339945b30..d8868b74117 100644
--- a/packages/desktop/views/onboarding/views/complete-onboarding/views/EnterNameView.svelte
+++ b/packages/desktop/views/onboarding/views/complete-onboarding/views/EnterNameView.svelte
@@ -5,7 +5,7 @@
     import { getNetworkNameFromNetworkId } from '@core/network'
     import { profiles, validateProfileName } from '@core/profile'
     import { Animation, Button, Input, Text } from '@ui'
-    import { completeOnboardingRouter } from '../complete-onboarding-router'
+    import { completeOnboardingRouter } from '@core/router'
     import { AnimationEnum } from '@auxiliary/animation'
 
     let error = ''
diff --git a/packages/desktop/views/onboarding/views/complete-onboarding/views/EnterPinView.svelte b/packages/desktop/views/onboarding/views/complete-onboarding/views/EnterPinView.svelte
index fbc84e9dce9..7f83d87134b 100644
--- a/packages/desktop/views/onboarding/views/complete-onboarding/views/EnterPinView.svelte
+++ b/packages/desktop/views/onboarding/views/complete-onboarding/views/EnterPinView.svelte
@@ -4,7 +4,7 @@
     import { localize } from '@core/i18n'
     import { isValidPin } from '@core/utils'
     import { Animation, Button, HTMLButtonType, PinInput, Text } from '@ui'
-    import { completeOnboardingRouter } from '../complete-onboarding-router'
+    import { completeOnboardingRouter } from '@core/router'
     import { AnimationEnum } from '@auxiliary/animation'
 
     export let busy = false
diff --git a/packages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte b/packages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte
index 4d1c983e7f3..1fec043abfe 100644
--- a/packages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte
+++ b/packages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte
@@ -14,9 +14,9 @@
     import { ProfileType } from '@core/profile'
     import { STRONGHOLD_VERSION } from '@core/stronghold'
     import { Animation, Button, Icon, Text, TextHint } from '@ui'
-    import { TextHintVariant } from 'shared/components/enums'
+    import { TextHintVariant } from '@ui/enums'
     import { TextType } from '@ui/enums'
-    import { onboardingRouter } from '@views/onboarding/onboarding-router'
+    import { onboardingRouter } from '@core/router'
     import { setStrongholdPassword } from '@core/wallet/actions/setStrongholdPassword'
 
     function onContinueClick(): void {
diff --git a/packages/desktop/views/onboarding/views/create-from-ledger/CreateFromLedgerRouterView.svelte b/packages/desktop/views/onboarding/views/create-from-ledger/CreateFromLedgerRouterView.svelte
index a69f429959a..564b6408644 100644
--- a/packages/desktop/views/onboarding/views/create-from-ledger/CreateFromLedgerRouterView.svelte
+++ b/packages/desktop/views/onboarding/views/create-from-ledger/CreateFromLedgerRouterView.svelte
@@ -3,8 +3,7 @@
     import { Subrouter } from '@core/router'
     import features from '@features/features'
     import { Transition } from '@ui'
-    import { CreateFromLedgerRoute } from './create-from-ledger-route.enum'
-    import { createFromLedgerRoute } from './create-from-ledger-router'
+    import { CreateFromLedgerRoute, createFromLedgerRoute } from '@core/router'
     import { ConnectLedgerView, InstallLedgerView } from './views'
 
     export let router: Subrouter<unknown>
diff --git a/packages/desktop/views/onboarding/views/create-from-ledger/index.js b/packages/desktop/views/onboarding/views/create-from-ledger/index.js
index b1c54dfa0bf..6f17fba295c 100644
--- a/packages/desktop/views/onboarding/views/create-from-ledger/index.js
+++ b/packages/desktop/views/onboarding/views/create-from-ledger/index.js
@@ -1,4 +1 @@
 export { default as CreateFromLedgerRouterView } from './CreateFromLedgerRouterView.svelte'
-
-export * from './create-from-ledger-route.enum'
-export * from './create-from-ledger-router'
diff --git a/packages/desktop/views/onboarding/views/create-from-ledger/views/InstallLedgerView.svelte b/packages/desktop/views/onboarding/views/create-from-ledger/views/InstallLedgerView.svelte
index ccdd759430d..8bef36986d2 100644
--- a/packages/desktop/views/onboarding/views/create-from-ledger/views/InstallLedgerView.svelte
+++ b/packages/desktop/views/onboarding/views/create-from-ledger/views/InstallLedgerView.svelte
@@ -5,7 +5,7 @@
     import { LedgerAppName, ledgerAppName, pollLedgerNanoStatus, stopPollingLedgerNanoStatus } from '@core/ledger'
     import { Button, Icon, LedgerAnimation, Link, Text, TextType } from '@ui'
     import { onMount } from 'svelte'
-    import { createFromLedgerRouter } from '../create-from-ledger-router'
+    import { createFromLedgerRouter } from '@core/router'
     import { Icon as IconEnum } from '@auxiliary/icon'
     import { IllustrationEnum } from '@auxiliary/illustration'
 
diff --git a/packages/desktop/views/onboarding/views/create-from-mnemonic/CreateFromMnemonicRouterView.svelte b/packages/desktop/views/onboarding/views/create-from-mnemonic/CreateFromMnemonicRouterView.svelte
index fd849ebca5f..1f7deec41f5 100644
--- a/packages/desktop/views/onboarding/views/create-from-mnemonic/CreateFromMnemonicRouterView.svelte
+++ b/packages/desktop/views/onboarding/views/create-from-mnemonic/CreateFromMnemonicRouterView.svelte
@@ -3,8 +3,7 @@
     import features from '@features/features'
     import { Transition } from '@ui'
     import { EncryptMnemonicView } from '../shared'
-    import { CreateFromMnemonicRoute } from './create-from-mnemonic-route.enum'
-    import { createFromMnemonicRoute, createFromMnemonicRouter } from './create-from-mnemonic-router'
+    import { createFromMnemonicRoute, createFromMnemonicRouter, CreateFromMnemonicRoute } from '@core/router'
     import { VerifyMnemonicView, ViewMnemonicView } from './views'
 
     $: if (features.analytics.onboardingRoute.enabled && $createFromMnemonicRoute) {
diff --git a/packages/desktop/views/onboarding/views/create-from-mnemonic/index.js b/packages/desktop/views/onboarding/views/create-from-mnemonic/index.js
index 3142ee2db7e..e5418da9580 100644
--- a/packages/desktop/views/onboarding/views/create-from-mnemonic/index.js
+++ b/packages/desktop/views/onboarding/views/create-from-mnemonic/index.js
@@ -1,4 +1 @@
 export { default as CreateFromMnemonicRouterView } from './CreateFromMnemonicRouterView.svelte'
-
-export * from './create-from-mnemonic-route.enum'
-export * from './create-from-mnemonic-router'
diff --git a/packages/desktop/views/onboarding/views/create-from-mnemonic/views/VerifyMnemonicView.svelte b/packages/desktop/views/onboarding/views/create-from-mnemonic/views/VerifyMnemonicView.svelte
index 310cc172d46..32576d2a675 100644
--- a/packages/desktop/views/onboarding/views/create-from-mnemonic/views/VerifyMnemonicView.svelte
+++ b/packages/desktop/views/onboarding/views/create-from-mnemonic/views/VerifyMnemonicView.svelte
@@ -5,7 +5,7 @@
     import { localize } from '@core/i18n'
     import { Button, Icon, RecoveryPhrase, Text, TextType } from '@ui'
     import { onMount } from 'svelte'
-    import { createFromMnemonicRouter } from '../create-from-mnemonic-router'
+    import { createFromMnemonicRouter } from '@core/router'
 
     const verifyRecoveryPhrase: Mnemonic = []
     const wordElements: HTMLButtonElement[] = []
diff --git a/packages/desktop/views/onboarding/views/create-from-mnemonic/views/ViewMnemonicView.svelte b/packages/desktop/views/onboarding/views/create-from-mnemonic/views/ViewMnemonicView.svelte
index c9b944da2dd..caf5d77f2cb 100644
--- a/packages/desktop/views/onboarding/views/create-from-mnemonic/views/ViewMnemonicView.svelte
+++ b/packages/desktop/views/onboarding/views/create-from-mnemonic/views/ViewMnemonicView.svelte
@@ -10,7 +10,7 @@
         updateOnboardingProfile,
     } from '@contexts/onboarding'
     import { Icon as IconEnum } from '@auxiliary/icon'
-    import { createFromMnemonicRouter } from '../create-from-mnemonic-router'
+    import { createFromMnemonicRouter } from '@core/router'
 
     let isHidden: boolean = true
     let hasRevealedRecoveryPhrase: boolean = false
diff --git a/packages/desktop/views/onboarding/views/create-profile/CreateProfileRouterView.svelte b/packages/desktop/views/onboarding/views/create-profile/CreateProfileRouterView.svelte
index d9b93efe04b..344c2c2344a 100644
--- a/packages/desktop/views/onboarding/views/create-profile/CreateProfileRouterView.svelte
+++ b/packages/desktop/views/onboarding/views/create-profile/CreateProfileRouterView.svelte
@@ -4,8 +4,7 @@
     import { Transition } from '@ui'
     import { CreateFromLedgerRouterView } from '../create-from-ledger'
     import { CreateFromMnemonicRouterView } from '../create-from-mnemonic'
-    import { CreateProfileRoute } from './create-profile-route.enum'
-    import { createProfileRoute, createProfileRouter } from './create-profile-router'
+    import { createProfileRoute, createProfileRouter, CreateProfileRoute } from '@core/router'
     import { ChooseCreateProfileFlowView } from './views'
 
     $: if (features.analytics.onboardingRoute.enabled && $createProfileRoute) {
diff --git a/packages/desktop/views/onboarding/views/create-profile/index.js b/packages/desktop/views/onboarding/views/create-profile/index.js
index c5bccab1ea3..8e4cb1abd99 100644
--- a/packages/desktop/views/onboarding/views/create-profile/index.js
+++ b/packages/desktop/views/onboarding/views/create-profile/index.js
@@ -1,4 +1 @@
 export { default as CreateProfileRouterView } from './CreateProfileRouterView.svelte'
-
-export * from './create-profile-route.enum'
-export * from './create-profile-router'
diff --git a/packages/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte b/packages/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte
index a2d7b675590..32107f3a990 100644
--- a/packages/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte
+++ b/packages/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte
@@ -12,7 +12,7 @@
     import features from '@features/features'
     import { Animation, OnboardingButton, Text } from '@ui'
     import { onMount } from 'svelte'
-    import { createProfileRouter } from '../create-profile-router'
+    import { createProfileRouter } from '@core/router'
     import { Icon as IconEnum } from '@auxiliary/icon'
     import { AnimationEnum } from '@auxiliary/animation'
 
diff --git a/packages/desktop/views/onboarding/views/network-setup/NetworkSetupRouterView.svelte b/packages/desktop/views/onboarding/views/network-setup/NetworkSetupRouterView.svelte
index dd1d7e82e3d..eff31aadbc7 100644
--- a/packages/desktop/views/onboarding/views/network-setup/NetworkSetupRouterView.svelte
+++ b/packages/desktop/views/onboarding/views/network-setup/NetworkSetupRouterView.svelte
@@ -2,8 +2,7 @@
     import { Platform } from '@core/app'
     import features from '@features/features'
     import { Transition } from '@ui'
-    import { NetworkSetupRoute } from './network-setup-route.enum'
-    import { networkSetupRoute } from './network-setup-router'
+    import { NetworkSetupRoute, networkSetupRoute } from '@core/router'
     import { ChooseNetworkView, CustomNetworkView } from './views'
 
     $: if (features.analytics.onboardingRoute.enabled && $networkSetupRoute) {
diff --git a/packages/desktop/views/onboarding/views/network-setup/index.js b/packages/desktop/views/onboarding/views/network-setup/index.js
index 3a59571f603..eb185e8787c 100644
--- a/packages/desktop/views/onboarding/views/network-setup/index.js
+++ b/packages/desktop/views/onboarding/views/network-setup/index.js
@@ -1,4 +1 @@
 export { default as NetworkSetupRouterView } from './NetworkSetupRouterView.svelte'
-
-export * from './network-setup-route.enum'
-export * from './network-setup-router'
diff --git a/packages/desktop/views/onboarding/views/network-setup/views/ChooseNetworkView.svelte b/packages/desktop/views/onboarding/views/network-setup/views/ChooseNetworkView.svelte
index 585b3fa0e19..cc7d87a2520 100644
--- a/packages/desktop/views/onboarding/views/network-setup/views/ChooseNetworkView.svelte
+++ b/packages/desktop/views/onboarding/views/network-setup/views/ChooseNetworkView.svelte
@@ -13,7 +13,7 @@
     import features from '@features/features'
     import { Animation, OnboardingButton, Text, TextType } from '@ui'
     import { onMount } from 'svelte'
-    import { networkSetupRouter } from '../network-setup-router'
+    import { networkSetupRouter } from '@core/router'
     import { AnimationEnum } from '@auxiliary/animation'
 
     const NETWORK_ICON: Record<NetworkId, Icon> = {
diff --git a/packages/desktop/views/onboarding/views/network-setup/views/CustomNetworkView.svelte b/packages/desktop/views/onboarding/views/network-setup/views/CustomNetworkView.svelte
index 9ad25a8abab..f4fb3c8a049 100644
--- a/packages/desktop/views/onboarding/views/network-setup/views/CustomNetworkView.svelte
+++ b/packages/desktop/views/onboarding/views/network-setup/views/CustomNetworkView.svelte
@@ -17,7 +17,7 @@
     import { getNodeInfo } from '@core/wallet/actions'
     import { Animation, Button, HTMLButtonType, NodeConfigurationForm, Text, TextType } from '@ui'
     import { onMount } from 'svelte'
-    import { networkSetupRouter } from '../network-setup-router'
+    import { networkSetupRouter } from '@core/router'
     import { AnimationEnum } from '@auxiliary/animation'
 
     let nodeConfigurationForm: NodeConfigurationForm
diff --git a/packages/desktop/views/onboarding/views/restore-from-mnemonic/RestoreFromMnemonicRouterView.svelte b/packages/desktop/views/onboarding/views/restore-from-mnemonic/RestoreFromMnemonicRouterView.svelte
index 997255d2e9e..660b9702f41 100644
--- a/packages/desktop/views/onboarding/views/restore-from-mnemonic/RestoreFromMnemonicRouterView.svelte
+++ b/packages/desktop/views/onboarding/views/restore-from-mnemonic/RestoreFromMnemonicRouterView.svelte
@@ -1,10 +1,9 @@
 <script lang="ts">
     import { Platform } from '@core/app'
     import features from '@features/features'
-    import { Transition } from 'shared/components'
+    import { Transition } from '@ui'
     import { EncryptMnemonicView } from '../shared'
-    import { RestoreFromMnemonicRoute } from './restore-from-mnemonic-route.enum'
-    import { restoreFromMnemonicRoute, restoreFromMnemonicRouter } from './restore-from-mnemonic-router'
+    import { RestoreFromMnemonicRoute, restoreFromMnemonicRoute, restoreFromMnemonicRouter } from '@core/router'
     import { InputMnemonicView } from './views'
 
     $: if (features.analytics.onboardingRoute.enabled && $restoreFromMnemonicRoute) {
diff --git a/packages/desktop/views/onboarding/views/restore-from-mnemonic/index.js b/packages/desktop/views/onboarding/views/restore-from-mnemonic/index.js
index ff4d6375e96..82a5842b543 100644
--- a/packages/desktop/views/onboarding/views/restore-from-mnemonic/index.js
+++ b/packages/desktop/views/onboarding/views/restore-from-mnemonic/index.js
@@ -1,4 +1 @@
 export { default as RestoreFromMnemonicRouterView } from './RestoreFromMnemonicRouterView.svelte'
-
-export * from './restore-from-mnemonic-route.enum'
-export * from './restore-from-mnemonic-router'
diff --git a/packages/desktop/views/onboarding/views/restore-from-mnemonic/views/InputMnemonicView.svelte b/packages/desktop/views/onboarding/views/restore-from-mnemonic/views/InputMnemonicView.svelte
index 8e49e9a53d4..3054aad5705 100644
--- a/packages/desktop/views/onboarding/views/restore-from-mnemonic/views/InputMnemonicView.svelte
+++ b/packages/desktop/views/onboarding/views/restore-from-mnemonic/views/InputMnemonicView.svelte
@@ -4,7 +4,7 @@
     import { localize } from '@core/i18n'
     import { Animation, Button, HTMLButtonType, ImportTextfield, Text } from '@ui'
     import { onMount } from 'svelte'
-    import { restoreFromMnemonicRouter } from '../restore-from-mnemonic-router'
+    import { restoreFromMnemonicRouter } from '@core/router'
     import { AnimationEnum } from '@auxiliary/animation'
 
     let input = ''
diff --git a/packages/desktop/views/onboarding/views/restore-from-stronghold/RestoreFromStrongholdRouterView.svelte b/packages/desktop/views/onboarding/views/restore-from-stronghold/RestoreFromStrongholdRouterView.svelte
index e9f81afb735..b37319f85e8 100644
--- a/packages/desktop/views/onboarding/views/restore-from-stronghold/RestoreFromStrongholdRouterView.svelte
+++ b/packages/desktop/views/onboarding/views/restore-from-stronghold/RestoreFromStrongholdRouterView.svelte
@@ -2,9 +2,8 @@
     import { Platform } from '@core/app'
     import features from '@features/features'
     import { UpdateStrongholdRouterView } from '@views/update-stronghold'
-    import { Transition } from 'shared/components'
-    import { RestoreFromStrongholdRoute } from './restore-from-stronghold-route.enum'
-    import { restoreFromStrongholdRoute } from './restore-from-stronghold-router'
+    import { Transition } from '@ui'
+    import { RestoreFromStrongholdRoute, restoreFromStrongholdRoute } from '@core/router'
     import { ImportStrongholdView, UnlockStrongholdView } from './views'
 
     $: if (features.analytics.onboardingRoute.enabled && $restoreFromStrongholdRoute) {
diff --git a/packages/desktop/views/onboarding/views/restore-from-stronghold/index.js b/packages/desktop/views/onboarding/views/restore-from-stronghold/index.js
index a9005a613ca..a94ea508548 100644
--- a/packages/desktop/views/onboarding/views/restore-from-stronghold/index.js
+++ b/packages/desktop/views/onboarding/views/restore-from-stronghold/index.js
@@ -1,4 +1 @@
 export { default as RestoreFromStrongholdRouterView } from './RestoreFromStrongholdRouterView.svelte'
-
-export * from './restore-from-stronghold-route.enum'
-export * from './restore-from-stronghold-router'
diff --git a/packages/desktop/views/onboarding/views/restore-from-stronghold/views/ImportStrongholdView.svelte b/packages/desktop/views/onboarding/views/restore-from-stronghold/views/ImportStrongholdView.svelte
index 9710254c4b0..b23b3f23f9e 100644
--- a/packages/desktop/views/onboarding/views/restore-from-stronghold/views/ImportStrongholdView.svelte
+++ b/packages/desktop/views/onboarding/views/restore-from-stronghold/views/ImportStrongholdView.svelte
@@ -9,7 +9,7 @@
     import { StrongholdVersion } from '@core/stronghold/enums'
     import { Animation, Button, Dropzone, Text } from '@ui'
     import { onMount } from 'svelte'
-    import { restoreFromStrongholdRouter } from '../../restore-from-stronghold/restore-from-stronghold-router'
+    import { restoreFromStrongholdRouter } from '@core/router'
     import { restoreBackup } from '@core/wallet/actions'
 
     interface FileWithPath extends File {
diff --git a/packages/desktop/views/onboarding/views/restore-from-stronghold/views/UnlockStrongholdView.svelte b/packages/desktop/views/onboarding/views/restore-from-stronghold/views/UnlockStrongholdView.svelte
index bf7eabd2625..fa06a4a24f3 100644
--- a/packages/desktop/views/onboarding/views/restore-from-stronghold/views/UnlockStrongholdView.svelte
+++ b/packages/desktop/views/onboarding/views/restore-from-stronghold/views/UnlockStrongholdView.svelte
@@ -6,7 +6,7 @@
     import { localize } from '@core/i18n'
     import { Animation, Button, PasswordInput, Text } from '@ui'
     import { onMount } from 'svelte'
-    import { restoreFromStrongholdRouter } from '../restore-from-stronghold-router'
+    import { restoreFromStrongholdRouter } from '@core/router'
     import { AnimationEnum } from '@auxiliary/animation'
 
     export let error = ''
diff --git a/packages/desktop/views/onboarding/views/restore-profile/RestoreProfileRouterView.svelte b/packages/desktop/views/onboarding/views/restore-profile/RestoreProfileRouterView.svelte
index ef129785360..425a8a4a244 100644
--- a/packages/desktop/views/onboarding/views/restore-profile/RestoreProfileRouterView.svelte
+++ b/packages/desktop/views/onboarding/views/restore-profile/RestoreProfileRouterView.svelte
@@ -5,8 +5,7 @@
     import { CreateFromLedgerRouterView } from '../create-from-ledger'
     import { RestoreFromMnemonicRouterView } from '../restore-from-mnemonic'
     import { RestoreFromStrongholdRouterView } from '../restore-from-stronghold'
-    import { RestoreProfileRoute } from './restore-profile-route.enum'
-    import { restoreProfileRoute, restoreProfileRouter } from './restore-profile-router'
+    import { restoreProfileRoute, restoreProfileRouter, RestoreProfileRoute } from '@core/router'
     import { ChooseRestoreProfileFlowView, ClaimFinderView } from './views'
 
     $: if (features.analytics.onboardingRoute.enabled && $restoreProfileRoute) {
diff --git a/packages/desktop/views/onboarding/views/restore-profile/index.js b/packages/desktop/views/onboarding/views/restore-profile/index.js
index 4576d00a227..65586d380c3 100644
--- a/packages/desktop/views/onboarding/views/restore-profile/index.js
+++ b/packages/desktop/views/onboarding/views/restore-profile/index.js
@@ -1,4 +1 @@
 export { default as RestoreProfileRouterView } from './RestoreProfileRouterView.svelte'
-
-export * from './restore-profile-route.enum'
-export * from './restore-profile-router'
diff --git a/packages/desktop/views/onboarding/views/restore-profile/views/ChooseRestoreProfileFlowView.svelte b/packages/desktop/views/onboarding/views/restore-profile/views/ChooseRestoreProfileFlowView.svelte
index dd74877d880..b7ef3bbb795 100644
--- a/packages/desktop/views/onboarding/views/restore-profile/views/ChooseRestoreProfileFlowView.svelte
+++ b/packages/desktop/views/onboarding/views/restore-profile/views/ChooseRestoreProfileFlowView.svelte
@@ -13,7 +13,7 @@
     import features from '@features/features'
     import { Animation, OnboardingButton, Text } from '@ui'
     import { onMount } from 'svelte'
-    import { restoreProfileRouter } from '../restore-profile-router'
+    import { restoreProfileRouter } from '@core/router'
     import { Icon as IconEnum } from '@auxiliary/icon'
     import { AnimationEnum } from '@auxiliary/animation'
 
diff --git a/packages/desktop/views/onboarding/views/restore-profile/views/ClaimFinderView.svelte b/packages/desktop/views/onboarding/views/restore-profile/views/ClaimFinderView.svelte
index d9d4de43bc4..e49123adfca 100644
--- a/packages/desktop/views/onboarding/views/restore-profile/views/ClaimFinderView.svelte
+++ b/packages/desktop/views/onboarding/views/restore-profile/views/ClaimFinderView.svelte
@@ -33,7 +33,7 @@
     } from '@core/ledger'
     import { Animation, Button, ShimmerClaimingAccountTile, Text } from '@ui'
     import { onDestroy, onMount } from 'svelte'
-    import { restoreProfileRouter } from '../restore-profile-router'
+    import { restoreProfileRouter } from '@core/router'
     import { AnimationEnum } from '@auxiliary/animation'
     import { setStrongholdPassword, unsubscribeFromWalletApiEvents } from '@core/wallet/actions'
 
diff --git a/packages/desktop/views/update-stronghold/UpdateStrongholdRouterView.svelte b/packages/desktop/views/update-stronghold/UpdateStrongholdRouterView.svelte
index 7015e84c350..8fd92f6dcd4 100644
--- a/packages/desktop/views/update-stronghold/UpdateStrongholdRouterView.svelte
+++ b/packages/desktop/views/update-stronghold/UpdateStrongholdRouterView.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
     import { Transition } from '@ui'
-    import { UpdateStrongholdRoute } from './update-stronghold-route.enum'
-    import { updateStrongholdRoute } from './update-stronghold-router'
+    import { UpdateStrongholdRoute, updateStrongholdRoute } from '@core/router'
     import { ChangePasswordView, UpdateBackupView, UpdateStrongholdView } from './views'
 
     export let isRecovery = false
diff --git a/packages/desktop/views/update-stronghold/index.js b/packages/desktop/views/update-stronghold/index.js
index cf2a156b1b5..c08a5f4ed65 100644
--- a/packages/desktop/views/update-stronghold/index.js
+++ b/packages/desktop/views/update-stronghold/index.js
@@ -1,4 +1 @@
 export { default as UpdateStrongholdRouterView } from './UpdateStrongholdRouterView.svelte'
-
-export * from './update-stronghold-route.enum'
-export * from './update-stronghold-router'
diff --git a/packages/desktop/views/update-stronghold/views/ChangePasswordView.svelte b/packages/desktop/views/update-stronghold/views/ChangePasswordView.svelte
index 8531c08d265..8bdfd121db4 100644
--- a/packages/desktop/views/update-stronghold/views/ChangePasswordView.svelte
+++ b/packages/desktop/views/update-stronghold/views/ChangePasswordView.svelte
@@ -8,8 +8,8 @@
     import { Animation, Button, PasswordInput, Text, TextHint } from '@ui'
     import { HTMLButtonType, TextType } from '@ui/enums'
     import zxcvbn from 'zxcvbn'
-    import { updateStrongholdRouter } from '../update-stronghold-router'
-    import { TextHintVariant } from 'shared/components/enums'
+    import { updateStrongholdRouter } from '@core/router'
+    import { TextHintVariant } from '@ui/enums'
     import { AnimationEnum } from '@auxiliary/animation'
     import { onboardingProfile, updateOnboardingProfile } from '@contexts/onboarding'
 
diff --git a/packages/desktop/views/update-stronghold/views/UpdateBackupView.svelte b/packages/desktop/views/update-stronghold/views/UpdateBackupView.svelte
index bb0fae2a3fd..cd2801a7b52 100644
--- a/packages/desktop/views/update-stronghold/views/UpdateBackupView.svelte
+++ b/packages/desktop/views/update-stronghold/views/UpdateBackupView.svelte
@@ -6,8 +6,8 @@
     import { localize } from '@core/i18n'
     import { login } from '@core/profile/actions'
     import { Animation, Button, Icon, Text, TextHint, TextType } from '@ui'
-    import { updateStrongholdRouter } from '../update-stronghold-router'
-    import { TextHintVariant } from 'shared/components/enums'
+    import { updateStrongholdRouter } from '@core/router'
+    import { TextHintVariant } from '@ui/enums'
     import { AnimationEnum } from '@auxiliary/animation'
 
     export let busy = false
diff --git a/packages/desktop/views/update-stronghold/views/UpdateStrongholdView.svelte b/packages/desktop/views/update-stronghold/views/UpdateStrongholdView.svelte
index 557e5de699e..966827f7e38 100644
--- a/packages/desktop/views/update-stronghold/views/UpdateStrongholdView.svelte
+++ b/packages/desktop/views/update-stronghold/views/UpdateStrongholdView.svelte
@@ -6,7 +6,7 @@
     import { isValidJson } from '@core/utils'
     import { Animation, Button, PasswordInput, Text } from '@ui'
     import { HTMLButtonType, TextType } from '@ui/enums'
-    import { updateStrongholdRouter } from '../update-stronghold-router'
+    import { updateStrongholdRouter } from '@core/router'
     import { AnimationEnum } from '@auxiliary/animation'
     import { Platform } from '@core/app'
     import { onboardingProfile } from '@contexts/onboarding'
diff --git a/packages/shared/components/AccountActivityDetails.svelte b/packages/shared/components/AccountActivityDetails.svelte
index 119c8ea9076..c2f3fa71c4e 100644
--- a/packages/shared/components/AccountActivityDetails.svelte
+++ b/packages/shared/components/AccountActivityDetails.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { AddressBox, ActivityInclusionStatusPill } from 'shared/components'
+    import { AddressBox, ActivityInclusionStatusPill } from '@ui'
     import { AccountActivity } from '@core/wallet'
 
     export let activity: AccountActivity
diff --git a/packages/shared/components/ActivityInformation.svelte b/packages/shared/components/ActivityInformation.svelte
index 3dfbb6c89ed..b20a7a17776 100644
--- a/packages/shared/components/ActivityInformation.svelte
+++ b/packages/shared/components/ActivityInformation.svelte
@@ -10,8 +10,8 @@
         ConsolidationActivityInformation,
         NftMetadataInformation,
         SmartContractActivityInformation,
-    } from 'shared/components'
-    import { Tab } from 'shared/components/enums'
+    } from '@ui'
+    import { Tab } from '@ui/enums'
     import { ActivityType, Activity } from '@core/wallet'
     import { getNftByIdFromAllWalletNfts } from '@core/nfts'
     import { selectedWalletId } from '@core/wallet'
diff --git a/packages/shared/components/Alert.svelte b/packages/shared/components/Alert.svelte
index 8e6a99f3377..d14b55258df 100644
--- a/packages/shared/components/Alert.svelte
+++ b/packages/shared/components/Alert.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Icon, Text, FontWeight } from 'shared/components'
+    import { Icon, Text, FontWeight } from '@ui'
     import { localize } from '@core/i18n'
     import { removeDisplayNotification } from '@auxiliary/notification/stores'
     import { Icon as IconEnum } from '@auxiliary/icon'
diff --git a/packages/shared/components/AmountBox.svelte b/packages/shared/components/AmountBox.svelte
index 6378c811061..c622a74bb08 100644
--- a/packages/shared/components/AmountBox.svelte
+++ b/packages/shared/components/AmountBox.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { AssetIcon, Text, FontWeight, TextType, InformationTooltip } from 'shared/components'
+    import { AssetIcon, Text, FontWeight, TextType, InformationTooltip } from '@ui'
     import { getNthOccurrenceIndex } from '@core/utils'
     import { IPersistedAsset, formatTokenAmountDefault } from '@core/wallet'
     import { getDecimalSeparator, getGroupSeparator } from '@core/i18n'
diff --git a/packages/shared/components/AssetIcon.svelte b/packages/shared/components/AssetIcon.svelte
index a8947138ae4..bed3ecbb613 100644
--- a/packages/shared/components/AssetIcon.svelte
+++ b/packages/shared/components/AssetIcon.svelte
@@ -5,7 +5,7 @@
     import { COIN_TYPE, NetworkId } from '@core/network'
     import { isBright } from '@core/utils'
     import { ANIMATED_TOKEN_IDS, getAssetInitials, IPersistedAsset, TokenStandard } from '@core/wallet'
-    import { Animation, AssetIconSize, Icon, VerificationBadge } from 'shared/components'
+    import { Animation, AssetIconSize, Icon, VerificationBadge } from '@ui'
 
     export let asset: IPersistedAsset
     export let size: AssetIconSize = AssetIconSize.Medium
diff --git a/packages/shared/components/AssetList.svelte b/packages/shared/components/AssetList.svelte
index 08a0f9ecd5c..b1dd4ff2ba9 100644
--- a/packages/shared/components/AssetList.svelte
+++ b/packages/shared/components/AssetList.svelte
@@ -1,10 +1,9 @@
 <script lang="ts">
     import VirtualList from '@sveltejs/svelte-virtual-list'
-    import { AssetTile, Text, TextType } from 'shared/components'
-    import { Filter } from '../../desktop/components'
+    import { AssetTile, Text, TextType, Filter } from '@ui'
     import { localize } from '@core/i18n'
     import { assetFilter, WalletAssets, IAsset } from '@core/wallet'
-    import { isVisibleAsset } from '@core/wallet/utils/isVisibleAsset'
+    import { isVisibleAsset } from '@core/wallet/utils'
     import { openPopup, PopupId } from '@auxiliary/popup'
 
     export let assets: WalletAssets
diff --git a/packages/shared/components/BalanceSummaryRow.svelte b/packages/shared/components/BalanceSummaryRow.svelte
index 83cda332eb6..e461a3933f9 100644
--- a/packages/shared/components/BalanceSummaryRow.svelte
+++ b/packages/shared/components/BalanceSummaryRow.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { FontWeight, Text } from 'shared/components'
+    import { FontWeight, Text } from '@ui'
 
     export let title: string
     export let subtitle: string | undefined = undefined
diff --git a/packages/shared/components/BalanceSummarySection.svelte b/packages/shared/components/BalanceSummarySection.svelte
index 5fcad7ba93c..cff4c7f7f21 100644
--- a/packages/shared/components/BalanceSummarySection.svelte
+++ b/packages/shared/components/BalanceSummarySection.svelte
@@ -2,7 +2,7 @@
     import { formatCurrency, localize } from '@core/i18n'
     import { getMarketAmountFromAssetValue } from '@core/market/utils'
     import { formatTokenAmountBestMatch, selectedWalletAssets } from '@core/wallet'
-    import { BalanceSummaryRow, Icon } from 'shared/components'
+    import { BalanceSummaryRow, Icon } from '@ui'
     import { Icon as IconEnum } from '@auxiliary/icon'
     import { activeProfile } from '@core/profile'
     import { DEFAULT_MANA } from '@core/network'
diff --git a/packages/shared/components/BasicActivityDetails.svelte b/packages/shared/components/BasicActivityDetails.svelte
index f262458cf13..0d25af9464d 100644
--- a/packages/shared/components/BasicActivityDetails.svelte
+++ b/packages/shared/components/BasicActivityDetails.svelte
@@ -1,11 +1,5 @@
 <script lang="ts">
-    import {
-        TransactionActivityStatusPill,
-        ActivityAsyncStatusPill,
-        Pill,
-        AmountBox,
-        SubjectBox,
-    } from 'shared/components'
+    import { TransactionActivityStatusPill, ActivityAsyncStatusPill, Pill, AmountBox, SubjectBox } from '@ui'
     import { localize } from '@core/i18n'
     import {
         TransactionActivity,
diff --git a/packages/shared/components/Button.svelte b/packages/shared/components/Button.svelte
index 0af8cb93dc1..801ad9577d8 100644
--- a/packages/shared/components/Button.svelte
+++ b/packages/shared/components/Button.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { ButtonSize, ButtonVariant, HTMLButtonType, Icon, Spinner } from 'shared/components'
+    import { ButtonSize, ButtonVariant, HTMLButtonType, Icon, Spinner } from '@ui'
     import { onMount } from 'svelte'
     import { appSettings } from '@core/app'
     import { debounce } from '@core/utils'
diff --git a/packages/shared/components/ColorPicker.svelte b/packages/shared/components/ColorPicker.svelte
index 4a21018f0fc..943f60f3107 100644
--- a/packages/shared/components/ColorPicker.svelte
+++ b/packages/shared/components/ColorPicker.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Text, Icon, Tooltip, TextType, Position } from 'shared/components'
+    import { Text, Icon, Tooltip, TextType, Position } from '@ui'
     import { WalletColors } from '@core/wallet/enums'
     import { localize } from '@core/i18n'
     import { clickOutside, isBright, convertHexToRgba } from '@core/utils'
diff --git a/packages/shared/components/ConsolidationActivityDetails.svelte b/packages/shared/components/ConsolidationActivityDetails.svelte
index 0bc4cfe912a..78a6ef3315f 100644
--- a/packages/shared/components/ConsolidationActivityDetails.svelte
+++ b/packages/shared/components/ConsolidationActivityDetails.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { TransactionActivityStatusPill } from 'shared/components'
+    import { TransactionActivityStatusPill } from '@ui'
     import { ConsolidationActivity } from '@core/wallet'
 
     export let activity: ConsolidationActivity
diff --git a/packages/shared/components/DateInputButton.svelte b/packages/shared/components/DateInputButton.svelte
index ccfd89721e7..aba9b0c1cbf 100644
--- a/packages/shared/components/DateInputButton.svelte
+++ b/packages/shared/components/DateInputButton.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { formatDate } from '@core/i18n'
-    import { Text, DateTimePicker, Icon } from 'shared/components'
+    import { Text, DateTimePicker, Icon } from '@ui'
     import { appSettings } from '@core/app'
     import { Icon as IconEnum } from '@auxiliary/icon'
 
diff --git a/packages/shared/components/Error.svelte b/packages/shared/components/Error.svelte
index a36a56ab215..db5b11e80ae 100644
--- a/packages/shared/components/Error.svelte
+++ b/packages/shared/components/Error.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Text } from 'shared/components'
+    import { Text } from '@ui'
     export let error: string | null
 </script>
 
diff --git a/packages/shared/components/ExpirationTimePicker.svelte b/packages/shared/components/ExpirationTimePicker.svelte
index a86e0f5be2a..b052094a6d6 100644
--- a/packages/shared/components/ExpirationTimePicker.svelte
+++ b/packages/shared/components/ExpirationTimePicker.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Text, Icon, Modal, MenuItem, DateTimePicker } from 'shared/components'
+    import { Text, Icon, Modal, MenuItem, DateTimePicker } from '@ui'
     import { Icon as IconEnum } from '@auxiliary/icon'
     import { formatDate, localize } from '@core/i18n'
     import { MILLISECONDS_PER_SECOND, SECONDS_PER_MINUTE, TimePeriod, isValidExpirationDateTime } from '@core/utils'
diff --git a/packages/shared/components/FoundryActivityDetails.svelte b/packages/shared/components/FoundryActivityDetails.svelte
index c17c904ede7..05e90ba6f83 100644
--- a/packages/shared/components/FoundryActivityDetails.svelte
+++ b/packages/shared/components/FoundryActivityDetails.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { AmountBox, SubjectBox, TransactionActivityStatusPill } from 'shared/components'
+    import { AmountBox, SubjectBox, TransactionActivityStatusPill } from '@ui'
     import { getAssetFromPersistedAssets } from '@core/wallet'
     import { FoundryActivity } from '@core/wallet'
 
diff --git a/packages/shared/components/GovernanceActivityDetails.svelte b/packages/shared/components/GovernanceActivityDetails.svelte
index 3287239a197..36736177911 100644
--- a/packages/shared/components/GovernanceActivityDetails.svelte
+++ b/packages/shared/components/GovernanceActivityDetails.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { AmountBox, ActivityInclusionStatusPill, Text, FontWeight } from 'shared/components'
+    import { AmountBox, ActivityInclusionStatusPill, Text, FontWeight } from '@ui'
     import { getAssetFromPersistedAssets } from '@core/wallet'
     import { GovernanceActivity } from '@core/wallet'
     import { getCoinType } from '@core/profile'
diff --git a/packages/shared/components/InformationTooltip.svelte b/packages/shared/components/InformationTooltip.svelte
index 063bdc1ec09..20eab872db7 100644
--- a/packages/shared/components/InformationTooltip.svelte
+++ b/packages/shared/components/InformationTooltip.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Text, Tooltip } from 'shared/components'
+    import { Text, Tooltip } from '@ui'
     import { TextType } from './enums'
 
     export let title: string = ''
diff --git a/packages/shared/components/LedgerAnimation.svelte b/packages/shared/components/LedgerAnimation.svelte
index 744044a0458..cf86dd57b68 100644
--- a/packages/shared/components/LedgerAnimation.svelte
+++ b/packages/shared/components/LedgerAnimation.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { AnimationEnum } from '@auxiliary/animation'
     import { IllustrationEnum } from '@auxiliary/illustration'
-    import { Animation, Illustration } from 'shared/components'
+    import { Animation, Illustration } from '@ui'
     import { Icon } from '@auxiliary/icon'
 
     export let animation: AnimationEnum | undefined = undefined
diff --git a/packages/shared/components/Link.svelte b/packages/shared/components/Link.svelte
index 121706c182b..20092551872 100644
--- a/packages/shared/components/Link.svelte
+++ b/packages/shared/components/Link.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Icon } from 'shared/components'
+    import { Icon } from '@ui'
     import { Icon as IconEnum } from '@auxiliary/icon'
 
     export let href: string | null = null
diff --git a/packages/shared/components/MarkdownBlock.svelte b/packages/shared/components/MarkdownBlock.svelte
index a7f1fd15f50..f12a6c20822 100644
--- a/packages/shared/components/MarkdownBlock.svelte
+++ b/packages/shared/components/MarkdownBlock.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import SvelteMarkdown from 'svelte-markdown'
     import { SvelteComponent } from 'svelte'
-    import { ParagraphBlock, LinkBlock } from 'shared/components'
+    import { ParagraphBlock, LinkBlock } from '@ui'
     export let text: string
 
     const renderers: Record<string, typeof SvelteComponent | null> = {
diff --git a/packages/shared/components/MediaPlaceholder.svelte b/packages/shared/components/MediaPlaceholder.svelte
index e252d6dc218..16725dd6d8c 100644
--- a/packages/shared/components/MediaPlaceholder.svelte
+++ b/packages/shared/components/MediaPlaceholder.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { MimeType, ParentMimeType } from '@core/nfts'
-    import { Icon } from 'shared/components'
+    import { Icon } from '@ui'
     import { Icon as IconEnum } from '@auxiliary/icon'
     import { appSettings } from '@core/app'
 
diff --git a/packages/shared/components/MenuItem.svelte b/packages/shared/components/MenuItem.svelte
index b399d2ee5de..137d59aebec 100644
--- a/packages/shared/components/MenuItem.svelte
+++ b/packages/shared/components/MenuItem.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Icon, Text, Spinner, Position, InformationTooltip } from 'shared/components'
+    import { Icon, Text, Spinner, Position, InformationTooltip } from '@ui'
     import { Icon as IconEnum } from '@auxiliary/icon'
     import { MenuItemVariant } from './enums'
 
diff --git a/packages/shared/components/NftActivityDetails.svelte b/packages/shared/components/NftActivityDetails.svelte
index feb84f99887..905826d2f40 100644
--- a/packages/shared/components/NftActivityDetails.svelte
+++ b/packages/shared/components/NftActivityDetails.svelte
@@ -17,7 +17,7 @@
         Text,
         TextType,
         TransactionActivityStatusPill,
-    } from 'shared/components'
+    } from '@ui'
     import { tick } from 'svelte'
 
     export let activity: NftActivity
diff --git a/packages/shared/components/NftGalleryItem.svelte b/packages/shared/components/NftGalleryItem.svelte
index 145e3f618ae..1fcaf7abe5a 100644
--- a/packages/shared/components/NftGalleryItem.svelte
+++ b/packages/shared/components/NftGalleryItem.svelte
@@ -1,5 +1,5 @@
 <script lang="typescript">
-    import { Text, FontWeight, NftMedia, TooltipIcon, Position, TooltipType } from 'shared/components'
+    import { Text, FontWeight, NftMedia, TooltipIcon, Position, TooltipType } from '@ui'
 
     import { time } from '@core/app'
     import { localize } from '@core/i18n'
diff --git a/packages/shared/components/NftImageOrIconBox.svelte b/packages/shared/components/NftImageOrIconBox.svelte
index c821731dc24..0fcbe6fb82a 100644
--- a/packages/shared/components/NftImageOrIconBox.svelte
+++ b/packages/shared/components/NftImageOrIconBox.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { INft } from '@core/nfts'
-    import { NftSize } from 'shared/components/enums'
-    import { MediaPlaceholder, NftMedia } from 'shared/components'
+    import { NftSize } from '@ui/enums'
+    import { MediaPlaceholder, NftMedia } from '@ui'
     import { ParentMimeType } from '@core/nfts'
 
     export let nft: INft | null = null
diff --git a/packages/shared/components/NodeConfigurationForm.svelte b/packages/shared/components/NodeConfigurationForm.svelte
index f30653efb39..89cc21dbfad 100644
--- a/packages/shared/components/NodeConfigurationForm.svelte
+++ b/packages/shared/components/NodeConfigurationForm.svelte
@@ -8,7 +8,7 @@
     import { activeProfile } from '@core/profile'
     import { IDropdownItem, cleanUrl } from '@core/utils'
     import features from '@features/features'
-    import { Dropdown, Error, NumberInput, PasswordInput, TextInput } from 'shared/components'
+    import { Dropdown, Error, NumberInput, PasswordInput, TextInput } from '@ui'
     import { getNodeInfo } from '@core/wallet/actions'
     import { IAuth, IClientOptions } from '@iota/sdk/out/types'
     interface INodeValidationOptions {
diff --git a/packages/shared/components/NodeListRow.svelte b/packages/shared/components/NodeListRow.svelte
index a946c32a126..3dee9f5e4d7 100644
--- a/packages/shared/components/NodeListRow.svelte
+++ b/packages/shared/components/NodeListRow.svelte
@@ -3,7 +3,7 @@
     import { EMPTY_NODE, INode } from '@core/network'
     import { activeProfile } from '@core/profile'
     import { Pill } from './pills'
-    import { Text, Modal, MeatballMenuButton, MenuItem } from 'shared/components'
+    import { Text, Modal, MeatballMenuButton, MenuItem } from '@ui'
     import { localize } from '@core/i18n'
     import {
         removeNodeFromClientOptions,
diff --git a/packages/shared/components/ProgressBar.svelte b/packages/shared/components/ProgressBar.svelte
index 6d7dc1e81a9..214aa8ba2f6 100644
--- a/packages/shared/components/ProgressBar.svelte
+++ b/packages/shared/components/ProgressBar.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Text, TextType } from 'shared/components'
+    import { Text, TextType } from '@ui'
 
     export let percent: number = 0
     export let message: string = ''
diff --git a/packages/shared/components/SelectorInput.svelte b/packages/shared/components/SelectorInput.svelte
index e967e5e7d49..94777d16d94 100644
--- a/packages/shared/components/SelectorInput.svelte
+++ b/packages/shared/components/SelectorInput.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { localize } from '@core/i18n'
-    import { Modal, TextInput, Text, TextType, FontWeight, IOption } from 'shared/components'
+    import { Modal, TextInput, Text, TextType, FontWeight, IOption } from '@ui'
     import { fade } from 'svelte/transition'
     import { truncateString } from '@core/utils'
 
diff --git a/packages/shared/components/Spinner.svelte b/packages/shared/components/Spinner.svelte
index ca406a34d5a..e6b9f6e5287 100644
--- a/packages/shared/components/Spinner.svelte
+++ b/packages/shared/components/Spinner.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Icon, Text } from 'shared/components'
+    import { Icon, Text } from '@ui'
     import { Icon as IconEnum } from '@auxiliary/icon'
 
     export let message: string = ''
diff --git a/packages/shared/components/SubjectBox.svelte b/packages/shared/components/SubjectBox.svelte
index 20848c9e48d..f4db786d2fd 100644
--- a/packages/shared/components/SubjectBox.svelte
+++ b/packages/shared/components/SubjectBox.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { localize } from '@core/i18n'
     import { Subject, SubjectType } from '@core/wallet'
-    import { Box, AddressBox, Text, WalletLabel, TextType, FontWeight } from 'shared/components'
+    import { Box, AddressBox, Text, WalletLabel, TextType, FontWeight } from '@ui'
 
     export let subject: Subject | null = null
 </script>
diff --git a/packages/shared/components/TextHint.svelte b/packages/shared/components/TextHint.svelte
index 49d8fb8fde4..f4dfe330ed2 100644
--- a/packages/shared/components/TextHint.svelte
+++ b/packages/shared/components/TextHint.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Icon, Text, TextHintVariant } from 'shared/components'
+    import { Icon, Text, TextHintVariant } from '@ui'
     import { Icon as IconEnum } from '@lib/auxiliary/icon'
 
     export let variant: TextHintVariant
diff --git a/packages/shared/components/Toast.svelte b/packages/shared/components/Toast.svelte
index 6358450897c..d07d2035160 100644
--- a/packages/shared/components/Toast.svelte
+++ b/packages/shared/components/Toast.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Alert, Icon, Logo } from 'shared/components'
+    import { Alert, Icon, Logo } from '@ui'
     import { localize } from '@core/i18n'
     import { removeDisplayNotification } from '@auxiliary/notification/stores'
     import { Logo as LogoEnum } from './enums'
diff --git a/packages/shared/components/activity-info/AccountActivityInformation.svelte b/packages/shared/components/activity-info/AccountActivityInformation.svelte
index f1aef643eeb..41e23e2e6b0 100644
--- a/packages/shared/components/activity-info/AccountActivityInformation.svelte
+++ b/packages/shared/components/activity-info/AccountActivityInformation.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { KeyValueBox } from 'shared/components'
+    import { KeyValueBox } from '@ui'
     import { localize } from '@core/i18n'
     import { AccountActivity } from '@core/wallet'
 
diff --git a/packages/shared/components/activity-info/ConsolidationActivityInformation.svelte b/packages/shared/components/activity-info/ConsolidationActivityInformation.svelte
index dfb0e564174..792422901aa 100644
--- a/packages/shared/components/activity-info/ConsolidationActivityInformation.svelte
+++ b/packages/shared/components/activity-info/ConsolidationActivityInformation.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { KeyValueBox } from 'shared/components'
+    import { KeyValueBox } from '@ui'
     import { getFormattedTimeStamp, localize } from '@core/i18n'
     import { ConsolidationActivity } from '@core/wallet'
     import { IKeyValueBoxList } from '@core/utils'
diff --git a/packages/shared/components/activity-info/FoundryActivityInformation.svelte b/packages/shared/components/activity-info/FoundryActivityInformation.svelte
index 575568921db..b3e0e54d4da 100644
--- a/packages/shared/components/activity-info/FoundryActivityInformation.svelte
+++ b/packages/shared/components/activity-info/FoundryActivityInformation.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { KeyValueBox } from 'shared/components'
+    import { KeyValueBox } from '@ui'
     import { localize } from '@core/i18n'
     import { FoundryActivity } from '@core/wallet'
     import { IKeyValueBoxList } from '@core/utils'
diff --git a/packages/shared/components/activity-info/GenericActivityInformation.svelte b/packages/shared/components/activity-info/GenericActivityInformation.svelte
index 438d409782e..9676ae27aa6 100644
--- a/packages/shared/components/activity-info/GenericActivityInformation.svelte
+++ b/packages/shared/components/activity-info/GenericActivityInformation.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { KeyValueBox } from 'shared/components'
+    import { KeyValueBox } from '@ui'
     import { getFormattedTimeStamp, localize } from '@core/i18n'
     import { activeProfile, getBaseToken } from '@core/profile'
     import { Activity, formatTokenAmountPrecise } from '@core/wallet'
diff --git a/packages/shared/components/activity-info/GovernanceActivityInformation.svelte b/packages/shared/components/activity-info/GovernanceActivityInformation.svelte
index b882788e711..97750cf54db 100644
--- a/packages/shared/components/activity-info/GovernanceActivityInformation.svelte
+++ b/packages/shared/components/activity-info/GovernanceActivityInformation.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { KeyValueBox } from 'shared/components'
+    import { KeyValueBox } from '@ui'
     import { getFormattedTimeStamp, localize } from '@core/i18n'
     import { formatTokenAmountBestMatch, GovernanceAction, GovernanceActivity } from '@core/wallet'
     import { getBaseToken } from '@core/profile'
diff --git a/packages/shared/components/activity-info/NftActivityInformation.svelte b/packages/shared/components/activity-info/NftActivityInformation.svelte
index 41c6e03a16e..56e8f521c5c 100644
--- a/packages/shared/components/activity-info/NftActivityInformation.svelte
+++ b/packages/shared/components/activity-info/NftActivityInformation.svelte
@@ -4,7 +4,7 @@
     import { getNftByIdFromAllWalletNfts } from '@core/nfts'
     import { IKeyValueBoxList } from '@core/utils'
     import { getBech32AddressFromAddressTypes, getHexAddressFromAddressTypes, NftActivity } from '@core/wallet'
-    import { KeyValueBox } from 'shared/components'
+    import { KeyValueBox } from '@ui'
     import { AddressType } from '@iota/sdk/out/types'
 
     export let activity: NftActivity
diff --git a/packages/shared/components/activity-info/NftMetadataInformation.svelte b/packages/shared/components/activity-info/NftMetadataInformation.svelte
index e7ae5bcbfea..b8a4a02a3a1 100644
--- a/packages/shared/components/activity-info/NftMetadataInformation.svelte
+++ b/packages/shared/components/activity-info/NftMetadataInformation.svelte
@@ -3,7 +3,7 @@
     import { localize } from '@core/i18n'
     import { convertAndFormatNftMetadata, getNftByIdFromAllWalletNfts, IIrc27Metadata } from '@core/nfts'
     import { NftActivity } from '@core/wallet'
-    import { KeyValueBox } from 'shared/components'
+    import { KeyValueBox } from '@ui'
 
     export let activity: NftActivity
 
diff --git a/packages/shared/components/activity-info/SmartContractActivityInformation.svelte b/packages/shared/components/activity-info/SmartContractActivityInformation.svelte
index ce9f85d5d67..113da1c856d 100644
--- a/packages/shared/components/activity-info/SmartContractActivityInformation.svelte
+++ b/packages/shared/components/activity-info/SmartContractActivityInformation.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { KeyValueBox } from 'shared/components'
+    import { KeyValueBox } from '@ui'
     import { localize } from '@core/i18n'
     import { TransactionActivity } from '@core/wallet'
     import { Layer2Metadata } from '@core/layer-2'
diff --git a/packages/shared/components/activity-info/TokenActivityInformation.svelte b/packages/shared/components/activity-info/TokenActivityInformation.svelte
index 6d329fca9ee..99bff263140 100644
--- a/packages/shared/components/activity-info/TokenActivityInformation.svelte
+++ b/packages/shared/components/activity-info/TokenActivityInformation.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { KeyValueBox } from 'shared/components'
+    import { KeyValueBox } from '@ui'
     import { localize } from '@core/i18n'
     import { FoundryActivity, getAssetFromPersistedAssets, IIrc30Metadata } from '@core/wallet'
     import { IKeyValueBoxList } from '@core/utils'
diff --git a/packages/shared/components/badges/NetworkIconBadge.svelte b/packages/shared/components/badges/NetworkIconBadge.svelte
index 323e3baf430..ed4704cef28 100644
--- a/packages/shared/components/badges/NetworkIconBadge.svelte
+++ b/packages/shared/components/badges/NetworkIconBadge.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { NetworkId } from '@core/network'
-    import { NetworkIcon, InformationTooltip } from 'shared/components'
-    import { Position } from 'shared/components/enums'
+    import { NetworkIcon, InformationTooltip } from '@ui'
+    import { Position } from '@ui/enums'
 
     export let networkId: NetworkId
     export let tooltipText: string = ''
diff --git a/packages/shared/components/badges/StrongholdBadge.svelte b/packages/shared/components/badges/StrongholdBadge.svelte
index 287f35a1d95..75e1009ac3c 100644
--- a/packages/shared/components/badges/StrongholdBadge.svelte
+++ b/packages/shared/components/badges/StrongholdBadge.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-    import { Icon, Text, Tooltip } from 'shared/components'
-    import { Position } from 'shared/components/enums'
+    import { Icon, Text, Tooltip } from '@ui'
+    import { Position } from '@ui/enums'
 
     import { localize } from '@core/i18n'
 
diff --git a/packages/shared/components/badges/VerificationBadge.svelte b/packages/shared/components/badges/VerificationBadge.svelte
index 9c0b911a717..20d549f9050 100644
--- a/packages/shared/components/badges/VerificationBadge.svelte
+++ b/packages/shared/components/badges/VerificationBadge.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Icon } from 'shared/components'
+    import { Icon } from '@ui'
     import { NotVerifiedStatus, VerifiedStatus } from '@core/wallet'
     import { Icon as IconEnum } from '@auxiliary/icon'
 
diff --git a/packages/shared/components/boxes/AddressBox.svelte b/packages/shared/components/boxes/AddressBox.svelte
index 25726827742..3194bcda2e3 100644
--- a/packages/shared/components/boxes/AddressBox.svelte
+++ b/packages/shared/components/boxes/AddressBox.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Text, CopyableBox, FontWeight, TextType } from 'shared/components'
+    import { Text, CopyableBox, FontWeight, TextType } from '@ui'
 
     export let address: string = ''
     export let isCopyable: boolean = false
diff --git a/packages/shared/components/boxes/CopyableBox.svelte b/packages/shared/components/boxes/CopyableBox.svelte
index aca769c5212..bdc81572f8b 100644
--- a/packages/shared/components/boxes/CopyableBox.svelte
+++ b/packages/shared/components/boxes/CopyableBox.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { setClipboard } from '@core/utils'
     import Box from './Box.svelte'
-    import { InformationTooltip } from 'shared/components'
+    import { InformationTooltip } from '@ui'
     import { localize } from '@core/i18n'
     import { onDestroy } from 'svelte'
 
diff --git a/packages/shared/components/boxes/KeyValueBox.svelte b/packages/shared/components/boxes/KeyValueBox.svelte
index f02377e1b0f..24783aedd3d 100644
--- a/packages/shared/components/boxes/KeyValueBox.svelte
+++ b/packages/shared/components/boxes/KeyValueBox.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Text, TooltipIcon, FontWeight } from 'shared/components'
+    import { Text, TooltipIcon, FontWeight } from '@ui'
     import { onMount } from 'svelte'
     import CopyableBox from './CopyableBox.svelte'
 
diff --git a/packages/shared/components/buttons/ExportStrongholdButton.svelte b/packages/shared/components/buttons/ExportStrongholdButton.svelte
index 7269c9afe05..118628e9374 100644
--- a/packages/shared/components/buttons/ExportStrongholdButton.svelte
+++ b/packages/shared/components/buttons/ExportStrongholdButton.svelte
@@ -3,7 +3,7 @@
     import { localize } from '@core/i18n'
     import { showAppNotification } from '@auxiliary/notification'
     import { openPopup, PopupId } from '@auxiliary/popup'
-    import { Button, ButtonSize } from 'shared/components'
+    import { Button, ButtonSize } from '@ui'
 
     export let isBusy: boolean = false
     export let message: string = ''
diff --git a/packages/shared/components/buttons/OnboardingButton.svelte b/packages/shared/components/buttons/OnboardingButton.svelte
index d9b568d4a32..2b20b561c62 100644
--- a/packages/shared/components/buttons/OnboardingButton.svelte
+++ b/packages/shared/components/buttons/OnboardingButton.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { appSettings } from '@core/app'
-    import { Icon, Spinner, Text, FontWeight, TextType } from 'shared/components'
+    import { Icon, Spinner, Text, FontWeight, TextType } from '@ui'
     import { Icon as IconEnum } from '@auxiliary/icon'
 
     export let primaryText: string = ''
diff --git a/packages/shared/components/buttons/ReceiveAddressButton.svelte b/packages/shared/components/buttons/ReceiveAddressButton.svelte
index 253faab0e81..0c6e71c97f8 100644
--- a/packages/shared/components/buttons/ReceiveAddressButton.svelte
+++ b/packages/shared/components/buttons/ReceiveAddressButton.svelte
@@ -2,7 +2,7 @@
     import { selectedWallet } from '@core/wallet'
     import { appSettings } from '@core/app'
     import { localize } from '@core/i18n'
-    import { QR, Text, FontWeight, AddressBox } from 'shared/components'
+    import { QR, Text, FontWeight, AddressBox } from '@ui'
 
     let addressBoxElement: AddressBox
 
diff --git a/packages/shared/components/buttons/TooltipIcon.svelte b/packages/shared/components/buttons/TooltipIcon.svelte
index 4e09bd140a1..ce2b1f1cc4b 100644
--- a/packages/shared/components/buttons/TooltipIcon.svelte
+++ b/packages/shared/components/buttons/TooltipIcon.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Icon, Text, Tooltip, FontWeight, TextType, Position } from 'shared/components'
+    import { Icon, Text, Tooltip, FontWeight, TextType, Position } from '@ui'
     import { Icon as IconEnum } from '@lib/auxiliary/icon'
 
     export let title: string = ''
diff --git a/packages/shared/components/filter-items/AssetFilterItem.svelte b/packages/shared/components/filter-items/AssetFilterItem.svelte
index f0d4dd54c76..0ed119f9793 100644
--- a/packages/shared/components/filter-items/AssetFilterItem.svelte
+++ b/packages/shared/components/filter-items/AssetFilterItem.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Dropdown } from 'shared/components'
+    import { Dropdown } from '@ui'
     import type { IDropdownItem } from '@core/utils'
     import { visibleSelectedWalletAssets } from '@core/wallet'
     import { AssetFilterUnit } from '@core/utils/interfaces/filter'
diff --git a/packages/shared/components/filter-items/DateFilterItem.svelte b/packages/shared/components/filter-items/DateFilterItem.svelte
index 8975ca7e408..c23777987c2 100644
--- a/packages/shared/components/filter-items/DateFilterItem.svelte
+++ b/packages/shared/components/filter-items/DateFilterItem.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { DateInputButton, Dropdown, Icon, Text, NumberInput } from 'shared/components'
+    import { DateInputButton, Dropdown, Icon, Text, NumberInput } from '@ui'
     import { localize } from '@core/i18n'
     import type { IDropdownItem } from '@core/utils'
     import { DateFilterUnit } from '@core/utils/interfaces/filter'
diff --git a/packages/shared/components/filter-items/NumberFilterItem.svelte b/packages/shared/components/filter-items/NumberFilterItem.svelte
index 943458ef9e7..9685adc9a38 100644
--- a/packages/shared/components/filter-items/NumberFilterItem.svelte
+++ b/packages/shared/components/filter-items/NumberFilterItem.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Dropdown, Icon, Text, NumberInput } from 'shared/components'
+    import { Dropdown, Icon, Text, NumberInput } from '@ui'
     import { localize } from '@core/i18n'
     import type { IDropdownItem } from '@core/utils'
     import { NumberFilterUnit } from '@core/utils/interfaces/filter'
diff --git a/packages/shared/components/filter-items/OrderFilterItem.svelte b/packages/shared/components/filter-items/OrderFilterItem.svelte
index 5e5a8112b4f..fa6bfc2aa24 100644
--- a/packages/shared/components/filter-items/OrderFilterItem.svelte
+++ b/packages/shared/components/filter-items/OrderFilterItem.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Dropdown } from 'shared/components'
+    import { Dropdown } from '@ui'
     import { localize } from '@core/i18n'
     import type { IDropdownItem } from '@core/utils'
     import { OrderFilterUnit } from '@core/utils/interfaces/filter'
diff --git a/packages/shared/components/filter-items/SelectionFilterItem.svelte b/packages/shared/components/filter-items/SelectionFilterItem.svelte
index 12af7f186fb..3ccccee153f 100644
--- a/packages/shared/components/filter-items/SelectionFilterItem.svelte
+++ b/packages/shared/components/filter-items/SelectionFilterItem.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Dropdown } from 'shared/components'
+    import { Dropdown } from '@ui'
     import { localize } from '@core/i18n'
     import type { IDropdownItem } from '@core/utils'
     import { SelectionFilterUnit } from '@core/utils/interfaces/filter'
diff --git a/packages/desktop/components/filter/Filter.svelte b/packages/shared/components/filter/Filter.svelte
similarity index 95%
rename from packages/desktop/components/filter/Filter.svelte
rename to packages/shared/components/filter/Filter.svelte
index 942f6570034..21bef5663cf 100644
--- a/packages/desktop/components/filter/Filter.svelte
+++ b/packages/shared/components/filter/Filter.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
     import type { Writable } from 'svelte/store'
-    import { TogglableButton, Modal } from '@ui'
-    import { FilterItem, FilterModal } from '@components'
+    import { TogglableButton, Modal, FilterItem, FilterModal } from '@ui'
     import { Filter } from '@core/utils'
     import { Icon as IconEnum } from '@auxiliary/icon'
 
diff --git a/packages/desktop/components/filter/FilterItem.svelte b/packages/shared/components/filter/FilterItem.svelte
similarity index 100%
rename from packages/desktop/components/filter/FilterItem.svelte
rename to packages/shared/components/filter/FilterItem.svelte
diff --git a/packages/desktop/components/filter/index.js b/packages/shared/components/filter/index.js
similarity index 100%
rename from packages/desktop/components/filter/index.js
rename to packages/shared/components/filter/index.js
diff --git a/packages/shared/components/index.js b/packages/shared/components/index.js
index 483e65123db..889a7ba1a16 100644
--- a/packages/shared/components/index.js
+++ b/packages/shared/components/index.js
@@ -70,4 +70,4 @@ export * from './iconButtons'
 export * from './labels'
 export * from './pills'
 export * from './tiles'
-export * from './markdown-renderers'
+export * from './filter'
diff --git a/packages/shared/components/inputs/AccountInput.svelte b/packages/shared/components/inputs/AccountInput.svelte
index 0e4d2c80d00..e88ef135813 100644
--- a/packages/shared/components/inputs/AccountInput.svelte
+++ b/packages/shared/components/inputs/AccountInput.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Modal, SelectorInput, IOption } from 'shared/components'
+    import { Modal, SelectorInput, IOption } from '@ui'
     import { selectedWallet } from '@core/wallet/stores'
     import { localize } from '@core/i18n'
     import { validateBech32Address } from '@core/utils/crypto'
diff --git a/packages/shared/components/inputs/AmountInput.svelte b/packages/shared/components/inputs/AmountInput.svelte
index 10e1d4ec3f0..fceec3faa91 100644
--- a/packages/shared/components/inputs/AmountInput.svelte
+++ b/packages/shared/components/inputs/AmountInput.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { NumberInput, FontWeight } from 'shared/components'
+    import { NumberInput, FontWeight } from '@ui'
 
     export let inputElement: HTMLInputElement | undefined = undefined
     export let fontSize = 24
diff --git a/packages/shared/components/inputs/AssetAmountInput.svelte b/packages/shared/components/inputs/AssetAmountInput.svelte
index 9c74224715a..8aaab818a23 100644
--- a/packages/shared/components/inputs/AssetAmountInput.svelte
+++ b/packages/shared/components/inputs/AssetAmountInput.svelte
@@ -14,7 +14,7 @@
         visibleSelectedWalletAssets,
     } from '@core/wallet'
     import Big from 'big.js'
-    import { AmountInput, AssetDropdown, InputContainer, SliderInput, Text, TooltipIcon } from 'shared/components'
+    import { AmountInput, AssetDropdown, InputContainer, SliderInput, Text, TooltipIcon } from '@ui'
     import UnitInput from './UnitInput.svelte'
 
     export let inputElement: HTMLInputElement = undefined
diff --git a/packages/shared/components/inputs/AssetDropdown.svelte b/packages/shared/components/inputs/AssetDropdown.svelte
index f081637fb80..2bcd3349387 100644
--- a/packages/shared/components/inputs/AssetDropdown.svelte
+++ b/packages/shared/components/inputs/AssetDropdown.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { IAsset, visibleSelectedWalletAssets } from '@core/wallet'
-    import { AssetTile, Icon, Text, AssetIcon, FontWeight, AssetIconSize } from 'shared/components'
+    import { AssetTile, Icon, Text, AssetIcon, FontWeight, AssetIconSize } from '@ui'
     import { clickOutside } from '@core/utils'
     import { activeProfile } from '@core/profile'
     import { Icon as IconEnum } from '@auxiliary/icon'
diff --git a/packages/shared/components/inputs/ClosableInput.svelte b/packages/shared/components/inputs/ClosableInput.svelte
index 82206d876f0..663d06d3205 100644
--- a/packages/shared/components/inputs/ClosableInput.svelte
+++ b/packages/shared/components/inputs/ClosableInput.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { NumberInput, TextInput, Icon } from 'shared/components'
+    import { NumberInput, TextInput, Icon } from '@ui'
     import { Icon as IconEnum } from '@auxiliary/icon'
 
     export let value = ''
diff --git a/packages/shared/components/inputs/DateTimePicker.svelte b/packages/shared/components/inputs/DateTimePicker.svelte
index b8f1d345667..4e9d84dcf62 100644
--- a/packages/shared/components/inputs/DateTimePicker.svelte
+++ b/packages/shared/components/inputs/DateTimePicker.svelte
@@ -3,7 +3,7 @@
     import SveltyPicker from 'svelty-picker'
     import sveltyPickerTranslations from 'svelty-picker/i18n'
     import { ComponentProps, createEventDispatcher } from 'svelte'
-    import { Tooltip, Button, ButtonSize } from 'shared/components'
+    import { Tooltip, Button, ButtonSize } from '@ui'
     import { localize } from '@core/i18n'
     import { appSettings } from '@core/app'
 
diff --git a/packages/shared/components/inputs/Dropdown.svelte b/packages/shared/components/inputs/Dropdown.svelte
index 8b69e70b76d..444fc3fdced 100644
--- a/packages/shared/components/inputs/Dropdown.svelte
+++ b/packages/shared/components/inputs/Dropdown.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { Icon as IconEnum } from '@auxiliary/icon'
     import { IDropdownItem, clickOutside, isNumberLetterOrPunctuation } from '@core/utils'
-    import { FontWeight, Icon, Text, TextPropTypes, TextType } from 'shared/components'
+    import { FontWeight, Icon, Text, TextPropTypes, TextType } from '@ui'
 
     type T = $$Generic
 
diff --git a/packages/shared/components/inputs/Dropdown2.svelte b/packages/shared/components/inputs/Dropdown2.svelte
index c9f0d9a9224..3c5ffd4eb5b 100644
--- a/packages/shared/components/inputs/Dropdown2.svelte
+++ b/packages/shared/components/inputs/Dropdown2.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { onMount } from 'svelte'
-    import { Icon, Text, Error } from 'shared/components'
+    import { Icon, Text, Error } from '@ui'
     import { IDropdownItem, clickOutside, isNumberLetterOrPunctuation } from '@core/utils'
     import { Icon as IconEnum } from '@auxiliary/icon'
 
diff --git a/packages/shared/components/inputs/Dropzone.svelte b/packages/shared/components/inputs/Dropzone.svelte
index 51d78d168fe..08e0aa3bba4 100644
--- a/packages/shared/components/inputs/Dropzone.svelte
+++ b/packages/shared/components/inputs/Dropzone.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Text, Button } from 'shared/components'
+    import { Text, Button } from '@ui'
     import { localize } from '@core/i18n'
 
     export let extentionsLabel = ''
diff --git a/packages/shared/components/inputs/ImportTextfield.svelte b/packages/shared/components/inputs/ImportTextfield.svelte
index 3edaa2ab856..00e779c5f08 100644
--- a/packages/shared/components/inputs/ImportTextfield.svelte
+++ b/packages/shared/components/inputs/ImportTextfield.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Text } from 'shared/components'
+    import { Text } from '@ui'
     import { english } from '@auxiliary/wordlists'
     import { localize } from '@core/i18n'
     import { debounce } from '@core/utils'
diff --git a/packages/shared/components/inputs/Input.svelte b/packages/shared/components/inputs/Input.svelte
index 09f6a76bc70..de5eacc0594 100644
--- a/packages/shared/components/inputs/Input.svelte
+++ b/packages/shared/components/inputs/Input.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { onMount, createEventDispatcher, tick } from 'svelte'
-    import { Text, InputContainer, TextPropTypes, TextType } from 'shared/components'
+    import { Text, InputContainer, TextPropTypes, TextType } from '@ui'
     import { DECIMAL_SEPARATORS, formatNumber, getDecimalSeparator, parseCurrency } from '@core/i18n'
     import { localize } from '@core/i18n'
 
diff --git a/packages/shared/components/inputs/NetworkInput.svelte b/packages/shared/components/inputs/NetworkInput.svelte
index ec68dcb2648..920e43fb5fc 100644
--- a/packages/shared/components/inputs/NetworkInput.svelte
+++ b/packages/shared/components/inputs/NetworkInput.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Modal, SelectorInput, IOption } from 'shared/components'
+    import { Modal, SelectorInput, IOption } from '@ui'
     import { activeProfile, getNetworkHrp } from '@core/profile'
     import { validateBech32Address } from '@core/utils'
     import type { ChainMetadata } from '@core/network'
diff --git a/packages/shared/components/inputs/NftInput.svelte b/packages/shared/components/inputs/NftInput.svelte
index 15067609178..dd1848a852c 100644
--- a/packages/shared/components/inputs/NftInput.svelte
+++ b/packages/shared/components/inputs/NftInput.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Modal, SelectorInput, IOption, NftImageOrIconBox, NftSize } from 'shared/components'
+    import { Modal, SelectorInput, IOption, NftImageOrIconBox, NftSize } from '@ui'
     import { ownedNfts } from '@core/nfts'
     import { getNftByIdFromAllWalletNfts } from '@core/nfts'
     import { selectedWalletId } from '@core/wallet'
diff --git a/packages/shared/components/inputs/NodeInput.svelte b/packages/shared/components/inputs/NodeInput.svelte
index 0d90540c0b2..cdb8505e061 100644
--- a/packages/shared/components/inputs/NodeInput.svelte
+++ b/packages/shared/components/inputs/NodeInput.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { SelectorInput, IOption, Modal } from 'shared/components'
+    import { SelectorInput, IOption, Modal } from '@ui'
     import { localize } from '@core/i18n'
     import { activeProfile } from '@core/profile/stores'
     import { isValidUrl, stripTrailingSlash } from '@core/utils'
diff --git a/packages/shared/components/inputs/NumberInput.svelte b/packages/shared/components/inputs/NumberInput.svelte
index 2c410483de1..205bc5547a3 100644
--- a/packages/shared/components/inputs/NumberInput.svelte
+++ b/packages/shared/components/inputs/NumberInput.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { TextInput } from 'shared/components'
+    import { TextInput } from '@ui'
     import { localize } from '@core/i18n'
 
     export let inputElement: HTMLInputElement = undefined
diff --git a/packages/shared/components/inputs/OptionalInput.svelte b/packages/shared/components/inputs/OptionalInput.svelte
index 9d48025f330..2c32697fd87 100644
--- a/packages/shared/components/inputs/OptionalInput.svelte
+++ b/packages/shared/components/inputs/OptionalInput.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
     import { onMount } from 'svelte'
     import { fade } from 'svelte/transition'
-    import { ClosableInput, FontWeight, InformationTooltip, Icon, Text } from 'shared/components'
-    import { Position } from 'shared/components/enums'
+    import { ClosableInput, FontWeight, InformationTooltip, Icon, Text } from '@ui'
+    import { Position } from '@ui/enums'
     import { Icon as IconEnum } from '@auxiliary/icon'
 
     export let label: string = ''
diff --git a/packages/shared/components/inputs/PasswordInput.svelte b/packages/shared/components/inputs/PasswordInput.svelte
index 285446b5421..d69c6fbbe64 100644
--- a/packages/shared/components/inputs/PasswordInput.svelte
+++ b/packages/shared/components/inputs/PasswordInput.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { Icon as IconEnum } from '@auxiliary/icon'
     import { localize } from '@core/i18n'
-    import { Icon, InputType, Text, TextInput } from 'shared/components'
+    import { Icon, InputType, Text, TextInput } from '@ui'
 
     export let value: string
     export let classes: string | undefined = undefined
diff --git a/packages/shared/components/inputs/PinInput.svelte b/packages/shared/components/inputs/PinInput.svelte
index 484fde3df9f..4f7fbefa9ea 100644
--- a/packages/shared/components/inputs/PinInput.svelte
+++ b/packages/shared/components/inputs/PinInput.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Error, Icon, Text } from 'shared/components'
+    import { Error, Icon, Text } from '@ui'
     import { createEventDispatcher, onMount } from 'svelte'
     import { isValidPin, PIN_LENGTH } from '@core/utils'
     import { Icon as IconEnum } from '@auxiliary/icon'
diff --git a/packages/shared/components/inputs/Radio.svelte b/packages/shared/components/inputs/Radio.svelte
index 56e3dc525a2..c7b5ff284c5 100644
--- a/packages/shared/components/inputs/Radio.svelte
+++ b/packages/shared/components/inputs/Radio.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Icon } from 'shared/components'
+    import { Icon } from '@ui'
     import { Icon as IconEnum } from '@lib/auxiliary/icon'
 
     export let value = undefined
diff --git a/packages/shared/components/inputs/RecipientInput.svelte b/packages/shared/components/inputs/RecipientInput.svelte
index dba8f10260b..660bc701cb6 100644
--- a/packages/shared/components/inputs/RecipientInput.svelte
+++ b/packages/shared/components/inputs/RecipientInput.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Modal, SelectorInput, IOption, ColoredCircle } from 'shared/components'
+    import { Modal, SelectorInput, IOption, ColoredCircle } from '@ui'
     import { localize } from '@core/i18n'
     import { validateBech32Address, validateEthereumAddress } from '@core/utils/crypto'
     import { Subject } from '@core/wallet/types'
@@ -7,7 +7,7 @@
     import { Layer1RecipientError } from '@core/layer-2/errors'
     import { getNetworkHrp, getWalletColorById, visibleActiveWallets } from '@core/profile'
     import { selectedWalletId } from '@core/wallet/stores'
-    import { SubjectType } from 'shared/lib/core/wallet'
+    import { SubjectType } from '@core/wallet'
 
     export let recipient: Subject
     export let disabled = false
diff --git a/packages/shared/components/inputs/SearchInput.svelte b/packages/shared/components/inputs/SearchInput.svelte
index af58869d6f4..4407e1d449a 100644
--- a/packages/shared/components/inputs/SearchInput.svelte
+++ b/packages/shared/components/inputs/SearchInput.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { TextInput, Icon, TogglableButton, FontWeight } from 'shared/components'
+    import { TextInput, Icon, TogglableButton, FontWeight } from '@ui'
     import { localize } from '@core/i18n'
     import { debounce } from '@core/utils'
     import { Icon as IconEnum } from '@auxiliary/icon'
diff --git a/packages/shared/components/inputs/TextInput.svelte b/packages/shared/components/inputs/TextInput.svelte
index 12507716d33..93eaba10fd7 100644
--- a/packages/shared/components/inputs/TextInput.svelte
+++ b/packages/shared/components/inputs/TextInput.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import Input from './Input.svelte'
-    import { FontWeight, InputType, TextPropTypes, TextType } from 'shared/components'
+    import { FontWeight, InputType, TextPropTypes, TextType } from '@ui'
 
     export let value: string = ''
     export let inputElement: HTMLInputElement | undefined = undefined
diff --git a/packages/shared/components/inputs/TogglableButton.svelte b/packages/shared/components/inputs/TogglableButton.svelte
index 0d8226cf8c4..9fd8eda10bb 100644
--- a/packages/shared/components/inputs/TogglableButton.svelte
+++ b/packages/shared/components/inputs/TogglableButton.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Icon } from 'shared/components'
+    import { Icon } from '@ui'
     import { Icon as IconEnum } from '@auxiliary/icon'
 
     export let icon: IconEnum
diff --git a/packages/shared/components/inputs/UnitInput.svelte b/packages/shared/components/inputs/UnitInput.svelte
index 284bd7c6a71..3b18901dce9 100644
--- a/packages/shared/components/inputs/UnitInput.svelte
+++ b/packages/shared/components/inputs/UnitInput.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Dropdown2 } from 'shared/components'
+    import { Dropdown2 } from '@ui'
     import { TokenMetadata, TokenStandard, getUnitFromTokenMetadata } from '@core/wallet'
     import { IDropdownItem } from '@core/utils'
 
diff --git a/packages/shared/components/inputs/WalletSelector.svelte b/packages/shared/components/inputs/WalletSelector.svelte
index 20382101050..594649a9e8f 100644
--- a/packages/shared/components/inputs/WalletSelector.svelte
+++ b/packages/shared/components/inputs/WalletSelector.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Modal, WalletLabel, Text, TextType } from 'shared/components'
+    import { Modal, WalletLabel, Text, TextType } from '@ui'
     import { fade } from 'svelte/transition'
     import { visibleActiveWallets, getBaseToken } from '@core/profile'
     import { IWalletState, formatTokenAmountBestMatch, selectedWallet } from '@core/wallet'
diff --git a/packages/shared/components/labels/TogglableAssetBalanceLabel.svelte b/packages/shared/components/labels/TogglableAssetBalanceLabel.svelte
index 9ca88288091..26c52b861a5 100644
--- a/packages/shared/components/labels/TogglableAssetBalanceLabel.svelte
+++ b/packages/shared/components/labels/TogglableAssetBalanceLabel.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-    import { Text, FontWeight, TextType } from 'shared/components'
+    import { Text, FontWeight, TextType } from '@ui'
     import { formatTokenAmountBestMatch, IAsset } from '@core/wallet'
     import { formatCurrency, localize } from '@core/i18n'
     import { getMarketAmountFromAssetValue } from '@core/market/utils'
-    import { DEFAULT_MANA } from 'shared/lib/core/network'
+    import { DEFAULT_MANA } from '@core/network'
 
     export let asset: IAsset
     export let mana: IAsset
diff --git a/packages/shared/components/labels/WalletLabel.svelte b/packages/shared/components/labels/WalletLabel.svelte
index 4502e213b93..9e7e692e95a 100644
--- a/packages/shared/components/labels/WalletLabel.svelte
+++ b/packages/shared/components/labels/WalletLabel.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Text, FontWeight, ColoredCircle } from 'shared/components/'
+    import { Text, FontWeight, ColoredCircle } from '@ui/'
     import { IWalletState } from '@core/wallet'
 
     export let wallet: IWalletState
diff --git a/packages/shared/components/modals/AssetActionsModal.svelte b/packages/shared/components/modals/AssetActionsModal.svelte
index 17e75a3bd41..f6864f836e7 100644
--- a/packages/shared/components/modals/AssetActionsModal.svelte
+++ b/packages/shared/components/modals/AssetActionsModal.svelte
@@ -12,7 +12,7 @@
     } from '@core/wallet'
     import { Icon } from '@lib/auxiliary/icon'
     import { openPopup, PopupId, updatePopupProps } from '@auxiliary/popup'
-    import { MenuItem, Modal } from 'shared/components'
+    import { MenuItem, Modal } from '@ui'
     import features from '@features/features'
 
     export let modal: Modal | undefined
diff --git a/packages/shared/components/modals/CollectibleActionsModal.svelte b/packages/shared/components/modals/CollectibleActionsModal.svelte
index db19ea2549e..b1939c68201 100644
--- a/packages/shared/components/modals/CollectibleActionsModal.svelte
+++ b/packages/shared/components/modals/CollectibleActionsModal.svelte
@@ -8,7 +8,7 @@
     import { burnNft } from '@core/wallet'
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import { activeProfile, updateActiveProfile } from '@core/profile/stores'
-    import { TextHintVariant } from 'shared/components/enums'
+    import { TextHintVariant } from '@ui/enums'
     import { Icon as IconEnum } from '@auxiliary/icon'
 
     export let modal: Modal
diff --git a/packages/desktop/components/modals/FilterModal.svelte b/packages/shared/components/modals/FilterModal.svelte
similarity index 100%
rename from packages/desktop/components/modals/FilterModal.svelte
rename to packages/shared/components/modals/FilterModal.svelte
diff --git a/packages/shared/components/modals/index.js b/packages/shared/components/modals/index.js
index 4edbf3bac92..eb54fb4ab74 100644
--- a/packages/shared/components/modals/index.js
+++ b/packages/shared/components/modals/index.js
@@ -2,3 +2,4 @@ export { default as AssetActionsModal } from './AssetActionsModal.svelte'
 export { default as CollectibleActionsModal } from './CollectibleActionsModal.svelte'
 export { default as Modal } from './Modal.svelte'
 export { default as ProfileActionsModal } from './ProfileActionsModal.svelte'
+export { default as FilterModal } from './FilterModal.svelte'
diff --git a/packages/shared/components/pills/DeveloperIndicatorPill.svelte b/packages/shared/components/pills/DeveloperIndicatorPill.svelte
index 6df8dfbcdaf..8da69829edd 100644
--- a/packages/shared/components/pills/DeveloperIndicatorPill.svelte
+++ b/packages/shared/components/pills/DeveloperIndicatorPill.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { localize } from '@core/i18n'
-    import { Pill } from 'shared/components'
+    import { Pill } from '@ui'
 </script>
 
 <Pill
diff --git a/packages/shared/components/pills/Pill.svelte b/packages/shared/components/pills/Pill.svelte
index e0bd5273638..3fb478c0889 100644
--- a/packages/shared/components/pills/Pill.svelte
+++ b/packages/shared/components/pills/Pill.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Text, FontWeight } from 'shared/components'
+    import { Text, FontWeight } from '@ui'
 
     export let data: string = ''
     export let textColor: string = 'gray-800'
diff --git a/packages/shared/components/pills/ProposalStatusPill.svelte b/packages/shared/components/pills/ProposalStatusPill.svelte
index 5df5db5d29c..2aa97419b16 100644
--- a/packages/shared/components/pills/ProposalStatusPill.svelte
+++ b/packages/shared/components/pills/ProposalStatusPill.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Icon, Pill } from 'shared/components'
+    import { Icon, Pill } from '@ui'
     import { Icon as IconEnum } from '@auxiliary/icon'
     import { localize } from '@core/i18n'
     import { ProposalStatus } from '@contexts/governance/enums'
diff --git a/packages/shared/components/tiles/ActivityTile.svelte b/packages/shared/components/tiles/ActivityTile.svelte
index 13f3edc2a52..793508f6e2d 100644
--- a/packages/shared/components/tiles/ActivityTile.svelte
+++ b/packages/shared/components/tiles/ActivityTile.svelte
@@ -24,7 +24,7 @@
         TimelockActivityTileFooter,
         TransactionActivityTileContent,
         VestingActivityTileContent,
-    } from 'shared/components'
+    } from '@ui'
 
     export let activity: Activity
 
diff --git a/packages/shared/components/tiles/AssetTile.svelte b/packages/shared/components/tiles/AssetTile.svelte
index 8191717ffa8..1a71fb9803e 100644
--- a/packages/shared/components/tiles/AssetTile.svelte
+++ b/packages/shared/components/tiles/AssetTile.svelte
@@ -5,7 +5,7 @@
     import { formatCurrency } from '@core/i18n/utils'
     import { getMarketAmountFromAssetValue } from '@core/market/utils/getMarketAmountFromAssetValue'
     import { getMarketPriceForAsset } from '@core/market/utils'
-    import { AssetIconSize } from 'shared/components/enums'
+    import { AssetIconSize } from '@ui/enums'
 
     export let asset: IAsset | undefined
     export let onClick: () => unknown
diff --git a/packages/shared/components/tiles/ClickableTile.svelte b/packages/shared/components/tiles/ClickableTile.svelte
index f376c987a5c..778850040ed 100644
--- a/packages/shared/components/tiles/ClickableTile.svelte
+++ b/packages/shared/components/tiles/ClickableTile.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Tile } from 'shared/components'
+    import { Tile } from '@ui'
 
     export let disabled = false
     export let classes = ''
diff --git a/packages/shared/components/tiles/ShimmerClaimingAccountTile.svelte b/packages/shared/components/tiles/ShimmerClaimingAccountTile.svelte
index 8e2309a0f06..517dab8fcb8 100644
--- a/packages/shared/components/tiles/ShimmerClaimingAccountTile.svelte
+++ b/packages/shared/components/tiles/ShimmerClaimingAccountTile.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Icon, Text, Tile, FontWeight, TextType } from 'shared/components'
+    import { Icon, Text, Tile, FontWeight, TextType } from '@ui'
     import { localize } from '@core/i18n'
     import { formatTokenAmountBestMatch } from '@core/wallet/utils'
     import { IShimmerClaimingWallet, ShimmerClaimingWalletState } from '@contexts/onboarding'
diff --git a/packages/shared/components/tiles/tileContents/AccountActivityTileContent.svelte b/packages/shared/components/tiles/tileContents/AccountActivityTileContent.svelte
index c996dda2fbb..c20c7c95c94 100644
--- a/packages/shared/components/tiles/tileContents/AccountActivityTileContent.svelte
+++ b/packages/shared/components/tiles/tileContents/AccountActivityTileContent.svelte
@@ -2,7 +2,7 @@
     import { localize } from '@core/i18n'
     import { AccountActivity, getActivityTileTitle } from '@core/wallet'
     import { truncateString } from '@core/utils'
-    import { ActivityTileContent } from 'shared/components'
+    import { ActivityTileContent } from '@ui'
     import { Icon } from '@lib/auxiliary/icon'
 
     export let activity: AccountActivity
diff --git a/packages/shared/components/tiles/tileContents/ActivityTileContent.svelte b/packages/shared/components/tiles/tileContents/ActivityTileContent.svelte
index 518b06fb825..966c2fab476 100644
--- a/packages/shared/components/tiles/tileContents/ActivityTileContent.svelte
+++ b/packages/shared/components/tiles/tileContents/ActivityTileContent.svelte
@@ -1,5 +1,5 @@
 <script lang="typescript">
-    import { Text, Icon, FontWeight } from 'shared/components'
+    import { Text, Icon, FontWeight } from '@ui'
     import { Icon as IconEnum } from '@lib/auxiliary/icon'
 
     export let action: string
diff --git a/packages/shared/components/tiles/tileContents/ConsolidationActivityTileContent.svelte b/packages/shared/components/tiles/tileContents/ConsolidationActivityTileContent.svelte
index 16f97d39b70..3aaed8b76ed 100644
--- a/packages/shared/components/tiles/tileContents/ConsolidationActivityTileContent.svelte
+++ b/packages/shared/components/tiles/tileContents/ConsolidationActivityTileContent.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { localize } from '@core/i18n'
     import { ConsolidationActivity, getActivityTileTitle } from '@core/wallet'
-    import { ActivityTileContent } from 'shared/components'
+    import { ActivityTileContent } from '@ui'
     import { Icon } from '@lib/auxiliary/icon'
 
     export let activity: ConsolidationActivity
diff --git a/packages/shared/components/tiles/tileContents/FoundryActivityTileContent.svelte b/packages/shared/components/tiles/tileContents/FoundryActivityTileContent.svelte
index 9604bea70bc..9a0eaaba69d 100644
--- a/packages/shared/components/tiles/tileContents/FoundryActivityTileContent.svelte
+++ b/packages/shared/components/tiles/tileContents/FoundryActivityTileContent.svelte
@@ -8,7 +8,7 @@
         IPersistedAsset,
         selectedWalletAssets,
     } from '@core/wallet'
-    import { AssetIcon, ActivityTileContent } from 'shared/components'
+    import { AssetIcon, ActivityTileContent } from '@ui'
 
     export let activity: FoundryActivity
 
diff --git a/packages/shared/components/tiles/tileContents/GovernanceActivityTileContent.svelte b/packages/shared/components/tiles/tileContents/GovernanceActivityTileContent.svelte
index 427c8d61c73..885dcc2d1ca 100644
--- a/packages/shared/components/tiles/tileContents/GovernanceActivityTileContent.svelte
+++ b/packages/shared/components/tiles/tileContents/GovernanceActivityTileContent.svelte
@@ -6,7 +6,7 @@
         getFormattedVotingPowerFromGovernanceActivity,
         GovernanceAction,
     } from '@core/wallet'
-    import { ActivityTileContent } from 'shared/components'
+    import { ActivityTileContent } from '@ui'
     import { Icon } from '@lib/auxiliary/icon'
 
     export let activity: GovernanceActivity
diff --git a/packages/shared/components/tiles/tileContents/NftActivityTileContent.svelte b/packages/shared/components/tiles/tileContents/NftActivityTileContent.svelte
index 78b998b982c..0a6e7bc3629 100644
--- a/packages/shared/components/tiles/tileContents/NftActivityTileContent.svelte
+++ b/packages/shared/components/tiles/tileContents/NftActivityTileContent.svelte
@@ -5,7 +5,7 @@
     import { ActivityDirection } from '@core/wallet/enums'
     import { getActivityTileTitle, getSubjectLocaleFromActivity } from '@core/wallet/utils'
     import { NftActivity } from '@core/wallet/types'
-    import { ActivityTileContent, NftImageOrIconBox } from 'shared/components'
+    import { ActivityTileContent, NftImageOrIconBox } from '@ui'
 
     export let activity: NftActivity
 
diff --git a/packages/shared/components/tiles/tileContents/TransactionActivityTileContent.svelte b/packages/shared/components/tiles/tileContents/TransactionActivityTileContent.svelte
index 80fcababb4c..7620eb1adbe 100644
--- a/packages/shared/components/tiles/tileContents/TransactionActivityTileContent.svelte
+++ b/packages/shared/components/tiles/tileContents/TransactionActivityTileContent.svelte
@@ -10,7 +10,7 @@
         selectedWalletAssets,
         TransactionActivity,
     } from '@core/wallet'
-    import { ActivityTileContent, AssetIcon } from 'shared/components'
+    import { ActivityTileContent, AssetIcon } from '@ui'
 
     export let activity: TransactionActivity
 
diff --git a/packages/shared/components/tiles/tileContents/VestingActivityTileContent.svelte b/packages/shared/components/tiles/tileContents/VestingActivityTileContent.svelte
index c167af1324b..0639830caa5 100644
--- a/packages/shared/components/tiles/tileContents/VestingActivityTileContent.svelte
+++ b/packages/shared/components/tiles/tileContents/VestingActivityTileContent.svelte
@@ -9,7 +9,7 @@
         getSubjectLocaleFromActivity,
         selectedWalletAssets,
     } from '@core/wallet'
-    import { ActivityTileContent, AssetIcon } from 'shared/components'
+    import { ActivityTileContent, AssetIcon } from '@ui'
 
     export let activity: VestingActivity
 
diff --git a/packages/shared/components/tiles/tileFooters/AsyncActivityTileFooter.svelte b/packages/shared/components/tiles/tileFooters/AsyncActivityTileFooter.svelte
index 82c87f8da2b..83d1a086580 100644
--- a/packages/shared/components/tiles/tileFooters/AsyncActivityTileFooter.svelte
+++ b/packages/shared/components/tiles/tileFooters/AsyncActivityTileFooter.svelte
@@ -7,18 +7,10 @@
         getTimeDifference,
         Activity,
     } from '@core/wallet'
-    import {
-        ActivityAsyncStatusPill,
-        TooltipIcon,
-        Text,
-        Button,
-        TileFooter,
-        FontWeight,
-        ButtonSize,
-    } from 'shared/components'
+    import { ActivityAsyncStatusPill, TooltipIcon, Text, Button, TileFooter, FontWeight, ButtonSize } from '@ui'
     import { time } from '@core/app'
     import { Icon as IconEnum } from '@lib/auxiliary/icon'
-    import { Position, TextHintVariant } from 'shared/components/enums'
+    import { Position, TextHintVariant } from '@ui/enums'
     import { localize } from '@core/i18n'
     import { showInternalVerificationPopup } from '@core/ledger'
     import { checkActiveProfileAuth, isActiveLedgerProfile } from '@core/profile'
diff --git a/packages/shared/components/tiles/tileFooters/TimelockActivityTileFooter.svelte b/packages/shared/components/tiles/tileFooters/TimelockActivityTileFooter.svelte
index edc46eed2ac..a79e4e875e1 100644
--- a/packages/shared/components/tiles/tileFooters/TimelockActivityTileFooter.svelte
+++ b/packages/shared/components/tiles/tileFooters/TimelockActivityTileFooter.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
     import { ActivityAsyncStatus, getTimeDifference, Activity } from '@core/wallet'
-    import { TooltipIcon, Text, Pill, TileFooter, FontWeight } from 'shared/components'
+    import { TooltipIcon, Text, Pill, TileFooter, FontWeight } from '@ui'
     import { time } from '@core/app'
     import { Icon as IconEnum } from '@lib/auxiliary/icon'
-    import { Position } from 'shared/components/enums'
+    import { Position } from '@ui/enums'
     import { localize } from '@core/i18n'
 
     export let activity: Activity
diff --git a/packages/shared/jest.config.js b/packages/shared/jest.config.js
index 747275b042d..71304b5dd94 100644
--- a/packages/shared/jest.config.js
+++ b/packages/shared/jest.config.js
@@ -7,6 +7,7 @@ const config = {
     },
     moduleFileExtensions: ['ts', 'js'],
     moduleNameMapper: {
+        '@ui/(.*)': '<rootDir>/components/$1',
         '@auxiliary/(.*)': '<rootDir>/lib/auxiliary/$1',
         '@contexts/(.*)': '<rootDir>/lib/contexts/$1',
         '@core/(.*)': '<rootDir>/lib/core/$1',
diff --git a/packages/shared/lib/auxiliary/deep-link/constants/time-unit-ms.constant.ts b/packages/shared/lib/auxiliary/deep-link/constants/time-unit-ms.constant.ts
index 97561be9ae7..e7cda4473d6 100644
--- a/packages/shared/lib/auxiliary/deep-link/constants/time-unit-ms.constant.ts
+++ b/packages/shared/lib/auxiliary/deep-link/constants/time-unit-ms.constant.ts
@@ -3,7 +3,7 @@ import {
     MILLISECONDS_PER_HOUR,
     MILLISECONDS_PER_MINUTE,
     MILLISECONDS_PER_WEEK,
-} from 'shared/lib/core/utils'
+} from '@core/utils'
 import { TimeUnit } from '../enums'
 
 export const TIME_UNIT_MS_MAP: Record<TimeUnit, number> = {
diff --git a/packages/shared/lib/auxiliary/deep-link/utils/getExpirationDateFromSearchParam.ts b/packages/shared/lib/auxiliary/deep-link/utils/getExpirationDateFromSearchParam.ts
index 88320a2338c..f218e6ed048 100644
--- a/packages/shared/lib/auxiliary/deep-link/utils/getExpirationDateFromSearchParam.ts
+++ b/packages/shared/lib/auxiliary/deep-link/utils/getExpirationDateFromSearchParam.ts
@@ -1,4 +1,4 @@
-import { convertUnixTimestampToDate } from 'shared/lib/core/utils'
+import { convertUnixTimestampToDate } from '@core/utils'
 import { EXPIRATION_DATE_REGEX, TIME_UNIT_MS_MAP } from '../constants'
 import { TimeUnit } from '../enums'
 import { InvalidExpirationDateError, PastExpirationDateError } from '../errors'
diff --git a/packages/shared/lib/contexts/governance/actions/addProposalsFromParticipationEventMap.ts b/packages/shared/lib/contexts/governance/actions/addProposalsFromParticipationEventMap.ts
index fe36989fc3d..89cfef3318d 100644
--- a/packages/shared/lib/contexts/governance/actions/addProposalsFromParticipationEventMap.ts
+++ b/packages/shared/lib/contexts/governance/actions/addProposalsFromParticipationEventMap.ts
@@ -2,7 +2,7 @@ import { ParticipationEventMap, ParticipationEventWithNodes } from '@iota/sdk/ou
 
 import { addOrUpdateProposalToRegisteredProposals } from '../stores'
 import { createProposalFromEvent } from '../utils'
-import { IWalletState } from 'shared/lib/core/wallet'
+import { IWalletState } from '@core/wallet'
 
 export function addProposalsFromParticipationEventMap(eventMap: ParticipationEventMap, wallet: IWalletState): void {
     Object.values(eventMap).forEach((event: ParticipationEventWithNodes) => {
diff --git a/packages/shared/lib/contexts/governance/actions/getVotingEvent.ts b/packages/shared/lib/contexts/governance/actions/getVotingEvent.ts
index 33b623a2c26..91b1ec57112 100644
--- a/packages/shared/lib/contexts/governance/actions/getVotingEvent.ts
+++ b/packages/shared/lib/contexts/governance/actions/getVotingEvent.ts
@@ -1,5 +1,5 @@
 import type { ParticipationEventId, ParticipationEventWithNodes } from '@iota/sdk/out/types'
-import { getSelectedWallet } from 'shared/lib/core/wallet'
+import { getSelectedWallet } from '@core/wallet'
 
 export function getVotingEvent(eventId: ParticipationEventId): Promise<ParticipationEventWithNodes> {
     const wallet = getSelectedWallet()
diff --git a/packages/shared/lib/contexts/governance/actions/getWalletsParticipationEventStatusForEvent.ts b/packages/shared/lib/contexts/governance/actions/getWalletsParticipationEventStatusForEvent.ts
index 52efac9b4c2..517d29d1f65 100644
--- a/packages/shared/lib/contexts/governance/actions/getWalletsParticipationEventStatusForEvent.ts
+++ b/packages/shared/lib/contexts/governance/actions/getWalletsParticipationEventStatusForEvent.ts
@@ -1,6 +1,6 @@
 import type { ParticipationEventId, ParticipationEventStatus } from '@iota/sdk/out/types'
-import { IWallet } from 'shared/lib/core/profile'
-import { getSelectedWallet } from 'shared/lib/core/wallet/stores/selected-wallet.store'
+import { IWallet } from '@core/profile'
+import { getSelectedWallet } from '@core/wallet/stores/selected-wallet.store'
 
 export function getWalletsParticipationEventStatusForEvent(
     eventId: ParticipationEventId,
diff --git a/packages/shared/lib/contexts/governance/actions/initializeRegisteredProposals.ts b/packages/shared/lib/contexts/governance/actions/initializeRegisteredProposals.ts
index aff18a0c03d..608b446d2b7 100644
--- a/packages/shared/lib/contexts/governance/actions/initializeRegisteredProposals.ts
+++ b/packages/shared/lib/contexts/governance/actions/initializeRegisteredProposals.ts
@@ -1,5 +1,5 @@
-import { activeWallets } from 'shared/lib/core/profile'
-import { getSelectedWallet /* IWalletState*/ } from 'shared/lib/core/wallet'
+import { activeWallets } from '@core/profile'
+import { getSelectedWallet /* IWalletState*/ } from '@core/wallet'
 import { get } from 'svelte/store'
 
 import { IRegisteredProposals } from '../interfaces'
diff --git a/packages/shared/lib/contexts/governance/actions/registerParticipationEvents.ts b/packages/shared/lib/contexts/governance/actions/registerParticipationEvents.ts
index fd3aa33c32f..508edc8ea5e 100644
--- a/packages/shared/lib/contexts/governance/actions/registerParticipationEvents.ts
+++ b/packages/shared/lib/contexts/governance/actions/registerParticipationEvents.ts
@@ -1,5 +1,5 @@
 import { ParticipationEventMap /* ParticipationEventRegistrationOptions*/ } from '@iota/sdk/out/types'
-// import { getSelectedWallet, IWalletState } from 'shared/lib/core/wallet'
+// import { getSelectedWallet, IWalletState } from '@core/wallet'
 // import { addProposalsFromParticipationEventMap } from './addProposalsFromParticipationEventMap'
 
 // TODO: https://github.com/iotaledger/firefly/issues/7947
diff --git a/packages/shared/lib/contexts/governance/actions/setVotingPower.ts b/packages/shared/lib/contexts/governance/actions/setVotingPower.ts
index 6a1854de74a..166a316f1f0 100644
--- a/packages/shared/lib/contexts/governance/actions/setVotingPower.ts
+++ b/packages/shared/lib/contexts/governance/actions/setVotingPower.ts
@@ -3,7 +3,7 @@ import { plainToInstance } from 'class-transformer'
 import { processAndAddToActivities } from '@core/wallet/utils'
 import { handleError } from '@core/error/handlers'
 import { closePopup } from '@auxiliary/popup'
-import { getSelectedWallet, updateSelectedWallet } from 'shared/lib/core/wallet'
+import { getSelectedWallet, updateSelectedWallet } from '@core/wallet'
 
 export async function setVotingPower(rawAmount: string): Promise<void> {
     const wallet = getSelectedWallet()
diff --git a/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts b/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts
index 6e58c998e90..39a1a2e9bef 100644
--- a/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts
+++ b/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts
@@ -4,7 +4,7 @@ import { showAppNotification } from '@auxiliary/notification/actions'
 import { localize } from '@core/i18n'
 import { handleError } from '@core/error/handlers'
 import { processAndAddToActivities } from '@core/wallet/utils'
-import { getSelectedWallet, updateSelectedWallet } from 'shared/lib/core/wallet'
+import { getSelectedWallet, updateSelectedWallet } from '@core/wallet'
 
 export async function stopVotingForProposal(eventId: string): Promise<Transaction | undefined> {
     const wallet = getSelectedWallet()
diff --git a/packages/shared/lib/contexts/governance/stores/selected-participation-event-status.store.ts b/packages/shared/lib/contexts/governance/stores/selected-participation-event-status.store.ts
index 66f532adc98..e98a4c166f5 100644
--- a/packages/shared/lib/contexts/governance/stores/selected-participation-event-status.store.ts
+++ b/packages/shared/lib/contexts/governance/stores/selected-participation-event-status.store.ts
@@ -1,5 +1,5 @@
 import { ParticipationEventStatus } from '@iota/sdk/out/types'
-import { selectedWalletId } from 'shared/lib/core/wallet'
+import { selectedWalletId } from '@core/wallet'
 import { get, writable } from 'svelte/store'
 import { getWalletsParticipationEventStatusForEvent } from '../actions'
 import { createProposalFromError } from '../utils'
diff --git a/packages/shared/lib/contexts/governance/utils/getParticipationsForProposal.ts b/packages/shared/lib/contexts/governance/utils/getParticipationsForProposal.ts
index d4fae484eac..99dda490b7c 100644
--- a/packages/shared/lib/contexts/governance/utils/getParticipationsForProposal.ts
+++ b/packages/shared/lib/contexts/governance/utils/getParticipationsForProposal.ts
@@ -1,7 +1,7 @@
 import { get } from 'svelte/store'
 import type { ParticipationOverview, TrackedParticipationOverview } from '@iota/sdk/out/types'
 import { allParticipationOverviews } from '@contexts/governance/stores'
-import { selectedWalletId } from 'shared/lib/core/wallet'
+import { selectedWalletId } from '@core/wallet'
 
 export function getParticipationsForProposal(proposalId: string): { [outputId: string]: TrackedParticipationOverview } {
     const walletId = get(selectedWalletId)
diff --git a/packages/shared/lib/contexts/onboarding/actions/cleanupOnboardingProfile.ts b/packages/shared/lib/contexts/onboarding/actions/cleanupOnboardingProfile.ts
index e91676452dc..d6794839efb 100644
--- a/packages/shared/lib/contexts/onboarding/actions/cleanupOnboardingProfile.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/cleanupOnboardingProfile.ts
@@ -1,5 +1,5 @@
 import { clearProfileFromMemory, removeProfileFolder } from '@core/profile'
-import { getSelectedWallet } from 'shared/lib/core/wallet'
+import { getSelectedWallet } from '@core/wallet'
 
 export async function cleanupOnboardingProfile(): Promise<void> {
     if (!getSelectedWallet()) {
diff --git a/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingFlow.ts b/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingFlow.ts
index c0ca936d54d..8b446d15e06 100644
--- a/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingFlow.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingFlow.ts
@@ -9,7 +9,7 @@ import { IOnboardingInitialisationOptions } from '../interfaces'
 import { updateOnboardingProfile } from '../stores'
 import { deleteOnboardingProfile } from './deleteOnboardingProfile'
 import { initialiseOnboardingProfile } from './initialiseOnboardingProfile'
-import { unsubscribeFromWalletApiEvents } from 'shared/lib/core/wallet'
+import { unsubscribeFromWalletApiEvents } from '@core/wallet'
 
 export async function initialiseOnboardingFlow(options: IOnboardingInitialisationOptions): Promise<void> {
     resetActiveProfile()
diff --git a/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingProfile.ts b/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingProfile.ts
index 72dbe380a54..f9ad6f5a7fe 100644
--- a/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingProfile.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingProfile.ts
@@ -1,5 +1,5 @@
-import { stopPollingLedgerNanoStatus } from 'shared/lib/core/ledger'
-import { clearProfileFromMemory } from 'shared/lib/core/profile'
+import { stopPollingLedgerNanoStatus } from '@core/ledger'
+import { clearProfileFromMemory } from '@core/profile'
 import { get } from 'svelte/store'
 import { OnboardingSecretManagerAlreadyInitializedError } from '../errors'
 import { buildInitialOnboardingProfile } from '../helpers'
diff --git a/packages/shared/lib/contexts/onboarding/actions/syncShimmerClaimingAccount.ts b/packages/shared/lib/contexts/onboarding/actions/syncShimmerClaimingAccount.ts
index 9c65333fbc0..a40716f3920 100644
--- a/packages/shared/lib/contexts/onboarding/actions/syncShimmerClaimingAccount.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/syncShimmerClaimingAccount.ts
@@ -8,7 +8,7 @@ import { getOnboardingBaseToken, shimmerClaimingProfileManager, updateShimmerCla
 import { setTotalUnclaimedShimmerRewards } from '@contexts/onboarding'
 import { formatTokenAmountBestMatch } from '@core/wallet/utils'
 import { showAppNotification } from '@auxiliary/notification'
-import { getWallet, IWallet } from 'shared/lib/core/profile'
+import { getWallet, IWallet } from '@core/profile'
 
 // TODO(2.0) Fix
 export async function syncShimmerClaimingAccount(wallet: IWallet): Promise<void> {
diff --git a/packages/shared/lib/contexts/onboarding/helpers/getSortedRenamedBoundAccounts.ts b/packages/shared/lib/contexts/onboarding/helpers/getSortedRenamedBoundAccounts.ts
index ee28bc220b8..8c709ee388c 100644
--- a/packages/shared/lib/contexts/onboarding/helpers/getSortedRenamedBoundAccounts.ts
+++ b/packages/shared/lib/contexts/onboarding/helpers/getSortedRenamedBoundAccounts.ts
@@ -2,7 +2,7 @@ import { Writable } from 'svelte/store'
 
 import { localize } from '@core/i18n'
 import { sortAccountsByIndex } from '@core/utils'
-import { IWallet } from 'shared/lib/core/profile'
+import { IWallet } from '@core/profile'
 
 // TODO(2.0) Fix this, account indexes are gone
 export async function getSortedRenamedBoundAccounts(
diff --git a/packages/shared/lib/contexts/onboarding/helpers/validateStrongholdCoinType.ts b/packages/shared/lib/contexts/onboarding/helpers/validateStrongholdCoinType.ts
index 4da699e44eb..73f1c33dbf7 100644
--- a/packages/shared/lib/contexts/onboarding/helpers/validateStrongholdCoinType.ts
+++ b/packages/shared/lib/contexts/onboarding/helpers/validateStrongholdCoinType.ts
@@ -1,5 +1,5 @@
 import { COIN_TYPE, NetworkId } from '@core/network'
-import { getActiveWallets } from 'shared/lib/core/profile'
+import { getActiveWallets } from '@core/profile'
 import { get } from 'svelte/store'
 import { OnboardingType } from '../enums'
 import { CannotRestoreWithMismatchedCoinTypeError } from '../errors'
diff --git a/packages/shared/lib/contexts/onboarding/stores/onboarding-secret-manager.store.ts b/packages/shared/lib/contexts/onboarding/stores/onboarding-secret-manager.store.ts
index 030a954323a..b3d0991658a 100644
--- a/packages/shared/lib/contexts/onboarding/stores/onboarding-secret-manager.store.ts
+++ b/packages/shared/lib/contexts/onboarding/stores/onboarding-secret-manager.store.ts
@@ -1,7 +1,7 @@
 import { onboardingProfile } from '@contexts/onboarding/stores'
 import { api } from '@core/api'
 import { SecretManager } from '@iota/sdk'
-import { verifyMnemonic } from 'shared/lib/core/secret-manager'
+import { verifyMnemonic } from '@core/secret-manager'
 import { get, writable, Writable } from 'svelte/store'
 
 export const onboardingProfileSecretManager: Writable<SecretManager | null> = writable(null)
diff --git a/packages/shared/lib/core/app/utils/openUrlInBrowser.ts b/packages/shared/lib/core/app/utils/openUrlInBrowser.ts
index faef2e5d0e6..09f35bca355 100644
--- a/packages/shared/lib/core/app/utils/openUrlInBrowser.ts
+++ b/packages/shared/lib/core/app/utils/openUrlInBrowser.ts
@@ -3,7 +3,7 @@ import { localize } from '@core/i18n'
 import { Platform } from '../classes/platform.class'
 import { externalAllowedLinks } from '../constants'
 import { showAppNotification } from '@auxiliary/notification'
-import { TextHintVariant } from 'shared/components/enums'
+import { TextHintVariant } from '@ui/enums'
 
 export function openUrlInBrowser(targetUrl: string): void {
     // If no protocol is specified, assume https
diff --git a/packages/shared/lib/core/layer-2/utils/getLayer2WithdrawRequest.ts b/packages/shared/lib/core/layer-2/utils/getLayer2WithdrawRequest.ts
index b24ff8fd3fe..1ff389acac9 100644
--- a/packages/shared/lib/core/layer-2/utils/getLayer2WithdrawRequest.ts
+++ b/packages/shared/lib/core/layer-2/utils/getLayer2WithdrawRequest.ts
@@ -4,8 +4,8 @@ import { SpecialStream } from '../classes'
 import { ACCOUNTS_CONTRACT, WITHDRAW } from '../constants'
 import { Blake2b } from '@iota/crypto.js'
 import { api } from '@core/api'
-import { activeProfile } from '../../profile'
-import { DEFAULT_CHAIN_CONFIGURATIONS } from '../../network'
+import { activeProfile } from '@core/profile'
+import { DEFAULT_CHAIN_CONFIGURATIONS } from '@core/network'
 import { Converter } from '@iota/util.js'
 import { Bip44 } from '@iota/sdk/out/types'
 import { HexEncodedString } from '@iota/sdk'
diff --git a/packages/shared/lib/core/ledger/helpers/deconstructLedgerNanoStatusPollingConfiguration.ts b/packages/shared/lib/core/ledger/helpers/deconstructLedgerNanoStatusPollingConfiguration.ts
index d3947e9825f..79ce3b74e2d 100644
--- a/packages/shared/lib/core/ledger/helpers/deconstructLedgerNanoStatusPollingConfiguration.ts
+++ b/packages/shared/lib/core/ledger/helpers/deconstructLedgerNanoStatusPollingConfiguration.ts
@@ -1,4 +1,4 @@
-import { activeProfileSecretManager } from '../../secret-manager'
+import { activeProfileSecretManager } from '@core/secret-manager'
 import { DEFAULT_LEDGER_NANO_STATUS_POLL_INTERVAL } from '../constants'
 import { ILedgerNanoStatusPollingConfiguration } from '../interfaces'
 
diff --git a/packages/shared/lib/core/network/helpers/getSlotInfoFromNodeProtocolParameters.ts b/packages/shared/lib/core/network/helpers/getSlotInfoFromNodeProtocolParameters.ts
index 0914a36ab92..8be8b0f94d7 100644
--- a/packages/shared/lib/core/network/helpers/getSlotInfoFromNodeProtocolParameters.ts
+++ b/packages/shared/lib/core/network/helpers/getSlotInfoFromNodeProtocolParameters.ts
@@ -1,6 +1,6 @@
 import { ProtocolParameters } from '@iota/sdk/out/types'
 import BigInteger from 'big-integer'
-import { convertDateToUnixTimestamp } from '../../utils'
+import { convertDateToUnixTimestamp } from '@core/utils'
 
 export function getSlotIndexFromNodeInfo(protocolParameters: ProtocolParameters): number {
     const elapsedTime = getElapsedTimeFromNodeInfo(protocolParameters)
diff --git a/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts b/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts
index 1d4779ff52b..683c0d52910 100644
--- a/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts
+++ b/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts
@@ -7,7 +7,7 @@ import { INft } from '../interfaces'
 import { buildNftFromNftOutput } from '../utils'
 import { NftOutput, OutputData, OutputType } from '@iota/sdk/out/types'
 import { setWalletNftsInAllWalletNfts } from './setWalletNftsInAllWalletNfts'
-import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from '../../network'
+import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from '@core/network'
 
 function sortNfts(outputA: OutputData, outputB: OutputData): number {
     const nodeProtocolParameters = get(nodeInfoProtocolParameters)
diff --git a/packages/desktop/views/onboarding/views/complete-onboarding/complete-onboarding-route.enum.ts b/packages/shared/lib/core/router/subrouters/complete-onboarding/complete-onboarding-route.enum.ts
similarity index 100%
rename from packages/desktop/views/onboarding/views/complete-onboarding/complete-onboarding-route.enum.ts
rename to packages/shared/lib/core/router/subrouters/complete-onboarding/complete-onboarding-route.enum.ts
diff --git a/packages/desktop/views/onboarding/views/complete-onboarding/complete-onboarding-router.ts b/packages/shared/lib/core/router/subrouters/complete-onboarding/complete-onboarding-router.ts
similarity index 100%
rename from packages/desktop/views/onboarding/views/complete-onboarding/complete-onboarding-router.ts
rename to packages/shared/lib/core/router/subrouters/complete-onboarding/complete-onboarding-router.ts
diff --git a/packages/shared/lib/core/router/subrouters/complete-onboarding/index.ts b/packages/shared/lib/core/router/subrouters/complete-onboarding/index.ts
new file mode 100644
index 00000000000..06e1154dd3b
--- /dev/null
+++ b/packages/shared/lib/core/router/subrouters/complete-onboarding/index.ts
@@ -0,0 +1,2 @@
+export * from './complete-onboarding-route.enum'
+export * from './complete-onboarding-router'
diff --git a/packages/desktop/views/onboarding/views/create-from-ledger/create-from-ledger-route.enum.ts b/packages/shared/lib/core/router/subrouters/create-from-ledger/create-from-ledger-route.enum.ts
similarity index 100%
rename from packages/desktop/views/onboarding/views/create-from-ledger/create-from-ledger-route.enum.ts
rename to packages/shared/lib/core/router/subrouters/create-from-ledger/create-from-ledger-route.enum.ts
diff --git a/packages/desktop/views/onboarding/views/create-from-ledger/create-from-ledger-router.ts b/packages/shared/lib/core/router/subrouters/create-from-ledger/create-from-ledger-router.ts
similarity index 100%
rename from packages/desktop/views/onboarding/views/create-from-ledger/create-from-ledger-router.ts
rename to packages/shared/lib/core/router/subrouters/create-from-ledger/create-from-ledger-router.ts
diff --git a/packages/shared/lib/core/router/subrouters/create-from-ledger/index.ts b/packages/shared/lib/core/router/subrouters/create-from-ledger/index.ts
new file mode 100644
index 00000000000..3c5e3e5938b
--- /dev/null
+++ b/packages/shared/lib/core/router/subrouters/create-from-ledger/index.ts
@@ -0,0 +1,2 @@
+export * from './create-from-ledger-route.enum'
+export * from './create-from-ledger-router'
diff --git a/packages/desktop/views/onboarding/views/create-from-mnemonic/create-from-mnemonic-route.enum.ts b/packages/shared/lib/core/router/subrouters/create-from-mnemonic/create-from-mnemonic-route.enum.ts
similarity index 100%
rename from packages/desktop/views/onboarding/views/create-from-mnemonic/create-from-mnemonic-route.enum.ts
rename to packages/shared/lib/core/router/subrouters/create-from-mnemonic/create-from-mnemonic-route.enum.ts
diff --git a/packages/desktop/views/onboarding/views/create-from-mnemonic/create-from-mnemonic-router.ts b/packages/shared/lib/core/router/subrouters/create-from-mnemonic/create-from-mnemonic-router.ts
similarity index 100%
rename from packages/desktop/views/onboarding/views/create-from-mnemonic/create-from-mnemonic-router.ts
rename to packages/shared/lib/core/router/subrouters/create-from-mnemonic/create-from-mnemonic-router.ts
diff --git a/packages/shared/lib/core/router/subrouters/create-from-mnemonic/index.ts b/packages/shared/lib/core/router/subrouters/create-from-mnemonic/index.ts
new file mode 100644
index 00000000000..1621171c201
--- /dev/null
+++ b/packages/shared/lib/core/router/subrouters/create-from-mnemonic/index.ts
@@ -0,0 +1,2 @@
+export * from './create-from-mnemonic-route.enum'
+export * from './create-from-mnemonic-router'
diff --git a/packages/desktop/views/onboarding/views/create-profile/create-profile-route.enum.ts b/packages/shared/lib/core/router/subrouters/create-profile/create-profile-route.enum.ts
similarity index 100%
rename from packages/desktop/views/onboarding/views/create-profile/create-profile-route.enum.ts
rename to packages/shared/lib/core/router/subrouters/create-profile/create-profile-route.enum.ts
diff --git a/packages/desktop/views/onboarding/views/create-profile/create-profile-router.ts b/packages/shared/lib/core/router/subrouters/create-profile/create-profile-router.ts
similarity index 100%
rename from packages/desktop/views/onboarding/views/create-profile/create-profile-router.ts
rename to packages/shared/lib/core/router/subrouters/create-profile/create-profile-router.ts
diff --git a/packages/shared/lib/core/router/subrouters/create-profile/index.ts b/packages/shared/lib/core/router/subrouters/create-profile/index.ts
new file mode 100644
index 00000000000..a8cd9af89c1
--- /dev/null
+++ b/packages/shared/lib/core/router/subrouters/create-profile/index.ts
@@ -0,0 +1,2 @@
+export * from './create-profile-route.enum'
+export * from './create-profile-router'
diff --git a/packages/desktop/views/dashboard/wallet/implicit-account-creation-router.ts b/packages/shared/lib/core/router/subrouters/implicit-account-creation/implicit-account-creation-router.ts
similarity index 95%
rename from packages/desktop/views/dashboard/wallet/implicit-account-creation-router.ts
rename to packages/shared/lib/core/router/subrouters/implicit-account-creation/implicit-account-creation-router.ts
index 4c517b3d456..470d4566188 100644
--- a/packages/desktop/views/dashboard/wallet/implicit-account-creation-router.ts
+++ b/packages/shared/lib/core/router/subrouters/implicit-account-creation/implicit-account-creation-router.ts
@@ -1,5 +1,5 @@
 import { get, writable } from 'svelte/store'
-import { Router } from '../../../../shared/lib/core/router/classes'
+import { Router } from '@lib/core/router/classes'
 import { ImplicitAccountCreationRoute } from './implicit-account-creation.enum'
 
 export const implicitAccountCreationRouter = writable<ImplicitAccountCreationRouter>(null)
diff --git a/packages/desktop/views/dashboard/wallet/implicit-account-creation.enum.ts b/packages/shared/lib/core/router/subrouters/implicit-account-creation/implicit-account-creation.enum.ts
similarity index 100%
rename from packages/desktop/views/dashboard/wallet/implicit-account-creation.enum.ts
rename to packages/shared/lib/core/router/subrouters/implicit-account-creation/implicit-account-creation.enum.ts
diff --git a/packages/shared/lib/core/router/subrouters/implicit-account-creation/index.ts b/packages/shared/lib/core/router/subrouters/implicit-account-creation/index.ts
new file mode 100644
index 00000000000..e174c8ba195
--- /dev/null
+++ b/packages/shared/lib/core/router/subrouters/implicit-account-creation/index.ts
@@ -0,0 +1,2 @@
+export * from './implicit-account-creation-router'
+export * from './implicit-account-creation.enum'
diff --git a/packages/shared/lib/core/router/subrouters/index.ts b/packages/shared/lib/core/router/subrouters/index.ts
index 908cb8822d3..ebc1c435ba1 100644
--- a/packages/shared/lib/core/router/subrouters/index.ts
+++ b/packages/shared/lib/core/router/subrouters/index.ts
@@ -1 +1,12 @@
 export * from './login-router'
+export * from './complete-onboarding'
+export * from './create-from-ledger'
+export * from './create-from-mnemonic'
+export * from './create-profile'
+export * from './network-setup'
+export * from './restore-from-stronghold'
+export * from './restore-from-mnemonic'
+export * from './restore-profile'
+export * from './update-stronghold'
+export * from './onboarding'
+export * from './implicit-account-creation'
diff --git a/packages/shared/lib/core/router/subrouters/login-router.ts b/packages/shared/lib/core/router/subrouters/login-router.ts
index 778351e7e3f..ff8ad5ec8a8 100644
--- a/packages/shared/lib/core/router/subrouters/login-router.ts
+++ b/packages/shared/lib/core/router/subrouters/login-router.ts
@@ -1,16 +1,12 @@
 import { isLatestStrongholdVersion } from '@core/app'
 import { activeProfile, ProfileType } from '@core/profile'
 import { get, writable } from 'svelte/store'
-
 import { Subrouter } from '../classes'
 import { LoginRoute } from '../enums'
 import { IRouterEvent } from '../interfaces'
 import { appRouter } from '../routers'
 import features from '@features/features'
-import {
-    UpdateStrongholdRouter,
-    updateStrongholdRouter,
-} from '../../../../../desktop/views/update-stronghold/update-stronghold-router'
+import { UpdateStrongholdRouter, updateStrongholdRouter } from '@core/router'
 
 export const loginRoute = writable<LoginRoute>(null)
 export const loginRouter = writable<LoginRouter>(null)
diff --git a/packages/shared/lib/core/router/subrouters/network-setup/index.ts b/packages/shared/lib/core/router/subrouters/network-setup/index.ts
new file mode 100644
index 00000000000..e2e0ecad5a9
--- /dev/null
+++ b/packages/shared/lib/core/router/subrouters/network-setup/index.ts
@@ -0,0 +1,2 @@
+export * from './network-setup-route.enum'
+export * from './network-setup-router'
diff --git a/packages/desktop/views/onboarding/views/network-setup/network-setup-route.enum.ts b/packages/shared/lib/core/router/subrouters/network-setup/network-setup-route.enum.ts
similarity index 100%
rename from packages/desktop/views/onboarding/views/network-setup/network-setup-route.enum.ts
rename to packages/shared/lib/core/router/subrouters/network-setup/network-setup-route.enum.ts
diff --git a/packages/desktop/views/onboarding/views/network-setup/network-setup-router.ts b/packages/shared/lib/core/router/subrouters/network-setup/network-setup-router.ts
similarity index 100%
rename from packages/desktop/views/onboarding/views/network-setup/network-setup-router.ts
rename to packages/shared/lib/core/router/subrouters/network-setup/network-setup-router.ts
diff --git a/packages/shared/lib/core/router/subrouters/onboarding/index.ts b/packages/shared/lib/core/router/subrouters/onboarding/index.ts
new file mode 100644
index 00000000000..04580dacc7a
--- /dev/null
+++ b/packages/shared/lib/core/router/subrouters/onboarding/index.ts
@@ -0,0 +1,2 @@
+export * from './onboarding-route.enum'
+export * from './onboarding-router'
diff --git a/packages/desktop/views/onboarding/onboarding-route.enum.ts b/packages/shared/lib/core/router/subrouters/onboarding/onboarding-route.enum.ts
similarity index 100%
rename from packages/desktop/views/onboarding/onboarding-route.enum.ts
rename to packages/shared/lib/core/router/subrouters/onboarding/onboarding-route.enum.ts
diff --git a/packages/desktop/views/onboarding/onboarding-router.ts b/packages/shared/lib/core/router/subrouters/onboarding/onboarding-router.ts
similarity index 83%
rename from packages/desktop/views/onboarding/onboarding-router.ts
rename to packages/shared/lib/core/router/subrouters/onboarding/onboarding-router.ts
index 7d79d760953..999e9888e94 100644
--- a/packages/desktop/views/onboarding/onboarding-router.ts
+++ b/packages/shared/lib/core/router/subrouters/onboarding/onboarding-router.ts
@@ -1,13 +1,19 @@
 import { OnboardingType, onboardingProfile } from '@contexts/onboarding'
 import { hasCompletedAppSetup } from '@core/app'
 import { get, writable } from 'svelte/store'
-import { Router } from '../../../shared/lib/core/router/classes'
-import { appRouter } from '../../../shared/lib/core/router/routers/app-router'
+import {
+    Router,
+    appRouter,
+    CompleteOnboardingRouter,
+    completeOnboardingRouter,
+    CreateProfileRouter,
+    createProfileRouter,
+    NetworkSetupRouter,
+    networkSetupRouter,
+    RestoreProfileRouter,
+    restoreProfileRouter,
+} from '@core/router'
 import { OnboardingRoute } from './onboarding-route.enum'
-import { CompleteOnboardingRouter, completeOnboardingRouter } from './views/complete-onboarding'
-import { CreateProfileRouter, createProfileRouter } from './views/create-profile'
-import { NetworkSetupRouter, networkSetupRouter } from './views/network-setup'
-import { RestoreProfileRouter, restoreProfileRouter } from './views/restore-profile'
 
 export const onboardingRoute = writable<OnboardingRoute>(undefined)
 export const onboardingRouter = writable<OnboardingRouter>(undefined)
diff --git a/packages/shared/lib/core/router/subrouters/restore-from-mnemonic/index.ts b/packages/shared/lib/core/router/subrouters/restore-from-mnemonic/index.ts
new file mode 100644
index 00000000000..bc55a07739a
--- /dev/null
+++ b/packages/shared/lib/core/router/subrouters/restore-from-mnemonic/index.ts
@@ -0,0 +1,2 @@
+export * from './restore-from-mnemonic-route.enum'
+export * from './restore-from-mnemonic-router'
diff --git a/packages/desktop/views/onboarding/views/restore-from-mnemonic/restore-from-mnemonic-route.enum.ts b/packages/shared/lib/core/router/subrouters/restore-from-mnemonic/restore-from-mnemonic-route.enum.ts
similarity index 100%
rename from packages/desktop/views/onboarding/views/restore-from-mnemonic/restore-from-mnemonic-route.enum.ts
rename to packages/shared/lib/core/router/subrouters/restore-from-mnemonic/restore-from-mnemonic-route.enum.ts
diff --git a/packages/desktop/views/onboarding/views/restore-from-mnemonic/restore-from-mnemonic-router.ts b/packages/shared/lib/core/router/subrouters/restore-from-mnemonic/restore-from-mnemonic-router.ts
similarity index 100%
rename from packages/desktop/views/onboarding/views/restore-from-mnemonic/restore-from-mnemonic-router.ts
rename to packages/shared/lib/core/router/subrouters/restore-from-mnemonic/restore-from-mnemonic-router.ts
diff --git a/packages/shared/lib/core/router/subrouters/restore-from-stronghold/index.ts b/packages/shared/lib/core/router/subrouters/restore-from-stronghold/index.ts
new file mode 100644
index 00000000000..fa9684208c8
--- /dev/null
+++ b/packages/shared/lib/core/router/subrouters/restore-from-stronghold/index.ts
@@ -0,0 +1,2 @@
+export * from './restore-from-stronghold-route.enum'
+export * from './restore-from-stronghold-router'
diff --git a/packages/desktop/views/onboarding/views/restore-from-stronghold/restore-from-stronghold-route.enum.ts b/packages/shared/lib/core/router/subrouters/restore-from-stronghold/restore-from-stronghold-route.enum.ts
similarity index 100%
rename from packages/desktop/views/onboarding/views/restore-from-stronghold/restore-from-stronghold-route.enum.ts
rename to packages/shared/lib/core/router/subrouters/restore-from-stronghold/restore-from-stronghold-route.enum.ts
diff --git a/packages/desktop/views/onboarding/views/restore-from-stronghold/restore-from-stronghold-router.ts b/packages/shared/lib/core/router/subrouters/restore-from-stronghold/restore-from-stronghold-router.ts
similarity index 98%
rename from packages/desktop/views/onboarding/views/restore-from-stronghold/restore-from-stronghold-router.ts
rename to packages/shared/lib/core/router/subrouters/restore-from-stronghold/restore-from-stronghold-router.ts
index e9cf8abd522..521f69bf844 100644
--- a/packages/desktop/views/onboarding/views/restore-from-stronghold/restore-from-stronghold-router.ts
+++ b/packages/shared/lib/core/router/subrouters/restore-from-stronghold/restore-from-stronghold-router.ts
@@ -3,7 +3,7 @@ import { get, writable } from 'svelte/store'
 import { RestoreFromStrongholdRoute } from './restore-from-stronghold-route.enum'
 import { onboardingProfile } from '@contexts/onboarding/stores'
 import { isLatestStrongholdVersion } from '@core/app/utils'
-import { UpdateStrongholdRouter, updateStrongholdRouter } from '@views/update-stronghold'
+import { UpdateStrongholdRouter, updateStrongholdRouter } from '@core/router'
 
 export const restoreFromStrongholdRoute = writable<RestoreFromStrongholdRoute>(undefined)
 export const restoreFromStrongholdRouter = writable<RestoreFromStrongholdRouter>(undefined)
diff --git a/packages/shared/lib/core/router/subrouters/restore-profile/index.ts b/packages/shared/lib/core/router/subrouters/restore-profile/index.ts
new file mode 100644
index 00000000000..a1387ea377b
--- /dev/null
+++ b/packages/shared/lib/core/router/subrouters/restore-profile/index.ts
@@ -0,0 +1,2 @@
+export * from './restore-profile-route.enum'
+export * from './restore-profile-router'
diff --git a/packages/desktop/views/onboarding/views/restore-profile/restore-profile-route.enum.ts b/packages/shared/lib/core/router/subrouters/restore-profile/restore-profile-route.enum.ts
similarity index 100%
rename from packages/desktop/views/onboarding/views/restore-profile/restore-profile-route.enum.ts
rename to packages/shared/lib/core/router/subrouters/restore-profile/restore-profile-route.enum.ts
diff --git a/packages/desktop/views/onboarding/views/restore-profile/restore-profile-router.ts b/packages/shared/lib/core/router/subrouters/restore-profile/restore-profile-router.ts
similarity index 100%
rename from packages/desktop/views/onboarding/views/restore-profile/restore-profile-router.ts
rename to packages/shared/lib/core/router/subrouters/restore-profile/restore-profile-router.ts
diff --git a/packages/shared/lib/core/router/subrouters/update-stronghold/index.ts b/packages/shared/lib/core/router/subrouters/update-stronghold/index.ts
new file mode 100644
index 00000000000..e34577f6004
--- /dev/null
+++ b/packages/shared/lib/core/router/subrouters/update-stronghold/index.ts
@@ -0,0 +1,2 @@
+export * from './update-stronghold-route.enum'
+export * from './update-stronghold-router'
diff --git a/packages/desktop/views/update-stronghold/update-stronghold-route.enum.ts b/packages/shared/lib/core/router/subrouters/update-stronghold/update-stronghold-route.enum.ts
similarity index 100%
rename from packages/desktop/views/update-stronghold/update-stronghold-route.enum.ts
rename to packages/shared/lib/core/router/subrouters/update-stronghold/update-stronghold-route.enum.ts
diff --git a/packages/desktop/views/update-stronghold/update-stronghold-router.ts b/packages/shared/lib/core/router/subrouters/update-stronghold/update-stronghold-router.ts
similarity index 100%
rename from packages/desktop/views/update-stronghold/update-stronghold-router.ts
rename to packages/shared/lib/core/router/subrouters/update-stronghold/update-stronghold-router.ts
diff --git a/packages/shared/lib/core/wallet/actions/activities/setAsyncStatusOfWalletActivities.ts b/packages/shared/lib/core/wallet/actions/activities/setAsyncStatusOfWalletActivities.ts
index 78e0dc12dd0..d09e48846eb 100644
--- a/packages/shared/lib/core/wallet/actions/activities/setAsyncStatusOfWalletActivities.ts
+++ b/packages/shared/lib/core/wallet/actions/activities/setAsyncStatusOfWalletActivities.ts
@@ -1,4 +1,4 @@
-import { syncBalance } from 'shared/lib/core/wallet/actions/syncBalance'
+import { syncBalance } from '@core/wallet/actions/syncBalance'
 import { updateNftInAllWalletNfts } from '@core/nfts'
 import { ActivityAsyncStatus, ActivityDirection, ActivityType } from '@core/wallet/enums'
 import { allWalletActivities } from '../../stores'
diff --git a/packages/shared/lib/core/wallet/actions/buildWalletState.ts b/packages/shared/lib/core/wallet/actions/buildWalletState.ts
index c375e0221e6..ad25bfa622b 100644
--- a/packages/shared/lib/core/wallet/actions/buildWalletState.ts
+++ b/packages/shared/lib/core/wallet/actions/buildWalletState.ts
@@ -1,6 +1,6 @@
 import { IWallet } from '@core/profile/interfaces'
 import { AccountAddress, AccountOutput, Balance, OutputData, OutputType } from '@iota/sdk/out/types'
-import { updateWalletPersistedDataOnActiveProfile } from '../../profile'
+import { updateWalletPersistedDataOnActiveProfile } from '@core/profile'
 import { IPersistedWalletData } from '../interfaces/persisted-wallet-data.interface'
 import { IWalletState } from '../interfaces/wallet-state.interface'
 import { getBech32AddressFromAddressTypes, getBlockIssuerAccounts } from '../utils'
diff --git a/packages/shared/lib/core/wallet/actions/events-handlers/handleSpentOutputEvent.ts b/packages/shared/lib/core/wallet/actions/events-handlers/handleSpentOutputEvent.ts
index 75960d20919..1d1c7a9d24f 100644
--- a/packages/shared/lib/core/wallet/actions/events-handlers/handleSpentOutputEvent.ts
+++ b/packages/shared/lib/core/wallet/actions/events-handlers/handleSpentOutputEvent.ts
@@ -10,8 +10,8 @@ import {
     validateWalletApiEvent,
 } from '@core/wallet'
 import { AccountOutput, OutputType, SpentOutputWalletEvent, WalletEvent, WalletEventType } from '@iota/sdk/out/types'
-import { nodeInfoProtocolParameters } from 'shared/lib/core/network'
-import { getUnixTimestampFromNodeInfoAndSlotIndex } from 'shared/lib/core/network/helpers/getSlotInfoFromNodeProtocolParameters'
+import { nodeInfoProtocolParameters } from '@core/network'
+import { getUnixTimestampFromNodeInfoAndSlotIndex } from '@core/network/helpers/getSlotInfoFromNodeProtocolParameters'
 import { get } from 'svelte/store'
 
 export function handleSpentOutputEvent(walletId: string): WalletApiEventHandler {
diff --git a/packages/shared/lib/core/wallet/actions/events-handlers/handleTransactionInclusionEvent.ts b/packages/shared/lib/core/wallet/actions/events-handlers/handleTransactionInclusionEvent.ts
index 12731d67125..3fb2771dd10 100644
--- a/packages/shared/lib/core/wallet/actions/events-handlers/handleTransactionInclusionEvent.ts
+++ b/packages/shared/lib/core/wallet/actions/events-handlers/handleTransactionInclusionEvent.ts
@@ -1,8 +1,7 @@
 import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
 import { TransactionInclusionWalletEvent, WalletEvent, WalletEventType } from '@iota/sdk/out/types'
-
 import { updateParticipationOverview } from '@contexts/governance/stores'
-import { isWalletVoting } from 'shared/lib/contexts/governance/utils/isWalletVoting'
+import { isWalletVoting } from '@contexts/governance/utils/isWalletVoting'
 import { updateNftInAllWalletNfts } from '@core/nfts'
 import { updateActiveWalletPersistedData } from '@core/profile/actions'
 import {
@@ -19,7 +18,7 @@ import {
     WalletApiEventHandler,
 } from '@core/wallet'
 import { get } from 'svelte/store'
-import { activeWallets, updateActiveWallet } from 'shared/lib/core/profile'
+import { activeWallets, updateActiveWallet } from '@core/profile'
 
 export function handleTransactionInclusionEvent(walletId: string): WalletApiEventHandler {
     return (error: Error, rawEvent: WalletEvent) => {
diff --git a/packages/shared/lib/core/wallet/actions/getClient.ts b/packages/shared/lib/core/wallet/actions/getClient.ts
index e8cda177bc2..4b78b614bed 100644
--- a/packages/shared/lib/core/wallet/actions/getClient.ts
+++ b/packages/shared/lib/core/wallet/actions/getClient.ts
@@ -1,6 +1,6 @@
 import { Client } from '@iota/sdk/out/client'
 import { selectedWalletId } from '@core/wallet/stores'
-import { api } from '../../api'
+import { api } from '@core/api'
 import { get } from 'svelte/store'
 
 export function getClient(): Promise<Client> {
diff --git a/packages/shared/lib/core/wallet/actions/refreshWalletAssetsForActiveProfile.ts b/packages/shared/lib/core/wallet/actions/refreshWalletAssetsForActiveProfile.ts
index 28aee63af7c..138edc960b6 100644
--- a/packages/shared/lib/core/wallet/actions/refreshWalletAssetsForActiveProfile.ts
+++ b/packages/shared/lib/core/wallet/actions/refreshWalletAssetsForActiveProfile.ts
@@ -8,7 +8,7 @@ import {
     clearPersistedAssetForActiveProfile,
     persistedAssets,
 } from '../stores/persisted-assets.store'
-import { PERSISTED_MANA_ASSET } from '../../network'
+import { PERSISTED_MANA_ASSET } from '@core/network'
 import { AssetVerification } from '../types'
 
 export async function refreshWalletAssetsForActiveProfile(
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAccountActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAccountActivity.ts
index defd0222018..348400b1252 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAccountActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAccountActivity.ts
@@ -11,7 +11,7 @@ import {
     getStorageDepositFromOutput,
     getTagFromOutput,
 } from './helper'
-import { AccountOutput } from 'shared/../../../iota-sdk/bindings/nodejs/out'
+import { AccountOutput } from '@iota/sdk/out/types'
 import { api } from '@core/api'
 
 export async function generateSingleAccountActivity(
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAnchorActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAnchorActivity.ts
index 384f38121dc..63cf04b62b0 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAnchorActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAnchorActivity.ts
@@ -11,7 +11,7 @@ import {
     getStorageDepositFromOutput,
     getTagFromOutput,
 } from './helper'
-import { AnchorOutput } from 'shared/../../../iota-sdk/bindings/nodejs/out'
+import { AnchorOutput } from '@iota/sdk/out/types'
 
 export async function generateSingleAnchorActivity(
     wallet: IWalletState,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts
index b372864a8c0..5353e54ac3d 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts
@@ -1,5 +1,5 @@
 import { CommonOutput, TimelockUnlockCondition, UnlockConditionType } from '@iota/sdk/out/types'
-import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from 'shared/lib/core/network'
+import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from '@core/network'
 import { get } from 'svelte/store'
 
 export function getTimelockDateFromOutput(output: CommonOutput): Date | undefined {
diff --git a/packages/shared/lib/core/wallet/utils/index.ts b/packages/shared/lib/core/wallet/utils/index.ts
index 2ff6b17d4f1..dafcb962c61 100644
--- a/packages/shared/lib/core/wallet/utils/index.ts
+++ b/packages/shared/lib/core/wallet/utils/index.ts
@@ -35,6 +35,8 @@ export * from './getIconColorFromString'
 export * from './syncWalletsInSeries'
 export * from './syncWalletsInParallel'
 export * from './validateWalletName'
+export * from './isVisibleAsset'
+export * from './isVisibleActivity'
 
 // Folders
 export * from './generateActivity'
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getExpirationDateFromOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getExpirationDateFromOutput.ts
index 5092e7b5bfe..eb044789e80 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getExpirationDateFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getExpirationDateFromOutput.ts
@@ -1,6 +1,6 @@
 import { CommonOutput, ExpirationUnlockCondition, UnlockConditionType } from '@iota/sdk/out/types'
 import { get } from 'svelte/store'
-import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from 'shared/lib/core/network'
+import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from '@core/network'
 
 export function getExpirationDateFromOutput(output: CommonOutput): Date | undefined {
     const expirationTime = getExpirationUnixTimeFromOutput(output)
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getNftId.ts b/packages/shared/lib/core/wallet/utils/outputs/getNftId.ts
index 75d10751a05..da053b2a668 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getNftId.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getNftId.ts
@@ -1,5 +1,5 @@
 import { EMPTY_HEX_ID } from '@core/wallet/constants'
-import { api } from 'shared/lib/core/api'
+import { api } from '@core/api'
 
 export function getNftId(nftId: string, outputId: string): string {
     const isNewNft = nftId === EMPTY_HEX_ID
diff --git a/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts b/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
index 74ec28eb5f2..343218bd9ae 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
@@ -5,9 +5,9 @@ import { IProcessedTransaction, IWrappedOutput } from '../../interfaces'
 import { getRecipientAddressFromOutput } from './getRecipientAddressFromOutput'
 import { getSenderAddressFromInputs } from '../transactions'
 import { getOutputIdFromTransactionIdAndIndex } from './getOutputIdFromTransactionIdAndIndex'
-import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from 'shared/lib/core/network'
+import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from '@core/network'
 import { get } from 'svelte/store'
-import { MILLISECONDS_PER_SECOND } from 'shared/lib/core/utils'
+import { MILLISECONDS_PER_SECOND } from '@core/utils'
 
 // TODO(2.0) Fix all usages
 export function preprocessGroupedOutputs(
diff --git a/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts b/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts
index 19ac9425489..e06917cb3dd 100644
--- a/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts
+++ b/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts
@@ -1,7 +1,7 @@
 import { InvalidExpirationDateTimeError } from '@contexts/wallet'
 import { convertUnixTimestampToDate, isValidExpirationDateTime } from '@core/utils'
 import { CommonOutput, ExpirationUnlockCondition, UnlockConditionType } from '@iota/sdk/out/types'
-import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from 'shared/lib/core/network'
+import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from '@core/network'
 import { get } from 'svelte/store'
 
 export function validateSendConfirmation(output: CommonOutput): void {
diff --git a/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts b/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts
index 7e493384ec4..a0decfa4b72 100644
--- a/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts
+++ b/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts
@@ -8,7 +8,7 @@ import {
     UnlockConditionType,
     AccountAddress,
 } from '@iota/sdk/out/types'
-import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from 'shared/lib/core/network'
+import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from '@core/network'
 import { get } from 'svelte/store'
 
 export function getSenderAddressFromInputs(inputs: IWrappedOutput[]): string | undefined {
diff --git a/packages/shared/tsconfig.test.json b/packages/shared/tsconfig.test.json
index 1b95e0acb91..baaa1785f96 100644
--- a/packages/shared/tsconfig.test.json
+++ b/packages/shared/tsconfig.test.json
@@ -6,6 +6,7 @@
         "isolatedModules": true,
         "lib": ["DOM", "ESNext"],
         "paths": {
+            "@ui": ["./components"],
             "@auxiliary/*": ["./lib/auxiliary/*"],
             "@contexts/*": ["./lib/contexts/*"],
             "@core/*": ["./lib/core/*"],