diff --git a/packages/mobile/routes/login/views/EnterPinView.svelte b/packages/mobile/routes/login/views/EnterPinView.svelte
index 6af9e5ee96..7df5a68c45 100644
--- a/packages/mobile/routes/login/views/EnterPinView.svelte
+++ b/packages/mobile/routes/login/views/EnterPinView.svelte
@@ -6,7 +6,7 @@
     import { loginRouter } from '../../../lib/core/router'
     import { Platform } from '@lib/platform'
     import { openPopup, popupState } from '@auxiliary/popup'
-    import { validatePinFormat } from '@lib/utils'
+    import { isValidPin } from '@core/utils'
     import { Icon, PinInput, Profile, Text, TextType } from 'shared/components'
     import { onDestroy } from 'svelte'
 
@@ -34,7 +34,7 @@
 
     $: hasReachedMaxAttempts = attempts >= MAX_PINCODE_INCORRECT_ATTEMPTS
     $: {
-        if (validatePinFormat(pinCode)) {
+        if (isValidPin(pinCode)) {
             void onSubmitClick()
         }
     }
diff --git a/packages/mobile/routes/onboarding/views/storage-protection-setup/views/SetupPinProtectionView.svelte b/packages/mobile/routes/onboarding/views/storage-protection-setup/views/SetupPinProtectionView.svelte
index 2efd2f52aa..296155a576 100644
--- a/packages/mobile/routes/onboarding/views/storage-protection-setup/views/SetupPinProtectionView.svelte
+++ b/packages/mobile/routes/onboarding/views/storage-protection-setup/views/SetupPinProtectionView.svelte
@@ -11,14 +11,10 @@
     import { localize } from '@core/i18n'
     import { pollLedgerNanoStatus, stopPollingLedgerNanoStatus } from '@core/ledger'
     import { ProfileType } from '@core/profile'
-    import { storageProtectionSetupRouter } from '../../../../../lib/core/router'
-    import { validatePinFormat } from '@lib/utils'
+    import { isValidPin } from '@core/utils'
     import { onMount } from 'svelte'
-
     export let busy = false
 
-    const title = localize('views.onboarding.storageProtectionSetup.setupPinProtection.title')
-
     let setPinInput = ''
     let setPinInputError = ''
     let confirmPinInput = ''
@@ -31,7 +27,7 @@
     $: setPinInput, (setPinInputError = '')
     $: confirmPinInput, (confirmPinInputError = '')
     $: arePinInputsMatching = setPinInput === confirmPinInput
-    $: arePinInputsValid = validatePinFormat(setPinInput) && validatePinFormat(confirmPinInput)
+    $: arePinInputsValid = isValidPin(setPinInput) && isValidPin(confirmPinInput)
     $: if (arePinInputsValid && !arePinInputsMatching) {
         confirmPinInputError = localize('error.pincode.match')
     } else {
diff --git a/packages/shared/components/Button.svelte b/packages/shared/components/Button.svelte
index 0946c99eb4..13f7d521ce 100644
--- a/packages/shared/components/Button.svelte
+++ b/packages/shared/components/Button.svelte
@@ -2,7 +2,7 @@
     import { ButtonSize, ButtonVariant, HTMLButtonType, Icon, Spinner } from 'shared/components'
     import { onMount } from 'svelte'
     import { appSettings } from '@core/app'
-    import { bindEvents, debounce } from '@lib/utils'
+    import { bindEvents, debounce } from '@core/utils'
     import { Icon as IconEnum } from '@lib/auxiliary/icon'
     import type { Event } from '@lib/typings/events'
 
diff --git a/packages/shared/components/CopyButton.svelte b/packages/shared/components/CopyButton.svelte
index 5a9d4f9324..cc5b4c649a 100644
--- a/packages/shared/components/CopyButton.svelte
+++ b/packages/shared/components/CopyButton.svelte
@@ -1,5 +1,5 @@
 <script lang="typescript">
-    import { setClipboard } from 'shared/lib/utils'
+    import { setClipboard } from '@core/utils'
     import { Icon } from 'shared/components'
 
     export let itemToCopy: string
diff --git a/packages/shared/components/Idle.svelte b/packages/shared/components/Idle.svelte
index 38b2c7dd70..1348f7449b 100644
--- a/packages/shared/components/Idle.svelte
+++ b/packages/shared/components/Idle.svelte
@@ -1,6 +1,6 @@
 <script lang="typescript">
     import { activeProfile, logout } from '@core/profile'
-    import { debounce } from 'shared/lib/utils'
+    import { debounce } from '@core/utils'
     import { onDestroy } from 'svelte'
     import { get } from 'svelte/store'
     import { MILLISECONDS_PER_SECOND, SECONDS_PER_MINUTE } from 'shared/lib/time'
diff --git a/packages/shared/components/Link.svelte b/packages/shared/components/Link.svelte
index 42f7b2514a..55f105dbad 100644
--- a/packages/shared/components/Link.svelte
+++ b/packages/shared/components/Link.svelte
@@ -1,6 +1,6 @@
 <script lang="typescript">
     import { Icon } from 'shared/components'
-    import { bindEvents } from 'shared/lib/utils'
+    import { bindEvents } from '@core/utils'
 
     export let events = []
     export let href = undefined
diff --git a/packages/shared/components/atoms/boxes/CopyableBox.svelte b/packages/shared/components/atoms/boxes/CopyableBox.svelte
index 34c819228d..adf2ceb4db 100644
--- a/packages/shared/components/atoms/boxes/CopyableBox.svelte
+++ b/packages/shared/components/atoms/boxes/CopyableBox.svelte
@@ -1,5 +1,5 @@
 <script lang="typescript">
-    import { setClipboard } from 'shared/lib/utils'
+    import { setClipboard } from '@core/utils'
     import Box from './Box.svelte'
     import { Text, Tooltip, FontWeight } from 'shared/components'
     import { localize } from '@core/i18n'
diff --git a/packages/shared/components/filters/Filter.svelte b/packages/shared/components/filters/Filter.svelte
index 08abdbb0e8..6c7b7c6814 100644
--- a/packages/shared/components/filters/Filter.svelte
+++ b/packages/shared/components/filters/Filter.svelte
@@ -1,7 +1,7 @@
 <script lang="typescript">
     import { TogglableButton, FilterModal, FilterItem, Modal } from 'shared/components'
     import type { Filter } from '@core/wallet/interfaces/filter/filter.interface'
-    import { deepCopy } from '@lib/utils'
+    import { deepCopy } from '@core/utils'
     import type { Writable } from 'svelte/store'
 
     export let filterStore: Writable<Filter>
diff --git a/packages/shared/components/inputs/Dropdown.svelte b/packages/shared/components/inputs/Dropdown.svelte
index a2d717fece..5b34fcbe13 100644
--- a/packages/shared/components/inputs/Dropdown.svelte
+++ b/packages/shared/components/inputs/Dropdown.svelte
@@ -2,8 +2,7 @@
     import { FontWeight, Icon, Text, TextPropTypes, TextType, Error } from 'shared/components'
     import { clickOutside } from 'shared/lib/actions'
     import { onMount } from 'svelte'
-    import { isNumberLetterOrPunctuation } from '@lib/utils/isNumberLetterOrPunctuation'
-    import { DropdownChoice } from '@core/utils'
+    import { DropdownChoice, isNumberLetterOrPunctuation } from '@core/utils'
 
     export let value: string
     export let label: string = ''
@@ -174,7 +173,7 @@
     {/if}
     <nav
         class:active={dropdown}
-        class="absolute w-full overflow-hidden pointer-events-none opacity-0 z-10 text-left 
+        class="absolute w-full overflow-hidden pointer-events-none opacity-0 z-10 text-left
         bg-white dark:bg-gray-800
             border border-solid border-blue-500 border-t-gray-500 dark:border-t-gray-700"
     >
@@ -182,7 +181,7 @@
             {#each items as item}
                 <button
                     class="relative flex items-center p-4 w-full whitespace-nowrap
-                        {item[valueKey] === value && 'bg-gray-100 dark:bg-gray-700 dark:bg-opacity-20'} 
+                        {item[valueKey] === value && 'bg-gray-100 dark:bg-gray-700 dark:bg-opacity-20'}
                         hover:bg-gray-100 dark:hover:bg-gray-700 dark:hover:bg-opacity-20
                         focus:bg-gray-200 dark:focus:bg-gray-600 dark:focus:bg-opacity-20"
                     id={item[valueKey]}
diff --git a/packages/shared/components/inputs/Dropdown2.svelte b/packages/shared/components/inputs/Dropdown2.svelte
index b7863e774d..2177f0c248 100644
--- a/packages/shared/components/inputs/Dropdown2.svelte
+++ b/packages/shared/components/inputs/Dropdown2.svelte
@@ -2,7 +2,7 @@
     import { onMount } from 'svelte'
     import { Icon, Text, Error, DropdownItem } from 'shared/components'
     import { clickOutside } from 'shared/lib/actions'
-    import { isNumberLetterOrPunctuation } from '@lib/utils/isNumberLetterOrPunctuation'
+    import { isNumberLetterOrPunctuation } from '@core/utils'
 
     export let value: string
     export let label: string = ''
@@ -142,7 +142,7 @@
 >
     <div
         class="selection relative flex flex-row space-x-0 pl-1 pb-1.5 items-end w-full whitespace-nowrap
-    bg-white dark:bg-gray-800 
+    bg-white dark:bg-gray-800
             {hasFocus ? '-mr-1 pr-1' : 'pr-0'}
             {items.length > 1 ? 'cursor-pointer' : ''}
             {dropdown
@@ -172,7 +172,7 @@
     {/if}
     <nav
         class:active={dropdown}
-        class="absolute w-full overflow-hidden pointer-events-none opacity-0 z-10 text-left 
+        class="absolute w-full overflow-hidden pointer-events-none opacity-0 z-10 text-left
         bg-white dark:bg-gray-800
             border border-solid border-blue-500 border-t-gray-500 dark:border-t-gray-700"
     >
@@ -180,7 +180,7 @@
             {#each items as item}
                 <button
                     class="relative flex items-center p-2 pl-1 w-full whitespace-nowrap
-                        {item[valueKey] === value && 'bg-gray-100 dark:bg-gray-700 dark:bg-opacity-20'} 
+                        {item[valueKey] === value && 'bg-gray-100 dark:bg-gray-700 dark:bg-opacity-20'}
                         hover:bg-gray-100 dark:hover:bg-gray-700 dark:hover:bg-opacity-20
                         focus:bg-gray-200 dark:focus:bg-gray-600 dark:focus:bg-opacity-20"
                     id={item[valueKey]}
diff --git a/packages/shared/components/inputs/ImportTextfield.svelte b/packages/shared/components/inputs/ImportTextfield.svelte
index b8e3d35539..d2274e4ae7 100644
--- a/packages/shared/components/inputs/ImportTextfield.svelte
+++ b/packages/shared/components/inputs/ImportTextfield.svelte
@@ -3,8 +3,8 @@
     import { english } from '@auxiliary/wordlists'
     import { localize } from '@core/i18n'
     import { verifyMnemonic } from '@core/profile-manager'
-    import { debounce } from '@lib/utils'
-    import { Mnemonic } from '../../lib/contexts/onboarding'
+    import { debounce } from '@core/utils'
+    import { Mnemonic } from '@contexts/onboarding'
 
     enum Type {
         Seed = 'seed',
diff --git a/packages/shared/components/inputs/PinInput.svelte b/packages/shared/components/inputs/PinInput.svelte
index 502d6f7195..e44e4a3bd4 100644
--- a/packages/shared/components/inputs/PinInput.svelte
+++ b/packages/shared/components/inputs/PinInput.svelte
@@ -2,7 +2,7 @@
     import { Error, Icon, Text } from 'shared/components'
     import { createEventDispatcher, onMount } from 'svelte'
     import { mobile, PlatformOption, platform } from '@core/app'
-    import { validatePinFormat, PIN_LENGTH } from '@lib/utils'
+    import { isValidPin, PIN_LENGTH } from '@core/utils'
 
     const dispatch = createEventDispatcher()
     const isAndroid = $platform === PlatformOption.Android
@@ -82,7 +82,7 @@
         if (event.key === KEYBOARD.BACKSPACE) {
             handleBackspace()
         } else if (event.key === KEYBOARD.ENTER) {
-            if (validatePinFormat(inputs.join(''))) {
+            if (isValidPin(inputs.join(''))) {
                 dispatch('submit')
             }
         } else if (event.key === KEYBOARD.TAB) {
diff --git a/packages/shared/components/inputs/RecipientInput.svelte b/packages/shared/components/inputs/RecipientInput.svelte
index 8ad7edc249..bbe77ca7dc 100644
--- a/packages/shared/components/inputs/RecipientInput.svelte
+++ b/packages/shared/components/inputs/RecipientInput.svelte
@@ -3,7 +3,7 @@
     import { localize } from '@core/i18n'
     import { networkHrp } from '@core/network'
     import { Subject } from '@core/wallet'
-    import { ADDRESS_LENGTH, validateBech32Address } from '@lib/utils'
+    import { BECH32_ADDRESS_LENGTH, validateBech32Address } from '@core/utils'
     import { Modal, RecipientAccountSelector, SelectorInput } from 'shared/components'
 
     export let recipient: Subject
@@ -46,10 +46,10 @@
             return Promise.resolve()
         }
 
-        if (value.length !== ADDRESS_LENGTH + addressPrefix.length) {
+        if (value.length !== BECH32_ADDRESS_LENGTH + addressPrefix.length) {
             error = localize('error.send.addressLength', {
                 values: {
-                    length: ADDRESS_LENGTH + addressPrefix.length,
+                    length: BECH32_ADDRESS_LENGTH + addressPrefix.length,
                 },
             })
         } else {
diff --git a/packages/shared/components/molecules/NftDetails.svelte b/packages/shared/components/molecules/NftDetails.svelte
index 396a280a59..f3c2ea5d70 100644
--- a/packages/shared/components/molecules/NftDetails.svelte
+++ b/packages/shared/components/molecules/NftDetails.svelte
@@ -23,7 +23,7 @@
     import { getOfficialExplorerUrl } from '@core/network/utils'
     import { Platform } from 'shared/lib/platform'
     import { truncateString } from '@lib/helpers'
-    import { setClipboard } from '@lib/utils'
+    import { setClipboard } from '@core/utils'
     import { time } from '@core/app'
 
     export let metadata: INftMetadata
diff --git a/packages/shared/components/molecules/TransactionDetails.svelte b/packages/shared/components/molecules/TransactionDetails.svelte
index 7592311752..52d56b8bf3 100644
--- a/packages/shared/components/molecules/TransactionDetails.svelte
+++ b/packages/shared/components/molecules/TransactionDetails.svelte
@@ -23,7 +23,7 @@
     import { getOfficialExplorerUrl } from '@core/network/utils'
     import { Platform } from 'shared/lib/platform'
     import { truncateString } from '@lib/helpers'
-    import { setClipboard } from '@lib/utils'
+    import { setClipboard } from '@core/utils'
     import { time } from '@core/app'
 
     export let asset: IPersistedAsset
diff --git a/packages/shared/components/organisms/AccountActivity.svelte b/packages/shared/components/organisms/AccountActivity.svelte
index 2914b366c3..0f53db9b07 100644
--- a/packages/shared/components/organisms/AccountActivity.svelte
+++ b/packages/shared/components/organisms/AccountActivity.svelte
@@ -10,9 +10,8 @@
     } from '@core/wallet'
     import { ActivityTile, Text, TextInput, TogglableButton, Filter, FontWeight } from 'shared/components'
     import features from 'shared/features/features'
-    import { debounce } from 'shared/lib/utils'
+    import { debounce, getMonthYear } from '@core/utils'
     import VirtualList from '@sveltejs/svelte-virtual-list'
-    import { getMonthYear } from '@lib/utils'
 
     let searchActive = false
     let inputElement: HTMLInputElement
diff --git a/packages/shared/components/popups/ActivityDetailsPopup.svelte b/packages/shared/components/popups/ActivityDetailsPopup.svelte
index b06b6abc1d..7c593a1539 100644
--- a/packages/shared/components/popups/ActivityDetailsPopup.svelte
+++ b/packages/shared/components/popups/ActivityDetailsPopup.svelte
@@ -16,7 +16,7 @@
     import { activeProfile, checkActiveProfileAuth } from '@core/profile'
     import { currencies, exchangeRates } from '@lib/currency'
     import { CurrencyTypes } from 'shared/lib/typings/currency'
-    import { setClipboard } from '@lib/utils'
+    import { setClipboard } from '@core/utils'
     import { truncateString } from '@lib/helpers'
     import { closePopup, openPopup } from '@auxiliary/popup'
     import { onMount } from 'svelte'
diff --git a/packages/shared/components/popups/Diagnostics.svelte b/packages/shared/components/popups/Diagnostics.svelte
index 4de48b3d1e..4c6a809e6e 100644
--- a/packages/shared/components/popups/Diagnostics.svelte
+++ b/packages/shared/components/popups/Diagnostics.svelte
@@ -4,7 +4,7 @@
     import { activeProfile } from '@core/profile'
     import { Button, Text } from 'shared/components'
     import { Platform } from 'shared/lib/platform'
-    import { setClipboard } from 'shared/lib/utils'
+    import { setClipboard } from '@core/utils'
     import { onMount } from 'svelte'
 
     const { loggedIn } = $activeProfile ?? {}
diff --git a/packages/shared/components/popups/ErrorLog.svelte b/packages/shared/components/popups/ErrorLog.svelte
index fc0f2506f2..83fc356beb 100644
--- a/packages/shared/components/popups/ErrorLog.svelte
+++ b/packages/shared/components/popups/ErrorLog.svelte
@@ -3,7 +3,7 @@
     import { errorLog } from '@core/error'
     import { localize } from '@core/i18n'
     import { closePopup } from '@auxiliary/popup'
-    import { setClipboard } from '@lib/utils'
+    import { setClipboard } from '@core/utils'
 
     function handleClearClick(): () => void {
         errorLog.set([])
diff --git a/packages/shared/components/popups/NodeInfoPopup.svelte b/packages/shared/components/popups/NodeInfoPopup.svelte
index 28d2bf0622..5d7816dd16 100644
--- a/packages/shared/components/popups/NodeInfoPopup.svelte
+++ b/packages/shared/components/popups/NodeInfoPopup.svelte
@@ -5,7 +5,7 @@
     import { INode, INodeInfo } from '@core/network'
     import { closePopup } from '@auxiliary/popup'
     import { showAppNotification } from '@auxiliary/notification'
-    import { resolveObjectPath, setClipboard } from 'shared/lib/utils'
+    import { resolveObjectPath, setClipboard } from '@core/utils'
     import { getNodeInfo } from '@core/profile-manager'
 
     enum NodeInfoTab {
diff --git a/packages/shared/components/popups/SendFormPopup.svelte b/packages/shared/components/popups/SendFormPopup.svelte
index 2610e26c9f..10bb438afe 100644
--- a/packages/shared/components/popups/SendFormPopup.svelte
+++ b/packages/shared/components/popups/SendFormPopup.svelte
@@ -4,7 +4,7 @@
     import { newTransactionDetails, updateNewTransactionDetails } from '@core/wallet'
     import { Button, Text, RecipientInput, AssetAmountInput, OptionalInput, FontWeight } from 'shared/components'
     import { closePopup, openPopup } from '@auxiliary/popup'
-    import { getByteLengthOfString } from '@lib/utils/getByteLengthOfString'
+    import { getByteLengthOfString } from '@core/utils'
 
     let { asset, rawAmount, unit, recipient, metadata, tag } = get(newTransactionDetails)
     let assetAmountInput: AssetAmountInput
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 6ac1e7c673..e95fce691c 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
@@ -1,5 +1,7 @@
 import { get } from 'svelte/store'
+
 import { networkHrp } from '@core/network'
+import { isStringTrue, getByteLengthOfString } from '@core/utils'
 import {
     getAssetById,
     INewTransactionDetails,
@@ -20,8 +22,6 @@ import {
     UnknownAssetError,
 } from '../../../errors'
 import { getRawAmountFromSearchParam } from '../../../utils'
-import { getByteLengthOfString } from '@lib/utils/getByteLengthOfString'
-import { isStringTrue } from '@core/utils'
 
 export function handleDeepLinkSendConfirmationOperation(searchParams: URLSearchParams): void {
     const transactionDetails = parseSendConfirmationOperation(searchParams)
diff --git a/packages/shared/lib/auxiliary/notification/actions/showNotification.ts b/packages/shared/lib/auxiliary/notification/actions/showNotification.ts
index 5accec63ed..d7cd249a4d 100644
--- a/packages/shared/lib/auxiliary/notification/actions/showNotification.ts
+++ b/packages/shared/lib/auxiliary/notification/actions/showNotification.ts
@@ -1,7 +1,7 @@
 import { get } from 'svelte/store'
 
 import { appSettings } from '@core/app'
-import { generateRandomId } from '@lib/utils'
+import { generateRandomId } from '@core/utils'
 import { Platform } from '@lib/platform'
 
 import { DEFAULT_NOTIFICATION_TIMEOUT, NOTIFICATION_TIMEOUT_NEVER } from '../constants'
diff --git a/packages/shared/lib/contexts/onboarding/actions/backupInitialStronghold.ts b/packages/shared/lib/contexts/onboarding/actions/backupInitialStronghold.ts
index a18f383c22..87a354d07c 100644
--- a/packages/shared/lib/contexts/onboarding/actions/backupInitialStronghold.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/backupInitialStronghold.ts
@@ -3,7 +3,7 @@ import { get } from 'svelte/store'
 import { Platform } from '@lib/platform'
 import { InvalidBackupDestinationError } from '@core/profile'
 import { backup } from '@core/profile-manager'
-import { getDefaultStrongholdName } from '@lib/utils'
+import { getDefaultStrongholdName } from '@core/stronghold'
 
 import { onboardingProfile, updateOnboardingProfile } from '../stores'
 
diff --git a/packages/shared/lib/contexts/onboarding/actions/createShimmerClaimingProfileManager.ts b/packages/shared/lib/contexts/onboarding/actions/createShimmerClaimingProfileManager.ts
index 4a363f5cf5..846729fdd4 100644
--- a/packages/shared/lib/contexts/onboarding/actions/createShimmerClaimingProfileManager.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/createShimmerClaimingProfileManager.ts
@@ -2,7 +2,7 @@ import { get } from 'svelte/store'
 
 import { COIN_TYPE, NetworkProtocol } from '@core/network'
 import { getSecretManagerFromProfileType, initialiseProfileManager } from '@core/profile-manager'
-import { generateRandomId } from '@lib/utils'
+import { generateRandomId } from '@core/utils'
 
 import { getShimmerClaimingProfileManagerStorageDirectory } from '../helpers'
 import { shimmerClaimingProfileManager, onboardingProfile } from '../stores'
diff --git a/packages/shared/lib/contexts/onboarding/helpers/buildOnboardingProfile.ts b/packages/shared/lib/contexts/onboarding/helpers/buildOnboardingProfile.ts
index da4c923cc8..67178481e6 100644
--- a/packages/shared/lib/contexts/onboarding/helpers/buildOnboardingProfile.ts
+++ b/packages/shared/lib/contexts/onboarding/helpers/buildOnboardingProfile.ts
@@ -1,5 +1,5 @@
 import { NetworkProtocol } from '@core/network'
-import { generateRandomId } from '@lib/utils'
+import { generateRandomId } from '@core/utils'
 
 import { IOnboardingProfile } from '../interfaces'
 
diff --git a/packages/shared/lib/contexts/settings/actions/exportStronghold.ts b/packages/shared/lib/contexts/settings/actions/exportStronghold.ts
index a6088862a6..db60f25872 100644
--- a/packages/shared/lib/contexts/settings/actions/exportStronghold.ts
+++ b/packages/shared/lib/contexts/settings/actions/exportStronghold.ts
@@ -1,7 +1,7 @@
 import { updateActiveProfile } from '@core/profile'
 import { backup } from '@core/profile-manager'
 import { Platform } from '@lib/platform'
-import { getDefaultStrongholdName } from '@lib/utils'
+import { getDefaultStrongholdName } from '@core/stronghold'
 
 export async function exportStronghold(
     password: string,
diff --git a/packages/shared/lib/core/account/stores/selected-account.store.ts b/packages/shared/lib/core/account/stores/selected-account.store.ts
index 3559abd19a..849e392f0e 100644
--- a/packages/shared/lib/core/account/stores/selected-account.store.ts
+++ b/packages/shared/lib/core/account/stores/selected-account.store.ts
@@ -1,7 +1,6 @@
 import { get, writable } from 'svelte/store'
-import { updateActiveAccount } from '@core/profile'
-import { IAccountState } from '../interfaces'
-
+import { updateActiveAccount } from '@core/profile/stores/active-accounts.store'
+import type { IAccountState } from '../interfaces'
 export const selectedAccount = writable<IAccountState>(null)
 
 export function updateSelectedAccount(payload: Partial<IAccountState>): void {
diff --git a/packages/shared/lib/core/app/utils/shouldBeDarkMode.ts b/packages/shared/lib/core/app/utils/shouldBeDarkMode.ts
index da7248d7a8..ef7ab16776 100644
--- a/packages/shared/lib/core/app/utils/shouldBeDarkMode.ts
+++ b/packages/shared/lib/core/app/utils/shouldBeDarkMode.ts
@@ -1,4 +1,4 @@
-import { AppTheme } from '@core/app'
+import { AppTheme } from '../enums'
 
 /**
  * NOTE: This media query is performed only once to help make the UX
diff --git a/packages/shared/lib/core/network/utils/checkNodeUrlValidity.ts b/packages/shared/lib/core/network/utils/checkNodeUrlValidity.ts
index db805d4ca0..d70b6d42d1 100644
--- a/packages/shared/lib/core/network/utils/checkNodeUrlValidity.ts
+++ b/packages/shared/lib/core/network/utils/checkNodeUrlValidity.ts
@@ -1,4 +1,4 @@
-import { isValidHttpsUrl, isValidUrl } from '@lib/utils'
+import { isValidHttpsUrl, isValidUrl } from '@core/utils'
 import { INode } from '../interfaces'
 
 /**
diff --git a/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts b/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
index 0c86d87a90..926bc9bf49 100644
--- a/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
+++ b/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
@@ -1,6 +1,6 @@
 import { ClientOptions, CoinType, SecretManager } from '@iota/wallet'
 
-import { generateRandomId } from '@lib/utils'
+import { generateRandomId } from '@core/utils'
 
 import { api } from '../api'
 import { IProfileManager } from '../interfaces'
diff --git a/packages/shared/lib/core/profile-manager/tests/api.test.ts b/packages/shared/lib/core/profile-manager/tests/api.test.ts
index 226767a89f..1d48756e23 100644
--- a/packages/shared/lib/core/profile-manager/tests/api.test.ts
+++ b/packages/shared/lib/core/profile-manager/tests/api.test.ts
@@ -4,7 +4,7 @@ import { MOCK_MNEMONIC, ProfileManagerMock } from '@mocks/profile-manager.mock'
 
 import { get } from 'svelte/store'
 
-import { generateRandomId } from '@lib/utils'
+import { generateRandomId } from '@core/utils'
 
 import { destroyProfileManager } from '../actions'
 import {
diff --git a/packages/shared/lib/core/profile/actions/active-profile/migrateActiveProfile.ts b/packages/shared/lib/core/profile/actions/active-profile/migrateActiveProfile.ts
index f50b7e7857..9f72701c9e 100644
--- a/packages/shared/lib/core/profile/actions/active-profile/migrateActiveProfile.ts
+++ b/packages/shared/lib/core/profile/actions/active-profile/migrateActiveProfile.ts
@@ -1,6 +1,6 @@
 import { activeProfile, IPersistedProfile, updateActiveProfile } from '@core/profile'
 import { DEFAULT_ACTIVE_PROFILE_VALUE } from '@core/profile/constants/default-active-profile-values.constant'
-import { migrateObjects } from '@lib/utils'
+import { migrateObjects } from '@core/utils'
 import { get } from 'svelte/store'
 
 // TODO: Fix this function does not seem to be migrating optional properties, at least on nested objects
diff --git a/packages/shared/lib/core/profile/stores/active-accounts.store.ts b/packages/shared/lib/core/profile/stores/active-accounts.store.ts
index 18e9fd604e..2aa6b0993b 100644
--- a/packages/shared/lib/core/profile/stores/active-accounts.store.ts
+++ b/packages/shared/lib/core/profile/stores/active-accounts.store.ts
@@ -1,4 +1,4 @@
-import { IAccountState } from '@core/account'
+import type { IAccountState } from '@core/account'
 import { derived, Readable, writable } from 'svelte/store'
 import { activeProfile } from './active-profile.store'
 
diff --git a/packages/shared/lib/core/profile/stores/active-profile.store.ts b/packages/shared/lib/core/profile/stores/active-profile.store.ts
index 5f846641fe..a92d10a498 100644
--- a/packages/shared/lib/core/profile/stores/active-profile.store.ts
+++ b/packages/shared/lib/core/profile/stores/active-profile.store.ts
@@ -1,7 +1,7 @@
-import { IAccountMetadata } from '@core/account'
+import type { IAccountMetadata } from '@core/account'
 import { get, writable } from 'svelte/store'
 import { INITIAL_ACTIVE_PROFILE } from '../constants'
-import { IProfile, IProfileSettings } from '../interfaces'
+import type { IProfile, IProfileSettings } from '../interfaces'
 
 export const activeProfile = writable<IProfile>(<IProfile>INITIAL_ACTIVE_PROFILE)
 
diff --git a/packages/shared/lib/core/profile/stores/timeSinceStrongholdUnlocked.store.ts b/packages/shared/lib/core/profile/stores/timeSinceStrongholdUnlocked.store.ts
index 2f54db2b2f..ee44569d06 100644
--- a/packages/shared/lib/core/profile/stores/timeSinceStrongholdUnlocked.store.ts
+++ b/packages/shared/lib/core/profile/stores/timeSinceStrongholdUnlocked.store.ts
@@ -1,4 +1,4 @@
-import { time } from '@core/app'
+import { time } from '@core/app/stores'
 import { derived } from 'svelte/store'
 import { timeStrongholdLastUnlocked } from './timeStrongholdLastUnlocked.store'
 
diff --git a/packages/shared/lib/core/stronghold/index.ts b/packages/shared/lib/core/stronghold/index.ts
index 1fdd461f83..cd4a866989 100644
--- a/packages/shared/lib/core/stronghold/index.ts
+++ b/packages/shared/lib/core/stronghold/index.ts
@@ -1,2 +1,3 @@
 export * from './actions'
 export * from './constants'
+export * from './utils'
diff --git a/packages/shared/lib/core/stronghold/utils/getDefaultStrongholdName.ts b/packages/shared/lib/core/stronghold/utils/getDefaultStrongholdName.ts
new file mode 100644
index 0000000000..518e913c8f
--- /dev/null
+++ b/packages/shared/lib/core/stronghold/utils/getDefaultStrongholdName.ts
@@ -0,0 +1,10 @@
+import { MILLISECONDS_PER_SECOND, SECONDS_PER_MINUTE } from '@lib/time'
+
+export function getDefaultStrongholdName(): string {
+    // Match https://github.com/iotaledger/wallet.rs/blob/ffbeaa3466b44f79dd5f87e14ed1bdc4846d9e85/src/account_manager.rs#L1428
+    // Trim milliseconds and replace colons with dashes
+    const timezoneOffset = new Date().getTimezoneOffset() * MILLISECONDS_PER_SECOND * SECONDS_PER_MINUTE // offset in milliseconds
+    const localIsoTime = new Date(Date.now() - timezoneOffset).toISOString()
+    const date = localIsoTime.slice(0, -5).replace(/:/g, '-')
+    return `firefly-backup-${date}.stronghold`
+}
diff --git a/packages/shared/lib/core/stronghold/utils/index.ts b/packages/shared/lib/core/stronghold/utils/index.ts
new file mode 100644
index 0000000000..bea1a8601f
--- /dev/null
+++ b/packages/shared/lib/core/stronghold/utils/index.ts
@@ -0,0 +1 @@
+export * from './getDefaultStrongholdName'
diff --git a/packages/shared/lib/core/token/index.ts b/packages/shared/lib/core/token/index.ts
new file mode 100644
index 0000000000..9c56149efa
--- /dev/null
+++ b/packages/shared/lib/core/token/index.ts
@@ -0,0 +1 @@
+export * from './utils'
diff --git a/packages/shared/lib/core/token/utils/index.ts b/packages/shared/lib/core/token/utils/index.ts
new file mode 100644
index 0000000000..cdb11cc02c
--- /dev/null
+++ b/packages/shared/lib/core/token/utils/index.ts
@@ -0,0 +1 @@
+export * from './isValidIrc30'
diff --git a/packages/shared/lib/core/token/utils/isValidIrc30.ts b/packages/shared/lib/core/token/utils/isValidIrc30.ts
new file mode 100644
index 0000000000..ffdd8a5cb1
--- /dev/null
+++ b/packages/shared/lib/core/token/utils/isValidIrc30.ts
@@ -0,0 +1,6 @@
+import type { ITokenMetadata } from '@core/wallet'
+import { MAX_SUPPORTED_DECIMALS } from '@core/wallet/constants'
+
+export function isValidIrc30(tokenMetadata: ITokenMetadata): boolean {
+    return tokenMetadata.decimals <= MAX_SUPPORTED_DECIMALS
+}
diff --git a/packages/shared/lib/core/utils/constants/bech32-address-length.constant.ts b/packages/shared/lib/core/utils/constants/bech32-address-length.constant.ts
new file mode 100644
index 0000000000..d3220865ff
--- /dev/null
+++ b/packages/shared/lib/core/utils/constants/bech32-address-length.constant.ts
@@ -0,0 +1 @@
+export const BECH32_ADDRESS_LENGTH = 60
diff --git a/packages/shared/lib/core/utils/constants/index.ts b/packages/shared/lib/core/utils/constants/index.ts
index 6581c82e1c..da16fa88e4 100644
--- a/packages/shared/lib/core/utils/constants/index.ts
+++ b/packages/shared/lib/core/utils/constants/index.ts
@@ -1 +1,3 @@
+export * from './bech32-address-length.constant'
 export * from './hex.constants'
+export * from './pin-length.constant'
diff --git a/packages/shared/lib/core/utils/constants/pin-length.constant.ts b/packages/shared/lib/core/utils/constants/pin-length.constant.ts
new file mode 100644
index 0000000000..4a0b3d6c21
--- /dev/null
+++ b/packages/shared/lib/core/utils/constants/pin-length.constant.ts
@@ -0,0 +1 @@
+export const PIN_LENGTH = 6
diff --git a/packages/shared/lib/core/utils/convert.utils.ts b/packages/shared/lib/core/utils/convert.utils.ts
index ce07629f14..509d02cd97 100644
--- a/packages/shared/lib/core/utils/convert.utils.ts
+++ b/packages/shared/lib/core/utils/convert.utils.ts
@@ -27,3 +27,38 @@ export function convertUInt16NumberToLittleEndianHex(num: number): string {
     const hex = ('0000' + littleEndianNumber.toString(16).toUpperCase()).slice(-4)
     return hex
 }
+
+export function convertBytesToUtf8String(bytes: Uint8Array | number[]): string {
+    if (!bytes || bytes.length <= 0) return ''
+
+    const extraByteMap = [1, 1, 1, 1, 2, 2, 3, 0]
+    const charCount = bytes.length
+
+    let result = ''
+
+    for (let idx = 0; idx < charCount; ) {
+        let char = bytes[idx++]
+        if (char & 0x80) {
+            let extraChar = extraByteMap[(char >> 3) & 0x07]
+            if (!(char & 0x40) || !extraChar || idx + extraChar > charCount) return ''
+
+            char = char & (0x3f >> extraChar)
+            for (; extraChar > 0; extraChar--) {
+                const _char = bytes[idx++]
+                if ((_char & 0xc0) !== 0x80) return ''
+
+                char = (char << 6) | (_char & 0x3f)
+            }
+        }
+
+        result += String.fromCharCode(char)
+    }
+
+    return result
+}
+
+export function convertBytesToHexString(bytes: number[]): string | undefined {
+    if (!bytes || bytes.length <= 0) return undefined
+
+    return bytes.map((byte) => ('0' + (byte & 0xff).toString(16)).slice(-2)).join('')
+}
diff --git a/packages/shared/lib/core/utils/crypto.utils.ts b/packages/shared/lib/core/utils/crypto.utils.ts
new file mode 100644
index 0000000000..0d8a9f08fe
--- /dev/null
+++ b/packages/shared/lib/core/utils/crypto.utils.ts
@@ -0,0 +1,27 @@
+import { localize } from '@core/i18n'
+import { Bech32 } from '@lib/bech32'
+
+export function validateBech32Address(prefix: string, addr: string): string {
+    if (!addr || !addr.startsWith(prefix)) {
+        return localize('error.send.wrongAddressPrefix', {
+            values: {
+                prefix: prefix,
+            },
+        })
+    }
+    if (!new RegExp(`^${prefix}1[02-9ac-hj-np-z]{59}$`).test(addr)) {
+        return localize('error.send.wrongAddressFormat')
+    }
+
+    let isValid = false
+    try {
+        const decoded = Bech32.decode(addr)
+        isValid = decoded && decoded.humanReadablePart === prefix
+    } catch (err) {
+        console.error('error.crypto.cannotDecodeBech32')
+    }
+
+    if (!isValid) {
+        return localize('error.send.invalidAddress')
+    }
+}
diff --git a/packages/shared/lib/utils/dateUtils.ts b/packages/shared/lib/core/utils/date.utils.ts
similarity index 100%
rename from packages/shared/lib/utils/dateUtils.ts
rename to packages/shared/lib/core/utils/date.utils.ts
diff --git a/packages/shared/lib/core/utils/format.utils.ts b/packages/shared/lib/core/utils/format.utils.ts
index 76ea373a6e..5ba0836614 100644
--- a/packages/shared/lib/core/utils/format.utils.ts
+++ b/packages/shared/lib/core/utils/format.utils.ts
@@ -1,4 +1,16 @@
 import { HEXADECIMAL_PREFIX, HEXADECIMAL_REGEXP } from './constants'
+import { formatDate } from '@core/i18n'
+
+export function capitalizeString(str: string): string {
+    if (!str) return str
+    else return str[0].toUpperCase() + str.substr(1).toLowerCase()
+}
+
+export function delineateNumber(str: string, delineator: ',' | '.' | '' = ','): string {
+    if (!str) return ''
+
+    return str.toString().replace(/\B(?=(\d{3})+(?!\d))/g, delineator)
+}
 
 export function formatHexString(
     hex: string,
@@ -20,3 +32,7 @@ export function formatHexString(
 
     return result
 }
+
+export function getMonthYear(date: Date): string {
+    return formatDate(date, { year: 'numeric', month: 'short' })
+}
diff --git a/packages/shared/lib/core/utils/index.ts b/packages/shared/lib/core/utils/index.ts
index c5090bbd48..406ec1da8d 100644
--- a/packages/shared/lib/core/utils/index.ts
+++ b/packages/shared/lib/core/utils/index.ts
@@ -1,13 +1,22 @@
 export * from './constants'
-export * from './types'
 export * from './enums'
+export * from './interfaces'
+export * from './types'
 
 export * from './convert.utils'
+export * from './crypto.utils'
+export * from './date.utils'
 export * from './filter.utils'
 export * from './format.utils'
 export * from './function.utils'
 export * from './iter.utils'
+export * from './math.utils'
 export * from './number.utils'
+export * from './object.utils'
+export * from './os.utils'
+export * from './random.utils'
 export * from './sort.utils'
 export * from './string.utils'
 export * from './time.utils'
+export * from './ui.utils'
+export * from './validation.utils'
diff --git a/packages/shared/lib/core/utils/interfaces/element.interface.ts b/packages/shared/lib/core/utils/interfaces/element.interface.ts
new file mode 100644
index 0000000000..466f293f2e
--- /dev/null
+++ b/packages/shared/lib/core/utils/interfaces/element.interface.ts
@@ -0,0 +1,6 @@
+import { Event } from '@lib/typings/events'
+
+export interface Element {
+    addEventListener(event: Event<unknown> | string, unknown): unknown
+    removeEventListener(event: Event<unknown> | string, handler: unknown): void
+}
diff --git a/packages/shared/lib/core/utils/interfaces/index.ts b/packages/shared/lib/core/utils/interfaces/index.ts
new file mode 100644
index 0000000000..a8e1aa74f0
--- /dev/null
+++ b/packages/shared/lib/core/utils/interfaces/index.ts
@@ -0,0 +1 @@
+export * from './element.interface'
diff --git a/packages/shared/lib/core/utils/math.utils.ts b/packages/shared/lib/core/utils/math.utils.ts
new file mode 100644
index 0000000000..bfea98caa6
--- /dev/null
+++ b/packages/shared/lib/core/utils/math.utils.ts
@@ -0,0 +1,5 @@
+export const clamp = (n: number, min: number, max: number): number => {
+    if (Number.isNaN(n) || Number.isNaN(min) || Number.isNaN(max)) return 0
+
+    return Math.min(Math.max(n, min), max)
+}
diff --git a/packages/shared/lib/core/utils/number.utils.ts b/packages/shared/lib/core/utils/number.utils.ts
index f73a3e3c4e..22a9d7f05a 100644
--- a/packages/shared/lib/core/utils/number.utils.ts
+++ b/packages/shared/lib/core/utils/number.utils.ts
@@ -1,4 +1,20 @@
+export function range(size: number, start: number = 0): number[] {
+    if (!size || size <= 0) return []
+
+    if (!start || typeof start !== 'number') start = 0
+
+    return Array.from(Array(size), (_, idx) => idx + start)
+}
+
 export function tryNumberOrZero(numberCandidate: unknown): number {
     const numberCandidateCasted = Number(numberCandidate)
     return Number.isNaN(numberCandidateCasted) ? 0 : numberCandidateCasted
 }
+
+export function isNumberLetterOrPunctuation(key: string): boolean {
+    if (key.length !== 1) {
+        return false
+    }
+    const code = key.charCodeAt(0)
+    return (code >= 48 && code <= 57) || (code >= 65 && code <= 122)
+}
diff --git a/packages/shared/lib/core/utils/object.utils.ts b/packages/shared/lib/core/utils/object.utils.ts
new file mode 100644
index 0000000000..89020f706b
--- /dev/null
+++ b/packages/shared/lib/core/utils/object.utils.ts
@@ -0,0 +1,56 @@
+/**
+ * Migrates an object to a newer version keeping old data if it already exists and
+ * adds new data if the property doesn't exist.
+ *
+ * @param oldObj The object whose keys and data will be used if found and matching the newer version
+ * @param newObj The object whose keys and data will be used if not found on older version
+ *
+ * @returns The resulting object of migrating from an older version to a newer one (i.e. updated keys and / or data)
+ */
+export function migrateObjects<T>(oldObj: T, newObj: T): T {
+    /* eslint-disable @typescript-eslint/no-explicit-any */
+    const _helper = (curObj: any, oldObj: any, newObj: any): any => {
+        // Iterate through each key of a new object...
+        for (const k in newObj) {
+            // If key also exists in old object then...
+            if (k in oldObj) {
+                // If corresponding value in the new object is also an object and is not undefined or null then...
+                if (typeof newObj[k] === 'object' && newObj[k] !== undefined && newObj[k] !== null) {
+                    // If corresponding value is actually an array (b/c an "Array" is an object in JS) then...
+                    if (Array.isArray(newObj[k])) {
+                        // Create key-value pair with array from new object or old object if it already exists
+                        curObj[k] = Array.isArray(oldObj[k]) ? oldObj[k] : newObj[k]
+                        // Else corresponding value is really an object, so...
+                    } else {
+                        // Create key-value pair with this function called on nested object
+                        curObj[k] = _helper({}, oldObj[k], newObj[k])
+                    }
+                    // Else corresponding value is NOT an object, so...
+                } else {
+                    // We can just simply assign the value from the old object
+                    curObj[k] = oldObj[k]
+                }
+                // Else the key does NOT exist in the old object, so...
+            } else {
+                // We create a new key-value pair with the value from the new object
+                curObj[k] = newObj[k]
+            }
+        }
+
+        return curObj
+    }
+
+    return _helper({}, oldObj, newObj) as T
+}
+
+export function resolveObjectPath(object: Record<string, any>, path: string, defaultValue: unknown = ''): unknown {
+    if (!object || !path) {
+        return defaultValue
+    }
+
+    return path.split('.').reduce((o, p) => o && o[p], object) ?? defaultValue
+}
+
+export function deepCopy<T>(object: T): T {
+    return JSON.parse(JSON.stringify(object)) as T
+}
diff --git a/packages/shared/lib/core/utils/os.utils.ts b/packages/shared/lib/core/utils/os.utils.ts
new file mode 100644
index 0000000000..75bed84ea2
--- /dev/null
+++ b/packages/shared/lib/core/utils/os.utils.ts
@@ -0,0 +1,50 @@
+import { showAppNotification } from '@auxiliary/notification'
+import { localize } from '@core/i18n'
+import { Platform } from '@lib/platform'
+
+export function sleep(ms: number): Promise<number> {
+    return new Promise((resolve) => setTimeout(resolve, ms))
+}
+
+export function setClipboard(input: string, shouldNotify: boolean = true): boolean {
+    try {
+        const textArea = document.createElement('textarea')
+        textArea.value = input
+        document.body.appendChild(textArea)
+
+        if (/ipad|iphone/i.exec(navigator.userAgent)) {
+            const range = document.createRange()
+            range.selectNodeContents(textArea)
+            const selection = window.getSelection()
+            selection.removeAllRanges()
+            selection.addRange(range)
+            textArea.setSelectionRange(0, 999999)
+        } else {
+            textArea.select()
+        }
+
+        document.execCommand('copy')
+        document.body.removeChild(textArea)
+
+        if (shouldNotify) {
+            showAppNotification({ type: 'info', message: localize('notifications.copiedToClipboard') })
+        }
+
+        return true
+    } catch (err) {
+        console.error(err)
+
+        return false
+    }
+}
+
+export function downloadRecoveryKit(): void {
+    fetch('assets/docs/recovery-kit.pdf')
+        .then((response) => response.arrayBuffer())
+        .then((data) => {
+            void Platform.saveRecoveryKit(data)
+        })
+        .catch((err) => {
+            console.error(err)
+        })
+}
diff --git a/packages/shared/lib/core/utils/random.utils.ts b/packages/shared/lib/core/utils/random.utils.ts
new file mode 100644
index 0000000000..665ffda8fc
--- /dev/null
+++ b/packages/shared/lib/core/utils/random.utils.ts
@@ -0,0 +1,17 @@
+export function generateRandomId(): string {
+    return Array.from(crypto.getRandomValues(new Uint8Array(16)), (byte) =>
+        ('0' + (byte & 0xff).toString(16)).slice(-2)
+    ).join('')
+}
+
+export function generateRandomInteger(beginning: number, end: number): number {
+    return Math.floor(Math.random() * end + beginning)
+}
+
+export const pick = <T>(arr: T[]): T | undefined => {
+    const length = arr?.length
+    if (length < 1) return undefined
+
+    const randIdx = Math.floor(Math.random() * length)
+    return arr[randIdx] || undefined
+}
diff --git a/packages/shared/lib/core/utils/string.utils.ts b/packages/shared/lib/core/utils/string.utils.ts
index 1466bf851d..b0e93f765e 100644
--- a/packages/shared/lib/core/utils/string.utils.ts
+++ b/packages/shared/lib/core/utils/string.utils.ts
@@ -1,3 +1,22 @@
 export function isStringTrue(value: string): boolean {
     return value === 'true'
 }
+
+export function getByteLengthOfString(str: string): number {
+    return new Blob([str]).size
+}
+
+export function chunkString(str: string, size: number = 0): string[] {
+    if (str) {
+        const numChunks = Math.ceil(str.length / size)
+        const chunks = new Array(numChunks)
+
+        for (let i = 0, o = 0; i < numChunks; ++i, o += size) {
+            chunks[i] = str.substr(o, size)
+        }
+
+        return chunks
+    } else {
+        return []
+    }
+}
diff --git a/packages/shared/lib/core/utils/tests/utils.test.ts b/packages/shared/lib/core/utils/tests/utils.test.ts
index e0f8d042f0..300c57b6af 100644
--- a/packages/shared/lib/core/utils/tests/utils.test.ts
+++ b/packages/shared/lib/core/utils/tests/utils.test.ts
@@ -1,6 +1,6 @@
 import '@mocks/i18n.mock'
 
-import { migrateObjects, range, validateBech32Address } from '@lib/utils'
+import { migrateObjects, range, validateBech32Address } from '@core/utils'
 
 type Simple = {
     prop1?: string
diff --git a/packages/shared/lib/core/utils/ui.utils.ts b/packages/shared/lib/core/utils/ui.utils.ts
new file mode 100644
index 0000000000..066f81edbc
--- /dev/null
+++ b/packages/shared/lib/core/utils/ui.utils.ts
@@ -0,0 +1,29 @@
+import { Event } from '@lib/typings/events'
+
+import { Element } from './interfaces'
+
+export function bindEvents(element: Element, events: Event<unknown>[]): { destroy } {
+    const listeners = Object.entries(events).map(([event, handler]) => {
+        const listener = element.addEventListener(event, handler)
+
+        return [event, listener]
+    })
+
+    return {
+        destroy() {
+            listeners.forEach(([event, listener]) => {
+                element.removeEventListener(event as string, listener)
+            })
+        },
+    }
+}
+
+export function debounce(callback: () => void, wait = 500): (...args: unknown[]) => void {
+    let _timeout
+    return (...args) => {
+        /* eslint-disable @typescript-eslint/no-this-alias */
+        const context = this
+        clearTimeout(_timeout)
+        _timeout = setTimeout(() => callback.apply(context, args), wait)
+    }
+}
diff --git a/packages/shared/lib/core/utils/validation.utils.ts b/packages/shared/lib/core/utils/validation.utils.ts
new file mode 100644
index 0000000000..e7115179c8
--- /dev/null
+++ b/packages/shared/lib/core/utils/validation.utils.ts
@@ -0,0 +1,16 @@
+import validUrl from 'valid-url'
+
+import { PIN_LENGTH } from './constants'
+
+export function isValidPin(pin: string): boolean {
+    const REGEX = new RegExp(`^\\d{${PIN_LENGTH}}$`)
+    return REGEX.test(pin)
+}
+
+export function isValidUrl(url: string): boolean {
+    return validUrl.isWebUri(url)
+}
+
+export function isValidHttpsUrl(url: string): boolean {
+    return validUrl.isHttpsUri(url)
+}
diff --git a/packages/shared/lib/core/wallet/actions/getAccountAssetsForSelectedAccount.ts b/packages/shared/lib/core/wallet/actions/getAccountAssetsForSelectedAccount.ts
index e5fdde7328..6c8a26d61e 100644
--- a/packages/shared/lib/core/wallet/actions/getAccountAssetsForSelectedAccount.ts
+++ b/packages/shared/lib/core/wallet/actions/getAccountAssetsForSelectedAccount.ts
@@ -1,7 +1,7 @@
 import { selectedAccount } from '@core/account'
 import { COIN_TYPE } from '@core/network'
 import { activeProfile } from '@core/profile'
-import { isValidIRC30 } from '@lib/utils/isValidIRC30'
+import { isValidIrc30 } from '@core/token'
 import { get } from 'svelte/store'
 import { IAsset } from '../interfaces'
 import { IAccountAssets } from '../interfaces/account-assets.interface'
@@ -25,7 +25,7 @@ export function getAccountAssetsForSelectedAccount(): IAccountAssets {
     const tokens = account?.balances?.nativeTokens ?? []
     for (const token of tokens) {
         const persistedAsset = getAssetFromPersistedAssets(token.tokenId)
-        if (persistedAsset && isValidIRC30(persistedAsset.metadata)) {
+        if (persistedAsset && isValidIrc30(persistedAsset.metadata)) {
             nativeTokens.push({
                 ...persistedAsset,
                 balance: {
diff --git a/packages/shared/lib/core/wallet/classes/activity.class.ts b/packages/shared/lib/core/wallet/classes/activity.class.ts
index f38a892835..8d6a2f4b80 100644
--- a/packages/shared/lib/core/wallet/classes/activity.class.ts
+++ b/packages/shared/lib/core/wallet/classes/activity.class.ts
@@ -1,4 +1,4 @@
-import { IAccountState } from '@core/account'
+import type { IAccountState } from '@core/account'
 import { convertToFiat, formatCurrency } from '@lib/currency'
 import { ActivityAsyncStatus, ActivityDirection, ActivityType, InclusionState } from '../enums'
 import {
diff --git a/packages/shared/lib/core/wallet/stores/hidden-activities.store.ts b/packages/shared/lib/core/wallet/stores/hidden-activities.store.ts
index 5d79162e2f..710d77acac 100644
--- a/packages/shared/lib/core/wallet/stores/hidden-activities.store.ts
+++ b/packages/shared/lib/core/wallet/stores/hidden-activities.store.ts
@@ -1,7 +1,7 @@
 import { activeProfileId } from '@core/profile'
 import { persistent } from '@lib/helpers'
 import { get } from 'svelte/store'
-import { IHiddenActivities } from '../interfaces'
+import type { IHiddenActivities } from '../interfaces'
 
 export const hiddenActivities = persistent<IHiddenActivities>('hiddenActivities', {})
 
diff --git a/packages/shared/lib/core/wallet/stores/selected-account-activities.store.ts b/packages/shared/lib/core/wallet/stores/selected-account-activities.store.ts
index a9c0fc0751..c4982cd7f4 100644
--- a/packages/shared/lib/core/wallet/stores/selected-account-activities.store.ts
+++ b/packages/shared/lib/core/wallet/stores/selected-account-activities.store.ts
@@ -1,4 +1,7 @@
 import { derived, Readable, writable, Writable } from 'svelte/store'
+
+import { isValidIrc30 } from '@core/token'
+
 import { selectedAccount } from '../../account/stores/selected-account.store'
 import { Activity } from '../classes/activity.class'
 import {
@@ -15,7 +18,6 @@ import { ActivityFilter } from '../interfaces/filter/filter.interface'
 import { getAssetFromPersistedAssets } from '../utils'
 import { isVisibleActivity } from '../utils/isVisibleActivity'
 import { allAccountActivities } from './all-account-activities.store'
-import { isValidIRC30 } from '@lib/utils/isValidIRC30'
 
 export const selectedAccountActivities: Readable<Activity[]> = derived(
     [selectedAccount, allAccountActivities],
@@ -107,7 +109,7 @@ export const queriedActivities: Readable<Activity[]> = derived(
         let activityList = $selectedAccountActivities.filter((_activity) => {
             const asset =
                 _activity.data.type !== ActivityType.Nft && getAssetFromPersistedAssets(_activity.data.assetId)
-            const hasValidAsset = _activity.data.type === ActivityType.Nft || (asset && isValidIRC30(asset.metadata))
+            const hasValidAsset = _activity.data.type === ActivityType.Nft || (asset && isValidIrc30(asset.metadata))
             return (
                 !_activity.isHidden &&
                 hasValidAsset &&
diff --git a/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts b/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts
index a6b1886c04..16863281c7 100644
--- a/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts
@@ -1,4 +1,4 @@
-import { IFoundryOutput } from '@iota/types'
+import type { IFoundryOutput } from '@iota/types'
 
 export function getMetadataFromFoundryOutput(foundry: IFoundryOutput): string {
     if (foundry?.immutableFeatures?.length > 0) {
diff --git a/packages/shared/lib/core/wallet/utils/isVisibleActivity.ts b/packages/shared/lib/core/wallet/utils/isVisibleActivity.ts
index 28510ece3f..0dc77b6088 100644
--- a/packages/shared/lib/core/wallet/utils/isVisibleActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/isVisibleActivity.ts
@@ -14,7 +14,7 @@ import {
     DateFilterOption,
     DateUnit,
 } from '../enums'
-import { dateIsAfterOtherDate, dateIsBeforeOtherDate, datesOnSameDay } from '@lib/utils/dateUtils'
+import { dateIsAfterOtherDate, dateIsBeforeOtherDate, datesOnSameDay } from '@core/utils'
 import { ActivityFilter } from '../interfaces'
 import { convertToRawAmount } from '.'
 import Big from 'big.js'
diff --git a/packages/shared/lib/ed25519.ts b/packages/shared/lib/ed25519.ts
index e72006ca33..5df5a31569 100644
--- a/packages/shared/lib/ed25519.ts
+++ b/packages/shared/lib/ed25519.ts
@@ -1,5 +1,5 @@
 import { Bech32 } from '@lib/bech32'
-import { toHexString } from '@lib/utils'
+import { convertBytesToHexString } from '@core/utils'
 
 /**
  * Converts a Bech32 address to an Ed25519 address.
@@ -7,5 +7,5 @@ import { toHexString } from '@lib/utils'
 export function convertBech32AddressToEd25519Address(bech32Address: string, includeTypeByte: boolean = false): string {
     if (!bech32Address) return ''
 
-    return toHexString(Array.from(Bech32.decode(bech32Address).data).slice(includeTypeByte ? 0 : 1))
+    return convertBytesToHexString(Array.from(Bech32.decode(bech32Address).data).slice(includeTypeByte ? 0 : 1))
 }
diff --git a/packages/shared/lib/utils.ts b/packages/shared/lib/utils.ts
deleted file mode 100644
index 81ace31096..0000000000
--- a/packages/shared/lib/utils.ts
+++ /dev/null
@@ -1,491 +0,0 @@
-import { Bech32 } from 'shared/lib/bech32'
-import { Platform } from 'shared/lib/platform'
-import { formatDate, localize } from '@core/i18n'
-import { showAppNotification } from '@auxiliary/notification'
-import validUrl from 'valid-url'
-import { Event } from './typings/events'
-
-export const ADDRESS_LENGTH = 60
-export const PIN_LENGTH = 6
-
-interface Element {
-    addEventListener(event: Event<unknown> | string, unknown)
-    removeEventListener(event: Event<unknown> | string, handler: unknown)
-}
-
-export function bindEvents(element: Element, events: Event<unknown>[]): { destroy } {
-    const listeners = Object.entries(events).map(([event, handler]) => {
-        const listener = element.addEventListener(event, handler)
-
-        return [event, listener]
-    })
-
-    return {
-        destroy(): void {
-            listeners.forEach(([event, listener]) => {
-                element.removeEventListener(event, listener)
-            })
-        },
-    }
-}
-
-/**
- * Validate pincode format
- */
-export const validatePinFormat = (pincode: string): boolean => {
-    const REGEX = new RegExp(`^\\d{${PIN_LENGTH}}$`)
-    return REGEX.test(pincode)
-}
-
-/**
- * @method generateRandomId
- *
- * @returns {string}
- */
-export const generateRandomId = (): string =>
-    Array.from(crypto.getRandomValues(new Uint8Array(16)), (byte) => ('0' + (byte & 0xff).toString(16)).slice(-2)).join(
-        ''
-    )
-
-/**
- * Checks if a URL is valid
- * @method isValidUrl
- *
- * @param {string}  url
- * @returns {Boolean}
- */
-export const isValidUrl = (url: string): boolean => {
-    if (validUrl.isWebUri(url)) {
-        return true
-    }
-    return false
-}
-
-/**
- * Check if a URL uses HTTPS
- *
- * @method isValidHttpsUrl
- *
- * @param  {string}  url
- * @returns {Boolean}
- */
-export const isValidHttpsUrl = (url: string): boolean => {
-    if (validUrl.isHttpsUri(url)) {
-        return true
-    }
-    return false
-}
-
-/**
- * Validate an address given its prefix.
- * @param prefix The bech32 hrp prefix to match.
- * @param addr The address to validate.
- * @returns The error string to use if it does not validate.
- */
-export const validateBech32Address = (prefix: string, addr: string): string => {
-    if (!addr || !addr.startsWith(prefix)) {
-        return localize('error.send.wrongAddressPrefix', {
-            values: {
-                prefix: prefix,
-            },
-        })
-    }
-    if (!new RegExp(`^${prefix}1[02-9ac-hj-np-z]{59}$`).test(addr)) {
-        return localize('error.send.wrongAddressFormat')
-    }
-
-    let isValid = false
-    try {
-        const decoded = Bech32.decode(addr)
-        isValid = decoded && decoded.humanReadablePart === prefix
-    } catch (err) {
-        console.error('error.crypto.cannotDecodeBech32')
-    }
-
-    if (!isValid) {
-        return localize('error.send.invalidAddress')
-    }
-}
-
-/**
- * Debounce the operation
- * @param callback Callback to execute after debouncing
- * @param wait Length of time (millis) before executing the callback
- */
-export function debounce(callback: () => void, wait = 500): (...args: unknown[]) => void {
-    let _timeout
-    return (...args): void => {
-        /* eslint-disable @typescript-eslint/no-this-alias */
-        const context = this
-        clearTimeout(_timeout)
-        _timeout = setTimeout(() => callback.apply(context, args), wait)
-    }
-}
-
-/**
- * Set text to clipboard
- */
-export const setClipboard = (input: string, shouldNotify: boolean = true): boolean => {
-    try {
-        const textArea = document.createElement('textarea')
-        textArea.value = input
-        document.body.appendChild(textArea)
-
-        if (/ipad|iphone/i.exec(navigator.userAgent)) {
-            const range = document.createRange()
-            range.selectNodeContents(textArea)
-            const selection = window.getSelection()
-            selection.removeAllRanges()
-            selection.addRange(range)
-            textArea.setSelectionRange(0, 999999)
-        } else {
-            textArea.select()
-        }
-
-        document.execCommand('copy')
-        document.body.removeChild(textArea)
-
-        if (shouldNotify) {
-            showAppNotification({ type: 'info', message: localize('notifications.copiedToClipboard') })
-        }
-
-        return true
-    } catch (err) {
-        console.error(err)
-
-        return false
-    }
-}
-
-export const getDefaultStrongholdName = (): string => {
-    // Match https://github.com/iotaledger/wallet.rs/blob/ffbeaa3466b44f79dd5f87e14ed1bdc4846d9e85/src/account_manager.rs#L1428
-    // Trim milliseconds and replace colons with dashes
-    const tzoffset = new Date().getTimezoneOffset() * 60000 // offset in milliseconds
-    const localISOTime = new Date(Date.now() - tzoffset).toISOString()
-    const date = localISOTime.slice(0, -5).replace(/:/g, '-')
-    return `firefly-backup-${date}.stronghold`
-}
-
-export const downloadRecoveryKit = (): void => {
-    fetch('assets/docs/recovery-kit.pdf')
-        .then((response) => response.arrayBuffer())
-        .then((data) => {
-            void Platform.saveRecoveryKit(data)
-        })
-        .catch((err) => {
-            console.error(err)
-        })
-}
-
-/**
- * Migrates an object to a newer version keeping old data if it already exists and
- * adds new data if the property doesn't exist.
- *
- * @param oldObj The object whose keys and data will be used if found and matching the newer version
- * @param newObj The object whose keys and data will be used if not found on older version
- *
- * @returns The resulting object of migrating from an older version to a newer one (i.e. updated keys and / or data)
- */
-export const migrateObjects = <T>(oldObj: T, newObj: T): T => {
-    /* eslint-disable @typescript-eslint/no-explicit-any */
-    const _helper = (curObj: any, oldObj: any, newObj: any): any => {
-        // Iterate through each key of a new object...
-        for (const k in newObj) {
-            // If key also exists in old object then...
-            if (k in oldObj) {
-                // If corresponding value in the new object is also an object and is not undefined or null then...
-                if (typeof newObj[k] === 'object' && newObj[k] !== undefined && newObj[k] !== null) {
-                    // If corresponding value is actually an array (b/c an "Array" is an object in JS) then...
-                    if (Array.isArray(newObj[k])) {
-                        // Create key-value pair with array from new object or old object if it already exists
-                        curObj[k] = Array.isArray(oldObj[k]) ? oldObj[k] : newObj[k]
-                        // Else corresponding value is really an object, so...
-                    } else {
-                        // Create key-value pair with this function called on nested object
-                        curObj[k] = _helper({}, oldObj[k], newObj[k])
-                    }
-                    // Else corresponding value is NOT an object, so...
-                } else {
-                    // We can just simply assign the value from the old object
-                    curObj[k] = oldObj[k]
-                }
-                // Else the key does NOT exist in the old object, so...
-            } else {
-                // We create a new key-value pair with the value from the new object
-                curObj[k] = newObj[k]
-            }
-        }
-
-        return curObj
-    }
-
-    return _helper({}, oldObj, newObj) as T
-}
-
-/**
- * Generates a random number between a given beginning and end. This is NOT
- * cryptographically secure.
- *
- * @method generateRandomInteger
- *
- * @param {number} beginning
- * @param {number} end
- *
- * @returns {number}
- */
-export const generateRandomInteger = (beginning: number, end: number): number =>
-    Math.floor(Math.random() * end + beginning)
-
-/**
- * Decodes an array of bytes to its UTF-8 string representation.
- *
- * @method stringFromUtf8Array
- *
- * @param {Uint8Array | number[]} bytes
- *
- * @returns {string | undefined}
- */
-export const toUtf8String = (bytes: Uint8Array | number[]): string | undefined => {
-    if (!bytes || bytes.length <= 0) return undefined
-
-    const extraByteMap = [1, 1, 1, 1, 2, 2, 3, 0]
-    const charCount = bytes.length
-
-    let result = ''
-
-    for (let idx = 0; idx < charCount; ) {
-        let char = bytes[idx++]
-        if (char & 0x80) {
-            let extraChar = extraByteMap[(char >> 3) & 0x07]
-            if (!(char & 0x40) || !extraChar || idx + extraChar > charCount) return null
-
-            char = char & (0x3f >> extraChar)
-            for (; extraChar > 0; extraChar--) {
-                const _char = bytes[idx++]
-                if ((_char & 0xc0) !== 0x80) return null
-
-                char = (char << 6) | (_char & 0x3f)
-            }
-        }
-
-        result += String.fromCharCode(char)
-    }
-
-    return result
-}
-
-/**
- * Deserializes an array of bytes into hexadecimal format.
- *
- * @method toHexString
- *
- * @param {number[]} bytes
- *
- * @returns {string | undefined}
- */
-export const toHexString = (bytes: number[]): string | undefined => {
-    if (!bytes || bytes.length <= 0) return undefined
-
-    return bytes.map((byte) => ('0' + (byte & 0xff).toString(16)).slice(-2)).join('')
-}
-
-/**
- * Returns an array of strings as the result of splitting the given string into chunks of a given size.
- *
- * @method chunkString
- *
- * @param {string} str
- * @param {number} size
- *
- * @returns {string[]}
- */
-export const chunkString = (str: string, size: number = 0): string[] => {
-    if (!str) return []
-
-    const numChunks = Math.ceil(str.length / size)
-    const chunks = new Array(numChunks)
-
-    for (let i = 0, o = 0; i < numChunks; ++i, o += size) {
-        chunks[i] = str.substr(o, size)
-    }
-
-    return chunks
-}
-
-/**
- * Formats a number into a more readable format separated by a specified delineator.
- *
- * @method delineateNumber
- *
- * @param {string} str
- * @param {',' | '.' | ''} delineator
- *
- * @returns {string}
- */
-export const delineateNumber = (str: string, delineator: ',' | '.' | '' = ','): string => {
-    if (!str) return ''
-
-    return str.toString().replace(/\B(?=(\d{3})+(?!\d))/g, delineator)
-}
-
-/**
- * Returns a promise that sets a timeout for the given duration (in milliseconds).
- *
- * @method sleep
- *
- * @param {number} ms
- *
- * @returns {Promise<number>}
- */
-export const sleep = (ms: number): Promise<number> => new Promise((resolve) => setTimeout(resolve, ms))
-
-/**
- * Returns a random value from a list of values.
- *
- * @method pick
- *
- * @param {any[]} arr
- *
- * @returns {any | undefined}
- */
-export const pick = <T>(arr: T[]): T | undefined => {
-    const length = arr?.length
-    if (length < 1) return undefined
-
-    const randIdx = Math.floor(Math.random() * length)
-    return arr[randIdx] || undefined
-}
-
-/**
- * Returns a capitalized version of a particular string.
- *
- * @method capitalize
- *
- * @param {string} str
- *
- * @returns {string}
- */
-export const capitalize = (str: string): string => {
-    if (!str) return str
-    else return str[0].toUpperCase() + str.substr(1).toLowerCase()
-}
-
-/**
- * Clamps a given number within a specified range.
- *
- * @method clamp
- *
- * @param {number} n
- * @param {number} min
- * @param {number} max
- *
- * @returns {number}
- */
-export const clamp = (n: number, min: number, max: number): number => {
-    if (Number.isNaN(n) || Number.isNaN(min) || Number.isNaN(max)) return 0
-
-    return Math.min(Math.max(n, min), max)
-}
-
-/**
- * Converts iota value-unit string to int value
- *
- * @method unitToValue
- * @param {string}
- *
- * @returns {number}
- */
-export const unitToValue = (str: string): number => {
-    const value = parseInt(str, 10)
-    const unit = str.substring(value.toString().length).toLowerCase()
-
-    switch (unit) {
-        case 'ki':
-            return value * 1000
-        case 'mi':
-            return value * 1000000
-        case 'gi':
-            return value * 1000000000
-        case 'ti':
-            return value * 1000000000000
-        case 'pi':
-            return value * 1000000000000000
-        default:
-            return value
-    }
-}
-
-/**
- * Check if value is in unit range
- *
- * @method isValueInUnitRange
- * @param {number} value
- * @param {string} unit
- *
- * @returns {boolean}
- */
-export const isValueInUnitRange = (value: number, unit: string): boolean => {
-    const ki = 1000,
-        mi = 1000000,
-        gi = 1000000000,
-        ti = 1000000000000,
-        pi = 1000000000000000
-
-    switch (unit) {
-        case 'ki':
-            return value >= ki && value <= mi
-        case 'mi':
-            return value >= mi && value <= gi
-        case 'gi':
-            return value >= gi && value <= ti
-        case 'ti':
-            return value >= ti && value <= pi
-        case 'pi':
-            return value >= pi
-        default:
-            return false
-    }
-}
-
-/**
- * Creates HTTP request headers for accepting JSON data.
- */
-export function getJsonRequestOptions(): RequestInit {
-    return {
-        headers: {
-            Accept: 'application/json',
-        },
-    }
-}
-
-/**
- * Creates an array of a given size at a given starting number.
- */
-export function range(size: number, start: number = 0): number[] {
-    if (!size || size <= 0) return []
-
-    if (!start || typeof start !== 'number') start = 0
-
-    return Array.from(Array(size), (_, idx) => idx + start)
-}
-
-/**
- * Transforms a date into a string of format "May 2022"
- */
-
-export function getMonthYear(date: Date): string {
-    return formatDate(date, { year: 'numeric', month: 'short' })
-}
-
-/*
- * Gets an object value from an object string path
- */
-export function resolveObjectPath(object: Record<string, any>, path: string, defaultValue: unknown = ''): unknown {
-    if (!object || !path) {
-        return defaultValue
-    }
-
-    return path.split('.').reduce((o, p) => o && o[p], object) ?? defaultValue
-}
-
-export const deepCopy = <T>(object: T): T => JSON.parse(JSON.stringify(object)) as T
diff --git a/packages/shared/lib/utils/getByteLengthOfString.ts b/packages/shared/lib/utils/getByteLengthOfString.ts
deleted file mode 100644
index 19d0f096de..0000000000
--- a/packages/shared/lib/utils/getByteLengthOfString.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export function getByteLengthOfString(str: string): number {
-    return new Blob([str]).size
-}
diff --git a/packages/shared/lib/utils/isNumberLetterOrPunctuation.ts b/packages/shared/lib/utils/isNumberLetterOrPunctuation.ts
deleted file mode 100644
index 49644d4159..0000000000
--- a/packages/shared/lib/utils/isNumberLetterOrPunctuation.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export function isNumberLetterOrPunctuation(key: string): boolean {
-    if (key.length !== 1) {
-        return false
-    }
-    const code = key.charCodeAt(0)
-    return (code >= 48 && code <= 57) || (code >= 65 && code <= 122)
-}
diff --git a/packages/shared/lib/utils/isValidIRC30.ts b/packages/shared/lib/utils/isValidIRC30.ts
deleted file mode 100644
index 619e21941d..0000000000
--- a/packages/shared/lib/utils/isValidIRC30.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ITokenMetadata, MAX_SUPPORTED_DECIMALS } from '@core/wallet'
-
-export function isValidIRC30(tokenMetadata: ITokenMetadata): boolean {
-    return tokenMetadata.decimals <= MAX_SUPPORTED_DECIMALS
-}
diff --git a/packages/shared/routes/dashboard/settings/views/security/ChangePincode.svelte b/packages/shared/routes/dashboard/settings/views/security/ChangePincode.svelte
index 721e309053..3a9ddf8fd9 100644
--- a/packages/shared/routes/dashboard/settings/views/security/ChangePincode.svelte
+++ b/packages/shared/routes/dashboard/settings/views/security/ChangePincode.svelte
@@ -4,7 +4,7 @@
     import { localize } from '@core/i18n'
     import { activeProfile } from '@core/profile'
     import { Platform } from '@lib/platform'
-    import { PIN_LENGTH } from '@lib/utils'
+    import { PIN_LENGTH } from '@core/utils'
 
     let currentPincode = ''
     let newPincode = ''
diff --git a/packages/shared/routes/login/views/EnterPinView.svelte b/packages/shared/routes/login/views/EnterPinView.svelte
index 6941776731..1562ed5353 100644
--- a/packages/shared/routes/login/views/EnterPinView.svelte
+++ b/packages/shared/routes/login/views/EnterPinView.svelte
@@ -6,7 +6,7 @@
     import { loginRouter } from '@core/router'
     import { Platform } from '@lib/platform'
     import { openPopup, popupState } from '@auxiliary/popup'
-    import { validatePinFormat } from '@lib/utils'
+    import { isValidPin } from '@core/utils'
     import { Icon, PinInput, Profile, Text } from 'shared/components'
     import { onDestroy } from 'svelte'
 
@@ -34,7 +34,7 @@
 
     $: hasReachedMaxAttempts = attempts >= MAX_PINCODE_INCORRECT_ATTEMPTS
     $: {
-        if (validatePinFormat(pinCode)) {
+        if (isValidPin(pinCode)) {
             void onSubmitClick()
         }
     }
diff --git a/packages/shared/routes/onboarding/views/profile-backup/views/ViewMnemonicView.svelte b/packages/shared/routes/onboarding/views/profile-backup/views/ViewMnemonicView.svelte
index dff08cc4a6..885565ac50 100644
--- a/packages/shared/routes/onboarding/views/profile-backup/views/ViewMnemonicView.svelte
+++ b/packages/shared/routes/onboarding/views/profile-backup/views/ViewMnemonicView.svelte
@@ -9,7 +9,7 @@
         generateMnemonicForOnboardingProfile,
         updateOnboardingProfile,
     } from '@contexts/onboarding'
-    import { downloadRecoveryKit } from '@lib/utils'
+    import { downloadRecoveryKit } from '@core/utils'
 
     const busy = false
     let hide = true
diff --git a/packages/shared/routes/onboarding/views/storage-protection-setup/views/SetupPinProtectionView.svelte b/packages/shared/routes/onboarding/views/storage-protection-setup/views/SetupPinProtectionView.svelte
index 8558598191..611ce1926a 100644
--- a/packages/shared/routes/onboarding/views/storage-protection-setup/views/SetupPinProtectionView.svelte
+++ b/packages/shared/routes/onboarding/views/storage-protection-setup/views/SetupPinProtectionView.svelte
@@ -13,7 +13,7 @@
     import { pollLedgerNanoStatus, stopPollingLedgerNanoStatus } from '@core/ledger'
     import { ProfileType } from '@core/profile'
     import { storageProtectionSetupRouter } from '@core/router'
-    import { validatePinFormat } from '@lib/utils'
+    import { isValidPin } from '@core/utils'
 
     export let busy = false
 
@@ -29,7 +29,7 @@
     $: setPinInput, (setPinInputError = '')
     $: confirmPinInput, (confirmPinInputError = '')
     $: arePinInputsMatching = setPinInput === confirmPinInput
-    $: arePinInputsValid = validatePinFormat(setPinInput) && validatePinFormat(confirmPinInput)
+    $: arePinInputsValid = isValidPin(setPinInput) && isValidPin(confirmPinInput)
     $: if (arePinInputsValid && !arePinInputsMatching) {
         confirmPinInputError = localize('error.pincode.match')
     } else {