diff --git a/src/app/pages/AccountDetailsPage/CardEmptyState.tsx b/src/app/components/CardEmptyState/index.tsx
similarity index 100%
rename from src/app/pages/AccountDetailsPage/CardEmptyState.tsx
rename to src/app/components/CardEmptyState/index.tsx
diff --git a/src/app/components/RuntimeEvents/RuntimeEventsDetailedList.tsx b/src/app/components/RuntimeEvents/RuntimeEventsDetailedList.tsx
index d4e13a079..705c0bff5 100644
--- a/src/app/components/RuntimeEvents/RuntimeEventsDetailedList.tsx
+++ b/src/app/components/RuntimeEvents/RuntimeEventsDetailedList.tsx
@@ -3,7 +3,7 @@ import { SearchScope } from '../../../types/searchScope'
 import { RuntimeEvent } from '../../../oasis-nexus/api'
 import { AddressSwitchOption } from '../AddressSwitch'
 import { useTranslation } from 'react-i18next'
-import { CardEmptyState } from '../../pages/AccountDetailsPage/CardEmptyState'
+import { CardEmptyState } from '../../components/CardEmptyState'
 import { TextSkeleton } from '../Skeleton'
 import { RuntimeEventDetails } from './RuntimeEventDetails'
 import Divider from '@mui/material/Divider'
diff --git a/src/app/pages/AccountDetailsPage/AccountDetailsView.tsx b/src/app/pages/AccountDetailsPage/AccountDetailsView.tsx
index 4d752a005..4cfabbc13 100644
--- a/src/app/pages/AccountDetailsPage/AccountDetailsView.tsx
+++ b/src/app/pages/AccountDetailsPage/AccountDetailsView.tsx
@@ -2,7 +2,7 @@ import { FC } from 'react'
 import { EvmToken, RuntimeAccount } from '../../../oasis-nexus/api'
 import { useTranslation } from 'react-i18next'
 import { TokenPriceInfo } from '../../../coin-gecko/api'
-import { CardEmptyState } from './CardEmptyState'
+import { CardEmptyState } from '../../components/CardEmptyState'
 import { Account } from '../../components/Account'
 
 export const AccountDetailsView: FC<{
diff --git a/src/app/pages/AccountDetailsPage/AccountNFTCollectionCard.tsx b/src/app/pages/AccountDetailsPage/AccountNFTCollectionCard.tsx
index e56514dcc..a03739e64 100644
--- a/src/app/pages/AccountDetailsPage/AccountNFTCollectionCard.tsx
+++ b/src/app/pages/AccountDetailsPage/AccountNFTCollectionCard.tsx
@@ -19,7 +19,7 @@ import { AccountLink } from 'app/components/Account/AccountLink'
 import { CopyToClipboard } from 'app/components/CopyToClipboard'
 import { AddressLoaderData, RouteUtils } from 'app/utils/route-utils'
 import { ImageListItemImage } from '../TokenDashboardPage/ImageListItemImage'
-import { CardEmptyState } from '../AccountDetailsPage/CardEmptyState'
+import { CardEmptyState } from '../../components/CardEmptyState'
 import { TablePagination } from '../../components/Table/TablePagination'
 import { useAccountTokenInventory } from '../TokenDashboardPage/hook'
 import { EvmNft } from 'oasis-nexus/api'
diff --git a/src/app/pages/AccountDetailsPage/AccountTokenTransfersCard.tsx b/src/app/pages/AccountDetailsPage/AccountTokenTransfersCard.tsx
index 1e49ad590..d117928c5 100644
--- a/src/app/pages/AccountDetailsPage/AccountTokenTransfersCard.tsx
+++ b/src/app/pages/AccountDetailsPage/AccountTokenTransfersCard.tsx
@@ -6,7 +6,7 @@ import CardContent from '@mui/material/CardContent'
 import { NUMBER_OF_ITEMS_ON_SEPARATE_PAGE } from '../../config'
 import { ErrorBoundary } from '../../components/ErrorBoundary'
 import { LinkableDiv } from '../../components/PageLayout/LinkableDiv'
-import { CardEmptyState } from './CardEmptyState'
+import { CardEmptyState } from '../../components/CardEmptyState'
 import { useTokenTransfers } from '../TokenDashboardPage/hook'
 import { TokenTransfers } from '../../components/Tokens/TokenTransfers'
 import { AccountDetailsContext } from './index'
diff --git a/src/app/pages/AccountDetailsPage/AccountTokensCard.tsx b/src/app/pages/AccountDetailsPage/AccountTokensCard.tsx
index ee535c307..71e15c55e 100644
--- a/src/app/pages/AccountDetailsPage/AccountTokensCard.tsx
+++ b/src/app/pages/AccountDetailsPage/AccountTokensCard.tsx
@@ -6,7 +6,7 @@ import Card from '@mui/material/Card'
 import CardHeader from '@mui/material/CardHeader'
 import CardContent from '@mui/material/CardContent'
 import Link from '@mui/material/Link'
-import { CardEmptyState } from './CardEmptyState'
+import { CardEmptyState } from '../../components/CardEmptyState'
 import { Table, TableCellAlign, TableColProps } from '../../components/Table'
 import { CopyToClipboard } from '../../components/CopyToClipboard'
 import { NUMBER_OF_ITEMS_ON_SEPARATE_PAGE } from '../../config'
diff --git a/src/app/pages/AccountDetailsPage/AccountTransactionsCard.tsx b/src/app/pages/AccountDetailsPage/AccountTransactionsCard.tsx
index fb0e4f956..848eceb1c 100644
--- a/src/app/pages/AccountDetailsPage/AccountTransactionsCard.tsx
+++ b/src/app/pages/AccountDetailsPage/AccountTransactionsCard.tsx
@@ -7,7 +7,7 @@ import { RuntimeTransactions } from '../../components/Transactions'
 import { NUMBER_OF_ITEMS_ON_SEPARATE_PAGE } from '../../config'
 import { ErrorBoundary } from '../../components/ErrorBoundary'
 import { LinkableDiv } from '../../components/PageLayout/LinkableDiv'
-import { CardEmptyState } from './CardEmptyState'
+import { CardEmptyState } from '../../components/CardEmptyState'
 import { useAccountTransactions } from './hook'
 import { AccountDetailsContext } from './index'
 
diff --git a/src/app/pages/AccountDetailsPage/ContractCodeCard.tsx b/src/app/pages/AccountDetailsPage/ContractCodeCard.tsx
index 546d7adcc..bf32e057d 100644
--- a/src/app/pages/AccountDetailsPage/ContractCodeCard.tsx
+++ b/src/app/pages/AccountDetailsPage/ContractCodeCard.tsx
@@ -4,7 +4,7 @@ import Card from '@mui/material/Card'
 import CardContent from '@mui/material/CardContent'
 import { LinkableDiv } from '../../components/PageLayout/LinkableDiv'
 import { useAccount } from './hook'
-import { CardEmptyState } from './CardEmptyState'
+import { CardEmptyState } from '../../components/CardEmptyState'
 import { TokenDashboardContext } from '../TokenDashboardPage'
 import { RawDataDisplay } from '../../components/CodeDisplay'
 
diff --git a/src/app/pages/NFTInstanceDashboardPage/NFTMetadataCard.tsx b/src/app/pages/NFTInstanceDashboardPage/NFTMetadataCard.tsx
index 5303130da..745469c45 100644
--- a/src/app/pages/NFTInstanceDashboardPage/NFTMetadataCard.tsx
+++ b/src/app/pages/NFTInstanceDashboardPage/NFTMetadataCard.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next'
 import Card from '@mui/material/Card'
 import CardContent from '@mui/material/CardContent'
 import { LinkableDiv } from '../../components/PageLayout/LinkableDiv'
-import { CardEmptyState } from './../AccountDetailsPage/CardEmptyState'
+import { CardEmptyState } from '../../components/CardEmptyState'
 import { NftDashboardContext } from '../NFTInstanceDashboardPage'
 import { JsonCodeDisplay } from '../../components/CodeDisplay'
 import { useNFTInstance } from '../TokenDashboardPage/hook'
diff --git a/src/app/pages/NFTInstanceDashboardPage/NFTTokenTransfersCard.tsx b/src/app/pages/NFTInstanceDashboardPage/NFTTokenTransfersCard.tsx
index b76e82680..f0b05555a 100644
--- a/src/app/pages/NFTInstanceDashboardPage/NFTTokenTransfersCard.tsx
+++ b/src/app/pages/NFTInstanceDashboardPage/NFTTokenTransfersCard.tsx
@@ -8,7 +8,7 @@ import { ErrorBoundary } from '../../components/ErrorBoundary'
 import { TokenTransfers } from '../../components/Tokens/TokenTransfers'
 import { LinkableDiv } from '../../components/PageLayout/LinkableDiv'
 import { NftDashboardContext } from './'
-import { CardEmptyState } from '../AccountDetailsPage/CardEmptyState'
+import { CardEmptyState } from '../../components/CardEmptyState'
 import { useNFTInstanceTransfers } from '../TokenDashboardPage/hook'
 
 export const nftTokenTransfersContainerId = 'nftTokenTransfers'
diff --git a/src/app/pages/TokenDashboardPage/TokenHoldersCard.tsx b/src/app/pages/TokenDashboardPage/TokenHoldersCard.tsx
index d74731922..3be9c5bb3 100644
--- a/src/app/pages/TokenDashboardPage/TokenHoldersCard.tsx
+++ b/src/app/pages/TokenDashboardPage/TokenHoldersCard.tsx
@@ -6,7 +6,7 @@ import CardContent from '@mui/material/CardContent'
 import { NUMBER_OF_ITEMS_ON_SEPARATE_PAGE } from '../../config'
 import { ErrorBoundary } from '../../components/ErrorBoundary'
 import { LinkableDiv } from '../../components/PageLayout/LinkableDiv'
-import { CardEmptyState } from '../AccountDetailsPage/CardEmptyState'
+import { CardEmptyState } from '../../components/CardEmptyState'
 import { useTokenHolders, useTokenInfo } from './hook'
 import { TokenHolders } from '../../components/Tokens/TokenHolders'
 import { TokenDashboardContext } from './index'
diff --git a/src/app/pages/TokenDashboardPage/TokenInventoryCard.tsx b/src/app/pages/TokenDashboardPage/TokenInventoryCard.tsx
index eac26aeb1..e050a0cb6 100644
--- a/src/app/pages/TokenDashboardPage/TokenInventoryCard.tsx
+++ b/src/app/pages/TokenDashboardPage/TokenInventoryCard.tsx
@@ -9,7 +9,7 @@ import ImageListItem from '@mui/material/ImageListItem'
 import ImageListItemBar from '@mui/material/ImageListItemBar'
 import { ErrorBoundary } from '../../components/ErrorBoundary'
 import { LinkableDiv } from '../../components/PageLayout/LinkableDiv'
-import { CardEmptyState } from '../AccountDetailsPage/CardEmptyState'
+import { CardEmptyState } from '../../components/CardEmptyState'
 import { TokenDashboardContext } from './index'
 import { RouteUtils } from '../../utils/route-utils'
 import { TablePagination } from '../../components/Table/TablePagination'
diff --git a/src/app/pages/TokenDashboardPage/TokenTransfersCard.tsx b/src/app/pages/TokenDashboardPage/TokenTransfersCard.tsx
index 629be0d4e..b34a61c1a 100644
--- a/src/app/pages/TokenDashboardPage/TokenTransfersCard.tsx
+++ b/src/app/pages/TokenDashboardPage/TokenTransfersCard.tsx
@@ -6,7 +6,7 @@ import CardContent from '@mui/material/CardContent'
 import { NUMBER_OF_ITEMS_ON_SEPARATE_PAGE } from '../../config'
 import { ErrorBoundary } from '../../components/ErrorBoundary'
 import { TokenTransfers } from '../../components/Tokens/TokenTransfers'
-import { CardEmptyState } from '../AccountDetailsPage/CardEmptyState'
+import { CardEmptyState } from '../../components/CardEmptyState'
 import { useAccount } from '../AccountDetailsPage/hook'
 import { useTokenInfo, useTokenTransfers } from './hook'
 import { TokenDashboardContext } from './index'