diff --git a/docs/specifications/modules.md b/docs/specifications/modules.md
index 78079981268..474ed93ea75 100644
--- a/docs/specifications/modules.md
+++ b/docs/specifications/modules.md
@@ -12,20 +12,23 @@ Core modules contain the baseline logic and functionality to build and run the a
 
 ### Modules
 
-- `account`: Manages the accounts of a profile
-- `app`: Application configuration, setup, settings, etc.
-- `error`: Generic code for building domain-specific errors
-- `i18n`: Logic related to internationalization, languages, locales, etc.
-- `network`: Client options and node configuration, protocol settings, etc.
-- `nft`: Managing NFTs, e.g. claiming, burning, transferring
-- `profile`: General application logic to support profiles
-- `profile-manager`: Library-related logic for managing and interacting with profiles
-- `router`: Manage application views and flows
-- `token`: Deals with tokens, metadata, conversion rates, registry, etc.
-- `utils`: Useful and generic functions, e.g. formatting strings, converting units
+- `account` - Manages the accounts of a profile
+- `app` - Application configuration, setup, settings, etc.
+- `error` - Generic code for building domain-specific errors
+- `i18n` - Logic related to internationalization, languages, locales, etc.
+- `ledger` - Code related to Ledger Nano profiles and devices
+- `network` - Client options and node configuration, protocol settings, etc.
+- `nft` - Managing NFTs, e.g. claiming, burning, transferring
+- `profile` - General application logic to support profiles
+- `profile-manager` - Library-related logic for managing and interacting with profiles
+- `router` - Manage application views and flows
+- `stronghold` - Code for Stronghold operations, utils, constants, etc. for software profiles
+- `token` - Deals with tokens, metadata, conversion rates, registry, etc.
+- `utils` - Useful and generic functions, e.g. formatting strings, converting units
 
 ### Rules
 
+- **MAY** import code from other core modules
 - **MAY NOT** import code from context or auxiliary modules
 
 ## Contexts
@@ -35,15 +38,17 @@ Context modules contain the logic specific to an area of the application.
 ### Modules
 
 - `collectibles` - managing or viewing an account's NFTs
+- `developer` - using developer tools to make lives easier
 - `onboarding` - creating or restoring a profile or initial app setup
 - `settings` - changing configuration of the app, profile, network, etc.
 - `staking` - staking tokens to receive more tokens
-- `voting` - using tokens to cast votes for community proposals
-- `wallet` - sending or receiving coins and tokens
+- `governance` - using tokens to cast votes for community proposals
+- `wallet` - sending or receiving coins and tokens, i.e. asset management
 
 ### Rules
 
-_None_
+- **MAY** import code from core and auxiliary modules
+- **SHOULD NOT** import code from other context modules
 
 ## Auxiliary
 
@@ -59,3 +64,4 @@ Auxiliary modules are non-essential pieces of code that help support the applica
 ### Rules
 
 - **MAY NOT** import code from context modules
+- **SHOULD NOT** import code from other auxiliary modules
diff --git a/packages/desktop/App.svelte b/packages/desktop/App.svelte
index 93ad0650854..913c022f047 100644
--- a/packages/desktop/App.svelte
+++ b/packages/desktop/App.svelte
@@ -16,7 +16,7 @@
     import { Electron } from '@lib/electron'
     import { addError } from '@core/error'
     import { showAppNotification } from '@lib/notifications'
-    import { openPopup, popupState } from '@lib/popup'
+    import { openPopup, popupState } from '@auxiliary/popup'
     import { Dashboard, LoginRouter, OnboardingRouter, Settings, Splash } from 'shared/routes'
     import { onDestroy, onMount } from 'svelte'
     import { getLocalisedMenuItems } from './lib/helpers'
diff --git a/packages/mobile/App.svelte b/packages/mobile/App.svelte
index a840a275371..0826ca41c30 100644
--- a/packages/mobile/App.svelte
+++ b/packages/mobile/App.svelte
@@ -27,7 +27,7 @@
     import { Electron } from 'shared/lib/electron'
     import { addError } from '@core/error'
     import { showAppNotification } from 'shared/lib/notifications'
-    import { openPopup } from 'shared/lib/popup'
+    import { openPopup } from '@auxiliary/popup'
     import { DashboardRouter, LoginRouter, OnboardingRouter } from './routes'
     import { onDestroy, onMount } from 'svelte'
     import { get } from 'svelte/store'
diff --git a/packages/mobile/routes/login/views/EnterPinView.svelte b/packages/mobile/routes/login/views/EnterPinView.svelte
index 22c009e4df6..6af9e5ee96a 100644
--- a/packages/mobile/routes/login/views/EnterPinView.svelte
+++ b/packages/mobile/routes/login/views/EnterPinView.svelte
@@ -5,7 +5,7 @@
     import { activeProfile, login, resetActiveProfile } from '@core/profile'
     import { loginRouter } from '../../../lib/core/router'
     import { Platform } from '@lib/platform'
-    import { openPopup, popupState } from '@lib/popup'
+    import { openPopup, popupState } from '@auxiliary/popup'
     import { validatePinFormat } from '@lib/utils'
     import { Icon, PinInput, Profile, Text, TextType } from 'shared/components'
     import { onDestroy } from 'svelte'
diff --git a/packages/mobile/routes/login/views/SelectProfileView.svelte b/packages/mobile/routes/login/views/SelectProfileView.svelte
index d6c95f152a4..976f97715f6 100644
--- a/packages/mobile/routes/login/views/SelectProfileView.svelte
+++ b/packages/mobile/routes/login/views/SelectProfileView.svelte
@@ -11,7 +11,7 @@
         shouldBeDeveloperProfile,
         updateOnboardingProfile,
     } from '@contexts/onboarding'
-    import { openPopup } from '@lib/popup'
+    import { openPopup } from '@auxiliary/popup'
 
     $: dark = $appSettings.darkMode
 
@@ -59,7 +59,7 @@
     </section>
     <footer class="w-full pt-5">
         <Button
-            classes="w-full text-blue-500 border border-solid 
+            classes="w-full text-blue-500 border border-solid
                 {dark ? 'border-gray-700' : 'border-gray-300'}"
             variant="none"
             onClick={onAddProfileClick}
diff --git a/packages/shared/components/TitleBar.svelte b/packages/shared/components/TitleBar.svelte
index 58363a8cf63..af36d4a8485 100644
--- a/packages/shared/components/TitleBar.svelte
+++ b/packages/shared/components/TitleBar.svelte
@@ -3,7 +3,7 @@
     import { activeProfile } from '@core/profile'
     import { appSettings, PlatformOption, platform } from '@core/app'
     import { Platform } from 'shared/lib/platform'
-    import { popupState } from 'shared/lib/popup'
+    import { popupState } from '@auxiliary/popup'
     import tailwindConfig from 'shared/tailwind.config.js'
     import { onDestroy, onMount } from 'svelte'
     import resolveConfig from 'tailwindcss/resolveConfig'
diff --git a/packages/shared/components/atoms/buttons/CreateAliasButton.svelte b/packages/shared/components/atoms/buttons/CreateAliasButton.svelte
index e0ce181a108..60264de4ba4 100644
--- a/packages/shared/components/atoms/buttons/CreateAliasButton.svelte
+++ b/packages/shared/components/atoms/buttons/CreateAliasButton.svelte
@@ -1,6 +1,6 @@
 <script lang="typescript">
     import { localize } from '@core/i18n'
-    import { openPopup } from '@lib/popup'
+    import { openPopup } from '@auxiliary/popup'
     import { OnboardingButton } from 'shared/components'
 
     function handleCreateAlias(): void {
diff --git a/packages/shared/components/atoms/buttons/ExportStrongholdButton.svelte b/packages/shared/components/atoms/buttons/ExportStrongholdButton.svelte
index c5693ae142e..21c8ad9d396 100644
--- a/packages/shared/components/atoms/buttons/ExportStrongholdButton.svelte
+++ b/packages/shared/components/atoms/buttons/ExportStrongholdButton.svelte
@@ -2,7 +2,7 @@
     import { exportStronghold } from '@contexts/settings'
     import { localize } from '@core/i18n'
     import { showAppNotification } from '@lib/notifications'
-    import { openPopup } from '@lib/popup'
+    import { openPopup } from '@auxiliary/popup'
     import { Button, ButtonSize } from 'shared/components'
 
     export let isBusy = false
diff --git a/packages/shared/components/atoms/buttons/FaucetRequestButton.svelte b/packages/shared/components/atoms/buttons/FaucetRequestButton.svelte
index a0b2a2f509b..aa5da909087 100644
--- a/packages/shared/components/atoms/buttons/FaucetRequestButton.svelte
+++ b/packages/shared/components/atoms/buttons/FaucetRequestButton.svelte
@@ -1,7 +1,7 @@
 <script lang="typescript">
     import { localize } from '@core/i18n'
     import { FAUCET_URLS, nodeInfo } from '@core/network'
-    import { openPopup } from '@lib/popup'
+    import { openPopup } from '@auxiliary/popup'
     import { OnboardingButton } from 'shared/components'
     import { activeProfile } from '@core/profile'
 
diff --git a/packages/shared/components/atoms/buttons/MintNativeTokenButton.svelte b/packages/shared/components/atoms/buttons/MintNativeTokenButton.svelte
index 317a39ee195..cee9b890689 100644
--- a/packages/shared/components/atoms/buttons/MintNativeTokenButton.svelte
+++ b/packages/shared/components/atoms/buttons/MintNativeTokenButton.svelte
@@ -1,6 +1,6 @@
 <script lang="typescript">
     import { localize } from '@core/i18n'
-    import { closePopup, openPopup } from '@lib/popup'
+    import { closePopup, openPopup } from '@auxiliary/popup'
     import { OnboardingButton } from 'shared/components'
     import { selectedAccount } from '@core/account'
 
diff --git a/packages/shared/components/atoms/buttons/ReceiveButton.svelte b/packages/shared/components/atoms/buttons/ReceiveButton.svelte
index d122483a602..23ce3eca879 100644
--- a/packages/shared/components/atoms/buttons/ReceiveButton.svelte
+++ b/packages/shared/components/atoms/buttons/ReceiveButton.svelte
@@ -1,6 +1,6 @@
 <script lang="typescript">
     import { localize } from '@core/i18n'
-    import { openPopup } from '@lib/popup'
+    import { openPopup } from '@auxiliary/popup'
 
     function handleReceiveClick(): void {
         openPopup({
diff --git a/packages/shared/components/atoms/buttons/RefreshTokenMetadataButton.svelte b/packages/shared/components/atoms/buttons/RefreshTokenMetadataButton.svelte
index 63f8efb863b..25f2212d3a1 100644
--- a/packages/shared/components/atoms/buttons/RefreshTokenMetadataButton.svelte
+++ b/packages/shared/components/atoms/buttons/RefreshTokenMetadataButton.svelte
@@ -2,7 +2,7 @@
     import { localize } from '@core/i18n'
     import { refreshAccountAssetsForActiveProfile } from '@core/wallet'
     import { showAppNotification } from '@lib/notifications'
-    import { closePopup, openPopup } from '@lib/popup'
+    import { closePopup, openPopup } from '@auxiliary/popup'
     import { OnboardingButton } from 'shared/components'
 
     function refreshTokenMetadata(): void {
diff --git a/packages/shared/components/atoms/buttons/SendButton.svelte b/packages/shared/components/atoms/buttons/SendButton.svelte
index 5e413aa11ea..b3b4f4ecae3 100644
--- a/packages/shared/components/atoms/buttons/SendButton.svelte
+++ b/packages/shared/components/atoms/buttons/SendButton.svelte
@@ -2,7 +2,7 @@
     import { localize } from '@core/i18n'
     import { resetLedgerPreparedOutput, resetShowInternalVerificationPopup } from '@core/ledger'
     import { resetNewTransactionDetails, selectedSendOptionIndex } from '@core/wallet'
-    import { openPopup } from '@lib/popup'
+    import { openPopup } from '@auxiliary/popup'
     import { appSettings } from '@core/app'
     import { Text, FontWeight, TextType, Icon, Modal } from 'shared/components'
     import { Icon as IconEnum } from '@auxiliary/icon'
diff --git a/packages/shared/components/atoms/buttons/TestDeepLinkButton.svelte b/packages/shared/components/atoms/buttons/TestDeepLinkButton.svelte
index f0c28ed7174..b953e20b085 100644
--- a/packages/shared/components/atoms/buttons/TestDeepLinkButton.svelte
+++ b/packages/shared/components/atoms/buttons/TestDeepLinkButton.svelte
@@ -1,6 +1,6 @@
 <script lang="typescript">
     import { localize } from '@core/i18n'
-    import { openPopup } from '@lib/popup'
+    import { openPopup } from '@auxiliary/popup'
     import { OnboardingButton } from 'shared/components'
 
     function handleClick(): void {
diff --git a/packages/shared/components/atoms/tiles/ActivityTile.svelte b/packages/shared/components/atoms/tiles/ActivityTile.svelte
index 7c078438b05..1b1ba149a09 100644
--- a/packages/shared/components/atoms/tiles/ActivityTile.svelte
+++ b/packages/shared/components/atoms/tiles/ActivityTile.svelte
@@ -9,7 +9,7 @@
         NotVerifiedStatus,
         ActivityAsyncStatus,
     } from '@core/wallet'
-    import { openPopup } from '@lib/popup'
+    import { openPopup } from '@auxiliary/popup'
     import {
         ClickableTile,
         TransactionActivityTileContent,
diff --git a/packages/shared/components/atoms/tiles/tileFooters/AsyncActivityTileFooter.svelte b/packages/shared/components/atoms/tiles/tileFooters/AsyncActivityTileFooter.svelte
index b33e520eaad..873428e0134 100644
--- a/packages/shared/components/atoms/tiles/tileFooters/AsyncActivityTileFooter.svelte
+++ b/packages/shared/components/atoms/tiles/tileFooters/AsyncActivityTileFooter.svelte
@@ -22,7 +22,7 @@
     import { localize } from '@core/i18n'
     import { showInternalVerificationPopup } from '@core/ledger'
     import { checkActiveProfileAuth, isActiveLedgerProfile } from '@core/profile'
-    import { closePopup, openPopup } from '@lib/popup'
+    import { closePopup, openPopup } from '@auxiliary/popup'
 
     export let activityId: string
     export let data: ITransactionActivityData
diff --git a/packages/shared/components/modals/AccountActionsMenu.svelte b/packages/shared/components/modals/AccountActionsMenu.svelte
index b4b50bad82f..5b6b6f2a549 100644
--- a/packages/shared/components/modals/AccountActionsMenu.svelte
+++ b/packages/shared/components/modals/AccountActionsMenu.svelte
@@ -4,7 +4,7 @@
     import { activeAccounts, visibleActiveAccounts } from '@core/profile'
     import { deleteAccount } from '@core/profile-manager'
     import { Icon } from '@lib/auxiliary/icon'
-    import { openPopup } from '@lib/popup'
+    import { openPopup } from '@auxiliary/popup'
     import { HR, MenuItem, Modal, ToggleHiddenAccountMenuItem } from 'shared/components'
 
     export let modal: Modal = undefined
diff --git a/packages/shared/components/modals/AccountSwitcherModal.svelte b/packages/shared/components/modals/AccountSwitcherModal.svelte
index 14d9893ac62..88fbecb7325 100644
--- a/packages/shared/components/modals/AccountSwitcherModal.svelte
+++ b/packages/shared/components/modals/AccountSwitcherModal.svelte
@@ -4,7 +4,7 @@
     import { activeProfile, visibleActiveAccounts } from '@core/profile'
     import { selectedAccount, sumBalanceForAccounts } from '@core/account'
     import { formatTokenAmountBestMatch } from '@core/wallet'
-    import { openPopup } from '@lib/popup'
+    import { openPopup } from '@auxiliary/popup'
     import { AccountSwitcherMenuItem } from 'shared/components/molecules'
     import { HR, Icon, Modal, Text } from 'shared/components'
     import { tick } from 'svelte'
diff --git a/packages/shared/components/modals/AssetActionsMenu.svelte b/packages/shared/components/modals/AssetActionsMenu.svelte
index b9fb02979cd..e30e778919e 100644
--- a/packages/shared/components/modals/AssetActionsMenu.svelte
+++ b/packages/shared/components/modals/AssetActionsMenu.svelte
@@ -11,7 +11,7 @@
         VerifiedStatus,
     } from '@core/wallet'
     import { Icon } from '@lib/auxiliary/icon'
-    import { updatePopupProps } from '@lib/popup'
+    import { updatePopupProps } from '@auxiliary/popup'
     import { HR, MenuItem, Modal } from 'shared/components'
 
     export let modal: Modal = undefined
diff --git a/packages/shared/components/modals/NodeActionsMenu.svelte b/packages/shared/components/modals/NodeActionsMenu.svelte
index e080d8aefdd..5a3fc351800 100644
--- a/packages/shared/components/modals/NodeActionsMenu.svelte
+++ b/packages/shared/components/modals/NodeActionsMenu.svelte
@@ -9,7 +9,7 @@
         toggleDisabledNodeInClientOptions,
         togglePrimaryNodeInClientOptions,
     } from '@core/network'
-    import { closePopup, openPopup } from 'shared/lib/popup'
+    import { closePopup, openPopup } from '@auxiliary/popup'
     import { activeProfile } from '@core/profile'
 
     export let node: INode
diff --git a/packages/shared/components/modals/ProfileActions.svelte b/packages/shared/components/modals/ProfileActions.svelte
index 801f50b10ed..cd1bfc1c6f3 100644
--- a/packages/shared/components/modals/ProfileActions.svelte
+++ b/packages/shared/components/modals/ProfileActions.svelte
@@ -3,7 +3,7 @@
     import { Button, DeveloperIndicatorPill, HR, Icon, Modal, Text, Toggle, ButtonSize } from 'shared/components'
     import { localize } from '@core/i18n'
     import { LedgerConnectionState, ledgerConnectionState } from '@core/ledger'
-    import { popupState, openPopup } from 'shared/lib/popup'
+    import { popupState, openPopup } from '@auxiliary/popup'
     import { openSettings } from '@core/router'
     import { diffDates, getBackupWarningColor, getInitials, isRecentDate } from 'shared/lib/helpers'
     import { appVersionDetails } from '@core/app'
diff --git a/packages/shared/components/molecules/AssetList.svelte b/packages/shared/components/molecules/AssetList.svelte
index 39dc0268875..ab11c36df29 100644
--- a/packages/shared/components/molecules/AssetList.svelte
+++ b/packages/shared/components/molecules/AssetList.svelte
@@ -2,7 +2,7 @@
     import { localize } from '@core/i18n'
     import { assetFilter, IAccountAssets, IAsset } from '@core/wallet'
     import { isVisibleAsset } from '@core/wallet/utils/isVisibleAsset'
-    import { openPopup } from '@lib/popup'
+    import { openPopup } from '@auxiliary/popup'
     import VirtualList from '@sveltejs/svelte-virtual-list'
     import { AssetTile, Text, Filter, TextType } from 'shared/components'
 
diff --git a/packages/shared/components/organisms/NodeListTable.svelte b/packages/shared/components/organisms/NodeListTable.svelte
index 7fd2c55c0d6..3431f931e06 100644
--- a/packages/shared/components/organisms/NodeListTable.svelte
+++ b/packages/shared/components/organisms/NodeListTable.svelte
@@ -2,7 +2,7 @@
     import { localize } from '@core/i18n'
     import { getOfficialNodes, INode, isOfficialNetwork } from '@core/network'
     import { activeProfile } from '@core/profile'
-    import { openPopup } from '@lib/popup'
+    import { openPopup } from '@auxiliary/popup'
     import { Text, NodeActionsButton, Pill } from 'shared/components'
 
     export let nodesContainer: HTMLElement = undefined
diff --git a/packages/shared/components/popups/AccountSwitcherPopup.svelte b/packages/shared/components/popups/AccountSwitcherPopup.svelte
index 042ad93735e..b967c80e888 100644
--- a/packages/shared/components/popups/AccountSwitcherPopup.svelte
+++ b/packages/shared/components/popups/AccountSwitcherPopup.svelte
@@ -1,7 +1,7 @@
 <script lang="typescript">
     import { localize } from '@core/i18n'
     import { Text, Button, AccountInput, FontWeight } from 'shared/components'
-    import { closePopup } from '@lib/popup'
+    import { closePopup } from '@auxiliary/popup'
     import { IAccountState, setSelectedAccount } from '@core/account'
 
     export let onCancel: () => void
diff --git a/packages/shared/components/popups/ActivityDetailsPopup.svelte b/packages/shared/components/popups/ActivityDetailsPopup.svelte
index faddd5f1bdb..b06b6abc1d4 100644
--- a/packages/shared/components/popups/ActivityDetailsPopup.svelte
+++ b/packages/shared/components/popups/ActivityDetailsPopup.svelte
@@ -18,7 +18,7 @@
     import { CurrencyTypes } from 'shared/lib/typings/currency'
     import { setClipboard } from '@lib/utils'
     import { truncateString } from '@lib/helpers'
-    import { closePopup, openPopup } from '@lib/popup'
+    import { closePopup, openPopup } from '@auxiliary/popup'
     import { onMount } from 'svelte'
 
     export let activityId: string
diff --git a/packages/shared/components/popups/AddNodePopup.svelte b/packages/shared/components/popups/AddNodePopup.svelte
index 25bbcceb631..7197a205900 100644
--- a/packages/shared/components/popups/AddNodePopup.svelte
+++ b/packages/shared/components/popups/AddNodePopup.svelte
@@ -2,7 +2,7 @@
     import { Text, NodeConfigurationForm, Button, HTMLButtonType } from 'shared/components'
     import { localize } from '@core/i18n'
     import { INode, addNodeToClientOptions, editNodeInClientOptions } from '@core/network'
-    import { closePopup } from '@lib/popup'
+    import { closePopup } from '@auxiliary/popup'
     import { activeProfile } from '@core/profile'
     import { showAppNotification } from '@lib/notifications'
 
diff --git a/packages/shared/components/popups/AliasConfirmationPopup.svelte b/packages/shared/components/popups/AliasConfirmationPopup.svelte
index 7ca1d3e8d59..b7fab127221 100644
--- a/packages/shared/components/popups/AliasConfirmationPopup.svelte
+++ b/packages/shared/components/popups/AliasConfirmationPopup.svelte
@@ -13,7 +13,7 @@
         UNLOCK_CONDITION_GOVERNOR_ADDRESS,
         UNLOCK_CONDITION_STATE_CONTROLLER_ADDRESS,
     } from '@core/wallet'
-    import { closePopup } from '@lib/popup'
+    import { closePopup } from '@auxiliary/popup'
     import { onMount } from 'svelte'
     import { BASE_TOKEN } from '@core/network'
     import { handleError } from '@core/error/handlers/handleError'
diff --git a/packages/shared/components/popups/BackupStrongholdPopup.svelte b/packages/shared/components/popups/BackupStrongholdPopup.svelte
index 9d632f12ed7..6ee81af747b 100644
--- a/packages/shared/components/popups/BackupStrongholdPopup.svelte
+++ b/packages/shared/components/popups/BackupStrongholdPopup.svelte
@@ -1,7 +1,7 @@
 <script lang="typescript">
     import { localize } from '@core/i18n'
     import { Button, Logo, Text, ExportStrongholdButton, TextType } from 'shared/components'
-    import { closePopup } from 'shared/lib/popup'
+    import { closePopup } from '@auxiliary/popup'
 
     const busy = false
 
diff --git a/packages/shared/components/popups/ConfirmationPopup.svelte b/packages/shared/components/popups/ConfirmationPopup.svelte
index 974522bc1a3..62353e1cc5c 100644
--- a/packages/shared/components/popups/ConfirmationPopup.svelte
+++ b/packages/shared/components/popups/ConfirmationPopup.svelte
@@ -1,7 +1,7 @@
 <script lang="typescript">
     import { Button, Text, TextHint, FontWeight, TextType, ButtonVariant } from 'shared/components'
     import { localize } from '@core/i18n'
-    import { closePopup } from '@lib/popup'
+    import { closePopup } from '@auxiliary/popup'
 
     export let title: string
     export let description: string = ''
diff --git a/packages/shared/components/popups/ConnectLedgerPopup.svelte b/packages/shared/components/popups/ConnectLedgerPopup.svelte
index 9b83e39d665..791b6d8cb7c 100644
--- a/packages/shared/components/popups/ConnectLedgerPopup.svelte
+++ b/packages/shared/components/popups/ConnectLedgerPopup.svelte
@@ -6,7 +6,7 @@
     import { activeProfile } from '@core/profile'
     import { isFunction } from '@core/utils'
     import { Button, LedgerAnimation, Text, TextHint, FontWeight, TextType } from 'shared/components'
-    import { closePopup } from 'shared/lib/popup'
+    import { closePopup } from '@auxiliary/popup'
 
     export let onCancel: () => void
     export let onContinue: () => void
diff --git a/packages/shared/components/popups/CreateAccountPopup.svelte b/packages/shared/components/popups/CreateAccountPopup.svelte
index ae6fb5a58ad..2c493931528 100644
--- a/packages/shared/components/popups/CreateAccountPopup.svelte
+++ b/packages/shared/components/popups/CreateAccountPopup.svelte
@@ -2,7 +2,7 @@
     import { Button, ColorPicker, Input, Text } from 'shared/components'
     import { getTrimmedLength } from 'shared/lib/helpers'
     import { localize } from '@core/i18n'
-    import { closePopup, updatePopupProps } from 'shared/lib/popup'
+    import { closePopup, updatePopupProps } from '@auxiliary/popup'
     import { checkActiveProfileAuth } from '@core/profile'
     import { getRandomAccountColor, tryCreateAdditionalAccount, validateAccountName } from '@core/account'
     import { onMount } from 'svelte'
diff --git a/packages/shared/components/popups/DeepLinkErrorPopup.svelte b/packages/shared/components/popups/DeepLinkErrorPopup.svelte
index 5ac2bd91593..1f86e3c8e13 100644
--- a/packages/shared/components/popups/DeepLinkErrorPopup.svelte
+++ b/packages/shared/components/popups/DeepLinkErrorPopup.svelte
@@ -1,7 +1,7 @@
 <script lang="typescript">
     import { localize } from '@core/i18n'
     import { Text, Button, TextHint, FontWeight } from 'shared/components'
-    import { closePopup } from '@lib/popup'
+    import { closePopup } from '@auxiliary/popup'
 
     export let error: Error
 </script>
diff --git a/packages/shared/components/popups/DeleteAccount.svelte b/packages/shared/components/popups/DeleteAccount.svelte
index 125ac04b542..0e9aad599ee 100644
--- a/packages/shared/components/popups/DeleteAccount.svelte
+++ b/packages/shared/components/popups/DeleteAccount.svelte
@@ -1,6 +1,6 @@
 <script lang="typescript">
     import { Button, PasswordInput, Text, Error, ButtonVariant, HTMLButtonType } from 'shared/components'
-    import { closePopup } from 'shared/lib/popup'
+    import { closePopup } from '@auxiliary/popup'
     import { localize } from '@core/i18n'
     import { setStrongholdPassword } from '@core/profile-manager'
     import { isSoftwareProfile } from '@core/profile'
diff --git a/packages/shared/components/popups/DeleteProfile.svelte b/packages/shared/components/popups/DeleteProfile.svelte
index 001ea518810..f3b03d330dd 100644
--- a/packages/shared/components/popups/DeleteProfile.svelte
+++ b/packages/shared/components/popups/DeleteProfile.svelte
@@ -3,7 +3,7 @@
     import { isSoftwareProfile } from '@core/profile'
     import { localize } from '@core/i18n'
     import { setStrongholdPassword } from '@core/profile-manager'
-    import { closePopup } from '@lib/popup'
+    import { closePopup } from '@auxiliary/popup'
     import { deleteProfile } from '@contexts/settings'
 
     let isBusy = false
diff --git a/packages/shared/components/popups/EnableLedgerBlindSigningPopup.svelte b/packages/shared/components/popups/EnableLedgerBlindSigningPopup.svelte
index dc3a5cb5099..8794cb541ad 100644
--- a/packages/shared/components/popups/EnableLedgerBlindSigningPopup.svelte
+++ b/packages/shared/components/popups/EnableLedgerBlindSigningPopup.svelte
@@ -7,7 +7,7 @@
         ledgerPreparedOutput,
         resetLedgerPreparedOutput,
     } from '@core/ledger'
-    import { closePopup } from '@lib/popup'
+    import { closePopup } from '@auxiliary/popup'
     import { sendOutput } from '@core/wallet'
 
     const STEPS = [1, 2, 3, 4]
diff --git a/packages/shared/components/popups/ErrorLog.svelte b/packages/shared/components/popups/ErrorLog.svelte
index 405dfb5658c..fc0f2506f23 100644
--- a/packages/shared/components/popups/ErrorLog.svelte
+++ b/packages/shared/components/popups/ErrorLog.svelte
@@ -2,7 +2,7 @@
     import { Button, Text } from 'shared/components'
     import { errorLog } from '@core/error'
     import { localize } from '@core/i18n'
-    import { closePopup } from '@lib/popup'
+    import { closePopup } from '@auxiliary/popup'
     import { setClipboard } from '@lib/utils'
 
     function handleClearClick(): () => void {
diff --git a/packages/shared/components/popups/ExportTransactionHistory.svelte b/packages/shared/components/popups/ExportTransactionHistory.svelte
index f493e183cab..0e9d1813823 100644
--- a/packages/shared/components/popups/ExportTransactionHistory.svelte
+++ b/packages/shared/components/popups/ExportTransactionHistory.svelte
@@ -7,7 +7,7 @@
     import { Platform } from 'shared/lib/platform'
     import { displayNotificationForLedgerProfile, ledgerNanoStatus } from '@core/ledger'
     import { showAppNotification } from 'shared/lib/notifications'
-    import { closePopup } from 'shared/lib/popup'
+    import { closePopup } from '@auxiliary/popup'
     import { activeProfile, isActiveLedgerProfile, isSoftwareProfile } from '@core/profile'
     import { localize } from '@core/i18n'
     import { setStrongholdPassword } from '@core/profile-manager'
diff --git a/packages/shared/components/popups/FaucetRequestPopup.svelte b/packages/shared/components/popups/FaucetRequestPopup.svelte
index 5a4679cc14f..90483c9c115 100644
--- a/packages/shared/components/popups/FaucetRequestPopup.svelte
+++ b/packages/shared/components/popups/FaucetRequestPopup.svelte
@@ -3,7 +3,7 @@
     import { BaseError } from '@core/error'
     import { localize } from '@core/i18n'
     import { nodeInfo } from '@core/network'
-    import { closePopup } from '@lib/popup'
+    import { closePopup } from '@auxiliary/popup'
     import { Button, Error, Text, FontWeight, TextType } from 'shared/components'
 
     let isBusy = false
diff --git a/packages/shared/components/popups/Index.svelte b/packages/shared/components/popups/Index.svelte
index a9282c3ef7b..676ebade7d3 100644
--- a/packages/shared/components/popups/Index.svelte
+++ b/packages/shared/components/popups/Index.svelte
@@ -2,7 +2,7 @@
     import { mobile, PlatformOption, platform } from '@core/app'
     import { Drawer, Icon } from 'shared/components'
     import { clickOutside } from 'shared/lib/actions'
-    import { closePopup, popupState } from 'shared/lib/popup'
+    import { closePopup, popupState } from '@auxiliary/popup'
     import { onMount } from 'svelte'
     import { fade } from 'svelte/transition'
 
diff --git a/packages/shared/components/popups/LedgerAppGuidePopup.svelte b/packages/shared/components/popups/LedgerAppGuidePopup.svelte
index f9f73b7829c..09fc3e05e93 100644
--- a/packages/shared/components/popups/LedgerAppGuidePopup.svelte
+++ b/packages/shared/components/popups/LedgerAppGuidePopup.svelte
@@ -1,6 +1,6 @@
 <script lang="typescript">
     import { LedgerAnimation, Button, Text } from 'shared/components'
-    import { closePopup } from 'shared/lib/popup'
+    import { closePopup } from '@auxiliary/popup'
     import { LedgerAppName } from '@core/ledger'
     import { localize } from '@core/i18n'
 
diff --git a/packages/shared/components/popups/LedgerConnectionGuidePopup.svelte b/packages/shared/components/popups/LedgerConnectionGuidePopup.svelte
index 26cdbdb29bc..92aba03d552 100644
--- a/packages/shared/components/popups/LedgerConnectionGuidePopup.svelte
+++ b/packages/shared/components/popups/LedgerConnectionGuidePopup.svelte
@@ -1,7 +1,7 @@
 <script lang="typescript">
     import { LedgerAnimation, Button, Link, Text } from 'shared/components'
     import { Platform } from 'shared/lib/platform'
-    import { closePopup } from 'shared/lib/popup'
+    import { closePopup } from '@auxiliary/popup'
     import { localize } from '@core/i18n'
 
     let stepIndex = 0
diff --git a/packages/shared/components/popups/LegalUpdate.svelte b/packages/shared/components/popups/LegalUpdate.svelte
index 17ce41585c5..cf7b1b53074 100644
--- a/packages/shared/components/popups/LegalUpdate.svelte
+++ b/packages/shared/components/popups/LegalUpdate.svelte
@@ -1,7 +1,7 @@
 <script lang="typescript">
     import { Button, Checkbox, Text, Link } from 'shared/components'
     import { localize } from '@core/i18n'
-    import { closePopup } from 'shared/lib/popup'
+    import { closePopup } from '@auxiliary/popup'
     import {
         lastAcceptedTermsOfService,
         lastAcceptedPrivacyPolicy,
diff --git a/packages/shared/components/popups/ManageAccountPopup.svelte b/packages/shared/components/popups/ManageAccountPopup.svelte
index 118527bcd0a..daa41a59bd0 100644
--- a/packages/shared/components/popups/ManageAccountPopup.svelte
+++ b/packages/shared/components/popups/ManageAccountPopup.svelte
@@ -3,7 +3,7 @@
     import { getTrimmedLength } from 'shared/lib/helpers'
     import { localize } from '@core/i18n'
     import { selectedAccount, tryEditSelectedAccountMetadata, validateAccountName } from '@core/account'
-    import { closePopup } from '@lib/popup'
+    import { closePopup } from '@auxiliary/popup'
 
     export let error = ''
 
diff --git a/packages/shared/components/popups/MintNativeTokenConfirmationPopup.svelte b/packages/shared/components/popups/MintNativeTokenConfirmationPopup.svelte
index 2caede2fba0..c788e5d9a9b 100644
--- a/packages/shared/components/popups/MintNativeTokenConfirmationPopup.svelte
+++ b/packages/shared/components/popups/MintNativeTokenConfirmationPopup.svelte
@@ -2,7 +2,7 @@
     import { localize } from '@core/i18n'
     import { checkActiveProfileAuth } from '@core/profile'
     import { mintNativeToken, mintTokenDetails, TokenStandard } from '@core/wallet'
-    import { closePopup, openPopup } from '@lib/popup'
+    import { closePopup, openPopup } from '@auxiliary/popup'
     import { Button, KeyValueBox, Text, FontWeight } from 'shared/components'
     import { onMount } from 'svelte'
     import { selectedAccount } from '@core/account'
diff --git a/packages/shared/components/popups/MintNativeTokenFormPopup.svelte b/packages/shared/components/popups/MintNativeTokenFormPopup.svelte
index 348bc0943e9..bf5cb76d138 100644
--- a/packages/shared/components/popups/MintNativeTokenFormPopup.svelte
+++ b/packages/shared/components/popups/MintNativeTokenFormPopup.svelte
@@ -2,7 +2,7 @@
     import { BaseError } from '@core/error'
     import { localize } from '@core/i18n'
     import { setMintTokenDetails, mintTokenDetails, selectedAccountActivities, ActivityType } from '@core/wallet'
-    import { closePopup, openPopup } from '@lib/popup'
+    import { closePopup, openPopup } from '@auxiliary/popup'
     import {
         Button,
         Error,
diff --git a/packages/shared/components/popups/NodeInfoPopup.svelte b/packages/shared/components/popups/NodeInfoPopup.svelte
index 07f9e83205c..2b847eda2f7 100644
--- a/packages/shared/components/popups/NodeInfoPopup.svelte
+++ b/packages/shared/components/popups/NodeInfoPopup.svelte
@@ -3,7 +3,7 @@
     import { Button, Checkbox, CopyableBox, Spinner, Text } from 'shared/components'
     import { localize } from '@core/i18n'
     import { INode, INodeInfo } from '@core/network'
-    import { closePopup } from 'shared/lib/popup'
+    import { closePopup } from '@auxiliary/popup'
     import { showAppNotification } from 'shared/lib/notifications'
     import { resolveObjectPath, setClipboard } from 'shared/lib/utils'
     import { getNodeInfo } from '@core/profile-manager'
diff --git a/packages/shared/components/popups/RemoveNode.svelte b/packages/shared/components/popups/RemoveNode.svelte
index 6e84de06898..838dadc53a1 100644
--- a/packages/shared/components/popups/RemoveNode.svelte
+++ b/packages/shared/components/popups/RemoveNode.svelte
@@ -1,6 +1,6 @@
 <script lang="typescript">
     import { Button, Text } from 'shared/components'
-    import { closePopup } from 'shared/lib/popup'
+    import { closePopup } from '@auxiliary/popup'
     import { localize } from '@core/i18n'
 
     export let node
diff --git a/packages/shared/components/popups/SendConfirmationPopup.svelte b/packages/shared/components/popups/SendConfirmationPopup.svelte
index 92ddcaf5464..967198756ea 100644
--- a/packages/shared/components/popups/SendConfirmationPopup.svelte
+++ b/packages/shared/components/popups/SendConfirmationPopup.svelte
@@ -34,7 +34,7 @@
         updateNewTransactionDetails,
     } from '@core/wallet'
     import { convertToFiat, currencies, exchangeRates, formatCurrency } from '@lib/currency'
-    import { closePopup, openPopup } from '@lib/popup'
+    import { closePopup, openPopup } from '@auxiliary/popup'
     import { CurrencyTypes } from '@lib/typings/currency'
     import { BaseError } from '@core/error'
     import { ledgerPreparedOutput } from '@core/ledger'
diff --git a/packages/shared/components/popups/SendFormPopup.svelte b/packages/shared/components/popups/SendFormPopup.svelte
index 683a1ecf587..2610e26c9fb 100644
--- a/packages/shared/components/popups/SendFormPopup.svelte
+++ b/packages/shared/components/popups/SendFormPopup.svelte
@@ -3,7 +3,7 @@
     import { localize } from '@core/i18n'
     import { newTransactionDetails, updateNewTransactionDetails } from '@core/wallet'
     import { Button, Text, RecipientInput, AssetAmountInput, OptionalInput, FontWeight } from 'shared/components'
-    import { closePopup, openPopup } from '@lib/popup'
+    import { closePopup, openPopup } from '@auxiliary/popup'
     import { getByteLengthOfString } from '@lib/utils/getByteLengthOfString'
 
     let { asset, rawAmount, unit, recipient, metadata, tag } = get(newTransactionDetails)
diff --git a/packages/shared/components/popups/TestDeepLinkFormPopup.svelte b/packages/shared/components/popups/TestDeepLinkFormPopup.svelte
index c06061e497a..a31e7ad452d 100644
--- a/packages/shared/components/popups/TestDeepLinkFormPopup.svelte
+++ b/packages/shared/components/popups/TestDeepLinkFormPopup.svelte
@@ -2,7 +2,7 @@
     import { handleDeepLink } from '@auxiliary/deep-link'
 
     import { localize } from '@core/i18n'
-    import { closePopup } from '@lib/popup'
+    import { closePopup } from '@auxiliary/popup'
     import { Button, Text, TextInput, FontWeight, TextType } from 'shared/components'
 
     const PREFIX = process.env.APP_PROTOCOL + '://'
diff --git a/packages/shared/components/popups/TokenInformationPopup.svelte b/packages/shared/components/popups/TokenInformationPopup.svelte
index 7bb773e2953..0994d3cd35b 100644
--- a/packages/shared/components/popups/TokenInformationPopup.svelte
+++ b/packages/shared/components/popups/TokenInformationPopup.svelte
@@ -9,7 +9,7 @@
         NotVerifiedStatus,
         VerifiedStatus,
     } from '@core/wallet'
-    import { openPopup, updatePopupProps } from '@lib/popup'
+    import { openPopup, updatePopupProps } from '@auxiliary/popup'
     import { AssetIcon, Button, Text, TextHint, AssetActionsButton, KeyValueBox, FontWeight } from 'shared/components'
 
     export let asset: IAsset
diff --git a/packages/shared/components/popups/UnlockStrongholdPopup.svelte b/packages/shared/components/popups/UnlockStrongholdPopup.svelte
index 1ecbd1e00d1..be271cd3087 100644
--- a/packages/shared/components/popups/UnlockStrongholdPopup.svelte
+++ b/packages/shared/components/popups/UnlockStrongholdPopup.svelte
@@ -1,6 +1,6 @@
 <script lang="typescript">
     import { Button, PasswordInput, Text, HTMLButtonType } from 'shared/components'
-    import { closePopup } from 'shared/lib/popup'
+    import { closePopup } from '@auxiliary/popup'
     import { localize } from '@core/i18n'
     import { unlockStronghold } from '@core/profile'
 
diff --git a/packages/shared/components/popups/Version.svelte b/packages/shared/components/popups/Version.svelte
index 45db448efd1..8e107b608f2 100644
--- a/packages/shared/components/popups/Version.svelte
+++ b/packages/shared/components/popups/Version.svelte
@@ -15,7 +15,7 @@
     } from '@core/app'
     import { Platform } from 'shared/lib/platform'
     import { formatDate, localize } from '@core/i18n'
-    import { closePopup } from 'shared/lib/popup'
+    import { closePopup } from '@auxiliary/popup'
 
     let hasAutoUpdate = true
     let isPreRelease = true
diff --git a/packages/shared/components/popups/WalletFinderPopup.svelte b/packages/shared/components/popups/WalletFinderPopup.svelte
index 64bfeefc37c..3560e548a43 100644
--- a/packages/shared/components/popups/WalletFinderPopup.svelte
+++ b/packages/shared/components/popups/WalletFinderPopup.svelte
@@ -1,7 +1,7 @@
 <script lang="typescript">
     import { onDestroy } from 'svelte'
     import { Button, KeyValueBox, Text, TextHint, FontWeight } from 'shared/components'
-    import { closePopup, openPopup } from '@lib/popup'
+    import { closePopup, openPopup } from '@auxiliary/popup'
     import { showAppNotification } from '@lib/notifications'
     import { displayNotificationForLedgerProfile, ledgerNanoStatus } from '@core/ledger'
     import { sumBalanceForAccounts } from '@core/account'
diff --git a/packages/shared/lib/auxiliary/deep-link/handlers/handleDeepLink.ts b/packages/shared/lib/auxiliary/deep-link/handlers/handleDeepLink.ts
index 9219868f658..8217105b328 100644
--- a/packages/shared/lib/auxiliary/deep-link/handlers/handleDeepLink.ts
+++ b/packages/shared/lib/auxiliary/deep-link/handlers/handleDeepLink.ts
@@ -7,7 +7,7 @@ import { resetDeepLink } from '../actions'
 import { DeepLinkContext } from '../enums'
 import { isDeepLinkRequestActive } from '../stores'
 import { handleDeepLinkWalletContext } from './wallet/handleDeepLinkWalletContext'
-import { closePopup, openPopup } from '@lib/popup'
+import { closePopup, openPopup } from '@auxiliary/popup'
 import { visibleActiveAccounts } from '@core/profile/stores/active-accounts.store'
 
 /**
diff --git a/packages/shared/lib/auxiliary/deep-link/handlers/wallet/handleDeepLinkWalletContext.ts b/packages/shared/lib/auxiliary/deep-link/handlers/wallet/handleDeepLinkWalletContext.ts
index 402addfff10..c5983ea6220 100644
--- a/packages/shared/lib/auxiliary/deep-link/handlers/wallet/handleDeepLinkWalletContext.ts
+++ b/packages/shared/lib/auxiliary/deep-link/handlers/wallet/handleDeepLinkWalletContext.ts
@@ -1,6 +1,6 @@
 import { addError } from '@core/error'
 import { localize } from '@core/i18n'
-import { openPopup } from '@lib/popup'
+import { openPopup } from '@auxiliary/popup'
 
 import { WalletOperation } from '../../enums'
 import { handleDeepLinkSendConfirmationOperation, handleDeepLinkSendFormOperation } from './operations'
diff --git a/packages/shared/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendConfirmationOperation.ts b/packages/shared/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendConfirmationOperation.ts
index c98e2ecf3b4..6ac1e7c6730 100644
--- a/packages/shared/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendConfirmationOperation.ts
+++ b/packages/shared/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendConfirmationOperation.ts
@@ -8,7 +8,7 @@ import {
     Subject,
 } from '@core/wallet'
 import { isValidAddressAndPrefix } from '@lib/address'
-import { openPopup } from '@lib/popup'
+import { openPopup } from '@auxiliary/popup'
 
 import { SendOperationParameter } from '../../../enums'
 import {
diff --git a/packages/shared/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendFormOperation.ts b/packages/shared/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendFormOperation.ts
index edece4fe021..c438c24df85 100644
--- a/packages/shared/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendFormOperation.ts
+++ b/packages/shared/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendFormOperation.ts
@@ -5,7 +5,7 @@ import {
     selectedAccountAssets,
     getAssetById,
 } from '@core/wallet'
-import { openPopup } from '@lib/popup'
+import { openPopup } from '@auxiliary/popup'
 import { get } from 'svelte/store'
 
 import { SendOperationParameter } from '../../../enums'
diff --git a/packages/shared/lib/auxiliary/popup/actions/closePopup.ts b/packages/shared/lib/auxiliary/popup/actions/closePopup.ts
new file mode 100644
index 00000000000..162e446d99f
--- /dev/null
+++ b/packages/shared/lib/auxiliary/popup/actions/closePopup.ts
@@ -0,0 +1,17 @@
+import { modifyPopupState } from '../helpers'
+
+export function closePopup(forceClose: boolean = false): void {
+    modifyPopupState(
+        {
+            active: false,
+            type: null,
+            hideClose: false,
+            preventClose: false,
+            fullScreen: false,
+            props: null,
+            overflow: false,
+            relative: false,
+        },
+        forceClose
+    )
+}
diff --git a/packages/shared/lib/auxiliary/popup/actions/index.ts b/packages/shared/lib/auxiliary/popup/actions/index.ts
new file mode 100644
index 00000000000..086cb42ca83
--- /dev/null
+++ b/packages/shared/lib/auxiliary/popup/actions/index.ts
@@ -0,0 +1,2 @@
+export * from './closePopup'
+export * from './openPopup'
diff --git a/packages/shared/lib/auxiliary/popup/actions/openPopup.ts b/packages/shared/lib/auxiliary/popup/actions/openPopup.ts
new file mode 100644
index 00000000000..a575fca6f07
--- /dev/null
+++ b/packages/shared/lib/auxiliary/popup/actions/openPopup.ts
@@ -0,0 +1,21 @@
+import { modifyPopupState } from '../helpers'
+import { IPopupState } from '../interfaces'
+
+export function openPopup(
+    {
+        type,
+        props = null,
+        hideClose = false,
+        preventClose = false,
+        fullScreen = false,
+        transition = undefined,
+        overflow = false,
+        relative = true,
+    }: Omit<IPopupState, 'active'>,
+    forceClose: boolean = false
+): void {
+    modifyPopupState(
+        { active: true, type, hideClose, preventClose, fullScreen, transition, props, overflow, relative },
+        forceClose
+    )
+}
diff --git a/packages/shared/lib/auxiliary/popup/constants/default-popup-state.constant.ts b/packages/shared/lib/auxiliary/popup/constants/default-popup-state.constant.ts
new file mode 100644
index 00000000000..8ca38bd32c4
--- /dev/null
+++ b/packages/shared/lib/auxiliary/popup/constants/default-popup-state.constant.ts
@@ -0,0 +1,13 @@
+import { IPopupState } from '../interfaces'
+
+export const DEFAULT_POPUP_STATE: IPopupState = {
+    active: false,
+    type: null,
+    hideClose: false,
+    preventClose: false,
+    fullScreen: false,
+    transition: undefined,
+    props: null,
+    overflow: false,
+    relative: true,
+}
diff --git a/packages/shared/lib/auxiliary/popup/constants/index.ts b/packages/shared/lib/auxiliary/popup/constants/index.ts
new file mode 100644
index 00000000000..c63aea8ee72
--- /dev/null
+++ b/packages/shared/lib/auxiliary/popup/constants/index.ts
@@ -0,0 +1 @@
+export * from './default-popup-state.constant'
diff --git a/packages/shared/lib/auxiliary/popup/helpers/index.ts b/packages/shared/lib/auxiliary/popup/helpers/index.ts
new file mode 100644
index 00000000000..d3a78e7085f
--- /dev/null
+++ b/packages/shared/lib/auxiliary/popup/helpers/index.ts
@@ -0,0 +1 @@
+export * from './modifyPopupState'
diff --git a/packages/shared/lib/auxiliary/popup/helpers/modifyPopupState.ts b/packages/shared/lib/auxiliary/popup/helpers/modifyPopupState.ts
new file mode 100644
index 00000000000..ef84bd0b10c
--- /dev/null
+++ b/packages/shared/lib/auxiliary/popup/helpers/modifyPopupState.ts
@@ -0,0 +1,22 @@
+import { get } from 'svelte/store'
+
+import { IPopupState } from '../interfaces'
+import { popupState } from '../stores'
+
+export function modifyPopupState(state: IPopupState, forceClose: boolean = false): void {
+    /**
+     * NOTE: There are some cases where a popup needs to stay open despite
+     * trying to perhaps close it or open another one. This is accomplished
+     * by the preventClose prop on the PopupState object, which if true
+     * will not allow the popup to be closed. Remember that it will have to
+     * be closed at some point though so we have the argument forceClose.
+     */
+    if (get(popupState).preventClose && !forceClose) {
+        /* showAppNotification({
+            type: 'error',
+            message: localize('error.popup.preventClose'),
+        }) */
+    } else {
+        popupState.set({ ...state })
+    }
+}
diff --git a/packages/shared/lib/auxiliary/popup/index.ts b/packages/shared/lib/auxiliary/popup/index.ts
index c9f6f047dc0..f3adad7290b 100644
--- a/packages/shared/lib/auxiliary/popup/index.ts
+++ b/packages/shared/lib/auxiliary/popup/index.ts
@@ -1 +1,5 @@
+export * from './actions'
+export * from './constants'
+export * from './interfaces'
+export * from './stores'
 export * from './types'
diff --git a/packages/shared/lib/auxiliary/popup/interfaces/index.ts b/packages/shared/lib/auxiliary/popup/interfaces/index.ts
new file mode 100644
index 00000000000..09368d8542d
--- /dev/null
+++ b/packages/shared/lib/auxiliary/popup/interfaces/index.ts
@@ -0,0 +1 @@
+export * from './popup-state.interface'
diff --git a/packages/shared/lib/auxiliary/popup/interfaces/popup-state.interface.ts b/packages/shared/lib/auxiliary/popup/interfaces/popup-state.interface.ts
new file mode 100644
index 00000000000..8ad505a0dcf
--- /dev/null
+++ b/packages/shared/lib/auxiliary/popup/interfaces/popup-state.interface.ts
@@ -0,0 +1,13 @@
+import { PopupProps } from '../types'
+
+export interface IPopupState {
+    active: boolean
+    type: string
+    hideClose?: boolean
+    preventClose?: boolean
+    fullScreen?: boolean
+    transition?: boolean
+    props?: PopupProps
+    overflow?: boolean
+    relative?: boolean
+}
diff --git a/packages/shared/lib/auxiliary/popup/stores/index.ts b/packages/shared/lib/auxiliary/popup/stores/index.ts
new file mode 100644
index 00000000000..732167eedfb
--- /dev/null
+++ b/packages/shared/lib/auxiliary/popup/stores/index.ts
@@ -0,0 +1 @@
+export * from './popup-state.store'
diff --git a/packages/shared/lib/auxiliary/popup/stores/popup-state.store.ts b/packages/shared/lib/auxiliary/popup/stores/popup-state.store.ts
new file mode 100644
index 00000000000..1fdd26857f9
--- /dev/null
+++ b/packages/shared/lib/auxiliary/popup/stores/popup-state.store.ts
@@ -0,0 +1,11 @@
+import { writable } from 'svelte/store'
+
+import { DEFAULT_POPUP_STATE } from '../constants'
+import { IPopupState } from '../interfaces'
+import { PopupProps } from '../types'
+
+export const popupState = writable<IPopupState>(DEFAULT_POPUP_STATE)
+
+export function updatePopupProps(payload: PopupProps): void {
+    popupState?.update((state) => ({ ...state, ...payload }))
+}
diff --git a/packages/shared/lib/core/ledger/actions/checkOrConnectLedger.ts b/packages/shared/lib/core/ledger/actions/checkOrConnectLedger.ts
index 2a2a2307122..78c5ff24723 100644
--- a/packages/shared/lib/core/ledger/actions/checkOrConnectLedger.ts
+++ b/packages/shared/lib/core/ledger/actions/checkOrConnectLedger.ts
@@ -1,5 +1,5 @@
 import { BaseError } from '@core/error'
-import { openPopup, popupState } from '@lib/popup'
+import { openPopup, popupState } from '@auxiliary/popup'
 import { get } from 'svelte/store'
 import { LedgerConnectionState } from '../interfaces'
 import { ledgerConnectionState } from '../stores'
diff --git a/packages/shared/lib/core/ledger/actions/getLedgerDeviceStatus.ts b/packages/shared/lib/core/ledger/actions/getLedgerDeviceStatus.ts
index 5c40bdfd6b7..0f1a5a84929 100644
--- a/packages/shared/lib/core/ledger/actions/getLedgerDeviceStatus.ts
+++ b/packages/shared/lib/core/ledger/actions/getLedgerDeviceStatus.ts
@@ -1,6 +1,6 @@
 import { get } from 'svelte/store'
 import { getLedgerNanoStatus } from '@lib/core/profile-manager/api'
-import { closePopup, popupState } from '@lib/popup'
+import { closePopup, popupState } from '@auxiliary/popup'
 import { ledgerNanoStatus, updateLedgerNanoStatus } from '../stores'
 
 export async function getLedgerDeviceStatus(
diff --git a/packages/shared/lib/core/ledger/actions/promptUserToConnectLedger.ts b/packages/shared/lib/core/ledger/actions/promptUserToConnectLedger.ts
index a130b1b4241..35f39289b56 100644
--- a/packages/shared/lib/core/ledger/actions/promptUserToConnectLedger.ts
+++ b/packages/shared/lib/core/ledger/actions/promptUserToConnectLedger.ts
@@ -1,6 +1,6 @@
 import { get } from 'svelte/store'
 
-import { popupState } from '@lib/popup'
+import { popupState } from '@auxiliary/popup'
 
 import { openLedgerNotConnectedPopup } from '../utils'
 
diff --git a/packages/shared/lib/core/ledger/utils/handleLedgerError.ts b/packages/shared/lib/core/ledger/utils/handleLedgerError.ts
index 61f3bf4ccbb..6c528a0441d 100644
--- a/packages/shared/lib/core/ledger/utils/handleLedgerError.ts
+++ b/packages/shared/lib/core/ledger/utils/handleLedgerError.ts
@@ -3,7 +3,7 @@ import { get } from 'svelte/store'
 import { localize } from '@core/i18n'
 import { resetNewTransactionDetails, resetMintTokenDetails } from '@core/wallet'
 import { showAppNotification } from '@lib/notifications'
-import { closePopup, openPopup, popupState } from '@lib/popup'
+import { closePopup, openPopup, popupState } from '@auxiliary/popup'
 
 import { LEDGER_ERROR_LOCALES } from '../constants'
 import { LedgerError } from '../enums'
diff --git a/packages/shared/lib/core/ledger/utils/openLedgerNotConnectedPopup.ts b/packages/shared/lib/core/ledger/utils/openLedgerNotConnectedPopup.ts
index 395f108393e..157a7a0fe05 100644
--- a/packages/shared/lib/core/ledger/utils/openLedgerNotConnectedPopup.ts
+++ b/packages/shared/lib/core/ledger/utils/openLedgerNotConnectedPopup.ts
@@ -1,5 +1,5 @@
 import { get } from 'svelte/store'
-import { openPopup, popupState } from '@lib/popup'
+import { openPopup, popupState } from '@auxiliary/popup'
 
 export function openLedgerNotConnectedPopup(
     cancel: () => void = () => {},
diff --git a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionProgressEvent.ts b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionProgressEvent.ts
index 3f4e2080566..39478b4a412 100644
--- a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionProgressEvent.ts
+++ b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionProgressEvent.ts
@@ -3,7 +3,7 @@ import { selectedAccountIndex } from '@core/account'
 import { ledgerNanoStatus } from '@core/ledger'
 import { isActiveLedgerProfile } from '@core/profile'
 import { isOnboardingLedgerProfile } from '@contexts/onboarding'
-import { closePopup, openPopup } from '@lib/popup'
+import { closePopup, openPopup } from '@auxiliary/popup'
 import { deconstructLedgerVerificationProps } from '@core/ledger/helpers'
 
 import { WalletApiEvent } from '../../enums'
diff --git a/packages/shared/lib/core/profile/actions/active-profile/logout.ts b/packages/shared/lib/core/profile/actions/active-profile/logout.ts
index b24cf2b566e..ff11e8b21fa 100644
--- a/packages/shared/lib/core/profile/actions/active-profile/logout.ts
+++ b/packages/shared/lib/core/profile/actions/active-profile/logout.ts
@@ -1,6 +1,6 @@
 import { resetRouters } from '@core/router'
 import { isPollingLedgerDeviceStatus, stopPollingLedgerNanoStatus } from '@core/ledger'
-import { closePopup } from '@lib/popup'
+import { closePopup } from '@auxiliary/popup'
 import { get } from 'svelte/store'
 import { destroyProfileManager, unsubscribeFromWalletApiEvents } from '@core/profile-manager'
 import { profileManager } from '@core/profile-manager/stores'
diff --git a/packages/shared/lib/core/router/helper.ts b/packages/shared/lib/core/router/helper.ts
index dcf7bae8656..e0a2f42ad18 100644
--- a/packages/shared/lib/core/router/helper.ts
+++ b/packages/shared/lib/core/router/helper.ts
@@ -1,6 +1,6 @@
 import { get } from 'svelte/store'
 
-import { closePopup } from '@lib/popup'
+import { closePopup } from '@auxiliary/popup'
 
 import { appRouter, AppRouter } from './app-router'
 import { collectiblesRouter, CollectiblesRouter } from './collectibles-router'
diff --git a/packages/shared/lib/core/stronghold/actions/checkOrUnlockStronghold.ts b/packages/shared/lib/core/stronghold/actions/checkOrUnlockStronghold.ts
index eda4e67dab2..f10b973c913 100644
--- a/packages/shared/lib/core/stronghold/actions/checkOrUnlockStronghold.ts
+++ b/packages/shared/lib/core/stronghold/actions/checkOrUnlockStronghold.ts
@@ -1,6 +1,6 @@
 import { BaseError } from '@core/error'
 import { isStrongholdUnlocked } from '@core/profile-manager'
-import { openPopup, popupState } from '@lib/popup'
+import { openPopup, popupState } from '@auxiliary/popup'
 import { get } from 'svelte/store'
 
 export async function checkOrUnlockStronghold(
diff --git a/packages/shared/lib/popup.ts b/packages/shared/lib/popup.ts
deleted file mode 100644
index 67fbd82e486..00000000000
--- a/packages/shared/lib/popup.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { get, writable } from 'svelte/store'
-
-import { PopupProps } from '@auxiliary/popup'
-
-interface PopupState {
-    active: boolean
-    type: string
-    hideClose?: boolean
-    preventClose?: boolean
-    fullScreen?: boolean
-    transition?: boolean
-    props?: PopupProps
-    overflow?: boolean
-    relative?: boolean
-}
-
-export const popupState = writable<PopupState>({
-    active: false,
-    type: null,
-    hideClose: false,
-    preventClose: false,
-    fullScreen: false,
-    transition: undefined,
-    props: null,
-    overflow: false,
-    relative: true,
-})
-
-export const openPopup = (
-    {
-        type,
-        props = null,
-        hideClose = false,
-        preventClose = false,
-        fullScreen = false,
-        transition = undefined,
-        overflow = false,
-        relative = true,
-    }: Omit<PopupState, 'active'>,
-    forceClose: boolean = false
-): void =>
-    modifyPopupState(
-        { active: true, type, hideClose, preventClose, fullScreen, transition, props, overflow, relative },
-        forceClose
-    )
-
-export function closePopup(forceClose: boolean = false): void {
-    modifyPopupState(
-        {
-            active: false,
-            type: null,
-            hideClose: false,
-            preventClose: false,
-            fullScreen: false,
-            props: null,
-            overflow: false,
-            relative: false,
-        },
-        forceClose
-    )
-}
-
-const modifyPopupState = (state: PopupState, forceClose: boolean = false): void => {
-    /**
-     * NOTE: There are some cases where a popup needs to stay open despite
-     * trying to perhaps close it or open another one. This is accomplished
-     * by the preventClose prop on the PopupState object, which if true
-     * will not allow the popup to be closed. Remember that it will have to
-     * be closed at some point though so we have the argument forceClose.
-     */
-    if (get(popupState).preventClose && !forceClose) {
-        /* showAppNotification({
-            type: 'error',
-            message: localize('error.popup.preventClose'),
-        }) */
-    } else {
-        popupState.set({ ...state })
-    }
-}
-
-export function updatePopupProps(props: { [key: string]: unknown }): void {
-    const popup = get(popupState)
-    popupState.set({ ...popup, props: { ...popup?.props, ...props } })
-}
diff --git a/packages/shared/routes/dashboard/TopNavigation.svelte b/packages/shared/routes/dashboard/TopNavigation.svelte
index 943ea5387d4..67df9c501c9 100644
--- a/packages/shared/routes/dashboard/TopNavigation.svelte
+++ b/packages/shared/routes/dashboard/TopNavigation.svelte
@@ -12,7 +12,7 @@
         settingsRouter,
     } from '@core/router'
     import { AccountSwitcher, Icon, Text } from 'shared/components'
-    import { popupState } from 'shared/lib/popup'
+    import { popupState } from '@auxiliary/popup'
 
     export let classes = ''
 
diff --git a/packages/shared/routes/dashboard/settings/views/advanced/Diagnostics.svelte b/packages/shared/routes/dashboard/settings/views/advanced/Diagnostics.svelte
index 2f5dfe349ee..800be84963c 100644
--- a/packages/shared/routes/dashboard/settings/views/advanced/Diagnostics.svelte
+++ b/packages/shared/routes/dashboard/settings/views/advanced/Diagnostics.svelte
@@ -1,7 +1,7 @@
 <script lang="typescript">
     import { Button, Text, ButtonSize } from 'shared/components'
     import { localize } from '@core/i18n'
-    import { openPopup } from 'shared/lib/popup'
+    import { openPopup } from '@auxiliary/popup'
 
     function handleDiagnosticsClick(): void {
         openPopup({ type: 'diagnostics' })
diff --git a/packages/shared/routes/dashboard/settings/views/advanced/ErrorLog.svelte b/packages/shared/routes/dashboard/settings/views/advanced/ErrorLog.svelte
index 50c92eae4d8..e9101516211 100644
--- a/packages/shared/routes/dashboard/settings/views/advanced/ErrorLog.svelte
+++ b/packages/shared/routes/dashboard/settings/views/advanced/ErrorLog.svelte
@@ -1,7 +1,7 @@
 <script lang="typescript">
     import { Button, Text, ButtonSize } from 'shared/components'
     import { localize } from '@core/i18n'
-    import { openPopup } from 'shared/lib/popup'
+    import { openPopup } from '@auxiliary/popup'
 
     function handleErrorLogClick(): void {
         openPopup({ type: 'errorLog' })
diff --git a/packages/shared/routes/dashboard/settings/views/advanced/NetworkConfiguration.svelte b/packages/shared/routes/dashboard/settings/views/advanced/NetworkConfiguration.svelte
index 7913448c443..b2c83605591 100644
--- a/packages/shared/routes/dashboard/settings/views/advanced/NetworkConfiguration.svelte
+++ b/packages/shared/routes/dashboard/settings/views/advanced/NetworkConfiguration.svelte
@@ -11,7 +11,7 @@
         toggleLocalPowInClientOptions,
     } from '@core/network'
     import { activeProfile } from '@core/profile'
-    import { closePopup, openPopup } from '@lib/popup'
+    import { closePopup, openPopup } from '@auxiliary/popup'
     import { Button, Checkbox, HR, Text, NodeListTable, ButtonSize } from 'shared/components'
 
     let nodesContainer: HTMLElement
diff --git a/packages/shared/routes/dashboard/settings/views/advanced/WalletFinder.svelte b/packages/shared/routes/dashboard/settings/views/advanced/WalletFinder.svelte
index a89a70e5105..33e6821854c 100644
--- a/packages/shared/routes/dashboard/settings/views/advanced/WalletFinder.svelte
+++ b/packages/shared/routes/dashboard/settings/views/advanced/WalletFinder.svelte
@@ -1,7 +1,7 @@
 <script lang="typescript">
     import { Button, Text, ButtonSize } from 'shared/components'
     import { localize } from '@core/i18n'
-    import { openPopup } from 'shared/lib/popup'
+    import { openPopup } from '@auxiliary/popup'
 
     function handleWalletFinderClick(): void {
         openPopup({ type: 'walletFinder' })
diff --git a/packages/shared/routes/dashboard/settings/views/security/DeleteProfile.svelte b/packages/shared/routes/dashboard/settings/views/security/DeleteProfile.svelte
index 4f7376ae74e..ff871e28669 100644
--- a/packages/shared/routes/dashboard/settings/views/security/DeleteProfile.svelte
+++ b/packages/shared/routes/dashboard/settings/views/security/DeleteProfile.svelte
@@ -1,7 +1,7 @@
 <script lang="typescript">
     import { Button, Text, ButtonVariant, ButtonSize } from 'shared/components'
     import { localize } from '@core/i18n'
-    import { openPopup } from 'shared/lib/popup'
+    import { openPopup } from '@auxiliary/popup'
     import { deleteProfile } from '@contexts/settings'
 
     function handleDeleteClick(): void {
diff --git a/packages/shared/routes/login/views/EnterPinView.svelte b/packages/shared/routes/login/views/EnterPinView.svelte
index 027348bd3be..6941776731e 100644
--- a/packages/shared/routes/login/views/EnterPinView.svelte
+++ b/packages/shared/routes/login/views/EnterPinView.svelte
@@ -5,7 +5,7 @@
     import { activeProfile, login, ProfileType, resetActiveProfile } from '@core/profile'
     import { loginRouter } from '@core/router'
     import { Platform } from '@lib/platform'
-    import { openPopup, popupState } from '@lib/popup'
+    import { openPopup, popupState } from '@auxiliary/popup'
     import { validatePinFormat } from '@lib/utils'
     import { Icon, PinInput, Profile, Text } from 'shared/components'
     import { onDestroy } from 'svelte'
diff --git a/packages/shared/routes/login/views/SelectProfileView.svelte b/packages/shared/routes/login/views/SelectProfileView.svelte
index b6f8d8d7a3e..dd222757017 100644
--- a/packages/shared/routes/login/views/SelectProfileView.svelte
+++ b/packages/shared/routes/login/views/SelectProfileView.svelte
@@ -6,7 +6,7 @@
     import { loadPersistedProfileIntoActiveProfile, profiles, ProfileType } from '@core/profile'
     import { loginRouter } from '@core/router'
     import { initialiseOnboardingFlow, shouldBeDeveloperProfile } from '@contexts/onboarding'
-    import { openPopup } from '@lib/popup'
+    import { openPopup } from '@auxiliary/popup'
 
     function onContinueClick(id: string): void {
         loadPersistedProfileIntoActiveProfile(id)
diff --git a/packages/shared/routes/onboarding/views/ledger-setup/views/ConnectLedgerView.svelte b/packages/shared/routes/onboarding/views/ledger-setup/views/ConnectLedgerView.svelte
index 9143807f174..6af652b050b 100644
--- a/packages/shared/routes/onboarding/views/ledger-setup/views/ConnectLedgerView.svelte
+++ b/packages/shared/routes/onboarding/views/ledger-setup/views/ConnectLedgerView.svelte
@@ -15,7 +15,7 @@
         ProfileSetupType,
         isOnboardingLedgerProfile,
     } from '@contexts/onboarding'
-    import { openPopup } from '@lib/popup'
+    import { openPopup } from '@auxiliary/popup'
 
     let isBusy = false
 
diff --git a/packages/shared/routes/onboarding/views/ledger-setup/views/LedgerInstallationGuideView.svelte b/packages/shared/routes/onboarding/views/ledger-setup/views/LedgerInstallationGuideView.svelte
index 2fe366eca38..4458c9517b2 100644
--- a/packages/shared/routes/onboarding/views/ledger-setup/views/LedgerInstallationGuideView.svelte
+++ b/packages/shared/routes/onboarding/views/ledger-setup/views/LedgerInstallationGuideView.svelte
@@ -2,7 +2,7 @@
     import { createEventDispatcher } from 'svelte'
     import { LedgerAnimation, Button, Icon, Link, OnboardingLayout, Text } from 'shared/components'
     import { localize } from '@core/i18n'
-    import { openPopup } from '@lib/popup'
+    import { openPopup } from '@auxiliary/popup'
     import { LedgerAppName } from '@core/ledger'
 
     const dispatch = createEventDispatcher()
diff --git a/packages/shared/routes/onboarding/views/shimmer-claiming/views/ClaimRewardsView.svelte b/packages/shared/routes/onboarding/views/shimmer-claiming/views/ClaimRewardsView.svelte
index aec0ea06598..957719a8818 100644
--- a/packages/shared/routes/onboarding/views/shimmer-claiming/views/ClaimRewardsView.svelte
+++ b/packages/shared/routes/onboarding/views/shimmer-claiming/views/ClaimRewardsView.svelte
@@ -26,7 +26,7 @@
         subscribeToWalletApiEventsForShimmerClaiming,
         initialiseAccountRecoveryConfigurationForShimmerClaiming,
     } from '@contexts/onboarding'
-    import { closePopup } from '@lib/popup'
+    import { closePopup } from '@auxiliary/popup'
 
     $: shimmerClaimingAccounts = $onboardingProfile?.shimmerClaimingAccounts ?? []