diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
index 4758911a25..3781bde624 100644
--- a/core/ui/build.gradle.kts
+++ b/core/ui/build.gradle.kts
@@ -1,5 +1,3 @@
-import com.android.ide.common.resources.generateLocaleList
-
 plugins {
     alias(deps.plugins.android.library)
     alias(deps.plugins.kotlin.android)
@@ -42,6 +40,7 @@ dependencies {
     implementation(deps.compose.coil)
     implementation(deps.compose.navigation)
     implementation(deps.compose.navigation.hilt)
+    implementation(deps.compose.reorderable)
 
     /** Other libraries */
     implementation(deps.compose.accompanist.systemUiController)
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/TokenItem.kt b/core/ui/src/main/java/com/tangem/core/ui/components/token/TokenItem.kt
similarity index 76%
rename from features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/TokenItem.kt
rename to core/ui/src/main/java/com/tangem/core/ui/components/token/TokenItem.kt
index 1917d4e4c8..8bdd28b235 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/TokenItem.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/token/TokenItem.kt
@@ -1,4 +1,4 @@
-package com.tangem.feature.wallet.presentation.common.component
+package com.tangem.core.ui.components.token
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
@@ -16,15 +16,18 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
 import androidx.compose.ui.unit.Constraints
+import com.tangem.core.ui.R
 import com.tangem.core.ui.components.currency.icon.CurrencyIcon
+import com.tangem.core.ui.components.currency.icon.CurrencyIconState
 import com.tangem.core.ui.components.marketprice.PriceChangeType
+import com.tangem.core.ui.components.token.internal.*
+import com.tangem.core.ui.components.token.state.TokenItemState
 import com.tangem.core.ui.extensions.rememberHapticFeedback
+import com.tangem.core.ui.res.TangemColorPalette
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
-import com.tangem.feature.wallet.presentation.common.WalletPreviewData
-import com.tangem.feature.wallet.presentation.common.component.token.*
-import com.tangem.feature.wallet.presentation.common.state.TokenItemState
 import org.burnoutcrew.reorderable.ReorderableLazyListState
+import java.util.UUID
 import kotlin.math.max
 
 private const val TITLE_MIN_WIDTH_COEFFICIENT = 0.3
@@ -35,7 +38,7 @@ private enum class LayoutId {
 }
 
 @Composable
-internal fun TokenItem(
+fun TokenItem(
     state: TokenItemState,
     isBalanceHidden: Boolean,
     modifier: Modifier = Modifier,
@@ -397,8 +400,8 @@ private fun Preview_TokenItem_InLight(@PreviewParameter(TokenItemStateProvider::
 
 private class TokenItemStateProvider : CollectionPreviewParameterProvider<TokenItemState>(
     collection = listOf(
-        WalletPreviewData.tokenItemVisibleState.copy(
-            iconState = WalletPreviewData.coinIconState.copy(showCustomBadge = true),
+        tokenItemVisibleState.copy(
+            iconState = coinIconState.copy(showCustomBadge = true),
             titleState = TokenItemState.TitleState.Content(
                 text = "PolygonPolygonPolygonPolygonPolygonPolygon",
                 hasPending = true,
@@ -414,13 +417,101 @@ private class TokenItemStateProvider : CollectionPreviewParameterProvider<TokenI
                 type = PriceChangeType.UP,
             ),
         ),
-        WalletPreviewData.tokenItemUnreachableState,
-        WalletPreviewData.tokenItemNoAddressState,
-        WalletPreviewData.tokenItemDragState,
-        WalletPreviewData.tokenItemHiddenState,
-        WalletPreviewData.loadingTokenItemState,
-        WalletPreviewData.testnetTokenItemVisibleState,
-        WalletPreviewData.customTokenItemVisibleState,
-        WalletPreviewData.customTestnetTokenItemVisibleState,
+        TokenItemState.Unreachable(
+            id = UUID.randomUUID().toString(),
+            iconState = tokenIconState,
+            titleState = TokenItemState.TitleState.Content(text = "Polygon"),
+            onItemClick = {},
+            onItemLongClick = {},
+        ),
+        TokenItemState.NoAddress(
+            id = UUID.randomUUID().toString(),
+            iconState = tokenIconState,
+            titleState = TokenItemState.TitleState.Content(text = "Polygon"),
+            onItemLongClick = {},
+        ),
+        TokenItemState.Draggable(
+            id = UUID.randomUUID().toString(),
+            iconState = tokenIconState,
+            titleState = TokenItemState.TitleState.Content(text = "Polygon"),
+            cryptoAmountState = TokenItemState.CryptoAmountState.Content(text = "3 172,14 $"),
+        ),
+        TokenItemState.Content(
+            id = UUID.randomUUID().toString(),
+            iconState = tokenIconState,
+            titleState = TokenItemState.TitleState.Content(text = "Polygon"),
+            fiatAmountState = TokenItemState.FiatAmountState.Content(text = "321 $", hasStaked = false),
+            cryptoAmountState = TokenItemState.CryptoAmountState.Content(text = "5,412 MATIC"),
+            cryptoPriceState = TokenItemState.CryptoPriceState.Content(
+                price = "312 USD",
+                priceChangePercent = "2.0%",
+                type = PriceChangeType.UP,
+            ),
+            onItemClick = {},
+            onItemLongClick = {},
+        ),
+        TokenItemState.Loading(
+            id = "Loading#1",
+            iconState = customTokenIconState.copy(isGrayscale = true),
+            titleState = TokenItemState.TitleState.Content(text = "Polygon"),
+        ),
+        tokenItemVisibleState.copy(
+            titleState = TokenItemState.TitleState.Content(text = "Polygon testnet"),
+            iconState = tokenIconState.copy(isGrayscale = true),
+        ),
+        tokenItemVisibleState.copy(
+            titleState = TokenItemState.TitleState.Content(text = "Polygon"),
+            iconState = customTokenIconState.copy(
+                tint = TangemColorPalette.White,
+                background = TangemColorPalette.Black,
+            ),
+        ),
+        tokenItemVisibleState.copy(
+            titleState = TokenItemState.TitleState.Content(text = "Polygon"),
+            iconState = customTokenIconState.copy(isGrayscale = true),
+        ),
     ),
-)
\ No newline at end of file
+) {
+
+    companion object {
+
+        val coinIconState
+            get() = CurrencyIconState.CoinIcon(
+                url = null,
+                fallbackResId = R.drawable.img_polygon_22,
+                isGrayscale = false,
+                showCustomBadge = false,
+            )
+
+        val tokenIconState
+            get() = CurrencyIconState.TokenIcon(
+                url = null,
+                topBadgeIconResId = R.drawable.img_polygon_22,
+                fallbackTint = TangemColorPalette.Black,
+                fallbackBackground = TangemColorPalette.Meadow,
+                isGrayscale = false,
+                showCustomBadge = false,
+            )
+
+        private val customTokenIconState
+            get() = CurrencyIconState.CustomTokenIcon(
+                tint = TangemColorPalette.Black,
+                background = TangemColorPalette.Meadow,
+                topBadgeIconResId = R.drawable.img_polygon_22,
+                isGrayscale = false,
+            )
+
+        val tokenItemVisibleState by lazy {
+            TokenItemState.Content(
+                id = UUID.randomUUID().toString(),
+                iconState = coinIconState,
+                titleState = TokenItemState.TitleState.Content(text = "Polygon", hasPending = true),
+                fiatAmountState = TokenItemState.FiatAmountState.Content(text = "321 $", hasStaked = true),
+                cryptoAmountState = TokenItemState.CryptoAmountState.Content(text = "5,412 MATIC"),
+                cryptoPriceState = TokenItemState.CryptoPriceState.Unknown,
+                onItemClick = {},
+                onItemLongClick = {},
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/LockedRectangle.kt b/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/LockedRectangle.kt
similarity index 88%
rename from features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/LockedRectangle.kt
rename to core/ui/src/main/java/com/tangem/core/ui/components/token/internal/LockedRectangle.kt
index 238d2ebb0d..be74ae4cb5 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/LockedRectangle.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/LockedRectangle.kt
@@ -1,4 +1,4 @@
-package com.tangem.feature.wallet.presentation.common.component.token
+package com.tangem.core.ui.components.token.internal
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/NonFiatContentBlock.kt b/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/NonFiatContentBlock.kt
similarity index 93%
rename from features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/NonFiatContentBlock.kt
rename to core/ui/src/main/java/com/tangem/core/ui/components/token/internal/NonFiatContentBlock.kt
index ab86fc3d08..5e486a5078 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/NonFiatContentBlock.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/NonFiatContentBlock.kt
@@ -1,4 +1,4 @@
-package com.tangem.feature.wallet.presentation.common.component.token
+package com.tangem.core.ui.components.token.internal
 
 import androidx.annotation.StringRes
 import androidx.compose.animation.AnimatedContent
@@ -12,9 +12,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
+import com.tangem.core.ui.R
+import com.tangem.core.ui.components.token.state.TokenItemState
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.feature.wallet.impl.R
-import com.tangem.feature.wallet.presentation.common.state.TokenItemState
 import org.burnoutcrew.reorderable.ReorderableLazyListState
 import org.burnoutcrew.reorderable.detectReorder
 
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenCryptoAmount.kt b/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenCryptoAmount.kt
similarity index 89%
rename from features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenCryptoAmount.kt
rename to core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenCryptoAmount.kt
index b68b55f129..bc87d3d276 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenCryptoAmount.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenCryptoAmount.kt
@@ -1,4 +1,4 @@
-package com.tangem.feature.wallet.presentation.common.component.token
+package com.tangem.core.ui.components.token.internal
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -8,11 +8,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
+import com.tangem.core.ui.R
 import com.tangem.core.ui.components.RectangleShimmer
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.feature.wallet.impl.R
 import com.tangem.utils.StringsSigns
-import com.tangem.feature.wallet.presentation.common.state.TokenItemState.CryptoAmountState as TokenCryptoAmountState
+import com.tangem.core.ui.components.token.state.TokenItemState.CryptoAmountState as TokenCryptoAmountState
 
 @Composable
 internal fun TokenCryptoAmount(
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenFiatAmount.kt b/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenFiatAmount.kt
similarity index 92%
rename from features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenFiatAmount.kt
rename to core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenFiatAmount.kt
index 4c0c3f8009..2f33bf4019 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenFiatAmount.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenFiatAmount.kt
@@ -1,4 +1,4 @@
-package com.tangem.feature.wallet.presentation.common.component.token
+package com.tangem.core.ui.components.token.internal
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Row
@@ -14,11 +14,11 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.style.TextOverflow
+import com.tangem.core.ui.R
 import com.tangem.core.ui.components.RectangleShimmer
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.feature.wallet.impl.R
 import com.tangem.utils.StringsSigns
-import com.tangem.feature.wallet.presentation.common.state.TokenItemState.FiatAmountState as TokenFiatAmountState
+import com.tangem.core.ui.components.token.state.TokenItemState.FiatAmountState as TokenFiatAmountState
 
 @Composable
 internal fun TokenFiatAmount(state: TokenFiatAmountState?, isBalanceHidden: Boolean, modifier: Modifier = Modifier) {
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenPrice.kt b/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenPrice.kt
similarity index 95%
rename from features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenPrice.kt
rename to core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenPrice.kt
index 4df035cf66..1d257b4853 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenPrice.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenPrice.kt
@@ -1,4 +1,4 @@
-package com.tangem.feature.wallet.presentation.common.component.token
+package com.tangem.core.ui.components.token.internal
 
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.foundation.layout.Row
@@ -12,14 +12,14 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextOverflow
+import com.tangem.core.ui.R
 import com.tangem.core.ui.components.RectangleShimmer
 import com.tangem.core.ui.components.SpacerW4
 import com.tangem.core.ui.components.SpacerW6
 import com.tangem.core.ui.components.marketprice.PriceChangeType
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.feature.wallet.impl.R
 import com.tangem.utils.StringsSigns.DASH_SIGN
-import com.tangem.feature.wallet.presentation.common.state.TokenItemState.CryptoPriceState as TokenPriceChangeState
+import com.tangem.core.ui.components.token.state.TokenItemState.CryptoPriceState as TokenPriceChangeState
 
 @Composable
 internal fun TokenPrice(state: TokenPriceChangeState?, modifier: Modifier = Modifier) {
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenTitle.kt b/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenTitle.kt
similarity index 92%
rename from features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenTitle.kt
rename to core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenTitle.kt
index e5b3050a53..706120f20e 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenTitle.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenTitle.kt
@@ -1,4 +1,4 @@
-package com.tangem.feature.wallet.presentation.common.component.token
+package com.tangem.core.ui.components.token.internal
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.Image
@@ -13,10 +13,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextOverflow
+import com.tangem.core.ui.R
 import com.tangem.core.ui.components.RectangleShimmer
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.feature.wallet.impl.R
-import com.tangem.feature.wallet.presentation.common.state.TokenItemState.TitleState as TokenTitleState
+import com.tangem.core.ui.components.token.state.TokenItemState.TitleState as TokenTitleState
 
 @Composable
 internal fun TokenTitle(state: TokenTitleState?, modifier: Modifier = Modifier) {
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/state/TokenItemState.kt b/core/ui/src/main/java/com/tangem/core/ui/components/token/state/TokenItemState.kt
similarity index 98%
rename from features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/state/TokenItemState.kt
rename to core/ui/src/main/java/com/tangem/core/ui/components/token/state/TokenItemState.kt
index 2ece6053fc..832b849235 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/state/TokenItemState.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/token/state/TokenItemState.kt
@@ -1,4 +1,4 @@
-package com.tangem.feature.wallet.presentation.common.state
+package com.tangem.core.ui.components.token.state
 
 import androidx.compose.runtime.Immutable
 import com.tangem.core.ui.components.currency.icon.CurrencyIconState
@@ -6,7 +6,7 @@ import com.tangem.core.ui.components.marketprice.PriceChangeType
 
 /** Token item state */
 @Immutable
-internal sealed class TokenItemState {
+sealed class TokenItemState {
 
     abstract val id: String
 
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/WalletPreviewData.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/WalletPreviewData.kt
index 0ad7e674a7..16cf6e8e9e 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/WalletPreviewData.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/WalletPreviewData.kt
@@ -2,13 +2,12 @@ package com.tangem.feature.wallet.presentation.common
 
 import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
 import com.tangem.core.ui.components.currency.icon.CurrencyIconState
-import com.tangem.core.ui.components.marketprice.PriceChangeType
+import com.tangem.core.ui.components.token.state.TokenItemState
 import com.tangem.core.ui.event.consumedEvent
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.res.TangemColorPalette
 import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.feature.wallet.impl.R
-import com.tangem.feature.wallet.presentation.common.state.TokenItemState
 import com.tangem.feature.wallet.presentation.organizetokens.model.DraggableItem
 import com.tangem.feature.wallet.presentation.organizetokens.model.OrganizeTokensListState
 import com.tangem.feature.wallet.presentation.organizetokens.model.OrganizeTokensState
@@ -66,122 +65,22 @@ internal object WalletPreviewData {
         )
     }
 
-    val coinIconState
-        get() = CurrencyIconState.CoinIcon(
-            url = null,
-            fallbackResId = R.drawable.img_polygon_22,
-            isGrayscale = false,
-            showCustomBadge = false,
-        )
-
-    private val tokenIconState
-        get() = CurrencyIconState.TokenIcon(
-            url = null,
-            topBadgeIconResId = R.drawable.img_polygon_22,
-            fallbackTint = TangemColorPalette.Black,
-            fallbackBackground = TangemColorPalette.Meadow,
-            isGrayscale = false,
-            showCustomBadge = false,
-        )
-
-    private val customTokenIconState
-        get() = CurrencyIconState.CustomTokenIcon(
-            tint = TangemColorPalette.Black,
-            background = TangemColorPalette.Meadow,
-            topBadgeIconResId = R.drawable.img_polygon_22,
-            isGrayscale = false,
-        )
-
-    val tokenItemVisibleState by lazy {
-        TokenItemState.Content(
-            id = UUID.randomUUID().toString(),
-            iconState = coinIconState,
-            titleState = TokenItemState.TitleState.Content(text = "Polygon", hasPending = true),
-            fiatAmountState = TokenItemState.FiatAmountState.Content(text = "321 $", hasStaked = true),
-            cryptoAmountState = TokenItemState.CryptoAmountState.Content(text = "5,412 MATIC"),
-            cryptoPriceState = TokenItemState.CryptoPriceState.Unknown,
-            onItemClick = {},
-            onItemLongClick = {},
-        )
-    }
-
-    val testnetTokenItemVisibleState by lazy {
-        tokenItemVisibleState.copy(
-            titleState = TokenItemState.TitleState.Content(text = "Polygon testnet"),
-            iconState = tokenIconState.copy(isGrayscale = true),
-        )
-    }
-
-    val tokenItemHiddenState by lazy {
-        TokenItemState.Content(
-            id = UUID.randomUUID().toString(),
-            iconState = tokenIconState,
-            titleState = TokenItemState.TitleState.Content(text = "Polygon"),
-            fiatAmountState = TokenItemState.FiatAmountState.Content(text = "321 $", hasStaked = false),
-            cryptoAmountState = TokenItemState.CryptoAmountState.Content(text = "5,412 MATIC"),
-            cryptoPriceState = TokenItemState.CryptoPriceState.Content(
-                price = "312 USD",
-                priceChangePercent = "2.0%",
-                type = PriceChangeType.UP,
-            ),
-            onItemClick = {},
-            onItemLongClick = {},
-        )
-    }
-
-    val tokenItemDragState by lazy {
+    private val tokenItemDragState by lazy {
         TokenItemState.Draggable(
             id = UUID.randomUUID().toString(),
-            iconState = tokenIconState,
+            iconState = CurrencyIconState.TokenIcon(
+                url = null,
+                topBadgeIconResId = R.drawable.img_polygon_22,
+                fallbackTint = TangemColorPalette.Black,
+                fallbackBackground = TangemColorPalette.Meadow,
+                isGrayscale = false,
+                showCustomBadge = false,
+            ),
             titleState = TokenItemState.TitleState.Content(text = "Polygon"),
             cryptoAmountState = TokenItemState.CryptoAmountState.Content(text = "3 172,14 $"),
         )
     }
 
-    val tokenItemUnreachableState by lazy {
-        TokenItemState.Unreachable(
-            id = UUID.randomUUID().toString(),
-            iconState = tokenIconState,
-            titleState = TokenItemState.TitleState.Content(text = "Polygon"),
-            onItemClick = {},
-            onItemLongClick = {},
-        )
-    }
-
-    val tokenItemNoAddressState by lazy {
-        TokenItemState.NoAddress(
-            id = UUID.randomUUID().toString(),
-            iconState = tokenIconState,
-            titleState = TokenItemState.TitleState.Content(text = "Polygon"),
-            onItemLongClick = {},
-        )
-    }
-
-    val customTokenItemVisibleState by lazy {
-        tokenItemVisibleState.copy(
-            titleState = TokenItemState.TitleState.Content(text = "Polygon"),
-            iconState = customTokenIconState.copy(
-                tint = TangemColorPalette.White,
-                background = TangemColorPalette.Black,
-            ),
-        )
-    }
-
-    val customTestnetTokenItemVisibleState by lazy {
-        tokenItemVisibleState.copy(
-            titleState = TokenItemState.TitleState.Content(text = "Polygon"),
-            iconState = customTokenIconState.copy(isGrayscale = true),
-        )
-    }
-
-    val loadingTokenItemState by lazy {
-        TokenItemState.Loading(
-            id = "Loading#1",
-            iconState = customTokenIconState.copy(isGrayscale = true),
-            titleState = TokenItemState.TitleState.Content(text = "Polygon"),
-        )
-    }
-
     private const val networksSize = 10
     private const val tokensSize = 3
     private val draggableItems by lazy {
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/preview/WalletScreenPreviewData.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/preview/WalletScreenPreviewData.kt
index 635afd0fc9..12dcfa641f 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/preview/WalletScreenPreviewData.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/preview/WalletScreenPreviewData.kt
@@ -2,6 +2,7 @@ package com.tangem.feature.wallet.presentation.common.preview
 
 import com.tangem.core.ui.components.currency.icon.CurrencyIconState
 import com.tangem.core.ui.components.marketprice.PriceChangeType
+import com.tangem.core.ui.components.token.state.TokenItemState
 import com.tangem.core.ui.event.consumedEvent
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.stringReference
@@ -9,7 +10,6 @@ import com.tangem.core.ui.utils.BigDecimalFormatter
 import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.common.WalletPreviewData.topBarConfig
-import com.tangem.feature.wallet.presentation.common.state.TokenItemState
 import com.tangem.feature.wallet.presentation.wallet.state.model.*
 import kotlinx.collections.immutable.persistentListOf
 
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/OrganizeTokensScreen.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/OrganizeTokensScreen.kt
index 6c3aea984f..437fd6b480 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/OrganizeTokensScreen.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/OrganizeTokensScreen.kt
@@ -32,6 +32,7 @@ import com.tangem.core.ui.components.PrimaryButton
 import com.tangem.core.ui.components.SecondaryButton
 import com.tangem.core.ui.components.buttons.actions.ActionButtonConfig
 import com.tangem.core.ui.components.buttons.actions.RoundedActionButton
+import com.tangem.core.ui.components.token.TokenItem
 import com.tangem.core.ui.event.EventEffect
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.res.TangemTheme
@@ -40,7 +41,6 @@ import com.tangem.core.ui.utils.WindowInsetsZero
 import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.common.WalletPreviewData
 import com.tangem.feature.wallet.presentation.common.component.DraggableNetworkGroupItem
-import com.tangem.feature.wallet.presentation.common.component.TokenItem
 import com.tangem.feature.wallet.presentation.organizetokens.model.DraggableItem
 import com.tangem.feature.wallet.presentation.organizetokens.model.OrganizeTokensListState
 import com.tangem.feature.wallet.presentation.organizetokens.model.OrganizeTokensState
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/model/DraggableItem.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/model/DraggableItem.kt
index f7c411a377..37387e16c8 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/model/DraggableItem.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/model/DraggableItem.kt
@@ -1,7 +1,7 @@
 package com.tangem.feature.wallet.presentation.organizetokens.model
 
 import androidx.compose.runtime.Immutable
-import com.tangem.feature.wallet.presentation.common.state.TokenItemState
+import com.tangem.core.ui.components.token.state.TokenItemState
 import com.tangem.feature.wallet.presentation.organizetokens.model.DraggableItem.RoundingMode
 
 /**
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/converter/items/CryptoCurrencyToDraggableItemConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/converter/items/CryptoCurrencyToDraggableItemConverter.kt
index 93f8267b5e..73eaaeb43b 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/converter/items/CryptoCurrencyToDraggableItemConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/converter/items/CryptoCurrencyToDraggableItemConverter.kt
@@ -1,10 +1,10 @@
 package com.tangem.feature.wallet.presentation.organizetokens.utils.converter.items
 
 import com.tangem.core.ui.components.currency.icon.converter.CryptoCurrencyToIconStateConverter
+import com.tangem.core.ui.components.token.state.TokenItemState
 import com.tangem.core.ui.utils.BigDecimalFormatter
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
-import com.tangem.feature.wallet.presentation.common.state.TokenItemState
 import com.tangem.feature.wallet.presentation.organizetokens.model.DraggableItem
 import com.tangem.feature.wallet.presentation.organizetokens.utils.common.getGroupHeaderId
 import com.tangem.feature.wallet.presentation.organizetokens.utils.common.getTokenItemId
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletTokensListState.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletTokensListState.kt
index 62f9ca68a1..c582f8d8d8 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletTokensListState.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletTokensListState.kt
@@ -1,9 +1,9 @@
 package com.tangem.feature.wallet.presentation.wallet.state.model
 
 import androidx.compose.runtime.Immutable
+import com.tangem.core.ui.components.token.state.TokenItemState
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.feature.wallet.impl.R
-import com.tangem.feature.wallet.presentation.common.state.TokenItemState
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TokenItemStateConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TokenItemStateConverter.kt
index 9abebae38f..e47f61c804 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TokenItemStateConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TokenItemStateConverter.kt
@@ -4,11 +4,11 @@ import com.tangem.common.extensions.isZero
 import com.tangem.core.ui.components.currency.icon.converter.CryptoCurrencyToIconStateConverter
 import com.tangem.core.ui.components.marketprice.PriceChangeType
 import com.tangem.core.ui.components.marketprice.utils.PriceChangeConverter
+import com.tangem.core.ui.components.token.state.TokenItemState
 import com.tangem.core.ui.utils.BigDecimalFormatter
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.staking.model.stakekit.YieldBalance
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
-import com.tangem.feature.wallet.presentation.common.state.TokenItemState
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntents
 import com.tangem.utils.Provider
 import com.tangem.utils.StringsSigns.DASH_SIGN
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyContentItem.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyContentItem.kt
index 9d39d7fcbc..87d84a3a64 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyContentItem.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyContentItem.kt
@@ -2,9 +2,9 @@ package com.tangem.feature.wallet.presentation.wallet.ui.components.multicurrenc
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import com.tangem.core.ui.components.token.TokenItem
 import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.feature.wallet.presentation.common.component.NetworkGroupItem
-import com.tangem.feature.wallet.presentation.common.component.TokenItem
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletTokensListState.TokensListItemState
 
 /**