diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1ff2af8354..7817290795 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -33,13 +33,13 @@ configurations.all {
 
 dependencies {
     implementation(files("libs/walletconnect-1.5.6.aar"))
-    implementation(project(":domain:legacy"))
-    implementation(project(":domain:models"))
-    implementation(project(":domain:core"))
+    implementation(projects.domain.legacy)
+    implementation(projects.domain.models)
+    implementation(projects.domain.core)
     implementation(projects.domain.card)
     implementation(projects.domain.demo)
-    implementation(project(":domain:wallets"))
-    implementation(project(":domain:wallets:models"))
+    implementation(projects.domain.wallets)
+    implementation(projects.domain.wallets.models)
     implementation(projects.domain.settings)
     implementation(projects.domain.tokens)
     implementation(projects.domain.tokens.models)
@@ -48,21 +48,24 @@ dependencies {
     implementation(projects.domain.appCurrency.models)
     implementation(projects.domain.appTheme)
     implementation(projects.domain.appTheme.models)
+    implementation(projects.domain.balanceHiding)
+    implementation(projects.domain.balanceHiding.models)
 
-    implementation(project(":common"))
-    implementation(project(":core:analytics"))
+    implementation(projects.common)
+    implementation(projects.core.analytics)
     implementation(projects.core.analytics.models)
-    implementation(project(":core:navigation"))
-    implementation(project(":core:featuretoggles"))
-    implementation(project(":core:res"))
-    implementation(project(":core:ui"))
-    implementation(project(":core:datasource"))
-    implementation(project(":core:utils"))
-    implementation(project(":libs:crypto"))
-    implementation(project(":libs:auth"))
+    implementation(projects.core.navigation)
+    implementation(projects.core.featuretoggles)
+    implementation(projects.core.res)
+    implementation(projects.core.ui)
+    implementation(projects.core.datasource)
+    implementation(projects.core.utils)
+    implementation(projects.libs.crypto)
+    implementation(projects.libs.auth)
 
     implementation(projects.data.appCurrency)
     implementation(projects.data.appTheme)
+    implementation(projects.data.balanceHiding)
     implementation(projects.data.card)
     implementation(projects.data.common)
     implementation(projects.data.settings)
@@ -72,22 +75,23 @@ dependencies {
     implementation(projects.data.wallets)
 
     /** Features */
-    implementation(project(":features:onboarding"))
-    implementation(project(":features:learn2earn:api"))
-    implementation(project(":features:learn2earn:impl"))
-    implementation(project(":features:referral:presentation"))
-    implementation(project(":features:referral:domain"))
-    implementation(project(":features:referral:data"))
-    implementation(project(":features:swap:api"))
-    implementation(project(":features:swap:presentation"))
-    implementation(project(":features:swap:domain"))
-    implementation(project(":features:swap:data"))
-    implementation(project(":features:tester:api"))
-    implementation(project(":features:tester:impl"))
-    implementation(project(":features:wallet:api"))
-    implementation(project(":features:wallet:impl"))
+    implementation(projects.features.onboarding)
+    implementation(projects.features.learn2earn.api)
+    implementation(projects.features.learn2earn.impl)
+    implementation(projects.features.referral.presentation)
+    implementation(projects.features.referral.domain)
+    implementation(projects.features.referral.data)
+    implementation(projects.features.swap.api)
+    implementation(projects.features.swap.presentation)
+    implementation(projects.features.swap.domain)
+    implementation(projects.features.swap.data)
+    implementation(projects.features.tester.api)
+    implementation(projects.features.tester.impl)
+    implementation(projects.features.wallet.api)
+    implementation(projects.features.wallet.impl)
     implementation(projects.features.tokendetails.api)
     implementation(projects.features.tokendetails.impl)
+    implementation(projects.features.send.api)
 
     /** AndroidX libraries */
     implementation(deps.androidx.core.ktx)
@@ -106,6 +110,7 @@ dependencies {
     /** Compose libraries */
     implementation(deps.compose.constraintLayout)
     implementation(deps.compose.material)
+    implementation(deps.compose.material3)
     implementation(deps.compose.animation)
     implementation(deps.compose.coil)
     implementation(deps.compose.constraintLayout)
diff --git a/app/src/main/assets/testnet_tokens.json b/app/src/main/assets/testnet_tokens.json
index e10caf1e7f..dd90c8b04c 100644
--- a/app/src/main/assets/testnet_tokens.json
+++ b/app/src/main/assets/testnet_tokens.json
@@ -517,6 +517,17 @@
                     "networkId": "aleph-zero/test"
                 }
             ]
+        },
+        {
+            "id": "near",
+            "symbol": "NEAR",
+            "name": "NEAR",
+            "networks":
+            [
+                {
+                    "networkId": "near-protocol/test"
+                }
+            ]
         }
     ]
 }
diff --git a/app/src/main/java/com/tangem/tap/GlobalSettingsState.kt b/app/src/main/java/com/tangem/tap/GlobalSettingsState.kt
deleted file mode 100644
index 19cd307271..0000000000
--- a/app/src/main/java/com/tangem/tap/GlobalSettingsState.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.tangem.tap
-
-import com.tangem.domain.apptheme.model.AppThemeMode
-
-internal sealed class GlobalSettingsState {
-
-    object Loading : GlobalSettingsState()
-
-    data class Content(
-        val appThemeMode: AppThemeMode,
-    ) : GlobalSettingsState()
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/MainActivity.kt b/app/src/main/java/com/tangem/tap/MainActivity.kt
index efa00b067f..2b66b30ca7 100644
--- a/app/src/main/java/com/tangem/tap/MainActivity.kt
+++ b/app/src/main/java/com/tangem/tap/MainActivity.kt
@@ -1,19 +1,26 @@
 package com.tangem.tap
 
+import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.pm.ActivityInfo
+import android.content.res.Configuration
 import android.os.Bundle
 import android.view.View
-import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.appcompat.app.AppCompatDelegate.setDefaultNightMode
+import androidx.core.os.bundleOf
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.WindowCompat
+import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
+import arrow.core.getOrElse
 import by.kirich1409.viewbindingdelegate.viewBinding
 import com.google.android.material.snackbar.Snackbar
 import com.tangem.core.navigation.AppScreen
 import com.tangem.core.navigation.NavigationAction
 import com.tangem.data.card.sdk.CardSdkLifecycleObserver
+import com.tangem.domain.apptheme.model.AppThemeMode
 import com.tangem.domain.card.ScanCardUseCase
 import com.tangem.domain.card.repository.CardSdkConfigRepository
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
@@ -27,15 +34,11 @@ import com.tangem.tap.common.DialogManager
 import com.tangem.tap.common.OnActivityResultCallback
 import com.tangem.tap.common.SnackbarHandler
 import com.tangem.tap.common.apptheme.MutableAppThemeModeHolder
-import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.redux.NotificationsHandler
-import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.common.shop.googlepay.GooglePayService
 import com.tangem.tap.common.shop.googlepay.GooglePayService.Companion.LOAD_PAYMENT_DATA_REQUEST_CODE
 import com.tangem.tap.common.shop.googlepay.GooglePayUtil.createPaymentsClient
 import com.tangem.tap.domain.TangemSdkManager
-import com.tangem.tap.domain.userWalletList.di.provideBiometricImplementation
-import com.tangem.tap.domain.userWalletList.di.provideRuntimeImplementation
 import com.tangem.tap.domain.walletconnect2.domain.WalletConnectInteractor
 import com.tangem.tap.features.intentHandler.IntentProcessor
 import com.tangem.tap.features.intentHandler.handlers.BackgroundScanIntentHandler
@@ -44,19 +47,15 @@ import com.tangem.tap.features.intentHandler.handlers.SellCurrencyIntentHandler
 import com.tangem.tap.features.intentHandler.handlers.WalletConnectLinkIntentHandler
 import com.tangem.tap.features.onboarding.products.wallet.redux.BackupAction
 import com.tangem.tap.features.shop.redux.ShopAction
-import com.tangem.tap.features.welcome.redux.WelcomeAction
+import com.tangem.tap.features.welcome.ui.WelcomeFragment
 import com.tangem.tap.proxy.AppStateHolder
 import com.tangem.tap.proxy.redux.DaggerGraphAction
 import com.tangem.utils.coroutines.FeatureCoroutineExceptionHandler
 import com.tangem.wallet.R
 import com.tangem.wallet.databinding.ActivityMainBinding
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.*
 import java.lang.ref.WeakReference
 import javax.inject.Inject
 import kotlin.coroutines.CoroutineContext
@@ -112,8 +111,7 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
     @Inject
     lateinit var walletConnectInteractor: WalletConnectInteractor
 
-    private val viewModel: MainViewModel by viewModels()
-    private var isInitializing: Boolean = true
+    private lateinit var appThemeModeFlow: SharedFlow<AppThemeMode?>
 
     // TODO: fixme: inject through DI
     private val intentProcessor: IntentProcessor = IntentProcessor()
@@ -125,34 +123,31 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
     private val onActivityResultCallbacks = mutableListOf<OnActivityResultCallback>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        val splashScreen = installSplashScreen()
+        installSplashScreen()
+        installAppTheme() // We need to call it before onCreate to prevent unnecessary activity recreation
 
         super.onCreate(savedInstanceState)
 
-        cardSdkLifecycleObserver.onCreate(context = this)
-
-        bootstrapMainStateUpdates()
-
-        splashScreen.setKeepOnScreenCondition { isInitializing }
+        installActivityDependencies()
+        observeAppThemeModeUpdates()
 
         setContentView(R.layout.activity_main)
-        systemActions()
+        initContent()
 
+        checkGooglePayAvailability()
+    }
+
+    private fun installActivityDependencies() {
         store.dispatch(NavigationAction.ActivityCreated(WeakReference(this)))
 
+        cardSdkLifecycleObserver.onCreate(context = this)
         tangemSdkManager = injectedTangemSdkManager
         appStateHolder.tangemSdkManager = tangemSdkManager
         backupService = BackupService.init(cardSdkConfigRepository.sdk, this)
         lockUserWalletsTimer = LockUserWalletsTimer(owner = this)
 
-        initUserWalletsListManager()
         initIntentHandlers()
 
-        store.dispatch(
-            ShopAction.CheckIfGooglePayAvailable(
-                GooglePayService(createPaymentsClient(this), this),
-            ),
-        )
         store.dispatch(
             DaggerGraphAction.SetActivityDependencies(
                 testerRouter = testerRouter,
@@ -165,6 +160,59 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
         )
     }
 
+    private fun installAppTheme() {
+        appThemeModeFlow = createAppThemeModeFlow()
+        val mode = runBlocking { appThemeModeFlow.filterNotNull().first() }
+
+        updateAppTheme(mode)
+    }
+
+    private fun observeAppThemeModeUpdates() {
+        appThemeModeFlow
+            .filterNotNull()
+            .flowWithLifecycle(lifecycle)
+            .onEach(::updateAppTheme)
+            .launchIn(lifecycleScope)
+    }
+
+    @SuppressLint("SourceLockedOrientationActivity")
+    private fun initContent() {
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+
+        supportFragmentManager.registerFragmentLifecycleCallbacks(
+            NavBarInsetsFragmentLifecycleCallback(),
+            true,
+        )
+
+        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+    }
+
+    private fun checkGooglePayAvailability() {
+        store.dispatch(
+            ShopAction.CheckIfGooglePayAvailable(
+                GooglePayService(createPaymentsClient(this), this),
+            ),
+        )
+    }
+
+    private fun createAppThemeModeFlow(): SharedFlow<AppThemeMode?> {
+        val tapApplication = application as TapApplication
+        val featureToggle = tapApplication.darkThemeFeatureToggle
+
+        return if (featureToggle.isDarkThemeEnabled) {
+            tapApplication.getAppThemeModeUseCase()
+                .map { maybeMode ->
+                    maybeMode.getOrElse { AppThemeMode.DEFAULT }
+                }
+                .shareIn(
+                    scope = lifecycleScope + Dispatchers.IO,
+                    started = SharingStarted.WhileSubscribed(stopTimeoutMillis = 5_000),
+                )
+        } else {
+            MutableStateFlow(AppThemeMode.FORCE_LIGHT)
+        }
+    }
+
     override fun onStart() {
         super.onStart()
         dialogManager.onStart(this)
@@ -175,7 +223,7 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
         // TODO: RESEARCH! NotificationsHandler is created in onResume and destroyed in onStop
         notificationsHandler = NotificationsHandler(binding.fragmentContainer)
 
-        navigateToInitialScreenIfNeededOnResume(intent)
+        navigateToInitialScreenIfNeeded(intent)
     }
 
     override fun onStop() {
@@ -193,53 +241,32 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
 
     private fun initIntentHandlers() {
         val hasSavedWalletsProvider = { store.state.globalState.userWalletsListManager?.hasUserWallets == true }
-        intentProcessor.addHandler(
-            BackgroundScanIntentHandler(
-                hasSavedWalletsProvider,
-                lifecycleScope,
-            ),
-        )
+        intentProcessor.addHandler(BackgroundScanIntentHandler(hasSavedWalletsProvider, lifecycleScope))
         intentProcessor.addHandler(WalletConnectLinkIntentHandler())
         intentProcessor.addHandler(BuyCurrencyIntentHandler())
         intentProcessor.addHandler(SellCurrencyIntentHandler())
     }
 
-    private fun initUserWalletsListManager() {
-        val manager = if (preferencesStorage.shouldSaveUserWallets) {
-            UserWalletsListManager.provideBiometricImplementation(
-                context = applicationContext,
-                tangemSdkManager = tangemSdkManager,
-            )
-        } else {
-            UserWalletsListManager.provideRuntimeImplementation()
+    private fun updateAppTheme(appThemeMode: AppThemeMode) {
+        MutableAppThemeModeHolder.value = appThemeMode
+        MutableAppThemeModeHolder.isDarkThemeActive = isDarkTheme()
+
+        val mode = when (appThemeMode) {
+            AppThemeMode.FORCE_DARK -> AppCompatDelegate.MODE_NIGHT_YES
+            AppThemeMode.FORCE_LIGHT -> AppCompatDelegate.MODE_NIGHT_NO
+            AppThemeMode.FOLLOW_SYSTEM -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
         }
-        store.dispatch(GlobalAction.UpdateUserWalletsListManager(manager))
+
+        setDefaultNightMode(mode)
     }
 
-    private fun bootstrapMainStateUpdates() {
-        viewModel.state
-            .onEach { state ->
-                isInitializing = state is GlobalSettingsState.Loading
-
-                when (state) {
-                    is GlobalSettingsState.Content -> {
-                        MutableAppThemeModeHolder.value = state.appThemeMode
-                    }
-                    is GlobalSettingsState.Loading -> Unit
-                }
-            }
-            .launchIn(lifecycleScope)
-    }
-
-    private fun systemActions() {
-        WindowCompat.setDecorFitsSystemWindows(window, false)
-
-        supportFragmentManager.registerFragmentLifecycleCallbacks(
-            NavBarInsetsFragmentLifecycleCallback(),
-            true,
-        )
-
-        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+    private fun isDarkTheme(): Boolean {
+        return when (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) {
+            Configuration.UI_MODE_NIGHT_YES -> true
+            Configuration.UI_MODE_NIGHT_NO -> false
+            Configuration.UI_MODE_NIGHT_UNDEFINED -> false
+            else -> false
+        }
     }
 
     override fun onNewIntent(intent: Intent?) {
@@ -303,43 +330,40 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
         lockUserWalletsTimer?.restart()
     }
 
-    private fun navigateToInitialScreenIfNeededOnResume(intentWhichStartedActivity: Intent?) {
+    private fun navigateToInitialScreenIfNeeded(intentWhichStartedActivity: Intent?) {
         val backStackIsEmpty = supportFragmentManager.backStackEntryCount == 0
         val isNotScannedBefore = store.state.globalState.scanResponse == null
         val isOnboardingServiceNotActive = store.state.globalState.onboardingState.onboardingStarted
         val isShopNotOpened = store.state.shopState.total != null
+
         when {
             !backStackIsEmpty && isNotScannedBefore && isOnboardingServiceNotActive && isShopNotOpened -> {
-                navigateToInitialScreenOnResume(intentWhichStartedActivity)
+                navigateToInitialScreen(intentWhichStartedActivity)
             }
             backStackIsEmpty -> {
-                navigateToInitialScreenOnResume(intentWhichStartedActivity)
+                navigateToInitialScreen(intentWhichStartedActivity)
             }
             else -> Unit
         }
     }
 
-    private fun navigateToInitialScreenOnResume(intentWhichStartedActivity: Intent?) {
+    private fun navigateToInitialScreen(intentWhichStartedActivity: Intent?) {
         if (store.state.globalState.userWalletsListManager?.hasUserWallets == true) {
-            store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.Welcome))
-            store.dispatchOnMain(WelcomeAction.SetInitialIntent(intentWhichStartedActivity))
-            lifecycleScope.launch {
-                val handler = BackgroundScanIntentHandler(
-                    hasSavedUserWalletsProvider = { true },
-                    lifecycleCoroutineScope = lifecycleScope,
-                )
-                val isBackgroundScanHandled = handler.handleIntent(intentWhichStartedActivity)
-                val hasNotIncompletedBackup = !backupService.hasIncompletedBackup
-                if (!isBackgroundScanHandled && hasNotIncompletedBackup) {
-                    store.dispatchOnMain(WelcomeAction.ProceedWithBiometrics)
-                }
-            }
+            store.dispatch(
+                NavigationAction.NavigateTo(
+                    screen = AppScreen.Welcome,
+                    bundle = intentWhichStartedActivity?.let {
+                        bundleOf(WelcomeFragment.INITIAL_INTENT_KEY to it)
+                    },
+                ),
+            )
         } else {
-            store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.Home))
+            store.dispatch(NavigationAction.NavigateTo(AppScreen.Home))
             lifecycleScope.launch {
                 intentProcessor.handleIntent(intentWhichStartedActivity)
             }
         }
+
         store.dispatch(BackupAction.CheckForUnfinishedBackup)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/MainViewModel.kt b/app/src/main/java/com/tangem/tap/MainViewModel.kt
deleted file mode 100644
index 2cb276000c..0000000000
--- a/app/src/main/java/com/tangem/tap/MainViewModel.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.tangem.tap
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import arrow.core.getOrElse
-import com.tangem.domain.apptheme.GetAppThemeModeUseCase
-import com.tangem.domain.apptheme.model.AppThemeMode
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
-import javax.inject.Inject
-
-@HiltViewModel
-internal class MainViewModel @Inject constructor(
-    private val getAppThemeModeUseCase: GetAppThemeModeUseCase,
-) : ViewModel() {
-
-    val state: StateFlow<GlobalSettingsState> = createMainStateFlow()
-
-    private fun createMainStateFlow(): StateFlow<GlobalSettingsState> {
-        return getAppThemeModeUseCase()
-            .map { maybeMode ->
-                val mode = maybeMode.getOrElse { AppThemeMode.DEFAULT }
-
-                GlobalSettingsState.Content(appThemeMode = mode)
-            }
-            .stateIn(
-                scope = viewModelScope,
-                started = SharingStarted.WhileSubscribed(stopTimeoutMillis = 5_000),
-                initialValue = GlobalSettingsState.Loading,
-            )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/TapApplication.kt b/app/src/main/java/com/tangem/tap/TapApplication.kt
index 8c4091a21f..2f6e54f690 100644
--- a/app/src/main/java/com/tangem/tap/TapApplication.kt
+++ b/app/src/main/java/com/tangem/tap/TapApplication.kt
@@ -22,13 +22,20 @@ import com.tangem.datasource.config.ConfigManager
 import com.tangem.datasource.config.FeaturesLocalLoader
 import com.tangem.datasource.config.models.Config
 import com.tangem.datasource.connection.NetworkConnectionManager
-import com.tangem.domain.DomainLayer
+import com.tangem.datasource.local.token.UserTokensStore
 import com.tangem.domain.appcurrency.repository.AppCurrencyRepository
+import com.tangem.domain.apptheme.GetAppThemeModeUseCase
+import com.tangem.domain.apptheme.repository.AppThemeModeRepository
+import com.tangem.domain.balancehiding.repositories.BalanceHidingRepository
 import com.tangem.domain.card.ScanCardProcessor
 import com.tangem.domain.common.LogConfig
+import com.tangem.domain.settings.repositories.AppRatingRepository
+import com.tangem.domain.tokens.repository.CurrenciesRepository
+import com.tangem.domain.tokens.repository.NetworksRepository
 import com.tangem.domain.walletmanager.WalletManagersFacade
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.legacy.WalletManagersRepository
-import com.tangem.features.tokendetails.featuretoggles.TokenDetailsFeatureToggles
+import com.tangem.domain.wallets.repository.WalletsRepository
 import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles
 import com.tangem.tap.common.analytics.AnalyticsFactory
 import com.tangem.tap.common.analytics.api.AnalyticsHandlerBuilder
@@ -48,9 +55,13 @@ import com.tangem.tap.common.redux.appReducer
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.common.shop.TangemShopService
 import com.tangem.tap.domain.configurable.warningMessage.WarningMessagesManager
+import com.tangem.tap.domain.tasks.product.DerivationsFinder
 import com.tangem.tap.domain.tokens.UserTokensRepository
+import com.tangem.tap.domain.tokens.UserTokensStorageService
 import com.tangem.tap.domain.totalBalance.TotalFiatBalanceCalculator
 import com.tangem.tap.domain.totalBalance.di.provideDefaultImplementation
+import com.tangem.tap.domain.userWalletList.di.provideBiometricImplementation
+import com.tangem.tap.domain.userWalletList.di.provideRuntimeImplementation
 import com.tangem.tap.domain.walletCurrencies.WalletCurrenciesManager
 import com.tangem.tap.domain.walletCurrencies.di.provideDefaultImplementation
 import com.tangem.tap.domain.walletStores.WalletStoresManager
@@ -61,8 +72,11 @@ import com.tangem.tap.domain.walletStores.repository.di.provideDefaultImplementa
 import com.tangem.tap.domain.walletconnect.WalletConnectRepository
 import com.tangem.tap.domain.walletconnect2.domain.WalletConnectSessionsRepository
 import com.tangem.tap.features.customtoken.api.featuretoggles.CustomTokenFeatureToggles
+import com.tangem.tap.features.details.DarkThemeFeatureToggle
+import com.tangem.tap.features.details.featuretoggles.DetailsFeatureToggles
 import com.tangem.tap.proxy.AppStateHolder
 import com.tangem.tap.proxy.redux.DaggerGraphState
+import com.tangem.utils.coroutines.AppCoroutineDispatcherProvider
 import com.tangem.wallet.BuildConfig
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.runBlocking
@@ -78,7 +92,8 @@ lateinit var activityResultCaller: ActivityResultCaller
 lateinit var preferencesStorage: PreferencesDataSource
 lateinit var walletConnectRepository: WalletConnectRepository
 lateinit var shopService: TangemShopService
-lateinit var userTokensRepository: UserTokensRepository
+internal lateinit var userTokensRepository: UserTokensRepository
+internal lateinit var derivationsFinder: DerivationsFinder
 
 private val walletStoresRepository by lazy { WalletStoresRepository.provideDefaultImplementation() }
 private val walletManagersRepository by lazy {
@@ -119,8 +134,9 @@ val totalFiatBalanceCalculator by lazy {
 }
 
 @HiltAndroidApp
-class TapApplication : Application(), ImageLoaderFactory {
+internal class TapApplication : Application(), ImageLoaderFactory {
 
+    // region Injected
     @Inject
     lateinit var appStateHolder: AppStateHolder
 
@@ -154,9 +170,6 @@ class TapApplication : Application(), ImageLoaderFactory {
     // @Inject
     // lateinit var learn2earnInteractor: Learn2earnInteractor
 
-    @Inject
-    lateinit var tokenDetailsFeatureToggles: TokenDetailsFeatureToggles
-
     @Inject
     lateinit var scanCardProcessor: ScanCardProcessor
 
@@ -169,29 +182,41 @@ class TapApplication : Application(), ImageLoaderFactory {
     @Inject
     lateinit var walletManagersFacade: WalletManagersFacade
 
+    @Inject
+    lateinit var networksRepository: NetworksRepository
+
+    @Inject
+    lateinit var currenciesRepository: CurrenciesRepository
+
+    @Inject
+    lateinit var appThemeModeRepository: AppThemeModeRepository
+
+    @Inject
+    lateinit var balanceHidingRepository: BalanceHidingRepository
+
+    @Inject
+    lateinit var detailsFeatureToggles: DetailsFeatureToggles
+
+    @Inject
+    lateinit var darkThemeFeatureToggle: DarkThemeFeatureToggle
+
+    @Inject
+    lateinit var userTokensStore: UserTokensStore
+
+    @Inject
+    lateinit var appRatingRepository: AppRatingRepository
+
+    @Inject
+    lateinit var getAppThemeModeUseCase: GetAppThemeModeUseCase
+
+    @Inject
+    lateinit var walletsRepository: WalletsRepository
+    // endregion Injected
+
     override fun onCreate() {
         super.onCreate()
 
-        store = Store(
-            reducer = { action, state ->
-                appReducer(action, state, appStateHolder)
-            },
-            middleware = AppState.getMiddleware(),
-            state = AppState(
-                daggerGraphState = DaggerGraphState(
-                    assetReader = assetReader,
-                    networkConnectionManager = networkConnectionManager,
-                    customTokenFeatureToggles = customTokenFeatureToggles,
-                    walletFeatureToggles = walletFeatureToggles,
-                    walletConnectRepository = walletConnect2Repository,
-                    walletConnectSessionsRepository = walletConnectSessionsRepository,
-                    tokenDetailsFeatureToggles = tokenDetailsFeatureToggles,
-                    scanCardProcessor = scanCardProcessor,
-                    appCurrencyRepository = appCurrencyRepository,
-                    walletManagersFacade = walletManagersFacade,
-                ),
-            ),
-        )
+        store = createReduxStore()
 
         if (BuildConfig.DEBUG) {
             Logger.addLogAdapter(AndroidLogAdapter(TimberFormatStrategy()))
@@ -208,10 +233,19 @@ class TapApplication : Application(), ImageLoaderFactory {
         activityResultCaller = foregroundActivityObserver
         registerActivityLifecycleCallbacks(foregroundActivityObserver.callbacks)
 
-        DomainLayer.init()
         preferencesStorage = preferencesDataSource
         walletConnectRepository = WalletConnectRepository(this)
 
+        // TODO: Try to performance and user experience.
+        //  [REDACTED_JIRA]
+        runBlocking {
+            walletsRepository.initialize()
+            initUserWalletsListManager()
+            featureTogglesManager.init()
+            appRatingRepository.initialize()
+            // learn2earnInteractor.init()
+        }
+
         val configLoader = FeaturesLocalLoader(assetReader, MoshiConverter.sdkMoshi, BuildConfig.ENVIRONMENT)
         initConfigManager(configLoader, ::initWithConfigDependency)
         initWarningMessagesManager()
@@ -224,26 +258,53 @@ class TapApplication : Application(), ImageLoaderFactory {
             )
         }
 
+        val userTokensStorageService = UserTokensStorageService.init(context = this)
         userTokensRepository = UserTokensRepository.init(
-            context = this,
             tangemTechService = store.state.domainNetworks.tangemTechService,
             networkConnectionManager = networkConnectionManager,
+            storageService = userTokensStorageService,
+        )
+        derivationsFinder = DerivationsFinder(
+            legacyTokensStore = userTokensStorageService,
+            newTokensStore = userTokensStore,
+            walletFeatureToggles = walletFeatureToggles,
+            dispatchers = AppCoroutineDispatcherProvider(),
         )
         appStateHolder.mainStore = store
         appStateHolder.userTokensRepository = userTokensRepository
         appStateHolder.walletStoresManager = walletStoresManager
 
-        // TODO: Try to performance and user experience.
-        //  [REDACTED_JIRA]
-        runBlocking {
-            featureTogglesManager.init()
-            // learn2earnInteractor.init()
-        }
-
         initTopUpController()
         walletConnect2Repository.init(projectId = configManager.config.walletConnectProjectId)
     }
 
+    private fun createReduxStore(): Store<AppState> {
+        return Store(
+            reducer = { action, state -> appReducer(action, state, appStateHolder) },
+            middleware = AppState.getMiddleware(),
+            state = AppState(
+                daggerGraphState = DaggerGraphState(
+                    assetReader = assetReader,
+                    networkConnectionManager = networkConnectionManager,
+                    customTokenFeatureToggles = customTokenFeatureToggles,
+                    walletFeatureToggles = walletFeatureToggles,
+                    walletConnectRepository = walletConnect2Repository,
+                    walletConnectSessionsRepository = walletConnectSessionsRepository,
+                    scanCardProcessor = scanCardProcessor,
+                    appCurrencyRepository = appCurrencyRepository,
+                    walletManagersFacade = walletManagersFacade,
+                    appStateHolder = appStateHolder,
+                    networksRepository = networksRepository,
+                    currenciesRepository = currenciesRepository,
+                    appThemeModeRepository = appThemeModeRepository,
+                    balanceHidingRepository = balanceHidingRepository,
+                    detailsFeatureToggles = detailsFeatureToggles,
+                    walletsRepository = walletsRepository,
+                ),
+            ),
+        )
+    }
+
     private fun initTopUpController() {
         val topUpController = TopUpController(
             scanResponseProvider = {
@@ -303,14 +364,16 @@ class TapApplication : Application(), ImageLoaderFactory {
         foregroundActivityObserver: ForegroundActivityObserver,
         store: Store<AppState>,
     ) {
-        fun initAdditionalFeedbackInfo(context: Context): AdditionalFeedbackInfo = AdditionalFeedbackInfo().apply {
-            appVersion = try {
-                // TODO don't use deprecated method
-                val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
-                pInfo.versionName
-            } catch (e: PackageManager.NameNotFoundException) {
-                e.printStackTrace()
-                "x.y.z"
+        fun initAdditionalFeedbackInfo(context: Context): AdditionalFeedbackInfo {
+            return AdditionalFeedbackInfo().apply {
+                appVersion = try {
+                    // TODO don't use deprecated method
+                    val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
+                    pInfo.versionName
+                } catch (e: PackageManager.NameNotFoundException) {
+                    e.printStackTrace()
+                    "x.y.z"
+                }
             }
         }
 
@@ -344,4 +407,14 @@ class TapApplication : Application(), ImageLoaderFactory {
     private fun initWarningMessagesManager() {
         store.dispatch(GlobalAction.SetWarningManager(WarningMessagesManager()))
     }
+
+    private suspend fun initUserWalletsListManager() {
+        val manager = if (walletsRepository.shouldSaveUserWalletsSync()) {
+            UserWalletsListManager.provideBiometricImplementation(applicationContext)
+        } else {
+            UserWalletsListManager.provideRuntimeImplementation()
+        }
+
+        store.dispatch(GlobalAction.UpdateUserWalletsListManager(manager))
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/CompositionCounter.kt b/app/src/main/java/com/tangem/tap/common/CompositionCounter.kt
deleted file mode 100644
index b09112d39f..0000000000
--- a/app/src/main/java/com/tangem/tap/common/CompositionCounter.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.tangem.tap.common
-
-import timber.log.Timber
-
-class CompositionCounter(
-    val id: String,
-    count: Int = 0,
-) {
-    var count: Int = count
-        private set
-
-    fun increase(id: String): CompositionCounter {
-        if (this.id != id) return this
-
-        count += 1
-        return CompositionCounter(id, count)
-    }
-}
-
-class CompositionLogger(
-    private val recomposeViewId: String,
-    private val tag: String = recomposeViewId,
-    private var turnOnForIds: List<String> = listOf(recomposeViewId),
-) {
-    val count: Int
-        get() = compositionCounter.count
-
-    private var compositionCounter: CompositionCounter = CompositionCounter(recomposeViewId)
-
-    fun nextComposition() {
-        compositionCounter = compositionCounter.increase(recomposeViewId)
-        log("")
-    }
-
-    fun log(message: String) {
-        if (!turnOnForIds.contains(recomposeViewId)) return
-
-        Timber.d("$tag[$recomposeViewId]:[${compositionCounter.count}]: $message")
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/CustomTabsManager.kt b/app/src/main/java/com/tangem/tap/common/CustomTabsManager.kt
index b66ed0a3ad..a913befc98 100644
--- a/app/src/main/java/com/tangem/tap/common/CustomTabsManager.kt
+++ b/app/src/main/java/com/tangem/tap/common/CustomTabsManager.kt
@@ -4,6 +4,9 @@ import android.content.Context
 import android.net.Uri
 import androidx.browser.customtabs.CustomTabColorSchemeParams
 import androidx.browser.customtabs.CustomTabsIntent
+import androidx.browser.customtabs.CustomTabsIntent.COLOR_SCHEME_DARK
+import androidx.browser.customtabs.CustomTabsIntent.COLOR_SCHEME_LIGHT
+import com.tangem.tap.common.apptheme.MutableAppThemeModeHolder
 import com.tangem.tap.common.extensions.getColorCompat
 import com.tangem.wallet.R
 
@@ -15,6 +18,9 @@ class CustomTabsManager {
                     .setNavigationBarColor(context.getColorCompat(R.color.toolbarColor))
                     .build(),
             )
+            .setColorScheme(
+                if (MutableAppThemeModeHolder.isDarkThemeActive) COLOR_SCHEME_DARK else COLOR_SCHEME_LIGHT,
+            )
             .build()
         customTabsIntent.launchUrl(context, Uri.parse(url))
     }
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/DefaultChangeCardAnalyticsContextUseCase.kt b/app/src/main/java/com/tangem/tap/common/analytics/DefaultChangeCardAnalyticsContextUseCase.kt
new file mode 100644
index 0000000000..27f55538da
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/analytics/DefaultChangeCardAnalyticsContextUseCase.kt
@@ -0,0 +1,13 @@
+package com.tangem.tap.common.analytics
+
+import com.tangem.core.analytics.Analytics
+import com.tangem.domain.analytics.ChangeCardAnalyticsContextUseCase
+import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.tap.common.extensions.setContext
+
+internal class DefaultChangeCardAnalyticsContextUseCase : ChangeCardAnalyticsContextUseCase {
+
+    override fun invoke(scanResponse: ScanResponse) {
+        Analytics.setContext(scanResponse)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/AnalyticsParam.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/AnalyticsParam.kt
index e5e4c697a6..e7e51bdd4c 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/AnalyticsParam.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/AnalyticsParam.kt
@@ -8,10 +8,7 @@ sealed class AnalyticsParam {
         class Currency(currency: com.tangem.tap.features.wallet.models.Currency) : CurrencyType(currency.currencySymbol)
         class Blockchain(blockchain: com.tangem.blockchain.common.Blockchain) : CurrencyType(blockchain.currency)
         class Token(token: com.tangem.blockchain.common.Token) : CurrencyType(token.symbol)
-        class FiatCurrency(
-            fiatCurrency: com.tangem.tap.common.entities.FiatCurrency,
-        ) : CurrencyType(fiatCurrency.code)
-
+        class FiatCurrency(fiatCurrency: com.tangem.tap.common.entities.FiatCurrency) : CurrencyType(fiatCurrency.code)
         class Amount(amount: com.tangem.blockchain.common.Amount) : CurrencyType(amount.currencySymbol)
     }
 
@@ -136,9 +133,9 @@ sealed class AnalyticsParam {
     }
 
     sealed class WalletCreationType(val value: String) {
-        object PrivateKey : WalletCreationType("Private key")
-        object NewSeed : WalletCreationType("New seed")
-        object SeedImport : WalletCreationType("Seed import")
+        object PrivateKey : WalletCreationType(value = "Private Key")
+        object NewSeed : WalletCreationType(value = "New Seed")
+        object SeedImport : WalletCreationType(value = "Seed Import")
     }
 
     companion object Key {
@@ -155,7 +152,8 @@ sealed class AnalyticsParam {
         const val ERROR_DESCRIPTION = "Error Description"
         const val ERROR_CODE = "Error Code"
         const val ERROR_KEY = "Error Key"
-        const val CREATION_TYPE = "Creation type"
+        const val CREATION_TYPE = "Creation Type"
+        const val SEED_PHRASE_LENGTH = "Seed Phrase Length"
         const val DAPP_NAME = "DApp Name"
         const val DAPP_URL = "DApp Url"
         const val METHOD_NAME = "Method Name"
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/Basic.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/Basic.kt
index 2782ceac8f..ade60b95cf 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/Basic.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Basic.kt
@@ -32,14 +32,18 @@ sealed class Basic(
         batch: String,
         signInType: SignInType,
         walletsCount: String,
+        hasBackup: Boolean?,
     ) : Basic(
         event = "Signed in",
-        params = mapOf(
-            AnalyticsParam.CURRENCY to currency.value,
-            AnalyticsParam.BATCH to batch,
-            "Sign in type" to signInType.name,
-            "Wallets Count" to walletsCount,
-        ),
+        params = buildMap {
+            put(AnalyticsParam.CURRENCY, currency.value)
+            put(AnalyticsParam.BATCH, batch)
+            put("Sign in type", signInType.name)
+            put("Wallets Count", walletsCount)
+            if (hasBackup != null) {
+                put("Backuped", if (hasBackup) "Yes" else "No")
+            }
+        },
     ) {
         enum class SignInType {
             Card, Biometric
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/Onboarding.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/Onboarding.kt
index a9432ad404..9088608413 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/Onboarding.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Onboarding.kt
@@ -23,9 +23,14 @@ sealed class Onboarding(
         class ButtonCreateWallet : CreateWallet("Button - Create Wallet")
         class WalletCreatedSuccessfully(
             creationType: AnalyticsParam.WalletCreationType = AnalyticsParam.WalletCreationType.PrivateKey,
+            seedPhraseLength: Int? = null,
         ) : CreateWallet(
             event = "Wallet Created Successfully",
-            params = mapOf(AnalyticsParam.CREATION_TYPE to creationType.value),
+            params = buildMap {
+                put(AnalyticsParam.CREATION_TYPE, creationType.value)
+
+                if (seedPhraseLength != null) put(AnalyticsParam.SEED_PHRASE_LENGTH, seedPhraseLength.toString())
+            },
         )
     }
 
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/Portfolio.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/Portfolio.kt
index 3e961883b7..8270df641c 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/Portfolio.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Portfolio.kt
@@ -12,6 +12,10 @@ sealed class Portfolio(
 ) : AnalyticsEvent("Portfolio", event, params) {
 
     class Refreshed : Portfolio("Refreshed")
+
     class ButtonManageTokens : Portfolio("Button - Manage Tokens")
+
     class TokenTapped : Portfolio("Token is Tapped")
+
+    class OrganizeTokens : Portfolio("Button - Organize Tokens")
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/Settings.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/Settings.kt
index e71eda15ad..7208d9943a 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/Settings.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Settings.kt
@@ -22,6 +22,7 @@ sealed class Settings(
     class ButtonAppSettings : Settings(event = "Button - App Settings")
     class ButtonCreateBackup : Settings(event = "Button - Create Backup")
     class ButtonWalletConnect : Settings(event = "Button - Wallet Connect")
+    object ScanNewCard : Settings(event = "Button - Scan New Card")
 
     class ButtonSocialNetwork(network: SocialNetwork) : Settings(
         event = "Button - Social Network",
@@ -78,5 +79,10 @@ sealed class Settings(
         )
 
         object ButtonEnableBiometricAuthentication : AppSettings(event = "Button - Enable Biometric Authentication")
+
+        class MainCurrencyChanged(currencyType: String) : MainScreen(
+            event = "Main Currency Changed",
+            params = mapOf("Currency Type" to currencyType),
+        )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/apptheme/MutableAppThemeModeHolder.kt b/app/src/main/java/com/tangem/tap/common/apptheme/MutableAppThemeModeHolder.kt
index c1b0f942c5..9dec177e01 100644
--- a/app/src/main/java/com/tangem/tap/common/apptheme/MutableAppThemeModeHolder.kt
+++ b/app/src/main/java/com/tangem/tap/common/apptheme/MutableAppThemeModeHolder.kt
@@ -14,4 +14,6 @@ internal object MutableAppThemeModeHolder : AppThemeModeHolder {
             appThemeMode.value = value
         }
         get() = appThemeMode.value
+
+    var isDarkThemeActive: Boolean = false
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/compose/OutlinedTextFieldWidget.kt b/app/src/main/java/com/tangem/tap/common/compose/OutlinedTextFieldWidget.kt
deleted file mode 100644
index 59cf01d88c..0000000000
--- a/app/src/main/java/com/tangem/tap/common/compose/OutlinedTextFieldWidget.kt
+++ /dev/null
@@ -1,277 +0,0 @@
-package com.tangem.tap.common.compose
-
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.animateContentSize
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.slideInVertically
-import androidx.compose.animation.slideOutVertically
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.LinearProgressIndicator
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Text
-import androidx.compose.material.TextFieldColors
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.input.VisualTransformation
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.tangem.common.module.ModuleError
-import com.tangem.core.ui.res.TangemTheme
-import com.tangem.domain.common.form.Field
-import com.tangem.tap.common.CompositionLogger
-import com.tangem.tap.common.compose.extensions.stringResourceDefault
-import com.tangem.tap.domain.moduleMessage.ModuleMessageConverter
-
-/**
-[REDACTED_AUTHOR]
- */
-@Composable
-fun OutlinedTextFieldWidget(
-    fieldData: Field.Data<String>,
-    labelId: Int? = null,
-    label: String = "",
-    placeholderId: Int? = null,
-    placeholder: String = "",
-    trailingIcon: @Composable (() -> Unit)? = null,
-    isEnabled: Boolean = true,
-    isVisible: Boolean = true,
-    isLoading: Boolean = false,
-    error: ModuleError? = null,
-    errorConverter: ModuleMessageConverter? = null,
-    debounceTextChanges: Long = 400,
-    visualTransformation: VisualTransformation = VisualTransformation.None,
-    keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
-    onTextChange: (String) -> Unit,
-) {
-    if (!isVisible) return
-
-    Column(modifier = Modifier.animateContentSize()) {
-        OutlinedProgressTextField(
-            fieldData = fieldData,
-            label = stringResourceDefault(labelId, label),
-            placeholder = stringResourceDefault(placeholderId, placeholder),
-            trailingIcon = trailingIcon,
-            isEnabled = isEnabled,
-            isLoading = isLoading,
-            error = error,
-            debounce = debounceTextChanges,
-            visualTransformation = visualTransformation,
-            keyboardOptions = keyboardOptions,
-            onTextChange = onTextChange,
-        )
-        errorConverter?.let { AnimatedErrorView(errorConverter = it, error = error) }
-    }
-}
-
-@Suppress("LongMethod", "NestedBlockDepth", "MagicNumber", "MaxLineLength")
-@Composable
-private fun OutlinedProgressTextField(
-    fieldData: Field.Data<String>,
-    label: String = "",
-    placeholder: String = "",
-    isEnabled: Boolean = true,
-    isLoading: Boolean = false,
-    error: ModuleError? = null,
-    debounce: Long = 400,
-    visualTransformation: VisualTransformation = VisualTransformation.None,
-    keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
-    colors: TextFieldColors = TangemTextFieldsDefault.defaultTextFieldColors,
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-    trailingIcon: @Composable (() -> Unit)? = null,
-    onTextChange: (String) -> Unit,
-) {
-    val logger = remember {
-        CompositionLogger(label, "OutlinedProgressTextField", listOf("Символ токена"))
-    }
-    logger.nextComposition()
-
-    val textValueState = remember { mutableStateOf(fieldData.value) }
-    val textDebouncer = valueDebouncerAsState(
-        initialValue = fieldData.value,
-        debounce = debounce,
-        onEmitValueReceive = {
-            logger.log("DEBOUNCER: onEmitValueReceived: [$it]")
-            logger.log("DEBOUNCER: start RECOMPOSE by new value for textValueState.value = [$it]")
-            textValueState.value = it
-        },
-        onValueChange = {
-            logger.log("DEBOUNCER: onValueChanged:  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>  dispatch.toStore([$it])")
-            onTextChange(it)
-        },
-    )
-
-    logger.log("RECOMPOSE ---------------------------------------------------------------START [${logger.count}]")
-    logger.log("RECOMPOSE --data: fieldData.value: [$fieldData]")
-    logger.log("RECOMPOSE --data: textValueState.value: [${textValueState.value}]")
-    logger.log("RECOMPOSE --data: textDebouncer.emittedValue = [${textDebouncer.emittedValue}]")
-    logger.log("RECOMPOSE --data: textDebouncer.debounced = [${textDebouncer.debounced}]")
-
-    if (!fieldData.isUserInput) {
-        // initial value is not from an user
-        val isNotUserInput = "-- IS NOT USER INPUT"
-        logger.log("recompose $isNotUserInput")
-        if (textValueState.value == fieldData.value) {
-            logger.log("$isNotUserInput: внешние данные ОДИНАКОВЫ с данными в поле")
-        } else {
-            logger.log("$isNotUserInput: внешние данные РАЗЛИЧАЮТСЯ с данными в поле")
-            if (textDebouncer.emittedValue != textDebouncer.debounced || textDebouncer.emitsCountBeforeDebounce > 0) {
-                logger.log("$isNotUserInput: пользователь ВВОДИТ данные -> внешние данные игнорируем, ждем RECOMPOSE")
-            } else {
-                logger.log("$isNotUserInput: пользователь НЕ вводит данные -> пытаемся обработать внешние данные")
-                if (textValueState.value != textDebouncer.emittedValue ||
-                    textValueState.value != textDebouncer.debounced
-                ) {
-                    logger.log("$isNotUserInput: даннные в поле не соответствуют данным из textDebouncer")
-                    if (textDebouncer.emittedValue.isEmpty() && textDebouncer.debounced.isEmpty()) {
-                        logger.log(
-                            "$isNotUserInput: даннные в textDebouncer ПУСТЫ -> start RECOMPOSE новые данные для " +
-                                "textValueState.value = [${fieldData.value}]",
-                        )
-                        textValueState.value = fieldData.value
-                    } else {
-                        logger.log(
-                            "$isNotUserInput: даннные в textDebouncer НЕ ПУСТЫ  -> start RECOMPOSE новые данные для " +
-                                "textValueState.value = [${fieldData.value}]",
-                        )
-                        textValueState.value = fieldData.value
-                    }
-                } else {
-                    logger.log(
-                        "$isNotUserInput: в пустое поле вставляются данные -> start RECOMPOSE новые данные для " +
-                            "textValueState.value = [${fieldData.value}]",
-                    )
-                    textValueState.value = fieldData.value
-                }
-            }
-        }
-    }
-    logger.log("recompose --------------------------------------------------------------FINISH [${logger.count}]")
-
-    Box {
-        OutlinedTextField(
-            modifier = Modifier
-                .fillMaxWidth(),
-            value = textValueState.value,
-            onValueChange = {
-                logger.log("WIDGET: textDebouncer.emmit([$it])")
-                textDebouncer.emmit(it)
-            },
-            keyboardOptions = keyboardOptions,
-            label = {
-                Text(
-                    text = label,
-                    style = TangemTheme.typography.caption,
-                    color = colors.labelColor(
-                        enabled = isEnabled,
-                        error = error != null,
-                        interactionSource = interactionSource,
-                    ).value,
-                )
-            },
-            placeholder = {
-                Text(
-                    text = placeholder,
-                    style = TangemTheme.typography.body1,
-                    color = colors.placeholderColor(enabled = isEnabled).value,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                )
-            },
-            trailingIcon = trailingIcon,
-            singleLine = true,
-            enabled = isEnabled,
-            isError = error != null,
-            visualTransformation = visualTransformation,
-            colors = colors,
-            interactionSource = interactionSource,
-        )
-        AnimatedVisibility(
-            modifier = Modifier
-                .fillMaxWidth()
-                .align(Alignment.BottomCenter)
-                .padding(start = 6.dp, top = 0.dp, end = 6.dp, bottom = 6.dp),
-            visible = isLoading,
-        ) {
-            LinearProgressIndicator(
-                color = TangemTheme.colors.icon.primary1,
-            )
-        }
-    }
-}
-
-@Composable
-private fun AnimatedErrorView(errorConverter: ModuleMessageConverter, error: ModuleError? = null) {
-    AnimatedVisibility(
-        visible = error != null,
-        enter = fadeIn() + slideInVertically(),
-        exit = slideOutVertically() + fadeOut(),
-    ) {
-        error?.let {
-            ErrorView(
-                text = errorConverter.convert(it).message,
-                style = TextStyle(fontSize = 14.sp),
-            )
-        }
-    }
-}
-
-@Preview
-@Composable
-private fun OutlinedTextFieldWithErrorTest() {
-    val context = LocalContext.current
-    val converter = remember { ModuleMessageConverter(context) }
-
-    class SimpleError(
-        override val code: Int = 1,
-        override val message: String = "Error message",
-        override val data: Any? = null,
-    ) : ModuleError()
-
-    val modifier = Modifier
-        .fillMaxWidth()
-        .padding(16.dp)
-    Column {
-        OutlinedTextFieldWidget(
-            fieldData = Field.Data("", false),
-            label = "First label",
-            placeholder = "1 placeholder",
-            error = null,
-            errorConverter = converter,
-        ) {}
-        OutlinedTextFieldWidget(
-            fieldData = Field.Data("First", false),
-            label = "First label",
-            placeholder = "1 placeholder",
-            error = null,
-            errorConverter = converter,
-        ) {}
-        OutlinedTextFieldWidget(
-            fieldData = Field.Data("First", false),
-            label = "First label",
-            placeholder = "1 placeholder",
-            isLoading = true,
-            error = null,
-            errorConverter = converter,
-        ) {}
-        OutlinedTextFieldWidget(
-            fieldData = Field.Data("First", false),
-            label = "First label",
-            placeholder = "1 placeholder",
-            error = SimpleError(),
-            errorConverter = converter,
-        ) {}
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/compose/Undefined.kt b/app/src/main/java/com/tangem/tap/common/compose/Undefined.kt
deleted file mode 100644
index d5e5168be3..0000000000
--- a/app/src/main/java/com/tangem/tap/common/compose/Undefined.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.tangem.tap.common.compose
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.sp
-
-/**
-[REDACTED_AUTHOR]
- * Compose views are not typically used as a main or base view.
- */
-
-@Composable
-fun TitleSubtitle(title: String, subtitle: String) {
-    Column {
-        Text(text = title)
-        Text(
-            text = subtitle,
-            fontSize = 12.sp,
-            color = Color.Gray,
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/compose/extensions/Resources.kt b/app/src/main/java/com/tangem/tap/common/compose/extensions/Resources.kt
deleted file mode 100644
index 5b8da92e24..0000000000
--- a/app/src/main/java/com/tangem/tap/common/compose/extensions/Resources.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.tangem.tap.common.compose.extensions
-
-import android.content.res.Resources
-import androidx.annotation.StringRes
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
-
-/**
-[REDACTED_AUTHOR]
- */
-@Composable
-fun stringResourceDefault(@StringRes id: Int?, default: String = ""): String {
-    val resources = LocalContext.current.resources
-    return try {
-        resources.getString(requireNotNull(id))
-    } catch (ex: Resources.NotFoundException) {
-        default
-    } catch (ex: IllegalArgumentException) {
-        default
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt b/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt
index 88a8e16ed6..f1daaf34f6 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt
@@ -47,6 +47,7 @@ fun Blockchain.getGreyedOutIconRes(): Int {
         Blockchain.AlephZero, Blockchain.AlephZeroTestnet -> R.drawable.ic_azero_no_color
         Blockchain.OctaSpace, Blockchain.OctaSpaceTestnet -> R.drawable.ic_octaspace_no_color
         Blockchain.Chia, Blockchain.ChiaTestnet -> R.drawable.ic_chia_no_color
+        Blockchain.Near, Blockchain.NearTestnet -> R.drawable.ic_near_no_color
         else -> R.drawable.ic_tangem_logo
     }
 }
diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt b/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt
index 9119734bfd..5ba15310c9 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt
@@ -6,7 +6,8 @@ import com.tangem.core.navigation.AppScreen
 import com.tangem.core.navigation.FragmentShareTransition
 import com.tangem.feature.referral.ReferralFragment
 import com.tangem.feature.swap.presentation.SwapFragment
-import com.tangem.tap.features.customtoken.legacy.AddCustomTokenFragment
+import com.tangem.tap.features.customtoken.impl.presentation.AddCustomTokenFragment
+import com.tangem.tap.features.details.ui.appcurrency.AppCurrencySelectorFragment
 import com.tangem.tap.features.details.ui.appsettings.AppSettingsFragment
 import com.tangem.tap.features.details.ui.cardsettings.CardSettingsFragment
 import com.tangem.tap.features.details.ui.cardsettings.coderecovery.AccessCodeRecoveryFragment
@@ -33,7 +34,6 @@ import com.tangem.tap.proxy.redux.DaggerGraphState
 import com.tangem.tap.store
 import com.tangem.wallet.R
 import timber.log.Timber
-import com.tangem.tap.features.customtoken.impl.presentation.AddCustomTokenFragment as RedesignedAddCustomTokenFragment
 
 fun FragmentActivity.openFragment(
     screen: AppScreen,
@@ -155,21 +155,10 @@ private fun fragmentFactory(screen: AppScreen): Fragment {
         AppScreen.AccessCodeRecovery -> AccessCodeRecoveryFragment()
         AppScreen.Disclaimer -> DisclaimerFragment()
         AppScreen.AddTokens -> TokensListFragment()
-
-        AppScreen.AddCustomToken -> {
-            val featureToggles = store.state.daggerGraphState.get(
-                getDependency = DaggerGraphState::customTokenFeatureToggles,
-            )
-            if (featureToggles.isRedesignedScreenEnabled) {
-                RedesignedAddCustomTokenFragment()
-            } else {
-                AddCustomTokenFragment()
-            }
-        }
-
+        AppScreen.AddCustomToken -> AddCustomTokenFragment()
         AppScreen.WalletDetails -> {
             val featureToggles = store.state.daggerGraphState.get(
-                getDependency = DaggerGraphState::tokenDetailsFeatureToggles,
+                getDependency = DaggerGraphState::walletFeatureToggles,
             )
             if (featureToggles.isRedesignedScreenEnabled) {
                 store.state.daggerGraphState
@@ -186,5 +175,6 @@ private fun fragmentFactory(screen: AppScreen): Fragment {
         AppScreen.Welcome -> WelcomeFragment()
         AppScreen.SaveWallet -> SaveWalletBottomSheetFragment()
         AppScreen.WalletSelector -> WalletSelectorBottomSheetFragment()
+        AppScreen.AppCurrencySelector -> AppCurrencySelectorFragment()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/extensions/ValueCallback.kt b/app/src/main/java/com/tangem/tap/common/extensions/ValueCallback.kt
deleted file mode 100644
index 3dd4357bba..0000000000
--- a/app/src/main/java/com/tangem/tap/common/extensions/ValueCallback.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.tangem.tap.common.extensions
-
-/**
-[REDACTED_AUTHOR]
- */
-typealias ValueCallback<T> = (T) -> Unit
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/extensions/WalletManager.kt b/app/src/main/java/com/tangem/tap/common/extensions/WalletManager.kt
index 1533313216..096f5c96bb 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/WalletManager.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/WalletManager.kt
@@ -1,12 +1,12 @@
 package com.tangem.tap.common.extensions
 
-import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.BlockchainSdkError
 import com.tangem.blockchain.common.Wallet
 import com.tangem.blockchain.common.WalletManager
 import com.tangem.common.services.Result
 import com.tangem.domain.common.extensions.amountToCreateAccount
 import com.tangem.tap.common.TestActions
+import com.tangem.tap.common.apptheme.MutableAppThemeModeHolder
 import com.tangem.tap.domain.TapError
 import com.tangem.tap.domain.getFirstToken
 import com.tangem.tap.domain.model.WalletDataModel
@@ -71,6 +71,7 @@ fun WalletManager.getTopUpUrl(): String? {
         cryptoCurrencyName = wallet.blockchain.currency,
         fiatCurrencyName = globalState.appCurrency.code,
         walletAddress = defaultAddress,
+        isDarkTheme = MutableAppThemeModeHolder.isDarkThemeActive,
     )
 }
 
@@ -79,12 +80,4 @@ fun WalletManager?.getAddressData(): WalletDataModel.AddressData? {
 
     val addressDataList = wallet.createAddressesData()
     return if (addressDataList.isEmpty()) null else addressDataList[0]
-}
-
-fun <T> WalletManager.Companion.stub(): T {
-    val wallet = Wallet(Blockchain.Unknown, setOf(), Wallet.PublicKey(byteArrayOf(), null), setOf())
-    return object : WalletManager(wallet) {
-        override val currentHost: String = ""
-        override suspend fun update() {}
-    } as T
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/feedback/AdditionalFeedbackInfo.kt b/app/src/main/java/com/tangem/tap/common/feedback/AdditionalFeedbackInfo.kt
index 947691b26f..e1d67df755 100644
--- a/app/src/main/java/com/tangem/tap/common/feedback/AdditionalFeedbackInfo.kt
+++ b/app/src/main/java/com/tangem/tap/common/feedback/AdditionalFeedbackInfo.kt
@@ -7,8 +7,10 @@ import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.userwallets.UserWalletIdBuilder
 import com.tangem.tap.common.extensions.stripZeroPlainString
+import kotlinx.coroutines.flow.*
 
 class AdditionalFeedbackInfo {
+
     class EmailWalletInfo(
         var blockchain: Blockchain = Blockchain.Unknown,
         var derivationPath: String = "",
@@ -46,6 +48,7 @@ class AdditionalFeedbackInfo {
     private val Address.name: String
         get() = type.javaClass.simpleName
 
+    @Deprecated("Don't use it directly")
     fun setCardInfo(data: ScanResponse) {
         cardId = data.card.cardId
         cardBlockchain = data.walletData?.blockchain ?: ""
@@ -55,6 +58,7 @@ class AdditionalFeedbackInfo {
         userWalletId = UserWalletIdBuilder.scanResponse(data).build()?.stringValue ?: ""
     }
 
+    @Deprecated("Don't use it directly")
     fun setWalletsInfo(walletManagers: List<WalletManager>) {
         walletsInfo.clear()
         tokens.clear()
diff --git a/app/src/main/java/com/tangem/tap/common/redux/AppState.kt b/app/src/main/java/com/tangem/tap/common/redux/AppState.kt
index 19248b08b9..7b9b9f2bd4 100644
--- a/app/src/main/java/com/tangem/tap/common/redux/AppState.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/AppState.kt
@@ -6,6 +6,7 @@ import com.tangem.domain.redux.domainStore
 import com.tangem.domain.redux.global.NetworkServices
 import com.tangem.tap.common.redux.global.GlobalMiddleware
 import com.tangem.tap.common.redux.global.GlobalState
+import com.tangem.tap.common.redux.legacy.LegacyMiddleware
 import com.tangem.tap.common.redux.navigation.navigationMiddleware
 import com.tangem.tap.features.details.redux.DetailsMiddleware
 import com.tangem.tap.features.details.redux.DetailsState
@@ -68,7 +69,7 @@ data class AppState(
     val daggerGraphState: DaggerGraphState = DaggerGraphState(),
 ) : StateType {
 
-    val domainState: DomainState
+    private val domainState: DomainState
         get() = domainStore.state
 
     val domainNetworks: NetworkServices
@@ -107,6 +108,7 @@ data class AppState(
                 AccessCodeRequestPolicyMiddleware().middleware,
                 SignInMiddleware.middleware,
                 DaggerGraphMiddleware.daggerGraphMiddleware,
+                LegacyMiddleware.legacyMiddleware,
             )
         }
     }
diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt
index 2d75cf1723..15227361e9 100644
--- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt
@@ -1,11 +1,10 @@
 package com.tangem.tap.common.redux.global
 
-import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.WalletManager
 import com.tangem.common.CompletionResult
-import com.tangem.common.core.TangemError
 import com.tangem.datasource.config.ConfigManager
 import com.tangem.datasource.config.models.ChatConfig
+import com.tangem.domain.apptheme.model.AppThemeMode
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.tap.common.analytics.topup.TopUpController
@@ -48,13 +47,6 @@ sealed class GlobalAction : Action {
         object Stop : Onboarding()
     }
 
-    data class ScanCard(
-        val additionalBlockchainsToDerive: Collection<Blockchain>? = null,
-        val onSuccess: ((ScanResponse) -> Unit)? = null,
-        val onFailure: ((TangemError) -> Unit)? = null,
-        val messageResId: Int? = null,
-    ) : GlobalAction()
-
     object ScanFailsCounter {
         data class ChooseBehavior(val result: CompletionResult<ScanResponse>) : GlobalAction()
         object Reset : GlobalAction()
@@ -103,4 +95,5 @@ sealed class GlobalAction : Action {
     }
 
     data class UpdateUserWalletsListManager(val manager: UserWalletsListManager) : GlobalAction()
+    data class ChangeAppThemeMode(val appThemeMode: AppThemeMode) : GlobalAction()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMiddleware.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMiddleware.kt
index 176841c442..68bc51a87c 100644
--- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMiddleware.kt
@@ -3,12 +3,12 @@ package com.tangem.tap.common.redux.global
 import com.tangem.common.CompletionResult
 import com.tangem.common.core.TangemSdkError
 import com.tangem.common.extensions.guard
+import com.tangem.core.analytics.Analytics
 import com.tangem.datasource.config.models.Config
 import com.tangem.domain.common.LogConfig
-import com.tangem.domain.common.extensions.withMainContext
 import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.models.scan.ScanResponse
-import com.tangem.tap.*
+import com.tangem.tap.common.analytics.events.Basic
 import com.tangem.tap.common.entities.FiatCurrency
 import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
 import com.tangem.tap.common.extensions.dispatchDialogShow
@@ -16,7 +16,6 @@ import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.dispatchWithMain
 import com.tangem.tap.common.redux.AppDialog
 import com.tangem.tap.common.redux.AppState
-import com.tangem.tap.domain.configurable.warningMessage.WarningMessagesManager
 import com.tangem.tap.features.send.redux.SendAction
 import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.network.exchangeServices.BuyExchangeService
@@ -26,8 +25,13 @@ import com.tangem.tap.network.exchangeServices.ExchangeService
 import com.tangem.tap.network.exchangeServices.mercuryo.MercuryoEnvironment
 import com.tangem.tap.network.exchangeServices.mercuryo.MercuryoService
 import com.tangem.tap.network.exchangeServices.moonpay.MoonPayService
+import com.tangem.tap.preferencesStorage
 import com.tangem.tap.proxy.redux.DaggerGraphState
-import kotlinx.coroutines.flow.firstOrNull
+import com.tangem.tap.scope
+import com.tangem.tap.store
+import com.tangem.tap.walletCurrenciesManager
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import org.rekotlin.Action
 import org.rekotlin.DispatchFunction
@@ -66,7 +70,13 @@ private fun handleAction(action: Action, appState: () -> AppState?, dispatch: Di
             }
         }
         is GlobalAction.RestoreAppCurrency -> {
-            if (store.state.daggerGraphState.get(DaggerGraphState::walletFeatureToggles).isRedesignedScreenEnabled) {
+            val daggerGraphState = store.state.daggerGraphState
+            val walletFeatureToggles = daggerGraphState.get(DaggerGraphState::walletFeatureToggles)
+            val detailsFeatureToggles = daggerGraphState.get(DaggerGraphState::detailsFeatureToggles)
+
+            if (walletFeatureToggles.isRedesignedScreenEnabled ||
+                detailsFeatureToggles.isRedesignedAppCurrencySelectorEnabled
+            ) {
                 restoreAppCurrencyNew()
             } else {
                 restoreAppCurrencyLegacy()
@@ -75,10 +85,10 @@ private fun handleAction(action: Action, appState: () -> AppState?, dispatch: Di
         is GlobalAction.HideWarningMessage -> {
             store.state.globalState.warningManager?.let {
                 if (it.hideWarning(action.warning)) {
-                    if (WarningMessagesManager.isAlreadySignedHashesWarning(action.warning)) {
-                        // TODO: No appropriate warningMessage identification. Make it better later
-                        store.dispatch(WalletAction.Warnings.CheckHashesCount.SaveCardId)
-                    }
+                    // if (WarningMessagesManager.isAlreadySignedHashesWarning()) {
+                    //     // TODO: No appropriate warningMessage identification. Make it better later
+                    //     store.dispatch(WalletAction.Warnings.CheckHashesCount.SaveCardId)
+                    // }
 
                     store.dispatch(WalletAction.Warnings.Update)
                     store.dispatch(SendAction.Warnings.Update)
@@ -131,6 +141,8 @@ private fun handleAction(action: Action, appState: () -> AppState?, dispatch: Di
                     sellService = makeSellExchangeService(config),
                     primaryRules = CardExchangeRules(cardProvider),
                 )
+                // TODO: for refactoring (after remove old design refactor CurrencyExchangeManager and use 1 instance)
+                store.state.daggerGraphState.get(DaggerGraphState::appStateHolder).exchangeService = exchangeManager
                 store.dispatchOnMain(GlobalAction.ExchangeManager.Init.Success(exchangeManager))
                 store.dispatchOnMain(GlobalAction.ExchangeManager.Update)
             }
@@ -143,28 +155,6 @@ private fun handleAction(action: Action, appState: () -> AppState?, dispatch: Di
             }
             scope.launch { exchangeManager.update() }
         }
-        is GlobalAction.ScanCard -> {
-            scope.launch {
-                tangemSdkManager.changeDisplayedCardIdNumbersCount(null)
-                val result = tangemSdkManager.scanProduct(
-                    userTokensRepository = userTokensRepository,
-                    additionalBlockchainsToDerive = action.additionalBlockchainsToDerive,
-                    messageRes = action.messageResId,
-                )
-                withMainContext {
-                    store.dispatch(GlobalAction.ScanFailsCounter.ChooseBehavior(result))
-                    when (result) {
-                        is CompletionResult.Success -> {
-                            tangemSdkManager.changeDisplayedCardIdNumbersCount(result.data)
-                            action.onSuccess?.invoke(result.data)
-                        }
-                        is CompletionResult.Failure -> {
-                            action.onFailure?.invoke(result.error)
-                        }
-                    }
-                }
-            }
-        }
         is GlobalAction.FetchUserCountry -> {
             scope.launch {
                 // TODO("After adding DI") get dependencies by DI
@@ -186,6 +176,28 @@ private fun handleAction(action: Action, appState: () -> AppState?, dispatch: Di
         is GlobalAction.SetTopUpController -> {
             walletCurrenciesManager.addListener(action.topUpController)
         }
+        is GlobalAction.UpdateUserWalletsListManager -> {
+            /*
+             * If UserWalletsListManager's implementation is changed,
+             * then all selectedUserWallet's observers is became irrelevant
+             */
+            action.manager.selectedUserWallet
+                .distinctUntilChanged()
+                .onEach { userWallet ->
+                    Analytics.send(event = Basic.WalletOpened())
+
+                    store.state.globalState.feedbackManager?.infoHolder?.let { infoHolder ->
+                        infoHolder.setCardInfo(data = userWallet.scanResponse)
+
+                        store.state.daggerGraphState.get(DaggerGraphState::walletManagersFacade)
+                            .getAll(userWalletId = userWallet.walletId)
+                            .onEach(infoHolder::setWalletsInfo)
+                            .launchIn(scope)
+                    }
+                }
+                .flowOn(Dispatchers.IO)
+                .launchIn(scope)
+        }
     }
 }
 
diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt
index 0c90110fcb..2b282844d5 100644
--- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt
@@ -97,6 +97,9 @@ fun globalReducer(action: Action, state: AppState, appStateHolder: AppStateHolde
                 userWalletsListManager = action.manager,
             )
         }
+        is GlobalAction.ChangeAppThemeMode -> globalState.copy(
+            appThemeMode = action.appThemeMode,
+        )
         else -> globalState
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt
index 1e5a3cfce0..f5a30ba673 100644
--- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt
@@ -1,6 +1,7 @@
 package com.tangem.tap.common.redux.global
 
 import com.tangem.datasource.config.ConfigManager
+import com.tangem.domain.apptheme.model.AppThemeMode
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.tap.common.analytics.topup.TopUpController
@@ -29,6 +30,7 @@ data class GlobalState(
     val userCountryCode: String? = null,
     val userWalletsListManager: UserWalletsListManager? = null,
     val topUpController: TopUpController? = null,
+    val appThemeMode: AppThemeMode = AppThemeMode.DEFAULT,
 ) : StateType
 
 typealias CryptoCurrencyName = String
diff --git a/app/src/main/java/com/tangem/tap/common/redux/legacy/LegacyMiddleware.kt b/app/src/main/java/com/tangem/tap/common/redux/legacy/LegacyMiddleware.kt
new file mode 100644
index 0000000000..495a45f59b
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/redux/legacy/LegacyMiddleware.kt
@@ -0,0 +1,22 @@
+package com.tangem.tap.common.redux.legacy
+
+import com.tangem.domain.redux.LegacyAction
+import com.tangem.tap.common.feedback.RateCanBeBetterEmail
+import com.tangem.tap.common.redux.AppState
+import com.tangem.tap.store
+import org.rekotlin.Middleware
+
+internal object LegacyMiddleware {
+    val legacyMiddleware: Middleware<AppState> = { _, _ ->
+        { next ->
+            { action ->
+                when (action) {
+                    is LegacyAction.SendEmailRateCanBeBetter -> {
+                        store.state.globalState.feedbackManager?.sendEmail(RateCanBeBetterEmail())
+                    }
+                }
+                next(action)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/ui/SimpleAlertDialog.kt b/app/src/main/java/com/tangem/tap/common/ui/SimpleAlertDialog.kt
index 365f235f11..3cd171d04a 100644
--- a/app/src/main/java/com/tangem/tap/common/ui/SimpleAlertDialog.kt
+++ b/app/src/main/java/com/tangem/tap/common/ui/SimpleAlertDialog.kt
@@ -2,6 +2,7 @@ package com.tangem.tap.common.ui
 
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.store
 import com.tangem.wallet.R
@@ -39,7 +40,7 @@ object SimpleCancelableAlertDialog {
         secondaryButtonAction: () -> Unit = {},
         context: Context,
     ): AlertDialog {
-        return AlertDialog.Builder(context).apply {
+        return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog).apply {
             setTitle(titleRes?.let { context.getString(it) } ?: title)
             setMessage(messageRes?.let { context.getString(it) } ?: message)
             setPositiveButton(context.getText(primaryButtonRes)) { _, _ -> primaryButtonAction() }
diff --git a/app/src/main/java/com/tangem/tap/di/ActivityModule.kt b/app/src/main/java/com/tangem/tap/di/ActivityModule.kt
index a894d7c4fe..2ff65f28a2 100644
--- a/app/src/main/java/com/tangem/tap/di/ActivityModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/ActivityModule.kt
@@ -3,14 +3,19 @@ package com.tangem.tap.di
 import android.content.Context
 import com.tangem.domain.card.ScanCardUseCase
 import com.tangem.domain.card.repository.CardSdkConfigRepository
+import com.tangem.domain.exchange.RampStateManager
 import com.tangem.tap.domain.TangemSdkManager
 import com.tangem.tap.domain.scanCard.repository.DefaultScanCardRepository
-import com.tangem.tap.userTokensRepository
+import com.tangem.tap.network.exchangeServices.DefaultRampManager
+import com.tangem.tap.proxy.AppStateHolder
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
 import javax.inject.Singleton
 
 @Module
@@ -35,9 +40,21 @@ internal object ActivityModule {
         return ScanCardUseCase(
             cardSdkConfigRepository = cardSdkConfigRepository,
             scanCardRepository = DefaultScanCardRepository(
-                userTokensRepository = userTokensRepository,
                 tangemSdkManager = tangemSdkManager,
             ),
         )
     }
+
+    @Provides
+    @Singleton
+    fun provideDefaultRampManager(appStateHolder: AppStateHolder): RampStateManager {
+        return DefaultRampManager(appStateHolder.exchangeService)
+    }
+
+    @Provides
+    @Singleton
+    @DelayedWork
+    fun provideActivityDelayedWorkCoroutineScope(): CoroutineScope {
+        return CoroutineScope(SupervisorJob() + Dispatchers.IO)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/di/Qualifiers.kt b/app/src/main/java/com/tangem/tap/di/Qualifiers.kt
new file mode 100644
index 0000000000..df7fab7779
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/di/Qualifiers.kt
@@ -0,0 +1,8 @@
+@file:Suppress("Filename")
+package com.tangem.tap.di
+
+import javax.inject.Qualifier
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class DelayedWork
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/di/analytics/AnalyticsModule.kt b/app/src/main/java/com/tangem/tap/di/analytics/AnalyticsModule.kt
new file mode 100644
index 0000000000..34dbbd2e11
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/di/analytics/AnalyticsModule.kt
@@ -0,0 +1,20 @@
+package com.tangem.tap.di.analytics
+
+import com.tangem.domain.analytics.ChangeCardAnalyticsContextUseCase
+import com.tangem.tap.common.analytics.DefaultChangeCardAnalyticsContextUseCase
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object AnalyticsModule {
+
+    @Provides
+    @Singleton
+    fun provideChangeCardAnalyticsContextUseCase(): ChangeCardAnalyticsContextUseCase {
+        return DefaultChangeCardAnalyticsContextUseCase()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/di/domain/AppCurrencyDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/AppCurrencyDomainModule.kt
index c69bca18d1..ab7bc24782 100644
--- a/app/src/main/java/com/tangem/tap/di/domain/AppCurrencyDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/AppCurrencyDomainModule.kt
@@ -1,22 +1,34 @@
 package com.tangem.tap.di.domain
 
+import com.tangem.domain.appcurrency.GetAvailableCurrenciesUseCase
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
+import com.tangem.domain.appcurrency.SelectAppCurrencyUseCase
 import com.tangem.domain.appcurrency.repository.AppCurrencyRepository
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ViewModelComponent
-import dagger.hilt.android.scopes.ViewModelScoped
 
 @Module
 @InstallIn(ViewModelComponent::class)
 internal object AppCurrencyDomainModule {
 
     @Provides
-    @ViewModelScoped
     fun provideGetSelectedAppCurrencyUseCase(
         appCurrencyRepository: AppCurrencyRepository,
     ): GetSelectedAppCurrencyUseCase {
         return GetSelectedAppCurrencyUseCase(appCurrencyRepository)
     }
+
+    @Provides
+    fun provideSelectAppCurrencyUseCase(appCurrencyRepository: AppCurrencyRepository): SelectAppCurrencyUseCase {
+        return SelectAppCurrencyUseCase(appCurrencyRepository)
+    }
+
+    @Provides
+    fun provideGetAvailableCurrenciesUseCase(
+        appCurrencyRepository: AppCurrencyRepository,
+    ): GetAvailableCurrenciesUseCase {
+        return GetAvailableCurrenciesUseCase(appCurrencyRepository)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/di/domain/AppThemeDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/AppThemeDomainModule.kt
index b4378101b0..4b6fc45a17 100644
--- a/app/src/main/java/com/tangem/tap/di/domain/AppThemeDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/AppThemeDomainModule.kt
@@ -6,10 +6,10 @@ import com.tangem.domain.apptheme.repository.AppThemeModeRepository
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ViewModelComponent
+import dagger.hilt.components.SingletonComponent
 
 @Module
-@InstallIn(ViewModelComponent::class)
+@InstallIn(SingletonComponent::class)
 internal object AppThemeDomainModule {
 
     @Provides
diff --git a/app/src/main/java/com/tangem/tap/di/domain/CardDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/CardDomainModule.kt
index a7f064da55..918b41ff04 100644
--- a/app/src/main/java/com/tangem/tap/di/domain/CardDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/CardDomainModule.kt
@@ -5,6 +5,10 @@ import com.tangem.domain.card.repository.CardRepository
 import com.tangem.domain.card.repository.CardSdkConfigRepository
 import com.tangem.domain.demo.DemoConfig
 import com.tangem.domain.demo.IsDemoCardUseCase
+import com.tangem.domain.wallets.legacy.WalletsStateHolder
+import com.tangem.domain.wallets.usecase.IsNeedToBackupUseCase
+import com.tangem.tap.domain.TangemSdkManager
+import com.tangem.tap.domain.card.DefaultDerivePublicKeysUseCase
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -41,11 +45,29 @@ internal object CardDomainModule {
 
     @Provides
     @ViewModelScoped
-    fun provideGetCardWasScannedUseCase(cardRepository: CardRepository): GetCardWasScannedUseCase {
-        return GetCardWasScannedUseCase(cardRepository = cardRepository)
+    fun provideWasWalletAlreadySignedHashesConfirmedUseCase(cardRepository: CardRepository): WasCardScannedUseCase {
+        return WasCardScannedUseCase(cardRepository = cardRepository)
+    }
+
+    @Provides
+    @ViewModelScoped
+    fun provideSetCardWasScannedUseCase(cardRepository: CardRepository): SetCardWasScannedUseCase {
+        return SetCardWasScannedUseCase(cardRepository = cardRepository)
     }
 
     @Provides
     @ViewModelScoped
     fun provideIsDemoCardUseCase(): IsDemoCardUseCase = IsDemoCardUseCase(config = DemoConfig())
+
+    @Provides
+    @ViewModelScoped
+    fun provideDerivePublicKeysUseCase(tangemSdkManager: TangemSdkManager): DerivePublicKeysUseCase {
+        return DefaultDerivePublicKeysUseCase(tangemSdkManager = tangemSdkManager)
+    }
+
+    @Provides
+    @ViewModelScoped
+    fun provideIsNeedToBackupUseCase(walletStateHolder: WalletsStateHolder): IsNeedToBackupUseCase {
+        return IsNeedToBackupUseCase(walletStateHolder)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/di/domain/SettingsDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/SettingsDomainModule.kt
index eaf0da329c..afe7009baa 100644
--- a/app/src/main/java/com/tangem/tap/di/domain/SettingsDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/SettingsDomainModule.kt
@@ -1,8 +1,11 @@
 package com.tangem.tap.di.domain
 
-import com.tangem.domain.settings.CanUseBiometryUseCase
-import com.tangem.domain.settings.IsUserAlreadyRateAppUseCase
-import com.tangem.domain.settings.ShouldShowSaveWalletScreenUseCase
+import com.tangem.domain.balancehiding.DeviceFlipDetector
+import com.tangem.domain.balancehiding.IsBalanceHiddenUseCase
+import com.tangem.domain.balancehiding.ListenToFlipsUseCase
+import com.tangem.domain.balancehiding.repositories.BalanceHidingRepository
+import com.tangem.domain.settings.*
+import com.tangem.domain.settings.repositories.AppRatingRepository
 import com.tangem.domain.settings.repositories.SettingsRepository
 import com.tangem.tap.domain.TangemSdkManager
 import com.tangem.tap.domain.settings.DefaultLegacySettingsRepository
@@ -18,8 +21,28 @@ internal object SettingsDomainModule {
 
     @Provides
     @ViewModelScoped
-    fun providesGetWalletsUseCase(settingsRepository: SettingsRepository): IsUserAlreadyRateAppUseCase {
-        return IsUserAlreadyRateAppUseCase(settingsRepository = settingsRepository)
+    fun providesIsReadyToShowRatingUseCase(appRatingRepository: AppRatingRepository): IsReadyToShowRateAppUseCase {
+        return IsReadyToShowRateAppUseCase(appRatingRepository = appRatingRepository)
+    }
+
+    @Provides
+    @ViewModelScoped
+    fun providesRemindToRateAppLaterUseCase(appRatingRepository: AppRatingRepository): RemindToRateAppLaterUseCase {
+        return RemindToRateAppLaterUseCase(appRatingRepository = appRatingRepository)
+    }
+
+    @Provides
+    @ViewModelScoped
+    fun providesNeverToSuggestRateAppUseCase(appRatingRepository: AppRatingRepository): NeverToSuggestRateAppUseCase {
+        return NeverToSuggestRateAppUseCase(appRatingRepository = appRatingRepository)
+    }
+
+    @Provides
+    @ViewModelScoped
+    fun providesSetWalletWithFundsFoundUseCase(
+        appRatingRepository: AppRatingRepository,
+    ): SetWalletWithFundsFoundUseCase {
+        return SetWalletWithFundsFoundUseCase(appRatingRepository = appRatingRepository)
     }
 
     @Provides
@@ -37,4 +60,24 @@ internal object SettingsDomainModule {
             legacySettingsRepository = DefaultLegacySettingsRepository(tangemSdkManager = tangemSdkManager),
         )
     }
+
+    @Provides
+    @ViewModelScoped
+    fun providesIsBalanceHiddenUseCase(balanceHidingRepository: BalanceHidingRepository): IsBalanceHiddenUseCase {
+        return IsBalanceHiddenUseCase(
+            balanceHidingRepository = balanceHidingRepository,
+        )
+    }
+
+    @Provides
+    @ViewModelScoped
+    fun providesListenUseCase(
+        flipDetector: DeviceFlipDetector,
+        balanceHidingRepository: BalanceHidingRepository,
+    ): ListenToFlipsUseCase {
+        return ListenToFlipsUseCase(
+            flipDetector = flipDetector,
+            balanceHidingRepository = balanceHidingRepository,
+        )
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/di/domain/TokensDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/TokensDomainModule.kt
index 1a77f50c7b..e9a9087e06 100644
--- a/app/src/main/java/com/tangem/tap/di/domain/TokensDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/TokensDomainModule.kt
@@ -1,9 +1,12 @@
 package com.tangem.tap.di.domain
 
+import com.tangem.domain.exchange.RampStateManager
 import com.tangem.domain.tokens.*
 import com.tangem.domain.tokens.repository.CurrenciesRepository
+import com.tangem.domain.tokens.repository.MarketCryptoCurrencyRepository
 import com.tangem.domain.tokens.repository.NetworksRepository
 import com.tangem.domain.tokens.repository.QuotesRepository
+import com.tangem.domain.walletmanager.WalletManagersFacade
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.Module
 import dagger.Provides
@@ -13,6 +16,7 @@ import dagger.hilt.android.scopes.ViewModelScoped
 
 @Module
 @InstallIn(ViewModelComponent::class)
+@Suppress("TooManyFunctions")
 internal object TokensDomainModule {
 
     @Provides
@@ -25,6 +29,14 @@ internal object TokensDomainModule {
         return FetchTokenListUseCase(currenciesRepository, networksRepository, quotesRepository)
     }
 
+    @Provides
+    @ViewModelScoped
+    fun provideFetchPendingTransactionsUseCase(
+        networksRepository: NetworksRepository,
+    ): FetchPendingTransactionsUseCase {
+        return FetchPendingTransactionsUseCase(networksRepository)
+    }
+
     @Provides
     @ViewModelScoped
     fun provideGetTokenListUseCase(
@@ -36,6 +48,17 @@ internal object TokensDomainModule {
         return GetTokenListUseCase(currenciesRepository, quotesRepository, networksRepository, dispatchers)
     }
 
+    @Provides
+    @ViewModelScoped
+    fun provideGetCardTokensListUseCase(
+        currenciesRepository: CurrenciesRepository,
+        quotesRepository: QuotesRepository,
+        networksRepository: NetworksRepository,
+        dispatchers: CoroutineDispatcherProvider,
+    ): GetCardTokensListUseCase {
+        return GetCardTokensListUseCase(currenciesRepository, quotesRepository, networksRepository, dispatchers)
+    }
+
     @Provides
     @ViewModelScoped
     fun provideRemoveCurrencyUseCase(
@@ -56,6 +79,24 @@ internal object TokensDomainModule {
         return GetCurrencyStatusUpdatesUseCase(currenciesRepository, quotesRepository, networksRepository, dispatchers)
     }
 
+    @Provides
+    @ViewModelScoped
+    fun provideGetCurrencyWarningsUseCase(
+        walletManagersFacade: WalletManagersFacade,
+        currenciesRepository: CurrenciesRepository,
+        quotesRepository: QuotesRepository,
+        networksRepository: NetworksRepository,
+        dispatchers: CoroutineDispatcherProvider,
+    ): GetCurrencyWarningsUseCase {
+        return GetCurrencyWarningsUseCase(
+            walletManagersFacade = walletManagersFacade,
+            currenciesRepository = currenciesRepository,
+            quotesRepository = quotesRepository,
+            networksRepository = networksRepository,
+            dispatchers = dispatchers,
+        )
+    }
+
     @Provides
     @ViewModelScoped
     fun provideGetPrimaryCurrencyUseCase(
@@ -82,6 +123,22 @@ internal object TokensDomainModule {
         return FetchCurrencyStatusUseCase(currenciesRepository, networksRepository, quotesRepository)
     }
 
+    @Provides
+    @ViewModelScoped
+    fun provideFetchCardTokenListUseCase(
+        currenciesRepository: CurrenciesRepository,
+        quotesRepository: QuotesRepository,
+        networksRepository: NetworksRepository,
+    ): FetchCardTokenListUseCase {
+        return FetchCardTokenListUseCase(currenciesRepository, networksRepository, quotesRepository)
+    }
+
+    @Provides
+    @ViewModelScoped
+    fun provideGetCryptoCurrencyUseCase(currenciesRepository: CurrenciesRepository): GetCryptoCurrencyUseCase {
+        return GetCryptoCurrencyUseCase(currenciesRepository)
+    }
+
     @Provides
     @ViewModelScoped
     fun provideToggleTokenListGroupingUseCase(
@@ -108,8 +165,60 @@ internal object TokensDomainModule {
     @Provides
     @ViewModelScoped
     fun provideGetCryptoCurrencyActionsUseCase(
+        rampStateManager: RampStateManager,
+        marketCryptoCurrencyRepository: MarketCryptoCurrencyRepository,
         dispatchers: CoroutineDispatcherProvider,
     ): GetCryptoCurrencyActionsUseCase {
-        return GetCryptoCurrencyActionsUseCase(dispatchers)
+        return GetCryptoCurrencyActionsUseCase(rampStateManager, marketCryptoCurrencyRepository, dispatchers)
+    }
+
+    @Provides
+    @ViewModelScoped
+    fun provideGetCurrencyStatusByNetworkUseCase(
+        currenciesRepository: CurrenciesRepository,
+        quotesRepository: QuotesRepository,
+        networksRepository: NetworksRepository,
+        dispatchers: CoroutineDispatcherProvider,
+    ): GetNetworkCoinStatusUseCase {
+        return GetNetworkCoinStatusUseCase(
+            currenciesRepository = currenciesRepository,
+            quotesRepository = quotesRepository,
+            networksRepository = networksRepository,
+            dispatchers = dispatchers,
+        )
+    }
+
+    @Provides
+    @ViewModelScoped
+    fun provideGetCurrenciesUseCase(currenciesRepository: CurrenciesRepository): GetCryptoCurrenciesUseCase {
+        return GetCryptoCurrenciesUseCase(currenciesRepository = currenciesRepository)
+    }
+
+    @Provides
+    @ViewModelScoped
+    fun provideIsCryptoCurrencyCoinCouldHideUseCase(
+        currenciesRepository: CurrenciesRepository,
+    ): IsCryptoCurrencyCoinCouldHideUseCase {
+        return IsCryptoCurrencyCoinCouldHideUseCase(
+            currenciesRepository = currenciesRepository,
+        )
+    }
+
+    @Provides
+    @ViewModelScoped
+    fun provideUpdateDelayedCurrencyStatusUseCase(
+        networksRepository: NetworksRepository,
+    ): UpdateDelayedNetworkStatusUseCase {
+        return UpdateDelayedNetworkStatusUseCase(
+            networksRepository = networksRepository,
+        )
+    }
+
+    @Provides
+    @ViewModelScoped
+    fun provideHasMissedAddressesCryptoCurrenciesUseCase(
+        currenciesRepository: CurrenciesRepository,
+    ): GetMissedAddressesCryptoCurrenciesUseCase {
+        return GetMissedAddressesCryptoCurrenciesUseCase(currenciesRepository = currenciesRepository)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/di/domain/TxHistoryDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/TxHistoryDomainModule.kt
index 3ab36cd231..7ba9e05cff 100644
--- a/app/src/main/java/com/tangem/tap/di/domain/TxHistoryDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/TxHistoryDomainModule.kt
@@ -2,6 +2,7 @@ package com.tangem.tap.di.domain
 
 import com.tangem.domain.tokens.*
 import com.tangem.domain.txhistory.repository.TxHistoryRepository
+import com.tangem.domain.txhistory.usecase.GetExplorerTransactionUrlUseCase
 import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsCountUseCase
 import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsUseCase
 import dagger.Module
@@ -25,4 +26,12 @@ internal object TxHistoryDomainModule {
     fun provideGetTxHistoryItemsUseCase(txHistoryRepository: TxHistoryRepository): GetTxHistoryItemsUseCase {
         return GetTxHistoryItemsUseCase(repository = txHistoryRepository)
     }
+
+    @Provides
+    @ViewModelScoped
+    fun providesGetExplorerTransactionUrlUseCase(
+        txHistoryRepository: TxHistoryRepository,
+    ): GetExplorerTransactionUrlUseCase {
+        return GetExplorerTransactionUrlUseCase(repository = txHistoryRepository)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/di/domain/WalletsDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/WalletsDomainModule.kt
index 8e3d763c56..3634bdc1b8 100644
--- a/app/src/main/java/com/tangem/tap/di/domain/WalletsDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/WalletsDomainModule.kt
@@ -20,6 +20,18 @@ internal object WalletsDomainModule {
         return GetWalletsUseCase(walletsStateHolder = walletsStateHolder)
     }
 
+    @Provides
+    @ViewModelScoped
+    fun providesGetUserWalletUseCase(walletsStateHolder: WalletsStateHolder): GetUserWalletUseCase {
+        return GetUserWalletUseCase(walletsStateHolder = walletsStateHolder)
+    }
+
+    @Provides
+    @ViewModelScoped
+    fun providesGetSelectedWalletSyncUseCase(walletsStateHolder: WalletsStateHolder): GetSelectedWalletSyncUseCase {
+        return GetSelectedWalletSyncUseCase(walletsStateHolder = walletsStateHolder)
+    }
+
     @Provides
     @ViewModelScoped
     fun providesGetSelectedWalletUseCase(walletsStateHolder: WalletsStateHolder): GetSelectedWalletUseCase {
@@ -62,6 +74,14 @@ internal object WalletsDomainModule {
         return DeleteWalletUseCase(walletsStateHolder = walletsStateHolder)
     }
 
+    @Provides
+    @ViewModelScoped
+    fun providesShouldSaveUserWalletsSyncUseCase(
+        walletsRepository: WalletsRepository,
+    ): ShouldSaveUserWalletsSyncUseCase {
+        return ShouldSaveUserWalletsSyncUseCase(walletsRepository = walletsRepository)
+    }
+
     @Provides
     @ViewModelScoped
     fun providesShouldSaveUserWalletsUseCase(walletsRepository: WalletsRepository): ShouldSaveUserWalletsUseCase {
diff --git a/app/src/main/java/com/tangem/tap/domain/RatesRepository.kt b/app/src/main/java/com/tangem/tap/domain/RatesRepository.kt
deleted file mode 100644
index 3d2a5764e2..0000000000
--- a/app/src/main/java/com/tangem/tap/domain/RatesRepository.kt
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.tangem.tap.domain
-
-import com.tangem.common.services.Result
-import com.tangem.datasource.api.tangemTech.TangemTechApi
-import com.tangem.domain.common.ThrottlerWithValues
-import com.tangem.tap.features.wallet.models.Currency
-import com.tangem.utils.coroutines.CoroutineDispatcherProvider
-import kotlinx.coroutines.withContext
-import java.math.BigDecimal
-
-class RatesRepository(
-    private val tangemTechApi: TangemTechApi,
-    private val dispatchers: CoroutineDispatcherProvider,
-) {
-    private val throttler = ThrottlerWithValues<Currency, Result<BigDecimal>?>(60000)
-
-    suspend fun loadFiatRate(currencyId: String, coinsList: List<Currency>): Result<RatesResult> =
-        withContext(dispatchers.io) {
-            // get and submit previous result of equivalents.
-            val throttledResult = coinsList.filter { throttler.isStillThrottled(it) }.map {
-                Pair(it, throttler.geValue(it))
-            }
-
-            val currenciesToUpdate = coinsList.filter { !throttler.isStillThrottled(it) }
-            val coinIds = currenciesToUpdate.mapNotNull { it.coinId }.distinct()
-            if (coinIds.isEmpty()) return@withContext handleFiatRatesResult(throttledResult.toMap())
-
-            runCatching { tangemTechApi.getRates(currencyId.lowercase(), coinIds.joinToString(",")) }
-                .onSuccess { response ->
-                    val ratesResultList: Map<String, Result<BigDecimal>> = response.rates.mapValues {
-                        Result.Success(it.value.toBigDecimal())
-                    }
-                    val updatedCurrencies = throttledResult.toMap().toMutableMap()
-                    coinsList.forEach { currency ->
-                        ratesResultList[currency.coinId]?.let {
-                            updatedCurrencies[currency] = it
-                            throttler.updateThrottlingTo(currency)
-                            throttler.setValue(currency, it)
-                        }
-                    }
-                    return@withContext handleFiatRatesResult(updatedCurrencies)
-                }
-                .onFailure { Result.Failure(it) }
-
-            error("Unreachable code because runCatching must return result")
-        }
-
-    private fun handleFiatRatesResult(rates: Map<Currency, Result<BigDecimal>?>): Result.Success<RatesResult> {
-        val success = mutableMapOf<Currency, BigDecimal>()
-        val failures = mutableMapOf<Currency, Throwable>()
-
-        rates.mapNotNull { (currency, priceResult) ->
-            when (priceResult) {
-                is Result.Success -> success[currency] = priceResult.data
-                is Result.Failure -> failures[currency] = priceResult.error
-                else -> null
-            }
-        }
-
-        return Result.Success(success to failures)
-    }
-
-    fun clear() {
-        throttler.clear()
-    }
-}
-
-typealias RatesResult = Pair<MutableMap<Currency, BigDecimal>, MutableMap<Currency, Throwable>>
-
-val RatesResult.loadedRates
-    get() = this.first
-
-val RatesResult.failedRates
-    get() = this.second
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt b/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
index a16c860685..ea5bd2e3aa 100644
--- a/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
@@ -5,12 +5,12 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import com.tangem.Message
 import com.tangem.TangemSdk
-import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.*
-import com.tangem.common.biometric.BiometricManager
+import com.tangem.common.authentication.KeystoreManager
 import com.tangem.common.card.FirmwareVersion
 import com.tangem.common.core.*
 import com.tangem.common.extensions.ByteArrayKey
+import com.tangem.common.services.secure.SecureStorage
 import com.tangem.common.usersCode.UserCodeRepository
 import com.tangem.core.analytics.Analytics
 import com.tangem.crypto.bip39.DefaultMnemonic
@@ -26,12 +26,12 @@ import com.tangem.operations.derivation.DeriveMultipleWalletPublicKeysTask
 import com.tangem.operations.pins.SetUserCodeCommand
 import com.tangem.operations.usersetttings.SetUserCodeRecoveryAllowedTask
 import com.tangem.tap.common.analytics.events.Basic
+import com.tangem.tap.derivationsFinder
 import com.tangem.tap.domain.tasks.CreateWalletAndRescanTask
 import com.tangem.tap.domain.tasks.product.CreateProductWalletTask
 import com.tangem.tap.domain.tasks.product.CreateProductWalletTaskResponse
 import com.tangem.tap.domain.tasks.product.ResetToFactorySettingsTask
 import com.tangem.tap.domain.tasks.product.ScanProductTask
-import com.tangem.tap.domain.tokens.UserTokensRepository
 import com.tangem.wallet.R
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.suspendCancellableCoroutine
@@ -39,31 +39,38 @@ import kotlinx.coroutines.withContext
 import kotlin.coroutines.resume
 
 @Suppress("TooManyFunctions")
-class TangemSdkManager(private val cardSdkConfigRepository: CardSdkConfigRepository, private val resources: Resources) {
+class TangemSdkManager(
+    private val cardSdkConfigRepository: CardSdkConfigRepository,
+    private val resources: Resources,
+) {
 
     private val tangemSdk: TangemSdk
         get() = cardSdkConfigRepository.sdk
 
     private val userCodeRepository by lazy {
         UserCodeRepository(
-            biometricManager = tangemSdk.biometricManager,
+            keystoreManager = tangemSdk.keystoreManager,
             secureStorage = tangemSdk.secureStorage,
         )
     }
 
     val canUseBiometry: Boolean
-        get() = tangemSdk.biometricManager.canAuthenticate || needEnrollBiometrics
+        get() = tangemSdk.authenticationManager.canAuthenticate || needEnrollBiometrics
 
     val needEnrollBiometrics: Boolean
-        get() = tangemSdk.biometricManager.canEnrollBiometrics
+        get() = tangemSdk.authenticationManager.needEnrollBiometrics
 
-    val biometricManager: BiometricManager
-        get() = tangemSdk.biometricManager
+    val keystoreManager: KeystoreManager
+        get() = tangemSdk.keystoreManager
+
+    val secureStorage: SecureStorage
+        get() = tangemSdk.secureStorage
+
+    val userCodeRequestPolicy: UserCodeRequestPolicy
+        get() = tangemSdk.config.userCodeRequestPolicy
 
     suspend fun scanProduct(
-        userTokensRepository: UserTokensRepository,
         cardId: String? = null,
-        additionalBlockchainsToDerive: Collection<Blockchain>? = null,
         messageRes: Int? = null,
         allowsRequestAccessCodeFromRepository: Boolean = false,
     ): CompletionResult<ScanResponse> {
@@ -71,8 +78,7 @@ class TangemSdkManager(private val cardSdkConfigRepository: CardSdkConfigReposit
         return runTaskAsyncReturnOnMain(
             runnable = ScanProductTask(
                 card = null,
-                userTokensRepository = userTokensRepository,
-                additionalBlockchainsToDerive = additionalBlockchainsToDerive,
+                derivationsFinder = derivationsFinder,
                 allowsRequestAccessCodeFromRepository = allowsRequestAccessCodeFromRepository,
             ),
             cardId = cardId,
@@ -141,7 +147,9 @@ class TangemSdkManager(private val cardSdkConfigRepository: CardSdkConfigReposit
         allowsRequestAccessCodeFromRepository: Boolean,
     ): CompletionResult<CardDTO> {
         return runTaskAsyncReturnOnMain(
-            runnable = ResetToFactorySettingsTask(allowsRequestAccessCodeFromRepository),
+            runnable = ResetToFactorySettingsTask(
+                allowsRequestAccessCodeFromRepository = allowsRequestAccessCodeFromRepository,
+            ),
             cardId = cardId,
             initialMessage = Message(resources.getString(R.string.card_settings_reset_card_to_factory)),
         )
@@ -247,17 +255,8 @@ class TangemSdkManager(private val cardSdkConfigRepository: CardSdkConfigReposit
         return resources.getString(stringResId, *formatArgs)
     }
 
-    fun setAccessCodeRequestPolicy(useBiometricsForAccessCode: Boolean) {
-        tangemSdk.config.userCodeRequestPolicy = if (useBiometricsForAccessCode) {
-            UserCodeRequestPolicy.AlwaysWithBiometrics(codeType = UserCodeType.AccessCode)
-        } else {
-            UserCodeRequestPolicy.Default
-        }
-    }
-
-    fun useBiometricsForAccessCode(): Boolean {
-        val policy = tangemSdk.config.userCodeRequestPolicy
-        return policy is UserCodeRequestPolicy.AlwaysWithBiometrics && policy.codeType == UserCodeType.AccessCode
+    fun setUserCodeRequestPolicy(policy: UserCodeRequestPolicy) {
+        tangemSdk.config.userCodeRequestPolicy = policy
     }
 
     companion object {
diff --git a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
index 6d23a8b78a..9edc4ee417 100644
--- a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
@@ -19,6 +19,7 @@ import com.tangem.tap.common.analytics.events.Basic
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.dispatchWithMain
 import com.tangem.tap.common.extensions.setContext
+import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.walletStores.WalletStoresError
 import com.tangem.tap.domain.walletconnect2.domain.WalletConnectInteractor
@@ -28,11 +29,13 @@ import com.tangem.tap.features.disclaimer.createDisclaimer
 import com.tangem.tap.features.disclaimer.redux.DisclaimerAction
 import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsAction
 import com.tangem.tap.features.wallet.redux.WalletAction
+import com.tangem.tap.proxy.redux.DaggerGraphState
 import com.tangem.utils.coroutines.AppCoroutineDispatcherProvider
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
+import org.rekotlin.Store
 import timber.log.Timber
 
 class TapWalletManager(
@@ -75,17 +78,34 @@ class TapWalletManager(
         withMainContext {
             // Order is important
             store.dispatch(DisclaimerAction.SetDisclaimer(card.createDisclaimer()))
-            store.dispatch(WalletAction.UserWalletChanged(userWallet))
-            store.dispatch(WalletAction.UpdateCanSaveUserWallets(preferencesStorage.shouldSaveUserWallets))
+            store.dispatchWalletAction(action = WalletAction.UserWalletChanged(userWallet))
+            store.dispatchWalletAction(
+                action = WalletAction.UpdateCanSaveUserWallets(
+                    canSaveUserWallets = store.state.daggerGraphState.get(DaggerGraphState::walletsRepository)
+                        .shouldSaveUserWalletsSync(),
+                ),
+            )
             store.dispatch(TwinCardsAction.IfTwinsPrepareState(scanResponse))
             store.dispatch(WalletConnectAction.ResetState)
             store.dispatch(GlobalAction.SaveScanResponse(scanResponse))
             store.dispatch(WalletConnectAction.RestoreSessions(scanResponse))
             store.dispatch(GlobalAction.SetIfCardVerifiedOnline(!attestationFailed))
-            store.dispatch(WalletAction.Warnings.CheckIfNeeded)
+            store.dispatchWalletAction(action = WalletAction.Warnings.CheckIfNeeded)
+        }
+
+        val walletFeatureToggles = store.state.daggerGraphState.get(DaggerGraphState::walletFeatureToggles)
+        if (!walletFeatureToggles.isRedesignedScreenEnabled) {
+            setupWalletConnectV2(userWallet)
+            loadData(userWallet = userWallet, refresh = refresh)
+        }
+    }
+
+    private fun Store<AppState>.dispatchWalletAction(action: WalletAction) {
+        val walletFeatureToggles = state.daggerGraphState.get(DaggerGraphState::walletFeatureToggles)
+
+        if (!walletFeatureToggles.isRedesignedScreenEnabled) {
+            dispatch(action = action)
         }
-        setupWalletConnectV2(userWallet)
-        loadData(userWallet, refresh)
     }
 
     private fun setupWalletConnectV2(userWallet: UserWallet) {
@@ -142,21 +162,31 @@ class TapWalletManager(
             }
     }
 
-    private fun getAccountsForWc(wcInteractor: WalletConnectInteractor): List<Account> {
-        return store.state.walletState.walletManagers
-            .mapNotNull {
-                val wallet = it.wallet
-                val chainId = wcInteractor.blockchainHelper.networkIdToChainIdOrNull(
-                    wallet.blockchain.toNetworkId(),
+    private suspend fun getAccountsForWc(wcInteractor: WalletConnectInteractor): List<Account> {
+        val walletManagerToggles = store.state.daggerGraphState
+            .get(DaggerGraphState::walletFeatureToggles)
+        val walletManagers = if (walletManagerToggles.isRedesignedScreenEnabled) {
+            val walletManagerFacade = store.state.daggerGraphState
+                .get(DaggerGraphState::walletManagersFacade)
+            val userWallet = userWalletsListManager.selectedUserWalletSync ?: return emptyList()
+            walletManagerFacade.getStoredWalletManagers(userWallet.walletId)
+        } else {
+            store.state.walletState.walletManagers
+        }
+
+        return walletManagers.mapNotNull {
+            val wallet = it.wallet
+            val chainId = wcInteractor.blockchainHelper.networkIdToChainIdOrNull(
+                wallet.blockchain.toNetworkId(),
+            )
+            chainId?.let {
+                Account(
+                    chainId,
+                    wallet.address,
+                    wallet.publicKey.derivationPath?.rawPath,
                 )
-                chainId?.let {
-                    Account(
-                        chainId,
-                        wallet.address,
-                        wallet.publicKey.derivationPath?.rawPath,
-                    )
-                }
             }
+        }
     }
 
     fun updateConfigManager(data: ScanResponse) {
diff --git a/app/src/main/java/com/tangem/tap/domain/card/DefaultDerivePublicKeysUseCase.kt b/app/src/main/java/com/tangem/tap/domain/card/DefaultDerivePublicKeysUseCase.kt
new file mode 100644
index 0000000000..d402c97a7c
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/card/DefaultDerivePublicKeysUseCase.kt
@@ -0,0 +1,29 @@
+package com.tangem.tap.domain.card
+
+import arrow.core.Either
+import arrow.core.left
+import arrow.core.right
+import com.tangem.common.doOnFailure
+import com.tangem.common.doOnSuccess
+import com.tangem.common.extensions.ByteArrayKey
+import com.tangem.crypto.hdWallet.DerivationPath
+import com.tangem.domain.card.DerivePublicKeysUseCase
+import com.tangem.operations.derivation.DerivationTaskResponse
+import com.tangem.tap.domain.TangemSdkManager
+
+// TODO: [REDACTED_JIRA]
+internal class DefaultDerivePublicKeysUseCase(
+    private val tangemSdkManager: TangemSdkManager,
+) : DerivePublicKeysUseCase {
+
+    override suspend fun invoke(
+        cardId: String?,
+        derivations: Map<ByteArrayKey, List<DerivationPath>>,
+    ): Either<Unit, DerivationTaskResponse> {
+        tangemSdkManager.derivePublicKeys(cardId = cardId, derivations = derivations)
+            .doOnSuccess { return it.right() }
+            .doOnFailure { return Unit.left() }
+
+        return Unit.left()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt b/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt
index 183ba76207..f1345d6989 100644
--- a/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt
@@ -8,6 +8,8 @@ import java.util.concurrent.CopyOnWriteArrayList
 /**
 [REDACTED_AUTHOR]
  */
+// TODO: Delete with WalletFeatureToggles
+@Deprecated(message = "Used only in old wallet screen")
 class WarningMessagesManager {
 
     private val warningsList = CopyOnWriteArrayList<WarningMessage>()
@@ -73,7 +75,7 @@ class WarningMessagesManager {
             location = listOf(WarningMessage.Location.MainScreen),
             blockchains = null,
             titleResId = R.string.common_warning,
-            messageResId = R.string.alert_developer_card,
+            // messageResId = R.string.alert_developer_card,
             origin = WarningMessage.Origin.Local,
         )
 
@@ -85,7 +87,7 @@ class WarningMessagesManager {
             location = listOf(WarningMessage.Location.MainScreen),
             blockchains = null,
             titleResId = R.string.common_warning,
-            messageResId = R.string.alert_card_signed_transactions,
+            // messageResId = R.string.alert_card_signed_transactions,
             origin = WarningMessage.Origin.Local,
         )
 
@@ -96,8 +98,8 @@ class WarningMessagesManager {
             priority = WarningMessage.Priority.Info,
             location = listOf(WarningMessage.Location.MainScreen),
             blockchains = null,
-            titleResId = R.string.warning_important_security_info,
-            messageResId = R.string.warning_signed_tx_previously,
+            // titleResId = R.string.warning_important_security_info,
+            // messageResId = R.string.warning_signed_tx_previously,
             origin = WarningMessage.Origin.Local,
             buttonTextId = R.string.warning_button_learn_more,
             titleFormatArg = "\u26A0",
@@ -147,7 +149,7 @@ class WarningMessagesManager {
             location = listOf(WarningMessage.Location.MainScreen),
             blockchains = null,
             titleResId = R.string.common_warning,
-            messageResId = R.string.alert_demo_message,
+            // messageResId = R.string.alert_demo_message,
             origin = WarningMessage.Origin.Local,
         )
 
@@ -160,14 +162,14 @@ class WarningMessagesManager {
                 location = listOf(WarningMessage.Location.MainScreen),
                 blockchains = null,
                 titleResId = R.string.common_warning,
-                messageResId = R.string.warning_low_signatures_format,
+                // messageResId = R.string.warning_low_signatures_format,
                 origin = WarningMessage.Origin.Local,
                 messageFormatArg = remainingSignatures.toString(),
             )
         }
 
-        fun isAlreadySignedHashesWarning(warning: WarningMessage): Boolean {
-            return warning.messageResId == R.string.alert_card_signed_transactions
-        }
+        // fun isAlreadySignedHashesWarning(warning: WarningMessage): Boolean {
+        //     return warning.messageResId == R.string.alert_card_signed_transactions
+        // }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/scanCard/LegacyScanProcessor.kt b/app/src/main/java/com/tangem/tap/domain/scanCard/LegacyScanProcessor.kt
index ec38e494bc..a1e3f77974 100644
--- a/app/src/main/java/com/tangem/tap/domain/scanCard/LegacyScanProcessor.kt
+++ b/app/src/main/java/com/tangem/tap/domain/scanCard/LegacyScanProcessor.kt
@@ -15,7 +15,10 @@ import com.tangem.domain.common.util.twinsIsTwinned
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.tap.*
 import com.tangem.tap.common.analytics.paramsInterceptor.CardContextInterceptor
-import com.tangem.tap.common.extensions.*
+import com.tangem.tap.common.extensions.addContext
+import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.common.extensions.dispatchWithMain
+import com.tangem.tap.common.extensions.setContext
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.features.disclaimer.createDisclaimer
 import com.tangem.tap.features.disclaimer.redux.DisclaimerAction
@@ -23,6 +26,7 @@ import com.tangem.tap.features.disclaimer.redux.DisclaimerCallback
 import com.tangem.tap.features.onboarding.OnboardingHelper
 import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsAction
 import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsStep
+import com.tangem.utils.extensions.DELAY_SDK_DIALOG_CLOSE
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -34,8 +38,7 @@ internal object LegacyScanProcessor {
         allowsRequestAccessCodeFromRepository: Boolean = false,
     ): CompletionResult<ScanResponse> {
         return tangemSdkManager.scanProduct(
-            userTokensRepository,
-            cardId,
+            cardId = cardId,
             allowsRequestAccessCodeFromRepository = allowsRequestAccessCodeFromRepository,
         )
     }
@@ -56,10 +59,7 @@ internal object LegacyScanProcessor {
 
         tangemSdkManager.changeDisplayedCardIdNumbersCount(null)
 
-        val result = tangemSdkManager.scanProduct(
-            userTokensRepository = userTokensRepository,
-            cardId = cardId,
-        )
+        val result = tangemSdkManager.scanProduct(cardId)
 
         store.dispatchOnMain(GlobalAction.ScanFailsCounter.ChooseBehavior(result))
 
diff --git a/app/src/main/java/com/tangem/tap/domain/scanCard/UseCaseScanProcessor.kt b/app/src/main/java/com/tangem/tap/domain/scanCard/UseCaseScanProcessor.kt
index 002b9bc7ff..562ac25718 100644
--- a/app/src/main/java/com/tangem/tap/domain/scanCard/UseCaseScanProcessor.kt
+++ b/app/src/main/java/com/tangem/tap/domain/scanCard/UseCaseScanProcessor.kt
@@ -8,13 +8,13 @@ import com.tangem.core.navigation.AppScreen
 import com.tangem.core.navigation.NavigationAction
 import com.tangem.domain.card.ScanCardException
 import com.tangem.domain.models.scan.ScanResponse
-import com.tangem.tap.DELAY_SDK_DIALOG_CLOSE
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.domain.scanCard.chains.*
 import com.tangem.tap.domain.scanCard.utils.ScanCardExceptionConverter
 import com.tangem.tap.preferencesStorage
 import com.tangem.tap.proxy.redux.DaggerGraphState
 import com.tangem.tap.store
+import com.tangem.utils.extensions.DELAY_SDK_DIALOG_CLOSE
 import kotlinx.coroutines.delay
 
 internal object UseCaseScanProcessor {
diff --git a/app/src/main/java/com/tangem/tap/domain/scanCard/chains/CheckForOnboardingChain.kt b/app/src/main/java/com/tangem/tap/domain/scanCard/chains/CheckForOnboardingChain.kt
index 4f5729135c..cb6471a4ca 100644
--- a/app/src/main/java/com/tangem/tap/domain/scanCard/chains/CheckForOnboardingChain.kt
+++ b/app/src/main/java/com/tangem/tap/domain/scanCard/chains/CheckForOnboardingChain.kt
@@ -11,7 +11,6 @@ import com.tangem.domain.common.TapWorkarounds.canSkipBackup
 import com.tangem.domain.common.util.twinsIsTwinned
 import com.tangem.domain.core.chain.Chain
 import com.tangem.domain.models.scan.ScanResponse
-import com.tangem.tap.DELAY_SDK_DIALOG_CLOSE
 import com.tangem.tap.common.extensions.addContext
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.setContext
@@ -21,6 +20,7 @@ import com.tangem.tap.domain.TapWalletManager
 import com.tangem.tap.features.onboarding.OnboardingHelper
 import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsAction
 import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsStep
+import com.tangem.utils.extensions.DELAY_SDK_DIALOG_CLOSE
 import kotlinx.coroutines.delay
 import org.rekotlin.Store
 
diff --git a/app/src/main/java/com/tangem/tap/domain/scanCard/repository/DefaultScanCardRepository.kt b/app/src/main/java/com/tangem/tap/domain/scanCard/repository/DefaultScanCardRepository.kt
index 2de676ba6c..f74d706775 100644
--- a/app/src/main/java/com/tangem/tap/domain/scanCard/repository/DefaultScanCardRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/scanCard/repository/DefaultScanCardRepository.kt
@@ -8,13 +8,8 @@ import com.tangem.domain.card.repository.ScanCardRepository
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.tap.domain.TangemSdkManager
 import com.tangem.tap.domain.scanCard.utils.ScanCardExceptionConverter
-import com.tangem.tap.domain.tokens.UserTokensRepository
 
 internal class DefaultScanCardRepository(
-    // FIXME: The repository should not depend on another repository.
-    //  But now we need to provide loadBlockchainsToDerive() to ScanProductTask and it's hard to move this method from
-    //  UserTokensRepository.
-    private val userTokensRepository: UserTokensRepository,
     private val tangemSdkManager: TangemSdkManager,
 ) : ScanCardRepository {
 
@@ -27,7 +22,6 @@ internal class DefaultScanCardRepository(
         when (
             val result = tangemSdkManager.scanProduct(
                 cardId = cardId,
-                userTokensRepository = userTokensRepository,
                 allowsRequestAccessCodeFromRepository = allowRequestAccessCodeFromStorage,
             )
         ) {
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateProductWalletTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateProductWalletTask.kt
index 3c0467b1da..b6536cfd4b 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateProductWalletTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateProductWalletTask.kt
@@ -303,7 +303,7 @@ private class CreateWalletTangemWallet(
 
     private fun getBlockchains(cardId: String, card: CardDTO): List<Blockchain> {
         return when {
-            DemoHelper.isDemoCardId(cardId) -> DemoHelper.config.demoBlockchains
+            DemoHelper.isDemoCardId(cardId) -> DemoHelper.config.demoBlockchains.toList()
             card.isTestCard -> listOf(Blockchain.BitcoinTestnet, Blockchain.EthereumTestnet)
             else -> listOf(Blockchain.Bitcoin, Blockchain.Ethereum)
         }
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/product/DerivationsFinder.kt b/app/src/main/java/com/tangem/tap/domain/tasks/product/DerivationsFinder.kt
new file mode 100644
index 0000000000..38a23139b6
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/DerivationsFinder.kt
@@ -0,0 +1,159 @@
+package com.tangem.tap.domain.tasks.product
+
+import com.tangem.blockchain.blockchains.cardano.CardanoUtils
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchain.common.derivation.DerivationStyle
+import com.tangem.crypto.hdWallet.DerivationPath
+import com.tangem.datasource.local.token.UserTokensStore
+import com.tangem.domain.common.DerivationStyleProvider
+import com.tangem.domain.common.TapWorkarounds.useOldStyleDerivation
+import com.tangem.domain.common.extensions.fromNetworkId
+import com.tangem.domain.models.scan.CardDTO
+import com.tangem.domain.userwallets.UserWalletIdBuilder
+import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles
+import com.tangem.tap.domain.tokens.UserTokensStorageService
+import com.tangem.tap.features.demo.DemoHelper
+import com.tangem.tap.features.wallet.models.Currency
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.withContext
+
+internal data class BlockchainToDerive(
+    val blockchain: Blockchain,
+    val derivationPath: DerivationPath?,
+)
+
+// FIXME: May be move to DI, currently unnecessary
+internal class DerivationsFinder(
+    private val legacyTokensStore: UserTokensStorageService,
+    private val newTokensStore: UserTokensStore,
+    private val walletFeatureToggles: WalletFeatureToggles,
+    private val dispatchers: CoroutineDispatcherProvider,
+) {
+
+    suspend fun findBlockchainsToDerive(
+        card: CardDTO,
+        derivationStyleProvider: DerivationStyleProvider,
+    ): Set<BlockchainToDerive> {
+        if (!card.settings.isHDWalletAllowed || card.wallets.isEmpty()) return emptySet()
+        val userWalletId = UserWalletIdBuilder.card(card).build() ?: return emptySet()
+        val derivationStyle = derivationStyleProvider.getDerivationStyle()
+
+        var blockchains = withContext(dispatchers.io) {
+            if (walletFeatureToggles.isRedesignedScreenEnabled) {
+                getBlockchainsNew(userWalletId)
+            } else {
+                getBlockchainsLegacy(userWalletId)
+            }
+        }
+
+        if (blockchains.isEmpty()) {
+            blockchains = if (DemoHelper.isDemoCardId(card.cardId)) {
+                getDemoBlockchains(derivationStyle)
+            } else {
+                getDefaultBlockchains(derivationStyle)
+            }
+        }
+
+        // we should generate second key for cardano
+        // because cardano address generation for wallet2 requires keys from 2 derivations
+        // https://developers.cardano.org/docs/get-started/cardano-serialization-lib/generating-keys/
+        blockchains.addSecondCardanoDerivationIfPresent()
+
+        if (card.settings.isHDWalletAllowed) {
+            blockchains.addEthereumBlockchains(derivationStyle)
+        }
+
+        // pay attention to this
+        if (!card.useOldStyleDerivation) {
+            blockchains.removeUnnecessaryBlockchains()
+        }
+
+        return blockchains
+    }
+
+    private suspend fun getBlockchainsNew(userWalletId: UserWalletId): MutableSet<BlockchainToDerive> {
+        val responseTokens = newTokensStore.getSyncOrNull(userWalletId)
+            ?.tokens
+            ?: return hashSetOf()
+
+        return responseTokens.asSequence()
+            .filter { it.contractAddress == null }
+            .mapNotNull { coin ->
+                val blockchain = Blockchain.fromNetworkId(coin.networkId) ?: return@mapNotNull null
+                val derivationPath = coin.derivationPath?.let(::DerivationPath)
+
+                BlockchainToDerive(blockchain, derivationPath)
+            }
+            .toMutableSet()
+    }
+
+    private fun getBlockchainsLegacy(userWalletId: UserWalletId): MutableSet<BlockchainToDerive> {
+        val currencies = legacyTokensStore.getUserTokens(userWalletId.stringValue)
+            ?.takeIf { it.isNotEmpty() }
+            ?: return hashSetOf()
+
+        return currencies.asSequence()
+            .filterIsInstance<Currency.Blockchain>()
+            .map { coin ->
+                val blockchain = coin.blockchain
+                val derivationPath = coin.derivationPath?.let(::DerivationPath)
+
+                BlockchainToDerive(blockchain, derivationPath)
+            }
+            .toMutableSet()
+    }
+
+    // TODO: Move to user wallet config
+    private fun getDemoBlockchains(derivationStyle: DerivationStyle?): MutableSet<BlockchainToDerive> {
+        return DemoHelper.config.demoBlockchains.mapToBlockchainsWithDerivations(derivationStyle)
+    }
+
+    // TODO: Move to user wallet config
+    private fun getDefaultBlockchains(derivationStyle: DerivationStyle?): MutableSet<BlockchainToDerive> {
+        val defaultBlockchains = setOf(Blockchain.Bitcoin, Blockchain.Ethereum)
+
+        return defaultBlockchains.mapToBlockchainsWithDerivations(derivationStyle)
+    }
+}
+
+private fun MutableSet<BlockchainToDerive>.addEthereumBlockchains(derivationStyle: DerivationStyle?) {
+    val ethereumBlockchains = setOf(Blockchain.Ethereum, Blockchain.EthereumTestnet)
+        .mapToBlockchainsWithDerivations(derivationStyle)
+
+    addAll(ethereumBlockchains)
+}
+
+private fun MutableSet<BlockchainToDerive>.removeUnnecessaryBlockchains() {
+    val unnecessaryBlockchains = listOf(
+        Blockchain.BSC, Blockchain.BSCTestnet,
+        Blockchain.Polygon, Blockchain.PolygonTestnet,
+        Blockchain.RSK,
+        Blockchain.Fantom, Blockchain.FantomTestnet,
+        Blockchain.Avalanche, Blockchain.AvalancheTestnet,
+    )
+
+    removeAll { it.blockchain in unnecessaryBlockchains }
+}
+
+private fun MutableSet<BlockchainToDerive>.addSecondCardanoDerivationIfPresent() {
+    val cardanoDerivation = this
+        .firstOrNull { it.blockchain == Blockchain.Cardano }
+        ?.derivationPath
+        ?: return
+
+    val secondCardanoBlockchain = BlockchainToDerive(
+        blockchain = Blockchain.Cardano,
+        derivationPath = CardanoUtils.extendedDerivationPath(cardanoDerivation),
+    )
+
+    add(secondCardanoBlockchain)
+}
+
+private fun Set<Blockchain>.mapToBlockchainsWithDerivations(
+    derivationStyle: DerivationStyle?,
+): MutableSet<BlockchainToDerive> {
+    return mapTo(hashSetOf()) { blockchain ->
+        BlockchainToDerive(blockchain, blockchain.derivationPath(derivationStyle))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
index ba72ddb543..a3fac64bc1 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
@@ -1,7 +1,5 @@
 package com.tangem.tap.domain.tasks.product
 
-import com.tangem.blockchain.blockchains.cardano.CardanoUtils
-import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.CompletionResult
 import com.tangem.common.card.Card
 import com.tangem.common.card.FirmwareVersion
@@ -15,13 +13,11 @@ import com.tangem.common.tlv.Tlv
 import com.tangem.common.tlv.TlvDecoder
 import com.tangem.crypto.CryptoUtils
 import com.tangem.crypto.hdWallet.DerivationPath
-import com.tangem.domain.common.BlockchainNetwork
 import com.tangem.domain.common.DerivationStyleProvider
 import com.tangem.domain.common.TapWorkarounds.isExcluded
 import com.tangem.domain.common.TapWorkarounds.isNotSupportedInThatRelease
 import com.tangem.domain.common.TapWorkarounds.isStart2Coin
 import com.tangem.domain.common.TapWorkarounds.isTangemTwins
-import com.tangem.domain.common.TapWorkarounds.useOldStyleDerivation
 import com.tangem.domain.common.TwinsHelper
 import com.tangem.domain.common.configs.CardConfig
 import com.tangem.domain.common.util.derivationStyleProvider
@@ -35,16 +31,14 @@ import com.tangem.operations.derivation.DeriveMultipleWalletPublicKeysTask
 import com.tangem.operations.files.ReadFilesTask
 import com.tangem.operations.issuerAndUserData.ReadIssuerDataCommand
 import com.tangem.tap.domain.TapSdkError
-import com.tangem.tap.domain.tokens.UserTokensRepository
 import com.tangem.tap.preferencesStorage
 import com.tangem.tap.scope
 import kotlinx.coroutines.launch
 import kotlin.collections.set
 
-class ScanProductTask(
-    val card: Card? = null,
-    private val userTokensRepository: UserTokensRepository?,
-    private val additionalBlockchainsToDerive: Collection<Blockchain>? = null,
+internal class ScanProductTask(
+    private val card: Card?,
+    private val derivationsFinder: DerivationsFinder?,
     override val allowsRequestAccessCodeFromRepository: Boolean = false,
 ) : CardSessionRunnable<ScanResponse> {
 
@@ -63,14 +57,14 @@ class ScanProductTask(
 
         val commandProcessor = when {
             cardDto.isTangemTwins -> ScanTwinProcessor()
-            else -> ScanWalletProcessor(userTokensRepository, additionalBlockchainsToDerive)
+            else -> ScanWalletProcessor(derivationsFinder)
         }
         commandProcessor.proceed(cardDto, session) { processorResult ->
             when (processorResult) {
                 is CompletionResult.Success -> ScanTask().run(session) { scanTaskResult ->
                     when (scanTaskResult) {
                         is CompletionResult.Success -> {
-                            // it need because processorResult.data.card doesn't contains attestation result
+                            // it needed because processorResult.data.card doesn't contains attestation result
                             // and CardWallet.derivedKeys
                             val processorScanResponseWithNewCard = processorResult.data.copy(
                                 card = CardDTO(scanTaskResult.data),
@@ -99,8 +93,7 @@ class ScanProductTask(
 }
 
 private class ScanWalletProcessor(
-    private val userTokensRepository: UserTokensRepository?,
-    private val additionalBlockchainsToDerive: Collection<Blockchain>? = null,
+    private val derivationsFinder: DerivationsFinder?,
 ) : ProductCommandProcessor<ScanResponse> {
 
     var primaryCard: PrimaryCard? = null
@@ -244,131 +237,28 @@ private class ScanWalletProcessor(
         }
     }
 
-    private suspend fun getBlockchainsToDerive(
-        card: CardDTO,
-        derivationStyleProvider: DerivationStyleProvider,
-    ): List<BlockchainNetwork> {
-        val userTokensRepository = userTokensRepository ?: return emptyList()
-        val blockchainsToDerive = userTokensRepository.loadBlockchainsToDerive(
-            card,
-            derivationStyleProvider.getDerivationStyle(),
-        )
-            .toMutableList()
-            .ifEmpty { getDefaultBlockchains(derivationStyleProvider) }
-
-        if (card.settings.isHDWalletAllowed) {
-            blockchainsToDerive += getEthereumBlockchains(derivationStyleProvider)
-        }
-
-        additionalBlockchainsToDerive?.let {
-            blockchainsToDerive += getAdditionalBlockchainToDerive(derivationStyleProvider, it)
-        }
-
-        // we should generate second key for cardano
-        // because cardano address generation for wallet2 requires keys from 2 derivations
-        // https://developers.cardano.org/docs/get-started/cardano-serialization-lib/generating-keys/
-        val secondCardanoNetwork = blockchainsToDerive
-            .find { it.blockchain == Blockchain.Cardano }
-            ?.let { getCardanoSecondNetwork(it) }
-        secondCardanoNetwork?.let { blockchainsToDerive.add(it) }
-
-        // pay attention to this
-        if (!card.useOldStyleDerivation) {
-            removeUnnecessaryBlockchains(blockchainsToDerive, derivationStyleProvider)
-        }
-
-        return blockchainsToDerive.distinct()
-    }
-
     private fun getWalletProductType(card: CardDTO): ProductType {
         if (card.batchId == CardDTO.RING_BATCH_ID) {
             return ProductType.Ring
         }
-        return if (card.firmwareVersion >= FirmwareVersion.Ed25519Slip0010Available) {
+        return if (card.firmwareVersion >= FirmwareVersion.Ed25519Slip0010Available &&
+            card.settings.isKeysImportAllowed
+        ) {
             ProductType.Wallet2
         } else {
             ProductType.Wallet
         }
     }
 
-    private fun getDefaultBlockchains(
-        derivationStyleProvider: DerivationStyleProvider,
-    ): MutableList<BlockchainNetwork> {
-        return mutableListOf(
-            BlockchainNetwork(
-                blockchain = Blockchain.Bitcoin,
-                derivationStyleProvider = derivationStyleProvider,
-            ),
-            BlockchainNetwork(
-                blockchain = Blockchain.Ethereum,
-                derivationStyleProvider = derivationStyleProvider,
-            ),
-        )
-    }
-
-    private fun getEthereumBlockchains(derivationStyleProvider: DerivationStyleProvider): List<BlockchainNetwork> {
-        return listOf(
-            BlockchainNetwork(
-                blockchain = Blockchain.Ethereum,
-                derivationStyleProvider = derivationStyleProvider,
-            ),
-            BlockchainNetwork(
-                blockchain = Blockchain.EthereumTestnet,
-                derivationStyleProvider = derivationStyleProvider,
-            ),
-        )
-    }
-
-    private fun getAdditionalBlockchainToDerive(
-        derivationStyleProvider: DerivationStyleProvider,
-        collection: Collection<Blockchain>,
-    ): List<BlockchainNetwork> {
-        return collection.map {
-            BlockchainNetwork(
-                blockchain = it,
-                derivationStyleProvider = derivationStyleProvider,
-            )
-        }
-    }
-
-    private fun getCardanoSecondNetwork(cardanoBlockchainNetwork: BlockchainNetwork): BlockchainNetwork? {
-        val cardanoStandardDerivation = cardanoBlockchainNetwork.derivationPath?.let { DerivationPath(it) }
-            ?: return null
-        val cardanoPatchedDerivation = CardanoUtils.extendedDerivationPath(cardanoStandardDerivation)
-        return BlockchainNetwork(
-            blockchain = Blockchain.Cardano,
-            derivationPath = cardanoPatchedDerivation.rawPath,
-            tokens = emptyList(),
-        )
-    }
-
-    private fun removeUnnecessaryBlockchains(
-        blockchainsToDerive: MutableList<BlockchainNetwork>,
-        derivationStyleProvider: DerivationStyleProvider,
-    ) {
-        blockchainsToDerive.removeAll(
-            listOf(
-                Blockchain.BSC, Blockchain.BSCTestnet,
-                Blockchain.Polygon, Blockchain.PolygonTestnet,
-                Blockchain.RSK,
-                Blockchain.Fantom, Blockchain.FantomTestnet,
-                Blockchain.Avalanche, Blockchain.AvalancheTestnet,
-            ).map {
-                BlockchainNetwork(
-                    blockchain = it,
-                    derivationStyleProvider = derivationStyleProvider,
-                )
-            },
-        )
-    }
-
     private suspend fun collectDerivations(
         card: CardDTO,
         config: CardConfig,
         derivationStyleProvider: DerivationStyleProvider,
     ): Map<ByteArrayKey, List<DerivationPath>> {
-        val blockchains = getBlockchainsToDerive(card, derivationStyleProvider)
         val derivations = mutableMapOf<ByteArrayKey, List<DerivationPath>>()
+        val blockchains = derivationsFinder
+            ?.findBlockchainsToDerive(card, derivationStyleProvider)
+            ?: return derivations
 
         blockchains.forEach { blockchain ->
             val curve = config.primaryCurve(blockchain.blockchain)
@@ -376,7 +266,7 @@ private class ScanWalletProcessor(
             if (wallet.chainCode == null) return@forEach
 
             val key = wallet.publicKey.toMapKey()
-            val path = blockchain.derivationPath?.let { DerivationPath(it) }
+            val path = blockchain.derivationPath
             if (path != null) {
                 val addedDerivations = derivations[key]
                 if (addedDerivations != null) {
@@ -386,6 +276,7 @@ private class ScanWalletProcessor(
                 }
             }
         }
+
         return derivations
     }
 }
diff --git a/app/src/main/java/com/tangem/tap/domain/tokens/LoadAvailableCoinsService.kt b/app/src/main/java/com/tangem/tap/domain/tokens/LoadAvailableCoinsService.kt
deleted file mode 100644
index 39e845f7b2..0000000000
--- a/app/src/main/java/com/tangem/tap/domain/tokens/LoadAvailableCoinsService.kt
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.tangem.tap.domain.tokens
-
-import com.squareup.moshi.JsonAdapter
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.common.services.Result
-import com.tangem.datasource.api.common.MoshiConverter
-import com.tangem.datasource.api.tangemTech.TangemTechApi
-import com.tangem.datasource.api.tangemTech.models.CoinsResponse
-import com.tangem.datasource.asset.AssetReader
-import com.tangem.domain.common.extensions.toNetworkId
-import com.tangem.utils.coroutines.CoroutineDispatcherProvider
-import kotlinx.coroutines.withContext
-
-class LoadAvailableCoinsService(
-    private val tangemTechApi: TangemTechApi,
-    private val dispatchers: CoroutineDispatcherProvider,
-    private val assetReader: AssetReader,
-) {
-    private val currenciesAdapter: JsonAdapter<CurrenciesFromJson> =
-        MoshiConverter.networkMoshi.adapter(CurrenciesFromJson::class.java)
-
-    suspend fun getSupportedTokens(
-        isTestNet: Boolean,
-        supportedBlockchains: List<Blockchain>,
-        page: Int,
-        searchInput: String?,
-    ): Result<LoadedCoins> {
-        if (isTestNet) {
-            return Result.Success(
-                LoadedCoins(
-                    currencies = getTestnetCoins().filter(searchInput),
-                    moreAvailable = false,
-                ),
-            )
-        }
-
-        val offset = page * LOAD_PER_PAGE
-        return when (val result = loadCoins(supportedBlockchains, offset, searchInput)) {
-            is Result.Success -> {
-                val data = result.data
-
-                Result.Success(
-                    LoadedCoins(
-                        currencies = data.coins.map {
-                            Currency.fromCoinResponse(currency = it, imageHost = data.imageHost)
-                        },
-                        moreAvailable = data.total > offset + LOAD_PER_PAGE,
-                    ),
-                )
-            }
-            is Result.Failure -> {
-                Result.Failure(result.error)
-            }
-        }
-    }
-
-    private suspend fun loadCoins(
-        supportedBlockchains: List<Blockchain>,
-        offset: Int,
-        searchInput: String?,
-    ): Result<CoinsResponse> {
-        return withContext(dispatchers.io) {
-            runCatching {
-                tangemTechApi.getCoins(
-                    networkIds = supportedBlockchains.joinToString(
-                        separator = ",",
-                        transform = Blockchain::toNetworkId,
-                    ),
-                    active = true,
-                    searchText = searchInput,
-                    offset = offset,
-                    limit = LOAD_PER_PAGE,
-                )
-            }.fold(
-                onSuccess = { Result.Success(it) },
-                onFailure = { Result.Failure(it) },
-            )
-        }
-    }
-
-    private fun getTestnetCoins(): List<Currency> {
-        val json = assetReader.readJson(FILE_NAME_TESTNET_COINS)
-        return currenciesAdapter.fromJson(json)!!.coins
-            .map { Currency.fromJsonObject(it) }
-    }
-
-    private fun List<Currency>.filter(searchInput: String?): List<Currency> {
-        if (searchInput.isNullOrBlank()) return this
-
-        return filter { currency ->
-            currency.symbol.contains(searchInput, ignoreCase = true) ||
-                currency.name.contains(searchInput, ignoreCase = true)
-        }
-    }
-
-    private companion object {
-        const val LOAD_PER_PAGE = 100
-        const val FILE_NAME_TESTNET_COINS = "testnet_tokens"
-    }
-}
-
-data class LoadedCoins(
-    val currencies: List<Currency>,
-    val moreAvailable: Boolean,
-)
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensRepository.kt b/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensRepository.kt
index 7026203db3..c3cfe566f3 100644
--- a/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensRepository.kt
@@ -1,13 +1,12 @@
 package com.tangem.tap.domain.tokens
 
-import android.content.Context
 import com.tangem.blockchain.common.derivation.DerivationStyle
 import com.tangem.common.core.TangemSdkError
+import com.tangem.datasource.api.common.response.getOrThrow
 import com.tangem.datasource.api.tangemTech.TangemTechApi
 import com.tangem.datasource.api.tangemTech.TangemTechService
 import com.tangem.datasource.api.tangemTech.models.UserTokensResponse
 import com.tangem.datasource.connection.NetworkConnectionManager
-import com.tangem.datasource.files.AndroidFileReader
 import com.tangem.domain.common.BlockchainNetwork
 import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.userwallets.UserWalletIdBuilder
@@ -108,7 +107,8 @@ class UserTokensRepository(
         return runCatching { tangemTechApi.getUserTokens(userWalletId) }
             .fold(
                 onSuccess = { response ->
-                    response.tokens
+                    response.getOrThrow()
+                        .tokens
                         .mapNotNull(Currency.Companion::fromTokenResponse)
                         .also { storageService.saveUserTokens(userWalletId, it.toUserTokensResponse()) }
                         .distinct()
@@ -131,12 +131,12 @@ class UserTokensRepository(
 
         // TODO("After adding DI") get dependencies by DI
         fun init(
-            context: Context,
             tangemTechService: TangemTechService,
             networkConnectionManager: NetworkConnectionManager,
+            storageService: UserTokensStorageService,
         ): UserTokensRepository {
             return UserTokensRepository(
-                storageService = UserTokensStorageService(fileReader = AndroidFileReader(context)),
+                storageService = storageService,
                 tangemTechApi = tangemTechService.api,
                 dispatchers = AppCoroutineDispatcherProvider(),
                 networkConnectionManager = networkConnectionManager,
diff --git a/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensStorageService.kt b/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensStorageService.kt
index ff90f83942..08fb2c4ce4 100644
--- a/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensStorageService.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensStorageService.kt
@@ -1,9 +1,11 @@
 package com.tangem.tap.domain.tokens
 
+import android.content.Context
 import com.squareup.moshi.JsonAdapter
 import com.tangem.Log
 import com.tangem.datasource.api.common.MoshiConverter
 import com.tangem.datasource.api.tangemTech.models.UserTokensResponse
+import com.tangem.datasource.files.AndroidFileReader
 import com.tangem.datasource.files.FileReader
 import com.tangem.tap.features.wallet.models.Currency
 
@@ -30,5 +32,7 @@ class UserTokensStorageService(private val fileReader: FileReader) {
     companion object {
         private const val FILE_NAME_PREFIX_USER_TOKENS = "user_tokens"
         private fun getFileNameForUserTokens(userId: String): String = "${FILE_NAME_PREFIX_USER_TOKENS}_$userId"
+
+        fun init(context: Context) = UserTokensStorageService(AndroidFileReader(context))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/twins/FinalizeTwinTask.kt b/app/src/main/java/com/tangem/tap/domain/twins/FinalizeTwinTask.kt
index 1ece7060b3..4e3364feba 100644
--- a/app/src/main/java/com/tangem/tap/domain/twins/FinalizeTwinTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/twins/FinalizeTwinTask.kt
@@ -23,7 +23,7 @@ class FinalizeTwinTask(
                     PreflightReadTask(PreflightReadMode.FullCardRead).run(session) { readResult ->
                         when (readResult) {
                             is CompletionResult.Success ->
-                                ScanProductTask(readResult.data, null)
+                                ScanProductTask(readResult.data, derivationsFinder = null)
                                     .run(session, callback)
                             is CompletionResult.Failure ->
                                 callback(CompletionResult.Failure(readResult.error))
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/di/UserWalletsListManagerProvider.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/di/UserWalletsListManagerProvider.kt
index 5f02cd1258..719491a036 100644
--- a/app/src/main/java/com/tangem/tap/domain/userWalletList/di/UserWalletsListManagerProvider.kt
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/di/UserWalletsListManagerProvider.kt
@@ -3,25 +3,28 @@ package com.tangem.tap.domain.userWalletList.di
 import android.content.Context
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import com.tangem.common.Provider
+import com.tangem.common.authentication.AuthenticatedStorage
 import com.tangem.common.json.TangemSdkAdapter
 import com.tangem.common.services.secure.SecureStorage
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.sdk.storage.AndroidSecureStorage
 import com.tangem.sdk.storage.createEncryptedSharedPreferences
-import com.tangem.tap.domain.TangemSdkManager
 import com.tangem.tap.domain.userWalletList.implementation.BiometricUserWalletsListManager
 import com.tangem.tap.domain.userWalletList.implementation.RuntimeUserWalletsListManager
+import com.tangem.tap.domain.userWalletList.repository.DelegatedKeystoreManager
+import com.tangem.tap.domain.userWalletList.repository.UserWalletsKeysStoreDecorator
 import com.tangem.tap.domain.userWalletList.repository.implementation.BiometricUserWalletsKeysRepository
 import com.tangem.tap.domain.userWalletList.repository.implementation.DefaultSelectedUserWalletRepository
 import com.tangem.tap.domain.userWalletList.repository.implementation.DefaultUserWalletsPublicInformationRepository
 import com.tangem.tap.domain.userWalletList.repository.implementation.DefaultUserWalletsSensitiveInformationRepository
 import com.tangem.tap.domain.userWalletList.utils.json.*
+import com.tangem.tap.tangemSdkManager
 
 private const val USER_WALLETS_STORAGE_NAME = "user_wallets_storage"
 
 fun UserWalletsListManager.Companion.provideBiometricImplementation(
-    context: Context,
-    tangemSdkManager: TangemSdkManager,
+    applicationContext: Context,
 ): UserWalletsListManager {
     val moshi = Moshi.Builder()
         .add(WalletDerivedKeysMapAdapter())
@@ -38,15 +41,25 @@ fun UserWalletsListManager.Companion.provideBiometricImplementation(
 
     val secureStorage = AndroidSecureStorage(
         preferences = SecureStorage.createEncryptedSharedPreferences(
-            context = context,
+            context = applicationContext,
             storageName = USER_WALLETS_STORAGE_NAME,
         ),
     )
 
+    val authenticatedStorage = AuthenticatedStorage(
+        secureStorage = UserWalletsKeysStoreDecorator(
+            featureStorage = secureStorage,
+            cardSdkStorageProvider = Provider { tangemSdkManager.secureStorage },
+        ),
+        keystoreManager = DelegatedKeystoreManager(
+            keystoreManagerProvider = Provider { tangemSdkManager.keystoreManager },
+        ),
+    )
+
     val keysRepository = BiometricUserWalletsKeysRepository(
         moshi = moshi,
         secureStorage = secureStorage,
-        biometricManager = tangemSdkManager.biometricManager,
+        authenticatedStorage = authenticatedStorage,
     )
     val publicInformationRepository = DefaultUserWalletsPublicInformationRepository(
         moshi = moshi,
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/BiometricUserWalletsListManager.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/BiometricUserWalletsListManager.kt
index 76a94f34bd..f4c32feb54 100644
--- a/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/BiometricUserWalletsListManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/BiometricUserWalletsListManager.kt
@@ -57,21 +57,11 @@ internal class BiometricUserWalletsListManager(
         get() = state.value.userWallets.size
 
     override suspend fun unlock(): CompletionResult<UserWallet> {
-        return unlockWithBiometryInternal()
-            .mapFailure { error ->
-                if (error is UserWalletsListError) {
-                    error
-                } else {
-                    UserWalletsListError.UnableToUnlockUserWallets(cause = error)
-                }
-            }
-            .map {
-                selectedUserWalletSync.guard {
-                    throw UserWalletsListError.UnableToUnlockUserWallets(
-                        cause = IllegalStateException("No user wallet selected"),
-                    )
-                }
-            }
+        return unlockWithBiometryInternal().mapUnlockResult()
+    }
+
+    override suspend fun unlockAndSelect(selectedWalletId: UserWalletId): CompletionResult<UserWallet> {
+        return unlockWithBiometryInternal(selectedWalletId = selectedWalletId).mapUnlockResult()
     }
 
     override fun lock() {
@@ -141,7 +131,7 @@ internal class BiometricUserWalletsListManager(
 
         return sensitiveInformationRepository.delete(idsToRemove)
             .flatMap { publicInformationRepository.delete(idsToRemove) }
-            .flatMap { keysRepository.delete(idsToRemove) }
+            .map { keysRepository.delete(idsToRemove) }
             .map {
                 state.update { prevState ->
                     val newUserWallets = prevState.userWallets.filter { it.walletId !in idsToRemove }
@@ -158,7 +148,7 @@ internal class BiometricUserWalletsListManager(
     override suspend fun clear(): CompletionResult<Unit> {
         return sensitiveInformationRepository.clear()
             .flatMap { publicInformationRepository.clear() }
-            .flatMap { keysRepository.clear() }
+            .map { keysRepository.clear() }
             .map {
                 selectedUserWalletRepository.set(null)
                 lock()
@@ -198,7 +188,7 @@ internal class BiometricUserWalletsListManager(
             }
     }
 
-    private suspend fun unlockWithBiometryInternal(): CompletionResult<Unit> {
+    private suspend fun unlockWithBiometryInternal(selectedWalletId: UserWalletId? = null): CompletionResult<Unit> {
         return keysRepository.getAll()
             .map { keys ->
                 state.update { prevState ->
@@ -207,7 +197,7 @@ internal class BiometricUserWalletsListManager(
                     )
                 }
             }
-            .flatMap { loadModels() }
+            .flatMap { loadModels(selectedWalletId = selectedWalletId) }
             .map {
                 state.update { prevState ->
                     val hasLockedUserWallets = prevState.userWallets.any { it.isLocked }
@@ -216,6 +206,24 @@ internal class BiometricUserWalletsListManager(
             }
     }
 
+    private fun CompletionResult<Unit>.mapUnlockResult(): CompletionResult<UserWallet> {
+        return this
+            .mapFailure { error ->
+                if (error is UserWalletsListError) {
+                    error
+                } else {
+                    UserWalletsListError.UnableToUnlockUserWallets(cause = error)
+                }
+            }
+            .map {
+                selectedUserWalletSync.guard {
+                    throw UserWalletsListError.UnableToUnlockUserWallets(
+                        cause = IllegalStateException("No user wallet selected"),
+                    )
+                }
+            }
+    }
+
     private suspend fun saveEncryptionKeyIfNotNull(userWallet: UserWallet): CompletionResult<ByteArray?> {
         val encryptionKey = userWallet.scanResponse.card.encryptionKey
             ?.let { UserWalletEncryptionKey(userWallet.walletId, it) }
@@ -237,7 +245,7 @@ internal class BiometricUserWalletsListManager(
         }
     }
 
-    private suspend fun loadModels(): CompletionResult<Unit> {
+    private suspend fun loadModels(selectedWalletId: UserWalletId? = null): CompletionResult<Unit> {
         return getSavedUserWallets()
             .map { userWallets ->
                 if (userWallets.isNotEmpty()) {
@@ -247,7 +255,7 @@ internal class BiometricUserWalletsListManager(
                         prevState.copy(
                             userWallets = wallets,
                             selectedUserWalletId = findOrSetSelectedUserWalletId(
-                                prevSelectedWalletId = prevState.selectedUserWalletId,
+                                prevSelectedWalletId = selectedWalletId ?: prevState.selectedUserWalletId,
                                 userWallets = wallets,
                             ),
                         )
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/DelegatedKeystoreManager.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/DelegatedKeystoreManager.kt
new file mode 100644
index 0000000000..64e0f9a1ce
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/DelegatedKeystoreManager.kt
@@ -0,0 +1,18 @@
+package com.tangem.tap.domain.userWalletList.repository
+
+import com.tangem.common.Provider
+import com.tangem.common.authentication.KeystoreManager
+import javax.crypto.SecretKey
+
+internal class DelegatedKeystoreManager(
+    private val keystoreManagerProvider: Provider<KeystoreManager>,
+) : KeystoreManager {
+
+    override suspend fun authenticateAndGetKey(keyAlias: String): SecretKey? {
+        return keystoreManagerProvider().authenticateAndGetKey(keyAlias)
+    }
+
+    override suspend fun storeKey(keyAlias: String, key: SecretKey) {
+        keystoreManagerProvider().storeKey(keyAlias, key)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/UserWalletsKeysRepository.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/UserWalletsKeysRepository.kt
index 08c509a16c..170296fbe1 100644
--- a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/UserWalletsKeysRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/UserWalletsKeysRepository.kt
@@ -23,15 +23,13 @@ internal interface UserWalletsKeysRepository {
     /**
      * Delete encryption keys for user wallets. Biometric authentication not required
      * @param userWalletsIds List of [UserWalletId] whose encryption keys will be deleted
-     * @return [CompletionResult] of operation
      * */
-    suspend fun delete(userWalletsIds: List<UserWalletId>): CompletionResult<Unit>
+    suspend fun delete(userWalletsIds: List<UserWalletId>)
 
     /**
      * Clear all encryption keys for user wallets. Biometric authentication not required
-     * @return [CompletionResult] of operation
      * */
-    suspend fun clear(): CompletionResult<Unit>
+    suspend fun clear()
 
     /**
      * Determine if the user has saved user wallets
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/UserWalletsKeysStoreDecorator.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/UserWalletsKeysStoreDecorator.kt
new file mode 100644
index 0000000000..49e87a395a
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/UserWalletsKeysStoreDecorator.kt
@@ -0,0 +1,32 @@
+package com.tangem.tap.domain.userWalletList.repository
+
+import com.tangem.common.Provider
+import com.tangem.common.services.secure.SecureStorage
+
+/**
+ * A decorator for [SecureStorage] that facilitates data migration between two storages.
+ *
+ * @property featureStorage The primary storage, which will eventually contain all user data.
+ * @property cardSdkStorageProvider The SDK's storage where user data might have been previously stored.
+ */
+internal class UserWalletsKeysStoreDecorator(
+    private val featureStorage: SecureStorage,
+    private val cardSdkStorageProvider: Provider<SecureStorage>,
+) : SecureStorage by featureStorage {
+
+    override fun delete(account: String) {
+        featureStorage.delete(account)
+        cardSdkStorageProvider().delete(account)
+    }
+
+    override fun get(account: String): ByteArray? {
+        var data = featureStorage.get(account)
+
+        if (data == null) {
+            data = cardSdkStorageProvider().get(account) ?: return null
+            featureStorage.store(data, account)
+        }
+
+        return data
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/BiometricUserWalletsKeysRepository.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/BiometricUserWalletsKeysRepository.kt
index 0d4dd5d1c5..bb40308916 100644
--- a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/BiometricUserWalletsKeysRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/BiometricUserWalletsKeysRepository.kt
@@ -4,8 +4,7 @@ import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types
 import com.tangem.common.*
-import com.tangem.common.biometric.BiometricManager
-import com.tangem.common.biometric.BiometricStorage
+import com.tangem.common.authentication.AuthenticatedStorage
 import com.tangem.common.core.TangemSdkError
 import com.tangem.common.services.secure.SecureStorage
 import com.tangem.domain.wallets.legacy.UserWalletsListError
@@ -18,13 +17,10 @@ import kotlinx.coroutines.withContext
 
 internal class BiometricUserWalletsKeysRepository(
     moshi: Moshi,
-    biometricManager: BiometricManager,
+    private val authenticatedStorage: AuthenticatedStorage,
     private val secureStorage: SecureStorage,
 ) : UserWalletsKeysRepository {
-    private val biometricStorage = BiometricStorage(
-        biometricManager = biometricManager,
-        secureStorage = secureStorage,
-    )
+
     private val encryptionKeyAdapter: JsonAdapter<UserWalletEncryptionKey> = moshi.adapter(
         UserWalletEncryptionKey::class.java,
     )
@@ -37,13 +33,13 @@ internal class BiometricUserWalletsKeysRepository(
             getAllInternal()
                 .mapFailure { error ->
                     when (error) {
-                        is TangemSdkError.BiometricsAuthenticationLockout ->
+                        is TangemSdkError.AuthenticationLockout ->
                             UserWalletsListError.BiometricsAuthenticationLockout(isPermanent = false)
-                        is TangemSdkError.BiometricsAuthenticationPermanentLockout ->
+                        is TangemSdkError.AuthenticationPermanentLockout ->
                             UserWalletsListError.BiometricsAuthenticationLockout(isPermanent = true)
-                        is TangemSdkError.BiometricCryptographyKeyInvalidated ->
+                        is TangemSdkError.KeystoreInvalidated ->
                             UserWalletsListError.EncryptionKeyInvalidated
-                        is TangemSdkError.BiometricsUnavailable ->
+                        is TangemSdkError.AuthenticationUnavailable ->
                             UserWalletsListError.BiometricsAuthenticationDisabled
                         else -> error
                     }
@@ -57,26 +53,24 @@ internal class BiometricUserWalletsKeysRepository(
         }
     }
 
-    override suspend fun delete(userWalletsIds: List<UserWalletId>): CompletionResult<Unit> {
+    override suspend fun delete(userWalletsIds: List<UserWalletId>) {
         return withContext(Dispatchers.IO) {
-            userWalletsIds.map { userWalletId ->
+            userWalletsIds.forEach { userWalletId ->
                 deleteEncryptionKey(userWalletId)
             }
-                .fold()
-                .map { deleteUserWalletsIds(userWalletsIds) }
+
+            deleteUserWalletsIds(userWalletsIds)
         }
     }
 
-    override suspend fun clear(): CompletionResult<Unit> {
+    override suspend fun clear() {
         return withContext(Dispatchers.IO) {
             getUserWalletsIds()
-                .map { userWalletId ->
+                .forEach { userWalletId ->
                     deleteEncryptionKey(userWalletId)
                 }
-                .fold()
-                .map {
-                    clearUserWalletsIds()
-                }
+
+            clearUserWalletsIds()
         }
     }
 
@@ -89,35 +83,20 @@ internal class BiometricUserWalletsKeysRepository(
     private suspend fun getAllInternal(): CompletionResult<List<UserWalletEncryptionKey>> {
         return getUserWalletsIds()
             .map { userWalletId ->
-                // It is possible to request multiple user wallet keys from biometric storage because
-                // the biometric cryptography key has an expiration time.
-                // If this operation runs more than that expiration time, then the user will have to re-authorize
-                // to receive all user wallets encryption keys
                 getEncryptionKey(userWalletId)
-                    .flatMapOnFailure { error ->
-                        when (error) {
-                            is TangemSdkError.InvalidBiometricCryptographyKey,
-                            is TangemSdkError.BiometricCryptographyOperationFailed,
-                            -> {
-                                // These errors can be skipped as the user has the option to re-save their wallets
-                                // in case they occur
-                                CompletionResult.Success(data = null)
-                            }
-                            else -> CompletionResult.Failure(error)
-                        }
-                    }
                     .doOnFailure { error ->
                         when (error) {
-                            is TangemSdkError.UserCanceledBiometricsAuthentication -> {
+                            is TangemSdkError.UserCanceledAuthentication -> {
                                 // If the user cancels biometric authentication, then cancel operation with error
                                 return CompletionResult.Failure(error)
                             }
-                            is TangemSdkError.BiometricCryptographyKeyInvalidated -> {
+                            is TangemSdkError.KeystoreInvalidated -> {
                                 // If the biometric cryptography key was invalidated,
                                 // then delete all user wallets encryption keys and cancel operation with error
                                 getUserWalletsIds().forEach { userWalletId ->
                                     deleteEncryptionKey(userWalletId)
                                 }
+
                                 return CompletionResult.Failure(error)
                             }
                         }
@@ -129,20 +108,22 @@ internal class BiometricUserWalletsKeysRepository(
     }
 
     private suspend fun getEncryptionKey(userWalletId: UserWalletId): CompletionResult<UserWalletEncryptionKey?> {
-        return biometricStorage.get(StorageKey.UserWalletEncryptionKey(userWalletId).name)
+        return catching { authenticatedStorage.get(StorageKey.UserWalletEncryptionKey(userWalletId).name) }
             .map { it.decodeToKey() }
     }
 
     private suspend fun storeEncryptionKey(encryptionKey: UserWalletEncryptionKey): CompletionResult<Unit> {
-        return biometricStorage.store(
-            key = StorageKey.UserWalletEncryptionKey(encryptionKey.walletId).name,
-            data = encryptionKey.encode(),
-        )
+        return catching {
+            authenticatedStorage.store(
+                key = StorageKey.UserWalletEncryptionKey(encryptionKey.walletId).name,
+                data = encryptionKey.encode(),
+            )
+        }
             .map { storeUserWalletId(encryptionKey.walletId) }
     }
 
-    private suspend fun deleteEncryptionKey(userWalletId: UserWalletId): CompletionResult<Unit> {
-        return biometricStorage.delete(StorageKey.UserWalletEncryptionKey(userWalletId).name)
+    private fun deleteEncryptionKey(userWalletId: UserWalletId) {
+        return authenticatedStorage.delete(StorageKey.UserWalletEncryptionKey(userWalletId).name)
     }
 
     private suspend fun getUserWalletsIds(): List<UserWalletId> {
diff --git a/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/DefaultWalletManagersRepository.kt b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/DefaultWalletManagersRepository.kt
index 006bca6820..883b3a821d 100644
--- a/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/DefaultWalletManagersRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/DefaultWalletManagersRepository.kt
@@ -1,18 +1,17 @@
 package com.tangem.tap.domain.walletStores.repository.implementation
 
 import com.tangem.blockchain.common.*
-import com.tangem.blockchain.common.derivation.DerivationStyle
 import com.tangem.common.CompletionResult
 import com.tangem.common.catching
 import com.tangem.common.doOnSuccess
 import com.tangem.common.mapFailure
 import com.tangem.crypto.hdWallet.DerivationPath
 import com.tangem.domain.common.BlockchainNetwork
+import com.tangem.domain.common.DerivationStyleProvider
 import com.tangem.domain.common.TapWorkarounds.isTestCard
-import com.tangem.domain.common.TapWorkarounds.useOldStyleDerivation
 import com.tangem.domain.common.extensions.makeWalletManagerForApp
 import com.tangem.domain.common.util.cardTypesResolver
-import com.tangem.domain.models.scan.CardDTO
+import com.tangem.domain.common.util.derivationStyleProvider
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.wallets.legacy.WalletManagersRepository
 import com.tangem.domain.wallets.models.UserWallet
@@ -70,7 +69,7 @@ internal class DefaultWalletManagersRepository(
             }
         val derivationParams = getDerivationParams(
             derivationPath = blockchainNetwork?.derivationPath,
-            card = scanResponse.card,
+            derivationStyleProvider = scanResponse.derivationStyleProvider,
         )
 
         val walletManager = blockchain?.let {
@@ -209,17 +208,16 @@ internal class DefaultWalletManagersRepository(
             }
     }
 
-    private fun getDerivationParams(derivationPath: String?, card: CardDTO): DerivationParams? {
-        return derivationPath?.let {
-            DerivationParams.Custom(
-                path = DerivationPath(it),
-            )
-        } ?: if (!card.settings.isHDWalletAllowed) {
-            null
-        } else if (card.useOldStyleDerivation) {
-            DerivationParams.Default(DerivationStyle.LEGACY)
+    private fun getDerivationParams(
+        derivationPath: String?,
+        derivationStyleProvider: DerivationStyleProvider,
+    ): DerivationParams? {
+        val derivationStyle = derivationStyleProvider.getDerivationStyle() ?: return null
+
+        return if (derivationPath == null) {
+            DerivationParams.Default(derivationStyle)
         } else {
-            DerivationParams.Default(DerivationStyle.NEW)
+            DerivationParams.Custom(DerivationPath(derivationPath))
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/BaseFragment.kt b/app/src/main/java/com/tangem/tap/features/BaseFragment.kt
index cd6161868b..e7aa8ff258 100644
--- a/app/src/main/java/com/tangem/tap/features/BaseFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/BaseFragment.kt
@@ -30,12 +30,6 @@ abstract class BaseFragment(layoutId: Int) : Fragment(layoutId), FragmentOnBackP
         configureTransitions()
     }
 
-    protected open fun configureTransitions() {
-        val inflater = TransitionInflater.from(requireContext())
-        enterTransition = inflater.inflateTransition(R.transition.slide_right)
-        exitTransition = inflater.inflateTransition(R.transition.fade)
-    }
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         mainView = super.onCreateView(inflater, container, savedInstanceState)!!
         return mainView
@@ -56,6 +50,16 @@ abstract class BaseFragment(layoutId: Int) : Fragment(layoutId), FragmentOnBackP
 
     protected open fun loadToolbarMenu(): MenuProvider? = null
 
+    protected open fun configureTransitions() {
+        configureDefaultTransactions()
+    }
+
+    protected fun configureDefaultTransactions() {
+        val inflater = TransitionInflater.from(requireContext())
+        enterTransition = inflater.inflateTransition(R.transition.fade)
+        exitTransition = inflater.inflateTransition(R.transition.fade)
+    }
+
     fun showRetrySnackbar(message: String, action: VoidCallback) {
         val snackbar = Snackbar.make(mainView, message, Snackbar.LENGTH_INDEFINITE)
         snackbar.setAction(getString(R.string.common_retry)) {
diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/api/featuretoggles/CustomTokenFeatureToggles.kt b/app/src/main/java/com/tangem/tap/features/customtoken/api/featuretoggles/CustomTokenFeatureToggles.kt
index b64f9efd14..a6894e04b1 100644
--- a/app/src/main/java/com/tangem/tap/features/customtoken/api/featuretoggles/CustomTokenFeatureToggles.kt
+++ b/app/src/main/java/com/tangem/tap/features/customtoken/api/featuretoggles/CustomTokenFeatureToggles.kt
@@ -7,8 +7,5 @@ package com.tangem.tap.features.customtoken.api.featuretoggles
  */
 interface CustomTokenFeatureToggles {
 
-    /** Availability of redesigned screen (internal feature) */
-    val isRedesignedScreenEnabled: Boolean
-
     val isNewCardScanningEnabled: Boolean
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/di/CustomTokenInteractorModule.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/di/CustomTokenInteractorModule.kt
index 4ae3926d84..193a65643f 100644
--- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/di/CustomTokenInteractorModule.kt
+++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/di/CustomTokenInteractorModule.kt
@@ -1,6 +1,7 @@
 package com.tangem.tap.features.customtoken.impl.di
 
 import com.tangem.datasource.api.tangemTech.TangemTechApi
+import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
 import com.tangem.tap.features.customtoken.impl.data.DefaultCustomTokenRepository
 import com.tangem.tap.features.customtoken.impl.domain.CustomTokenInteractor
 import com.tangem.tap.features.customtoken.impl.domain.DefaultCustomTokenInteractor
@@ -24,6 +25,7 @@ internal object CustomTokenInteractorModule {
     fun provideCustomTokenInteractor(
         tangemTechApi: TangemTechApi,
         appCoroutineDispatcherProvider: AppCoroutineDispatcherProvider,
+        getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase,
         reduxStateHolder: AppStateHolder,
     ): CustomTokenInteractor {
         return DefaultCustomTokenInteractor(
@@ -32,7 +34,7 @@ internal object CustomTokenInteractorModule {
                 dispatchers = appCoroutineDispatcherProvider,
                 reduxStateHolder = reduxStateHolder,
             ),
-            reduxStateHolder = reduxStateHolder,
+            getSelectedWalletSyncUseCase = getSelectedWalletSyncUseCase,
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/domain/DefaultCustomTokenInteractor.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/domain/DefaultCustomTokenInteractor.kt
index f104a8ca09..473a81eeef 100644
--- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/domain/DefaultCustomTokenInteractor.kt
+++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/domain/DefaultCustomTokenInteractor.kt
@@ -9,12 +9,17 @@ import com.tangem.common.extensions.guard
 import com.tangem.common.extensions.toMapKey
 import com.tangem.common.flatMap
 import com.tangem.crypto.hdWallet.DerivationPath
+import com.tangem.data.tokens.utils.CryptoCurrencyFactory
 import com.tangem.domain.common.configs.CardConfig
 import com.tangem.domain.common.extensions.toNetworkId
 import com.tangem.domain.common.util.derivationStyleProvider
 import com.tangem.domain.common.util.hasDerivation
 import com.tangem.domain.features.addCustomToken.CustomCurrency
 import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
 import com.tangem.operations.derivation.ExtendedPublicKeysMap
 import com.tangem.tap.*
 import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
@@ -24,21 +29,22 @@ import com.tangem.tap.domain.TapError
 import com.tangem.tap.features.customtoken.impl.domain.models.FoundToken
 import com.tangem.tap.features.tokens.legacy.redux.TokensMiddleware
 import com.tangem.tap.features.wallet.models.Currency
-import com.tangem.tap.proxy.AppStateHolder
+import com.tangem.tap.proxy.redux.DaggerGraphState
+import com.tangem.utils.extensions.DELAY_SDK_DIALOG_CLOSE
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import timber.log.Timber
 
 /**
  * Default implementation of custom token interactor
  *
  * @property featureRepository feature repository
- * @property reduxStateHolder  redux state holder
  *
 [REDACTED_AUTHOR]
  */
 class DefaultCustomTokenInteractor(
     private val featureRepository: CustomTokenRepository,
-    private val reduxStateHolder: AppStateHolder,
+    private val getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase,
 ) : CustomTokenInteractor {
 
     override suspend fun findToken(address: String, blockchain: Blockchain): FoundToken {
@@ -49,28 +55,30 @@ class DefaultCustomTokenInteractor(
     }
 
     override suspend fun saveToken(customCurrency: CustomCurrency) {
-        val scanResponse = reduxStateHolder.scanResponse ?: return
+        val userWallet = getSelectedWalletSyncUseCase().fold(ifLeft = { return }, ifRight = { it })
 
         val currency = Currency.fromCustomCurrency(customCurrency)
-        val isNeedToDerive = isNeedToDerive(scanResponse, currency)
+        val isNeedToDerive = isNeedToDerive(userWallet, currency)
         if (isNeedToDerive) {
-            deriveMissingBlockchains(scanResponse = scanResponse, currencyList = listOf(currency)) {
-                submitAdd(scanResponse = it, currency = currency)
+            deriveMissingBlockchains(userWallet = userWallet, currencyList = listOf(currency)) {
+                submitAdd(userWallet = userWallet.copy(scanResponse = it), currency = currency)
             }
         } else {
-            submitAdd(scanResponse, currency)
+            submitAdd(userWallet, currency)
         }
     }
 
-    private fun isNeedToDerive(scanResponse: ScanResponse, currency: Currency): Boolean {
+    private fun isNeedToDerive(userWallet: UserWallet, currency: Currency): Boolean {
+        val scanResponse = userWallet.scanResponse
         return currency.derivationPath?.let { !scanResponse.hasDerivation(currency.blockchain, it) } ?: false
     }
 
     private suspend fun deriveMissingBlockchains(
-        scanResponse: ScanResponse,
+        userWallet: UserWallet,
         currencyList: List<Currency>,
         onSuccess: suspend (ScanResponse) -> Unit,
     ) {
+        val scanResponse = userWallet.scanResponse
         val config = CardConfig.createConfig(scanResponse.card)
         val derivationDataList = currencyList.mapNotNull { currency ->
             val curve = config.primaryCurve(currency.blockchain)
@@ -153,7 +161,42 @@ class DefaultCustomTokenInteractor(
         return TokensMiddleware.DerivationData(derivations = mapKeyOfWalletPublicKey to toDerive)
     }
 
-    private suspend fun submitAdd(scanResponse: ScanResponse, currency: Currency) {
+    private suspend fun submitAdd(userWallet: UserWallet, currency: Currency) {
+        val scanResponse = userWallet.scanResponse
+        val walletFeatureToggles = store.state.daggerGraphState.get(DaggerGraphState::walletFeatureToggles)
+
+        if (walletFeatureToggles.isRedesignedScreenEnabled) {
+            val cryptoCurrencyFactory = CryptoCurrencyFactory()
+
+            submitNewAdd(
+                userWalletId = userWallet.walletId,
+                updatedScanResponse = scanResponse,
+                currencyList = listOfNotNull(
+                    when (currency) {
+                        is Currency.Blockchain -> {
+                            cryptoCurrencyFactory.createCoin(
+                                blockchain = currency.blockchain,
+                                extraDerivationPath = currency.derivationPath,
+                                derivationStyleProvider = scanResponse.derivationStyleProvider,
+                            )
+                        }
+                        is Currency.Token -> {
+                            cryptoCurrencyFactory.createToken(
+                                sdkToken = currency.token,
+                                blockchain = currency.blockchain,
+                                extraDerivationPath = currency.derivationPath,
+                                derivationStyleProvider = scanResponse.derivationStyleProvider,
+                            )
+                        }
+                    },
+                ),
+            )
+        } else {
+            submitLegacyAdd(scanResponse = scanResponse, currency = currency)
+        }
+    }
+
+    private suspend fun submitLegacyAdd(scanResponse: ScanResponse, currency: Currency) {
         val selectedUserWallet = userWalletsListManager.selectedUserWalletSync.guard {
             Timber.e("Unable to add currencies, no user wallet selected")
             return
@@ -170,4 +213,27 @@ class DefaultCustomTokenInteractor(
                 )
             }
     }
+
+    private fun submitNewAdd(
+        userWalletId: UserWalletId,
+        updatedScanResponse: ScanResponse,
+        currencyList: List<CryptoCurrency>,
+    ) {
+        val currenciesRepository = store.state.daggerGraphState.get(DaggerGraphState::currenciesRepository)
+        val networksRepository = store.state.daggerGraphState.get(DaggerGraphState::networksRepository)
+        scope.launch {
+            userWalletsListManager.update(
+                userWalletId = userWalletId,
+                update = { it.copy(scanResponse = updatedScanResponse) },
+            )
+
+            currenciesRepository.addCurrencies(userWalletId = userWalletId, currencies = currencyList)
+            val networks = currencyList.map { it.network }.toSet()
+            networksRepository.getNetworkStatusesSync(
+                userWalletId = userWalletId,
+                networks = networks,
+                refresh = true,
+            )
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/featuretoggles/DefaultCustomTokenFeatureToggles.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/featuretoggles/DefaultCustomTokenFeatureToggles.kt
index a19dde5403..cd06665b00 100644
--- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/featuretoggles/DefaultCustomTokenFeatureToggles.kt
+++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/featuretoggles/DefaultCustomTokenFeatureToggles.kt
@@ -14,9 +14,6 @@ internal class DefaultCustomTokenFeatureToggles(
     private val featureTogglesManager: FeatureTogglesManager,
 ) : CustomTokenFeatureToggles {
 
-    override val isRedesignedScreenEnabled: Boolean
-        get() = featureTogglesManager.isFeatureEnabled(name = "REDESIGNED_CUSTOM_TOKEN_SCREEN_ENABLED")
-
     override val isNewCardScanningEnabled: Boolean
         get() = featureTogglesManager.isFeatureEnabled(name = "NEW_CARD_SCANNING_ENABLED")
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/AddCustomTokenFragment.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/AddCustomTokenFragment.kt
index a203e348dd..3900824553 100644
--- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/AddCustomTokenFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/AddCustomTokenFragment.kt
@@ -1,21 +1,18 @@
 package com.tangem.tap.features.customtoken.impl.presentation
 
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.compose.foundation.layout.systemBarsPadding
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.LocalLifecycleOwner
-import androidx.fragment.app.Fragment
 import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.transition.TransitionInflater
+import com.tangem.core.ui.components.SystemBarsEffect
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.screen.ComposeFragment
+import com.tangem.core.ui.theme.AppThemeModeHolder
 import com.tangem.tap.features.customtoken.impl.presentation.ui.AddCustomTokenScreen
 import com.tangem.tap.features.customtoken.impl.presentation.viewmodels.AddCustomTokenViewModel
-import com.tangem.wallet.R
 import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 
 /**
  * Add custom token screen
@@ -23,29 +20,23 @@ import dagger.hilt.android.AndroidEntryPoint
 [REDACTED_AUTHOR]
  */
 @AndroidEntryPoint
-internal class AddCustomTokenFragment : Fragment() {
+internal class AddCustomTokenFragment : ComposeFragment() {
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        with(TransitionInflater.from(requireContext())) {
-            enterTransition = inflateTransition(R.transition.fade)
-            exitTransition = inflateTransition(R.transition.fade)
+    @Inject
+    override lateinit var appThemeModeHolder: AppThemeModeHolder
+
+    @Composable
+    override fun ScreenContent(modifier: Modifier) {
+        val viewModel = hiltViewModel<AddCustomTokenViewModel>().apply {
+            LocalLifecycleOwner.current.lifecycle.addObserver(this)
         }
-
-        return ComposeView(inflater.context).apply {
-            setContent {
-                isTransitionGroup = true
-
-                val viewModel = hiltViewModel<AddCustomTokenViewModel>().apply {
-                    LocalLifecycleOwner.current.lifecycle.addObserver(this)
-                }
-
-                TangemTheme {
-                    AddCustomTokenScreen(
-                        modifier = Modifier.systemBarsPadding(),
-                        stateHolder = viewModel.uiState,
-                    )
-                }
-            }
+        val statusBarColor = TangemTheme.colors.background.secondary
+        SystemBarsEffect {
+            setSystemBarsColor(color = statusBarColor)
         }
+        AddCustomTokenScreen(
+            modifier = Modifier.systemBarsPadding(),
+            stateHolder = viewModel.uiState,
+        )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/AddCustomTokenPreviewData.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/AddCustomTokenPreviewData.kt
index d69f1c08fa..ba881741b0 100644
--- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/AddCustomTokenPreviewData.kt
+++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/AddCustomTokenPreviewData.kt
@@ -55,7 +55,7 @@ internal object AddCustomTokenPreviewData {
                 value = "",
                 onValueChange = {},
                 keyboardOptions = KeyboardOptions(imeAction = ImeAction.Next),
-                label = TextReference.Res(R.string.custom_token_token_symbol_input_title),
+                label = TextReference.Res(R.string.custom_token_token_symbol_input_title_old),
                 placeholder = TextReference.Res(id = R.string.custom_token_token_symbol_input_placeholder),
                 isEnabled = false,
             ),
diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/AddCustomTokenScreen.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/AddCustomTokenScreen.kt
index eb099e7ee8..3824462da3 100644
--- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/AddCustomTokenScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/AddCustomTokenScreen.kt
@@ -25,10 +25,20 @@ internal fun AddCustomTokenScreen(stateHolder: AddCustomTokenStateHolder, modifi
 
 @Preview(showSystemUi = true)
 @Composable
-private fun Preview_AddCustomTokenScreen(
+private fun Preview_AddCustomTokenScreen_Light(
     @PreviewParameter(AddCustomTokenScreenProvider::class) stateHolder: AddCustomTokenStateHolder,
 ) {
-    TangemTheme {
+    TangemTheme(isDark = false) {
+        AddCustomTokenScreen(stateHolder)
+    }
+}
+
+@Preview(showSystemUi = true)
+@Composable
+private fun Preview_AddCustomTokenScreen_Dark(
+    @PreviewParameter(AddCustomTokenScreenProvider::class) stateHolder: AddCustomTokenStateHolder,
+) {
+    TangemTheme(isDark = true) {
         AddCustomTokenScreen(stateHolder)
     }
 }
diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/AddCustomTokenTestContent.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/AddCustomTokenTestContent.kt
index 9304675ad7..48ffb09110 100644
--- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/AddCustomTokenTestContent.kt
+++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/AddCustomTokenTestContent.kt
@@ -91,7 +91,7 @@ internal fun AddCustomTokenTestContent(state: AddCustomTokenStateHolder.TestCont
         floatingActionButtonPosition = FabPosition.Center,
         sheetBackgroundColor = TangemTheme.colors.background.secondary,
         sheetPeekHeight = TangemTheme.dimens.size0,
-        backgroundColor = TangemTheme.colors.background.secondary,
+        backgroundColor = TangemTheme.colors.background.primary,
     ) {
         Column(
             modifier = Modifier
diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/components/AddCustomTokenForm.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/components/AddCustomTokenForm.kt
index 0090ef8223..fb6c260728 100644
--- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/components/AddCustomTokenForm.kt
+++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/components/AddCustomTokenForm.kt
@@ -94,7 +94,7 @@ private fun TextField(model: AddCustomTokenInputField, isError: Boolean) {
             label = {
                 Text(
                     text = model.label.resolveReference(),
-                    style = TangemTheme.typography.caption,
+                    style = TangemTheme.typography.caption2,
                     color = TangemTextFieldsDefault.defaultTextFieldColors.labelColor(
                         enabled = isEnabled,
                         error = isError,
@@ -178,7 +178,7 @@ private fun SelectorField(model: AddCustomTokenSelectorField) {
                                 text = subtitle,
                                 color = TangemTheme.colors.text.secondary,
                                 maxLines = 1,
-                                style = TangemTheme.typography.caption,
+                                style = TangemTheme.typography.caption2,
                             )
                         }
                     }
diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/components/AddCustomTokenToolbar.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/components/AddCustomTokenToolbar.kt
index 8587b990bf..81d0f52912 100644
--- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/components/AddCustomTokenToolbar.kt
+++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/components/AddCustomTokenToolbar.kt
@@ -1,11 +1,9 @@
 package com.tangem.tap.features.customtoken.impl.presentation.ui.components
 
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.Text
-import androidx.compose.material.TopAppBar
+import androidx.compose.material.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
@@ -25,7 +23,15 @@ import com.tangem.tap.features.details.ui.cardsettings.resolveReference
  */
 @Composable
 internal fun AddCustomTokenToolbar(title: TextReference, onBackButtonClick: () -> Unit) {
-    TopAppBar(backgroundColor = TangemTheme.colors.background.secondary) {
+    val toolbarElevation = if (isSystemInDarkTheme()) {
+        TangemTheme.dimens.elevation0
+    } else {
+        AppBarDefaults.TopAppBarElevation
+    }
+    TopAppBar(
+        backgroundColor = TangemTheme.colors.background.primary,
+        elevation = toolbarElevation,
+    ) {
         IconButton(onClick = onBackButtonClick) {
             Icon(
                 painter = painterResource(id = R.drawable.ic_back_24),
diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/components/AddCustomTokenWarnings.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/components/AddCustomTokenWarnings.kt
index 7627e3c6af..a00fc2d4fb 100644
--- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/components/AddCustomTokenWarnings.kt
+++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/components/AddCustomTokenWarnings.kt
@@ -72,8 +72,16 @@ private fun AddCustomTokenWarning(warning: AddCustomTokenWarning) {
 
 @Preview
 @Composable
-private fun Preview_AddCustomTokenWarnings() {
+private fun Preview_AddCustomTokenWarnings_Light() {
     TangemTheme {
         AddCustomTokenWarnings(warnings = AddCustomTokenPreviewData.createWarnings())
     }
+}
+
+@Preview
+@Composable
+private fun Preview_AddCustomTokenWarnings_Dark() {
+    TangemTheme(isDark = true) {
+        AddCustomTokenWarnings(warnings = AddCustomTokenPreviewData.createWarnings())
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt
index dffe1709dd..5926da1a71 100644
--- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt
@@ -22,6 +22,10 @@ import com.tangem.domain.common.extensions.*
 import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.common.util.derivationStyleProvider
 import com.tangem.domain.features.addCustomToken.CustomCurrency
+import com.tangem.domain.tokens.GetCryptoCurrenciesUseCase
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
+import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles
 import com.tangem.tap.domain.model.WalletDataModel
 import com.tangem.tap.features.customtoken.impl.domain.CustomTokenInteractor
 import com.tangem.tap.features.customtoken.impl.domain.models.FoundToken
@@ -35,7 +39,6 @@ import com.tangem.tap.features.customtoken.impl.presentation.validators.ContactA
 import com.tangem.tap.features.customtoken.impl.presentation.validators.ContractAddressValidatorResult
 import com.tangem.tap.features.details.ui.cardsettings.TextReference
 import com.tangem.tap.features.wallet.models.Currency
-import com.tangem.tap.proxy.AppStateHolder
 import com.tangem.tap.store
 import com.tangem.utils.coroutines.AppCoroutineDispatcherProvider
 import com.tangem.utils.coroutines.runCatching
@@ -51,22 +54,24 @@ import javax.inject.Inject
 /**
  * ViewModel for add custom token screen
  *
- * @param analyticsEventHandler analytics event handler
- * @param featureRouter         feature router
- * @property featureInteractor  feature interactor
- * @property dispatchers        coroutine dispatchers provider
- * @property reduxStateHolder   redux state holder
+ * @param analyticsEventHandler           analytics event handler
+ * @param featureRouter                   feature router
+ * @property featureInteractor            feature interactor
+ * @property getSelectedWalletSyncUseCase use case that returns selected wallet
+ * @property dispatchers                  coroutine dispatchers provider
  *
 [REDACTED_AUTHOR]
  */
-@Suppress("LargeClass")
+@Suppress("LargeClass", "LongParameterList")
 @HiltViewModel
 internal class AddCustomTokenViewModel @Inject constructor(
     analyticsEventHandler: AnalyticsEventHandler,
     featureRouter: CustomTokenRouter,
+    getCurrenciesUseCase: GetCryptoCurrenciesUseCase,
     private val featureInteractor: CustomTokenInteractor,
     private val dispatchers: AppCoroutineDispatcherProvider,
-    private val reduxStateHolder: AppStateHolder,
+    private val getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase,
+    private val walletFeatureToggles: WalletFeatureToggles,
 ) : ViewModel(), DefaultLifecycleObserver {
 
     private val analyticsSender = AddCustomTokenAnalyticsSender(analyticsEventHandler)
@@ -74,12 +79,30 @@ internal class AddCustomTokenViewModel @Inject constructor(
     private val testActionsHandler = TestActionsHandler()
     private val formStateBuilder = FormStateBuilder()
 
+    private var currentCryptoCurrencies: List<CryptoCurrency> = emptyList()
+
     /** Screen state */
     var uiState by mutableStateOf(getInitialUiState())
         private set
 
     private var foundToken: FoundToken? = null
 
+    init {
+        if (walletFeatureToggles.isRedesignedScreenEnabled) {
+            viewModelScope.launch(dispatchers.main) {
+                currentCryptoCurrencies = getSelectedWalletSyncUseCase().fold(
+                    ifLeft = { emptyList() },
+                    ifRight = { selectedWallet ->
+                        getCurrenciesUseCase(selectedWallet.walletId).fold(
+                            ifLeft = { emptyList() },
+                            ifRight = { it },
+                        )
+                    },
+                )
+            }
+        }
+    }
+
     override fun onCreate(owner: LifecycleOwner) {
         analyticsSender.sendWhenScreenOpened()
     }
@@ -208,7 +231,10 @@ internal class AddCustomTokenViewModel @Inject constructor(
 
         private fun getNetworkSelectorItems(): List<SelectorItem.Title> {
             val defaultNetwork = createNetworkSelectorItem(blockchain = Blockchain.Unknown)
-            val scanResponse = reduxStateHolder.scanResponse
+            val scanResponse = getSelectedWalletSyncUseCase().fold(
+                ifLeft = { null },
+                ifRight = { it.scanResponse },
+            )
             val derivationStyle = scanResponse?.derivationStyleProvider?.getDerivationStyle()
             return listOf(defaultNetwork) + Blockchain.values()
                 .filter { blockchain ->
@@ -244,7 +270,7 @@ internal class AddCustomTokenViewModel @Inject constructor(
                 value = "",
                 onValueChange = actionsHandler::onTokenSymbolValueChange,
                 keyboardOptions = KeyboardOptions(imeAction = ImeAction.Next),
-                label = TextReference.Res(R.string.custom_token_token_symbol_input_title),
+                label = TextReference.Res(R.string.custom_token_token_symbol_input_title_old),
                 placeholder = TextReference.Res(id = R.string.custom_token_token_symbol_input_placeholder),
                 isEnabled = false,
             )
@@ -262,17 +288,20 @@ internal class AddCustomTokenViewModel @Inject constructor(
         }
 
         private fun createDerivationPathsSelectorField(): AddCustomTokenSelectorField.DerivationPath? {
-            val scanResponse = reduxStateHolder.scanResponse
-            if (scanResponse?.card?.settings?.isHDWalletAllowed == false) return null
+            return getSelectedWalletSyncUseCase().fold(
+                ifLeft = { null },
+                ifRight = {
+                    if (!it.scanResponse.card.settings.isHDWalletAllowed) return null
 
-            val selectorItems =
-                getDerivationPathsSelectorItems(scanResponse?.derivationStyleProvider)
-            return AddCustomTokenSelectorField.DerivationPath(
-                label = TextReference.Res(R.string.custom_token_derivation_path_input_title),
-                selectedItem = requireNotNull(selectorItems.firstOrNull()),
-                items = selectorItems,
-                onMenuItemClick = actionsHandler::onDerivationPathSelectorItemClick,
-                isEnabled = true,
+                    val selectorItems = getDerivationPathsSelectorItems(it.scanResponse.derivationStyleProvider)
+                    AddCustomTokenSelectorField.DerivationPath(
+                        label = TextReference.Res(R.string.custom_token_derivation_path_input_title),
+                        selectedItem = requireNotNull(selectorItems.firstOrNull()),
+                        items = selectorItems,
+                        onMenuItemClick = actionsHandler::onDerivationPathSelectorItemClick,
+                        isEnabled = true,
+                    )
+                },
             )
         }
 
@@ -315,14 +344,19 @@ internal class AddCustomTokenViewModel @Inject constructor(
         }
 
         private fun createDerivationPathInputField(): AddCustomTokenInputField.DerivationPath? {
-            if (reduxStateHolder.scanResponse?.card?.settings?.isHDWalletAllowed == false) return null
+            return getSelectedWalletSyncUseCase().fold(
+                ifLeft = { null },
+                ifRight = {
+                    if (!it.scanResponse.card.settings.isHDWalletAllowed) return null
 
-            return AddCustomTokenInputField.DerivationPath(
-                value = "",
-                onValueChange = actionsHandler::onDerivationPathValueChange,
-                keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
-                label = TextReference.Res(R.string.custom_token_custom_derivation),
-                placeholder = TextReference.Str(value = DERIVATION_PATH_PLACEHOLDER),
+                    AddCustomTokenInputField.DerivationPath(
+                        value = "",
+                        onValueChange = actionsHandler::onDerivationPathValueChange,
+                        keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
+                        label = TextReference.Res(R.string.custom_token_custom_derivation),
+                        placeholder = TextReference.Str(value = DERIVATION_PATH_PLACEHOLDER),
+                    )
+                },
             )
         }
     }
@@ -440,11 +474,15 @@ internal class AddCustomTokenViewModel @Inject constructor(
         val isSupportedToken = if (!isNetworkSelected()) {
             true
         } else {
-            val scanResponse = reduxStateHolder.scanResponse
-            scanResponse?.card?.canHandleToken(
-                blockchain = networkSelectorValue,
-                cardTypesResolver = scanResponse.cardTypesResolver,
-            ) ?: false
+            getSelectedWalletSyncUseCase().fold(
+                ifLeft = { false },
+                ifRight = {
+                    it.scanResponse.card.canHandleToken(
+                        blockchain = networkSelectorValue,
+                        cardTypesResolver = it.scanResponse.cardTypesResolver,
+                    )
+                },
+            )
         }
 
         return buildSet {
@@ -478,13 +516,16 @@ internal class AddCustomTokenViewModel @Inject constructor(
                     address = uiState.form.contractAddressInputField.value,
                     blockchain = networkSelectorValue,
                 )
-                val scanResponse = reduxStateHolder.scanResponse
-                val isSupportedToken = scanResponse?.card
-                    ?.canHandleToken(
-                        blockchain = networkSelectorValue,
-                        cardTypesResolver = scanResponse.cardTypesResolver,
-                    )
-                    ?: false
+
+                val isSupportedToken = getSelectedWalletSyncUseCase().fold(
+                    ifLeft = { false },
+                    ifRight = {
+                        it.scanResponse.card.canHandleToken(
+                            blockchain = networkSelectorValue,
+                            cardTypesResolver = it.scanResponse.cardTypesResolver,
+                        )
+                    },
+                )
 
                 uiState.copySealed(
                     floatingButton = uiState.floatingButton.copy(
@@ -546,6 +587,33 @@ internal class AddCustomTokenViewModel @Inject constructor(
     }
 
     private fun isTokenAlreadyAdded(): Boolean {
+        return if (walletFeatureToggles.isRedesignedScreenEnabled) {
+            isTokenAlreadyAddedNew()
+        } else {
+            isTokenAlreadyAddedOld()
+        }
+    }
+
+    private fun isTokenAlreadyAddedNew(): Boolean {
+        return currentCryptoCurrencies
+            .filterIsInstance<CryptoCurrency.Token>()
+            .any { token ->
+                val contractAddress = uiState.form.contractAddressInputField.value
+                val networkSelectorValue = uiState.form.networkSelectorField.selectedItem.blockchain
+                val networkId = Blockchain.fromNetworkId(networkSelectorValue.toNetworkId())?.id
+
+                val savedTokenId = if (token.isCustom) null else token.id.value
+
+                val sameId = foundToken?.id == savedTokenId
+                val sameAddress = contractAddress == token.contractAddress
+                val sameBlockchain = networkId == token.network.id.value
+                val isSameDerivationPath = getDerivationPath()?.rawPath == token.network.derivationPath.value
+
+                sameId && sameAddress && sameBlockchain && isSameDerivationPath
+            }
+    }
+
+    private fun isTokenAlreadyAddedOld(): Boolean {
         return store.state.walletState.walletsStores
             .map { walletStore -> walletStore.walletsData.map(WalletDataModel::currency) }
             .flatten()
@@ -563,6 +631,23 @@ internal class AddCustomTokenViewModel @Inject constructor(
     }
 
     private fun isBlockchainAlreadyAdded(): Boolean {
+        return if (walletFeatureToggles.isRedesignedScreenEnabled) {
+            isBlockchainAlreadyAddedNew()
+        } else {
+            isBlockchainAlreadyAddedOld()
+        }
+    }
+
+    private fun isBlockchainAlreadyAddedNew(): Boolean {
+        return currentCryptoCurrencies
+            .filterIsInstance<CryptoCurrency.Coin>()
+            .any { coin ->
+                coin.network.id.value == uiState.form.networkSelectorField.selectedItem.blockchain.id &&
+                    coin.network.derivationPath.value == getDerivationPath()?.rawPath
+            }
+    }
+
+    private fun isBlockchainAlreadyAddedOld(): Boolean {
         return store.state.walletState.walletsStores
             .map { walletStore -> walletStore.walletsData.map(WalletDataModel::currency) }
             .flatten()
@@ -641,8 +726,12 @@ internal class AddCustomTokenViewModel @Inject constructor(
     private fun getDerivationPathForBlockchain(blockchain: Blockchain?): DerivationPath? {
         if (blockchain == null) return null
 
-        val derivationStyle = reduxStateHolder.scanResponse?.derivationStyleProvider?.getDerivationStyle()
-            ?: DerivationStyle.V1
+        val derivationStyle = getSelectedWalletSyncUseCase().fold(
+            ifLeft = { null },
+            ifRight = {
+                it.scanResponse.derivationStyleProvider.getDerivationStyle()
+            },
+        )
 
         val derivationNetwork = if (blockchain == Blockchain.Unknown) {
             uiState.form.networkSelectorField.selectedItem.blockchain
@@ -653,12 +742,15 @@ internal class AddCustomTokenViewModel @Inject constructor(
     }
 
     private fun isUnsupportedBlockchain(blockchain: Blockchain): Boolean {
-        val scanResponse = reduxStateHolder.scanResponse
-        val canHandleToken = scanResponse?.card?.canHandleBlockchain(
-            blockchain = blockchain,
-            cardTypesResolver = scanResponse.cardTypesResolver,
-        ) ?: false
-        return !canHandleToken
+        return getSelectedWalletSyncUseCase().fold(
+            ifLeft = { false },
+            ifRight = {
+                !it.scanResponse.card.canHandleBlockchain(
+                    blockchain = blockchain,
+                    cardTypesResolver = it.scanResponse.cardTypesResolver,
+                )
+            },
+        )
     }
 
     private inner class ActionsHandler(private val featureRouter: CustomTokenRouter) {
@@ -827,7 +919,6 @@ internal class AddCustomTokenViewModel @Inject constructor(
         }
 
         fun onResetButtonClick() {
-            val scanResponse = reduxStateHolder.scanResponse
             with(uiState.form) {
                 uiState = uiState.copySealed(
                     form = uiState.form.copy(
diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/legacy/AddCustomTokenFragment.kt b/app/src/main/java/com/tangem/tap/features/customtoken/legacy/AddCustomTokenFragment.kt
deleted file mode 100644
index 204f95ec25..0000000000
--- a/app/src/main/java/com/tangem/tap/features/customtoken/legacy/AddCustomTokenFragment.kt
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.tangem.tap.features.customtoken.legacy
-
-import android.os.Bundle
-import android.view.View
-import android.view.WindowManager
-import androidx.appcompat.widget.Toolbar
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.ComposeView
-import com.tangem.core.analytics.Analytics
-import com.tangem.core.ui.res.TangemTheme
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenState
-import com.tangem.domain.redux.domainStore
-import com.tangem.tap.common.analytics.events.ManageTokens
-import com.tangem.tap.features.BaseStoreFragment
-import com.tangem.tap.features.FragmentOnBackPressedHandler
-import com.tangem.tap.features.addBackPressHandler
-import com.tangem.tap.features.customtoken.legacy.compose.AddCustomTokenScreen
-import com.tangem.tap.features.customtoken.legacy.compose.ClosePopupTrigger
-import com.tangem.wallet.R
-import org.rekotlin.StoreSubscriber
-
-/**
-[REDACTED_AUTHOR]
- */
-class AddCustomTokenFragment : BaseStoreFragment(R.layout.view_compose_fragment), StoreSubscriber<AddCustomTokenState> {
-
-    private var state: MutableState<AddCustomTokenState> = mutableStateOf(domainStore.state.addCustomTokensState)
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        Analytics.send(ManageTokens.CustomToken.ScreenOpened)
-    }
-
-    override fun subscribeToStore() {
-        domainStore.subscribe(this) { state ->
-            state.skipRepeats { oldState, newState ->
-                oldState.addCustomTokensState == newState.addCustomTokensState
-            }.select { it.addCustomTokensState }
-        }
-    }
-
-    override fun newState(state: AddCustomTokenState) {
-        if (activity == null || view == null) return
-
-        this.state.value = state
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        requireActivity().window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
-        view.findViewById<Toolbar>(R.id.toolbar)?.setTitle(R.string.add_custom_token_title)
-
-        val closePopupTrigger = initClosingPopupTriggerEvent()
-        view.findViewById<ComposeView>(R.id.view_compose)?.setContent {
-            TangemTheme {
-                Box(
-                    modifier = Modifier
-                        .fillMaxSize(),
-                ) {
-                    AddCustomTokenScreen(state, closePopupTrigger)
-                }
-            }
-        }
-    }
-
-    private fun initClosingPopupTriggerEvent(): ClosePopupTrigger = ClosePopupTrigger().apply {
-        onCloseComplete = ::handleOnBackPressed
-        addBackPressHandler(
-            object : FragmentOnBackPressedHandler {
-                override fun handleOnBackPressed() = close()
-            },
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/AddCustomTokenScreen.kt b/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/AddCustomTokenScreen.kt
deleted file mode 100644
index baa487cec7..0000000000
--- a/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/AddCustomTokenScreen.kt
+++ /dev/null
@@ -1,208 +0,0 @@
-package com.tangem.tap.features.customtoken.legacy.compose
-
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.colorResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.tangem.core.ui.components.PrimaryButtonIconStart
-import com.tangem.core.ui.components.keyboardAsState
-import com.tangem.core.ui.res.TangemTheme
-import com.tangem.domain.AddCustomTokenError
-import com.tangem.domain.common.form.DataField
-import com.tangem.domain.common.form.FieldId
-import com.tangem.domain.features.addCustomToken.CustomTokenFieldId.*
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenState
-import com.tangem.domain.features.addCustomToken.redux.ScreenState
-import com.tangem.domain.features.addCustomToken.redux.ViewStates
-import com.tangem.domain.redux.domainStore
-import com.tangem.tap.common.compose.AddCustomTokenWarning
-import com.tangem.tap.domain.moduleMessage.ModuleMessageConverter
-import com.tangem.tap.features.customtoken.legacy.compose.test.TestCase
-import com.tangem.tap.features.customtoken.legacy.compose.test.TestCasesList
-import com.tangem.wallet.R
-import kotlinx.coroutines.launch
-
-@OptIn(ExperimentalMaterialApi::class)
-@Composable
-fun AddCustomTokenScreen(state: MutableState<AddCustomTokenState>, closePopupTrigger: ClosePopupTrigger) {
-    val selectedTestCase = remember { mutableStateOf(TestCase.ContractAddress) }
-
-    val bottomSheetScaffoldState = rememberBottomSheetScaffoldState(
-        bottomSheetState = BottomSheetState(BottomSheetValue.Collapsed),
-    )
-    val coroutineScope = rememberCoroutineScope()
-    val toggleBottomSheet = { coroutineScope.launch { bottomSheetScaffoldState.toggle() } }
-
-    BottomSheetScaffold(
-        scaffoldState = bottomSheetScaffoldState,
-        sheetContent = {
-            Surface(color = colorResource(id = R.color.lightGray5)) {
-                selectedTestCase.value.content(toggleBottomSheet)
-            }
-        },
-        sheetPeekHeight = 0.dp,
-    ) {
-        Column {
-            TestCasesList(
-                onItemClick = {
-                    selectedTestCase.value = it
-                    toggleBottomSheet()
-                },
-            )
-            ScreenContent(state, closePopupTrigger)
-        }
-    }
-
-    ComposeDialogManager()
-    LaunchedEffect(key1 = Unit, block = { domainStore.dispatch(AddCustomTokenAction.OnCreate) })
-    DisposableEffect(key1 = Unit, effect = { onDispose { domainStore.dispatch(AddCustomTokenAction.OnDestroy) } })
-}
-
-@OptIn(ExperimentalMaterialApi::class)
-private suspend fun BottomSheetScaffoldState.toggle() {
-    if (bottomSheetState.isCollapsed) {
-        bottomSheetState.expand()
-    } else {
-        bottomSheetState.collapse()
-    }
-}
-
-@Composable
-private fun ScreenContent(state: MutableState<AddCustomTokenState>, closePopupTrigger: ClosePopupTrigger) {
-    val scaffoldState = rememberScaffoldState()
-
-    Scaffold(
-        scaffoldState = scaffoldState,
-        backgroundColor = colorResource(id = R.color.backgroundLightGray),
-        floatingActionButton = {
-            HangingOverKeyboardView(keyboardState = keyboardAsState()) {
-                AddButton(state)
-            }
-        },
-        floatingActionButtonPosition = FabPosition.Center,
-    ) { paddings ->
-        Box(
-            modifier = Modifier
-                .padding(paddings)
-                .fillMaxSize(),
-        ) {
-            LazyColumn(
-                contentPadding = PaddingValues(bottom = 90.dp),
-            ) {
-                item {
-                    Surface(
-                        modifier = Modifier.padding(16.dp),
-                        shape = MaterialTheme.shapes.small,
-                        elevation = 4.dp,
-                    ) {
-                        Column(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(16.dp),
-                        ) {
-                            FormFields(state, closePopupTrigger)
-                        }
-                    }
-                }
-                item { Warnings(state.value.warnings.toList()) }
-            }
-        }
-    }
-}
-
-@Composable
-private fun FormFields(state: MutableState<AddCustomTokenState>, closePopupTrigger: ClosePopupTrigger) {
-    val context = LocalContext.current
-    val errorConverter = remember { ModuleMessageConverter(context) }
-
-    val stateValue = state.value
-    stateValue.form.fieldList.forEach { field ->
-        val data = ScreenFieldData.fromState(field, stateValue, errorConverter)
-        when (field.id) {
-            ContractAddress -> TokenContractAddressView(data)
-            Network -> TokenNetworkView(data, stateValue, closePopupTrigger)
-            Name -> TokenNameView(data)
-            Symbol -> TokenSymbolView(data)
-            Decimals -> TokenDecimalsView(data)
-            DerivationPath -> TokenDerivationPathView(data, stateValue, closePopupTrigger)
-        }
-    }
-}
-
-@Composable
-fun Warnings(warnings: List<AddCustomTokenError.Warning>) {
-    if (warnings.isEmpty()) return
-
-    val context = LocalContext.current
-    val warningConverter = remember { ModuleMessageConverter(context) }
-
-    Column {
-        warnings.forEachIndexed { index, item ->
-            val modifier = when (index) {
-                0 -> Modifier.padding(vertical = 0.dp)
-                warnings.lastIndex -> Modifier.padding(top = 8.dp, bottom = 16.dp)
-                else -> Modifier.padding(top = 8.dp, bottom = 0.dp)
-            }
-            AddCustomTokenWarning(
-                modifier = modifier
-                    .padding(horizontal = TangemTheme.dimens.spacing16)
-                    .fillMaxWidth(),
-                warning = item,
-                converter = warningConverter,
-            )
-        }
-    }
-}
-
-@Composable
-private fun AddButton(state: MutableState<AddCustomTokenState>) {
-    PrimaryButtonIconStart(
-        modifier = Modifier
-            .padding(horizontal = TangemTheme.dimens.spacing16)
-            .fillMaxWidth(),
-        text = stringResource(id = R.string.common_add),
-        iconResId = R.drawable.ic_plus_24,
-        enabled = state.value.screenState.addButton.isEnabled,
-        onClick = { domainStore.dispatch(AddCustomTokenAction.OnAddCustomTokenClicked) },
-    )
-}
-
-data class ScreenFieldData(
-    val field: DataField<*>,
-    val error: AddCustomTokenError?,
-    val errorConverter: ModuleMessageConverter,
-    val viewState: ViewStates.TokenField,
-) {
-    companion object {
-        fun fromState(
-            field: DataField<*>,
-            state: AddCustomTokenState,
-            errorConverter: ModuleMessageConverter,
-        ): ScreenFieldData {
-            return ScreenFieldData(
-                field = field,
-                error = state.getError(field.id),
-                errorConverter = errorConverter,
-                viewState = selectField(field.id, state.screenState),
-            )
-        }
-
-        private fun selectField(id: FieldId, screenState: ScreenState): ViewStates.TokenField {
-            return when (id) {
-                ContractAddress -> screenState.contractAddressField
-                Network -> screenState.network
-                Name -> screenState.name
-                Symbol -> screenState.symbol
-                Decimals -> screenState.decimals
-                DerivationPath -> screenState.derivationPath
-                else -> throw UnsupportedOperationException()
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/BlockchainSpinner.kt b/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/BlockchainSpinner.kt
deleted file mode 100644
index d6c60c2b26..0000000000
--- a/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/BlockchainSpinner.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.tangem.tap.features.customtoken.legacy.compose
-
-import androidx.annotation.StringRes
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.domain.common.form.Field
-
-@Composable
-fun BlockchainSpinner(
-    @StringRes title: Int,
-    itemList: List<Blockchain>,
-    selectedItem: Field.Data<Blockchain>,
-    isEnabled: Boolean = true,
-    textFieldConverter: (Blockchain) -> String,
-    dropdownItemView: @Composable ((Blockchain) -> Unit)? = null,
-    closePopupTrigger: ClosePopupTrigger = ClosePopupTrigger(),
-    onItemSelect: (Blockchain) -> Unit,
-) {
-    OutlinedSpinner(
-        modifier = Modifier.fillMaxWidth(),
-        label = stringResource(id = title),
-        itemList = itemList,
-        selectedItem = selectedItem,
-        textFieldConverter = textFieldConverter,
-        dropdownItemView = dropdownItemView,
-        isEnabled = isEnabled,
-        onItemSelected = onItemSelect,
-        closePopupTrigger = closePopupTrigger,
-    )
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/ComposeDialogManager.kt b/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/ComposeDialogManager.kt
deleted file mode 100644
index 453ace8c9e..0000000000
--- a/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/ComposeDialogManager.kt
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.tangem.tap.features.customtoken.legacy.compose
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material.AlertDialog
-import androidx.compose.material.Button
-import androidx.compose.material.LocalTextStyle
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import com.tangem.core.ui.components.SpacerH16
-import com.tangem.core.ui.res.TangemTheme
-import com.tangem.datasource.api.tangemTech.models.CoinsResponse
-import com.tangem.domain.DomainDialog
-import com.tangem.domain.redux.domainStore
-import com.tangem.domain.redux.global.DomainGlobalAction
-import com.tangem.domain.redux.global.DomainGlobalState
-import com.tangem.tap.domain.moduleMessage.ModuleMessageConverter
-import com.tangem.wallet.R
-import org.rekotlin.StoreSubscriber
-
-@Composable
-internal fun ComposeDialogManager() {
-    val dialogSate = remember { mutableStateOf<DomainDialog?>(null) }
-    val subscriber = remember {
-        object : StoreSubscriber<DomainGlobalState> {
-            override fun newState(state: DomainGlobalState) {
-                dialogSate.value = state.dialog
-            }
-        }
-    }
-
-    ShowTheDialog(dialogSate)
-
-    LaunchedEffect(
-        key1 = Unit,
-        block = {
-            domainStore.subscribe(subscriber) { state ->
-                state.skipRepeats { oldState, newState ->
-                    oldState.globalState == newState.globalState
-                }.select { it.globalState }
-            }
-        },
-    )
-    DisposableEffect(
-        key1 = Unit,
-        effect = {
-            onDispose { domainStore.unsubscribe(subscriber) }
-        },
-    )
-}
-
-@Composable
-private fun ShowTheDialog(dialogState: MutableState<DomainDialog?>) {
-    if (dialogState.value == null) return
-
-    val context = LocalContext.current
-    val errorConverter = remember { ModuleMessageConverter(context) }
-    val onDismissRequest = { domainStore.dispatch(DomainGlobalAction.ShowDialog(null)) }
-
-    when (val dialog = dialogState.value) {
-        is DomainDialog.DialogError -> ErrorDialog(
-            title = stringResource(id = R.string.common_error),
-            body = errorConverter.convert(dialog.error).message,
-            onDismissRequest,
-        )
-        is DomainDialog.SelectTokenDialog -> SelectTokenNetworkDialog(dialog, onDismissRequest)
-        else -> {}
-    }
-}
-
-/**
- * Dialog with single item selection
- */
-@Composable
-fun SimpleDialog(
-    title: String,
-    items: List<CoinsResponse.Coin.Network>,
-    onSelect: (CoinsResponse.Coin.Network) -> Unit,
-    onDismissRequest: () -> Unit,
-    itemContent: @Composable (CoinsResponse.Coin.Network) -> Unit,
-) {
-    Dialog(
-        properties = DialogProperties(dismissOnBackPress = false, dismissOnClickOutside = false),
-        onDismissRequest = { },
-    ) {
-        Surface(modifier = Modifier.fillMaxWidth(), shape = MaterialTheme.shapes.medium) {
-            Column(modifier = Modifier.padding(TangemTheme.dimens.spacing22)) {
-                DialogTitle(title = title)
-                LazyColumn {
-                    items(items = items, key = CoinsResponse.Coin.Network::networkId) { item ->
-                        Row(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .height(56.dp)
-                                .clickable {
-                                    onSelect(item)
-                                    onDismissRequest()
-                                },
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) { itemContent(item) }
-                    }
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun DialogTitle(title: String) {
-    Text(
-        text = title,
-        style = LocalTextStyle.provides(
-            TextStyle(
-                fontWeight = FontWeight.Bold,
-                fontSize = 20.sp,
-            ),
-        ).value,
-    )
-    SpacerH16()
-}
-
-@Composable
-fun ErrorDialog(title: String, body: String, onDismissRequest: () -> Unit) {
-    AlertDialog(
-        title = { DialogTitle(title) },
-        text = { Text(body) },
-        onDismissRequest = onDismissRequest,
-        confirmButton = {
-            Button(onClick = onDismissRequest) {
-                Text(text = stringResource(id = R.string.common_ok))
-            }
-        },
-    )
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/FormFieldViews.kt b/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/FormFieldViews.kt
deleted file mode 100644
index a640e91575..0000000000
--- a/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/FormFieldViews.kt
+++ /dev/null
@@ -1,149 +0,0 @@
-package com.tangem.tap.features.customtoken.legacy.compose
-
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.input.KeyboardType
-import com.tangem.core.ui.components.SpacerH8
-import com.tangem.domain.common.form.Field
-import com.tangem.domain.features.addCustomToken.TokenBlockchainField
-import com.tangem.domain.features.addCustomToken.TokenDerivationPathField
-import com.tangem.domain.features.addCustomToken.TokenField
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenContractAddressChanged
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenDecimalsChanged
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenDerivationPathChanged
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenNameChanged
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenNetworkChanged
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenSymbolChanged
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenState
-import com.tangem.domain.redux.domainStore
-import com.tangem.tap.common.compose.OutlinedTextFieldWidget
-import com.tangem.tap.common.compose.TitleSubtitle
-import com.tangem.wallet.R
-
-/**
-[REDACTED_AUTHOR]
- */
-@Composable
-fun TokenContractAddressView(screenFieldData: ScreenFieldData) {
-    if (!screenFieldData.viewState.isVisible) return
-
-    val tokenField = screenFieldData.field as TokenField
-
-    OutlinedTextFieldWidget(
-        fieldData = tokenField.data,
-        labelId = R.string.custom_token_contract_address_input_title,
-        placeholder = "0x0000000000000000000000000000000000000000",
-        isEnabled = screenFieldData.viewState.isEnabled,
-        isLoading = screenFieldData.viewState.isLoading,
-        error = screenFieldData.error,
-        errorConverter = screenFieldData.errorConverter,
-//        trailingIcon = { PasteClearButton(showFirst = tokenField.data.value.isEmpty()) }
-    ) {
-        domainStore.dispatch(OnTokenContractAddressChanged(Field.Data(it, true)))
-    }
-    SpacerH8()
-}
-
-@Composable
-fun TokenNameView(screenFieldData: ScreenFieldData) {
-    if (!screenFieldData.viewState.isVisible) return
-
-    val tokenField = screenFieldData.field as TokenField
-
-    OutlinedTextFieldWidget(
-        fieldData = tokenField.data,
-        labelId = R.string.custom_token_name_input_title,
-        placeholderId = R.string.custom_token_name_input_placeholder,
-        isEnabled = screenFieldData.viewState.isEnabled,
-        error = screenFieldData.error,
-        errorConverter = screenFieldData.errorConverter,
-    ) {
-        domainStore.dispatch(OnTokenNameChanged(Field.Data(it, true)))
-    }
-    SpacerH8()
-}
-
-@Composable
-fun TokenNetworkView(
-    screenFieldData: ScreenFieldData,
-    state: AddCustomTokenState,
-    closePopupTrigger: ClosePopupTrigger,
-) {
-    if (!screenFieldData.viewState.isVisible) return
-
-    val notSelected = stringResource(id = R.string.custom_token_network_input_not_selected)
-    val networkField = screenFieldData.field as TokenBlockchainField
-
-    BlockchainSpinner(
-        title = R.string.custom_token_network_input_title,
-        itemList = networkField.itemList,
-        selectedItem = networkField.data,
-        isEnabled = screenFieldData.viewState.isEnabled,
-        textFieldConverter = { state.blockchainToName(it) ?: notSelected },
-        closePopupTrigger = closePopupTrigger,
-    ) { domainStore.dispatch(OnTokenNetworkChanged(Field.Data(it, true))) }
-    SpacerH8()
-}
-
-@Composable
-fun TokenSymbolView(screenFieldData: ScreenFieldData) {
-    if (!screenFieldData.viewState.isVisible) return
-
-    val tokenField = screenFieldData.field as TokenField
-
-    OutlinedTextFieldWidget(
-        fieldData = tokenField.data,
-        labelId = R.string.custom_token_token_symbol_input_title,
-        placeholderId = R.string.custom_token_token_symbol_input_placeholder,
-        isEnabled = screenFieldData.viewState.isEnabled,
-        error = screenFieldData.error,
-        errorConverter = screenFieldData.errorConverter,
-    ) { domainStore.dispatch(OnTokenSymbolChanged(Field.Data(it, true))) }
-    SpacerH8()
-}
-
-@Composable
-fun TokenDecimalsView(screenFieldData: ScreenFieldData) {
-    if (!screenFieldData.viewState.isVisible) return
-
-    val tokenField = screenFieldData.field as TokenField
-
-    OutlinedTextFieldWidget(
-        fieldData = tokenField.data,
-        labelId = R.string.custom_token_decimals_input_title,
-        placeholder = "8",
-        isEnabled = screenFieldData.viewState.isEnabled,
-        error = screenFieldData.error,
-        errorConverter = screenFieldData.errorConverter,
-        keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
-    ) { domainStore.dispatch(OnTokenDecimalsChanged(Field.Data(it, true))) }
-    SpacerH8()
-}
-
-@Composable
-fun TokenDerivationPathView(
-    screenFieldData: ScreenFieldData,
-    state: AddCustomTokenState,
-    closePopupTrigger: ClosePopupTrigger,
-) {
-    if (!screenFieldData.viewState.isVisible) return
-
-    val notSelected = stringResource(id = R.string.custom_token_derivation_path_default)
-    val networkField = screenFieldData.field as TokenDerivationPathField
-
-    BlockchainSpinner(
-        title = R.string.custom_token_derivation_path_input_title,
-        itemList = networkField.itemList,
-        selectedItem = networkField.data,
-        isEnabled = screenFieldData.viewState.isEnabled,
-        textFieldConverter = { state.blockchainToName(it) ?: notSelected },
-        dropdownItemView = { blockchain ->
-            val derivationPathName = state.blockchainToName(blockchain, true) ?: notSelected
-            val blockchainName = state.blockchainToName(blockchain) ?: notSelected
-            TitleSubtitle(derivationPathName, blockchainName)
-        },
-        closePopupTrigger = closePopupTrigger,
-    ) { domainStore.dispatch(OnTokenDerivationPathChanged(Field.Data(it, true))) }
-    SpacerH8()
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/HangingOverKeyboardView.kt b/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/HangingOverKeyboardView.kt
deleted file mode 100644
index 6aa2994210..0000000000
--- a/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/HangingOverKeyboardView.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.tangem.tap.features.customtoken.legacy.compose
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxScope
-import androidx.compose.foundation.layout.padding
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.State
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import com.tangem.core.ui.components.Keyboard
-
-/**
-[REDACTED_AUTHOR]
- */
-@Composable
-fun HangingOverKeyboardView(
-    modifier: Modifier = Modifier,
-    keyboardState: State<Keyboard>,
-    spaceBetweenKeyboard: Dp = 0.dp,
-    content: @Composable (BoxScope.() -> Unit),
-) {
-    val padding = remember(keyboardState) {
-        when (val state = keyboardState.value) {
-            is Keyboard.Closed -> 0.dp
-            is Keyboard.Opened -> state.height + spaceBetweenKeyboard
-        }
-    }
-
-    Box(modifier.padding(bottom = padding)) { content() }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/OutlinedSpinner.kt b/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/OutlinedSpinner.kt
deleted file mode 100644
index a3ddaedf7e..0000000000
--- a/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/OutlinedSpinner.kt
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.tangem.tap.features.customtoken.legacy.compose
-
-import android.os.Handler
-import android.os.Looper
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.key
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.core.os.postDelayed
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.common.extensions.VoidCallback
-import com.tangem.domain.common.form.Field
-import com.tangem.tap.common.compose.TangemTextFieldsDefault
-import com.tangem.tap.common.extensions.ValueCallback
-
-/**
-[REDACTED_AUTHOR]
- */
-@Suppress("MagicNumber")
-@OptIn(ExperimentalMaterialApi::class)
-@Composable
-internal fun <T> OutlinedSpinner(
-    label: String,
-    itemList: List<T>,
-    selectedItem: Field.Data<T>,
-    onItemSelected: ValueCallback<T>,
-    modifier: Modifier = Modifier,
-    textFieldConverter: (T) -> String = { it.toString() },
-    dropdownItemView: @Composable ((T) -> Unit)? = null,
-    isEnabled: Boolean = true,
-    onClose: VoidCallback = {},
-    closePopupTrigger: ClosePopupTrigger = ClosePopupTrigger(),
-) {
-    val rIsExpanded = remember { mutableStateOf(false) }
-    val stateSelectedItem = remember { mutableStateOf(selectedItem.value) }
-    if (!selectedItem.isUserInput) {
-        stateSelectedItem.value = selectedItem.value
-    }
-
-    val onDropDownItemSelectedInternal: (T) -> Unit = {
-        stateSelectedItem.value = it
-        rIsExpanded.value = false
-        onItemSelected(it)
-    }
-    val onDismissRequest = {
-        rIsExpanded.value = false
-        onClose()
-    }
-
-    closePopupTrigger.close = {
-        onDismissRequest()
-        Handler(Looper.getMainLooper()).postDelayed(100) {
-            closePopupTrigger.onCloseComplete()
-        }
-    }
-
-    ExposedDropdownMenuBox(
-        expanded = rIsExpanded.value,
-        onExpandedChange = { rIsExpanded.value = !rIsExpanded.value },
-    ) {
-        OutlinedTextField(
-            modifier = modifier,
-            readOnly = true,
-            enabled = isEnabled,
-            value = textFieldConverter(stateSelectedItem.value),
-            onValueChange = {},
-            label = { Text(label) },
-            trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = rIsExpanded.value) },
-            colors = TangemTextFieldsDefault.defaultTextFieldColors,
-        )
-
-        if (isEnabled) {
-            ExposedDropdownMenu(expanded = rIsExpanded.value, onDismissRequest = onDismissRequest) {
-                itemList.forEach { item ->
-                    key(item) {
-                        DropdownMenuItem(onClick = { onDropDownItemSelectedInternal(item) }) {
-                            if (dropdownItemView == null) Text(textFieldConverter(item)) else dropdownItemView(item)
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-class ClosePopupTrigger {
-    var close: () -> Unit = {}
-    var onCloseComplete: () -> Unit = {}
-}
-
-@Preview
-@Composable
-private fun TestSpinnerPreview() {
-    OutlinedSpinner(
-        label = "Blockchain name",
-        itemList = listOf(Blockchain.values()),
-        selectedItem = Field.Data(Blockchain.Avalanche, false),
-        onItemSelected = {},
-    )
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/SelectTokenNetworkDialog.kt b/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/SelectTokenNetworkDialog.kt
deleted file mode 100644
index 441969ad5e..0000000000
--- a/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/SelectTokenNetworkDialog.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.tangem.tap.features.customtoken.legacy.compose
-
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.stringResource
-import com.tangem.domain.DomainDialog
-import com.tangem.tap.common.compose.TitleSubtitle
-import com.tangem.wallet.R
-
-/**
-[REDACTED_AUTHOR]
- */
-@Composable
-fun SelectTokenNetworkDialog(dialog: DomainDialog.SelectTokenDialog, onDismissRequest: () -> Unit) {
-    SimpleDialog(
-        title = stringResource(id = R.string.custom_token_network_input_title),
-        items = dialog.items,
-        onSelect = dialog.onSelect,
-        onDismissRequest = onDismissRequest,
-    ) { network -> TitleSubtitle(dialog.networkIdConverter(network.networkId), network.contractAddress ?: "") }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/test/ContractAddressTests.kt b/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/test/ContractAddressTests.kt
deleted file mode 100644
index 3ba171f427..0000000000
--- a/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/test/ContractAddressTests.kt
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.tangem.tap.features.customtoken.legacy.compose.test
-
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.Button
-import androidx.compose.material.Divider
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.common.extensions.VoidCallback
-import com.tangem.domain.common.form.Field
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction
-import com.tangem.domain.redux.domainStore
-
-/**
-[REDACTED_AUTHOR]
- */
-@Composable
-fun ContractAddressTests(onItemClick: VoidCallback) {
-    val casesInfo = listOf(
-        "USDC on ETH" to "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
-        "BUSD on ETH" to "0x4fabb145d64652a948d72533023f6e7a623c7c53",
-        "ETH on AVALANCHE" to "0xf20d962a6c8f70c731bd838a3a388d7d48fa6e15",
-        "USDC on ETH (invalid - cut address)" to "0xa0b86991c6218b36c1d1",
-        "Custom EVM" to "0x1111111111111111112111111111111111111113",
-        "Supported by several networks" to "0xa1faa113cbe53436df28ff0aee54275c13b40975",
-        "Invalid" to "!@#_  _-%%^&&*((){P P2iOWsdfFQLA",
-    )
-    CasesListContent(casesInfo, onItemClick)
-}
-
-@Composable
-fun SolanaAddressTests(onItemClick: VoidCallback) {
-    val casesInfo = listOf(
-        "USDT (full)" to "Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB",
-        "USDT (valid - 2/3 of address)" to "Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8Ben",
-        "USDT (invalid - 1/3 of address)" to "Es9vMFrzaCERmJ",
-        "ETH (full)" to "2FPyTwcZLUg1MDrwsyoP4D6s1tM7hAkHYRjkNb5w6Pxk",
-    )
-    CasesListContent(casesInfo, onItemClick)
-}
-
-@Composable
-private fun CasesListContent(casesList: List<Pair<String, String>>, onItemClick: VoidCallback) {
-    LazyColumn(
-        content = {
-            item {
-                Row {
-                    ResetContractAddressButton(onItemClick)
-                    Text("", modifier = Modifier.weight(1f))
-                    ResetAllFieldsButton(onItemClick)
-                }
-                Divider()
-            }
-            items(casesList.size) {
-                val (info, address) = casesList[it]
-                ContractAddressButton(info, address, onItemClick)
-            }
-        },
-    )
-}
-
-@Composable
-fun ResetAllFieldsButton(onItemClick: VoidCallback) {
-    ActionButton(
-        name = "Reset",
-        onClick = {
-            onItemClick()
-            domainStore.dispatch(AddCustomTokenAction.OnTokenContractAddressChanged(Field.Data("", false)))
-            domainStore.dispatch(AddCustomTokenAction.OnTokenNetworkChanged(Field.Data(Blockchain.Unknown, false)))
-            domainStore.dispatch(AddCustomTokenAction.OnTokenNameChanged(Field.Data("", false)))
-            domainStore.dispatch(AddCustomTokenAction.OnTokenSymbolChanged(Field.Data("", false)))
-            domainStore.dispatch(AddCustomTokenAction.OnTokenDecimalsChanged(Field.Data("", false)))
-            domainStore.dispatch(
-                AddCustomTokenAction.OnTokenDerivationPathChanged(
-                    Field.Data(
-                        Blockchain.Unknown,
-                        false,
-                    ),
-                ),
-            )
-        },
-    )
-}
-
-@Composable
-fun ResetContractAddressButton(onItemClick: VoidCallback) {
-    ActionButton(
-        name = "Set empty address",
-        onClick = {
-            onItemClick()
-            domainStore.dispatch(AddCustomTokenAction.OnTokenContractAddressChanged(Field.Data("", false)))
-        },
-    )
-}
-
-@Composable
-private fun ContractAddressButton(name: String, address: String, onItemClick: VoidCallback) {
-    ActionButton(
-        modifier = Modifier.fillMaxWidth(),
-        name = name,
-        onClick = {
-            onItemClick()
-            domainStore.dispatch(AddCustomTokenAction.OnTokenContractAddressChanged(Field.Data(address, false)))
-        },
-    )
-}
-
-@Composable
-fun ActionButton(name: String, onClick: () -> Unit, modifier: Modifier = Modifier) {
-    Button(
-        modifier = modifier.padding(horizontal = 8.dp),
-        onClick = onClick,
-    ) { Text(name, fontSize = 12.sp) }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/test/TestCasesList.kt b/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/test/TestCasesList.kt
deleted file mode 100644
index 3bae26e193..0000000000
--- a/app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/test/TestCasesList.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.tangem.tap.features.customtoken.legacy.compose.test
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Button
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.colorResource
-import androidx.compose.ui.unit.dp
-import com.tangem.common.extensions.VoidCallback
-import com.tangem.wallet.BuildConfig
-import com.tangem.wallet.R
-
-/**
-[REDACTED_AUTHOR]
- */
-@Composable
-fun TestCasesList(onItemClick: (TestCase) -> Unit) {
-    if (!BuildConfig.TEST_ACTION_ENABLED) return
-
-    Surface(color = colorResource(id = R.color.lightGray5)) {
-        Column(Modifier.padding(horizontal = 16.dp)) {
-            listOf(TestCase.ContractAddress, TestCase.SolanaTokens)
-                .map { case -> TestCaseListItem(testCase = case, onItemClick = { onItemClick(case) }) }
-        }
-    }
-}
-
-@Composable
-fun TestCaseListItem(testCase: TestCase, onItemClick: () -> Unit) {
-    Row(
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        Text(
-            modifier = Modifier.weight(1f),
-            text = testCase.description,
-        )
-        Button(
-            onClick = onItemClick,
-        ) { Text("Start") }
-    }
-}
-
-enum class TestCase(val description: String, val content: @Composable (VoidCallback) -> Unit) {
-    ContractAddress("Test contract address field", { ContractAddressTests(it) }),
-    Auto("Test contract address field", { ContractAddressTests(it) }),
-    SolanaTokens("Test Solana contract addresses", { SolanaAddressTests(it) }),
-    ;
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/DarkThemeFeatureToggle.kt b/app/src/main/java/com/tangem/tap/features/details/DarkThemeFeatureToggle.kt
new file mode 100644
index 0000000000..afb3010ad3
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/details/DarkThemeFeatureToggle.kt
@@ -0,0 +1,10 @@
+package com.tangem.tap.features.details
+
+import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
+
+class DarkThemeFeatureToggle(
+    private val featureTogglesManager: FeatureTogglesManager,
+) {
+    val isDarkThemeEnabled: Boolean
+        get() = featureTogglesManager.isFeatureEnabled(name = "DARK_THEME_ENABLED")
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/featuretoggles/DefaultDetailsFeatureToggles.kt b/app/src/main/java/com/tangem/tap/features/details/featuretoggles/DefaultDetailsFeatureToggles.kt
new file mode 100644
index 0000000000..2ed04a4c94
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/details/featuretoggles/DefaultDetailsFeatureToggles.kt
@@ -0,0 +1,11 @@
+package com.tangem.tap.features.details.featuretoggles
+
+import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
+
+internal class DefaultDetailsFeatureToggles(
+    private val featureTogglesManager: FeatureTogglesManager,
+) : DetailsFeatureToggles {
+
+    override val isRedesignedAppCurrencySelectorEnabled: Boolean
+        get() = featureTogglesManager.isFeatureEnabled(name = "REDESIGNED_APP_CURRENCY_SELECTOR_ENABLED")
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/featuretoggles/DetailsFeatureToggles.kt b/app/src/main/java/com/tangem/tap/features/details/featuretoggles/DetailsFeatureToggles.kt
new file mode 100644
index 0000000000..dd1cd3bbdd
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/details/featuretoggles/DetailsFeatureToggles.kt
@@ -0,0 +1,6 @@
+package com.tangem.tap.features.details.featuretoggles
+
+interface DetailsFeatureToggles {
+
+    val isRedesignedAppCurrencySelectorEnabled: Boolean
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/featuretoggles/DetailsFeatureTogglesModule.kt b/app/src/main/java/com/tangem/tap/features/details/featuretoggles/DetailsFeatureTogglesModule.kt
new file mode 100644
index 0000000000..2e6fd9874a
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/details/featuretoggles/DetailsFeatureTogglesModule.kt
@@ -0,0 +1,17 @@
+package com.tangem.tap.features.details.featuretoggles
+
+import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object DetailsFeatureTogglesModule {
+
+    @Provides
+    fun provideDetailsFeatureToggles(featureTogglesManager: FeatureTogglesManager): DetailsFeatureToggles {
+        return DefaultDetailsFeatureToggles(featureTogglesManager)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsAction.kt b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsAction.kt
index 1248e2537c..338e8f255c 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsAction.kt
@@ -1,7 +1,8 @@
 package com.tangem.tap.features.details.redux
 
 import androidx.lifecycle.LifecycleCoroutineScope
-import com.tangem.blockchain.common.Wallet
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.domain.apptheme.model.AppThemeMode
 import com.tangem.domain.common.CardTypesResolver
 import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.models.scan.ScanResponse
@@ -12,7 +13,8 @@ sealed class DetailsAction : Action {
 
     data class PrepareScreen(
         val scanResponse: ScanResponse,
-        val wallets: List<Wallet>,
+        val darkThemeSwitchEnabled: Boolean,
+        val shouldSaveUserWallets: Boolean,
     ) : DetailsAction()
 
     object ReCreateTwinsWallet : DetailsAction()
@@ -20,7 +22,8 @@ sealed class DetailsAction : Action {
     sealed class ResetToFactory : DetailsAction() {
         object Start : ResetToFactory()
         object Proceed : ResetToFactory()
-        data class Confirm(val confirmed: Boolean) : ResetToFactory()
+        data class AcceptCondition1(val accepted: Boolean) : ResetToFactory()
+        data class AcceptCondition2(val accepted: Boolean) : ResetToFactory()
         object Failure : ResetToFactory()
         object Success : ResetToFactory()
     }
@@ -29,6 +32,14 @@ sealed class DetailsAction : Action {
 
     data class PrepareCardSettingsData(val card: CardDTO, val cardTypesResolver: CardTypesResolver) : DetailsAction()
     object ResetCardSettingsData : DetailsAction()
+    object ScanAndSaveUserWallet : DetailsAction() {
+
+        object Success : DetailsAction()
+
+        data class Error(val error: TextReference?) : DetailsAction()
+    }
+
+    object DismissError : DetailsAction()
 
     sealed class AccessCodeRecovery : DetailsAction() {
         object Open : AccessCodeRecovery()
@@ -64,14 +75,25 @@ sealed class DetailsAction : Action {
         }
 
         data class CheckBiometricsStatus(
-            val awaitStatusChange: Boolean,
-            val lifecycleCoroutineScope: LifecycleCoroutineScope,
+            val lifecycleScope: LifecycleCoroutineScope,
         ) : AppSettings()
 
         object EnrollBiometrics : AppSettings()
         data class BiometricsStatusChanged(
             val needEnrollBiometrics: Boolean,
         ) : AppSettings()
+
+        data class ChangeAppThemeMode(
+            val appThemeMode: AppThemeMode,
+        ) : AppSettings()
+
+        data class ChangeBalanceHiding(
+            val hideBalance: Boolean,
+        ) : AppSettings()
+
+        data class ChangeAppCurrency(
+            val fiatCurrency: FiatCurrency,
+        ) : AppSettings()
     }
 
     data class ChangeAppCurrency(val fiatCurrency: FiatCurrency) : DetailsAction()
diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt
index a672117ab2..3dac94f996 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt
@@ -1,15 +1,19 @@
 package com.tangem.tap.features.details.redux
 
 import androidx.lifecycle.LifecycleCoroutineScope
-import com.tangem.common.CompletionResult
+import com.tangem.common.*
+import com.tangem.common.core.TangemError
 import com.tangem.common.core.TangemSdkError
-import com.tangem.common.doOnFailure
-import com.tangem.common.doOnSuccess
+import com.tangem.common.core.UserCodeRequestPolicy
 import com.tangem.common.extensions.guard
-import com.tangem.common.flatMap
 import com.tangem.core.analytics.Analytics
 import com.tangem.core.navigation.AppScreen
 import com.tangem.core.navigation.NavigationAction
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.domain.apptheme.model.AppThemeMode
+import com.tangem.domain.balancehiding.BalanceHidingSettings
 import com.tangem.domain.common.TapWorkarounds.isTangemTwins
 import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.models.scan.ScanResponse
@@ -19,6 +23,7 @@ import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.legacy.isLockedSync
 import com.tangem.tap.*
 import com.tangem.tap.common.analytics.events.AnalyticsParam
+import com.tangem.tap.common.analytics.events.Basic
 import com.tangem.tap.common.analytics.events.Settings
 import com.tangem.tap.common.extensions.dispatchDialogShow
 import com.tangem.tap.common.extensions.dispatchOnMain
@@ -33,8 +38,10 @@ import com.tangem.tap.features.demo.DemoHelper
 import com.tangem.tap.features.onboarding.products.twins.redux.CreateTwinWalletMode
 import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsAction
 import com.tangem.tap.features.wallet.redux.WalletAction
+import com.tangem.tap.features.walletSelector.redux.WalletSelectorAction
 import com.tangem.tap.proxy.redux.DaggerGraphState
-import com.tangem.tap.tangemSdkManager
+import com.tangem.utils.coroutines.JobHolder
+import com.tangem.utils.coroutines.saveIn
 import com.tangem.wallet.R
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
@@ -47,7 +54,7 @@ import timber.log.Timber
 class DetailsMiddleware {
     private val eraseWalletMiddleware = EraseWalletMiddleware()
     private val manageSecurityMiddleware = ManageSecurityMiddleware()
-    private val managePrivacyMiddleware = ManagePrivacyMiddleware()
+    private val appSettingsMiddleware = AppSettingsMiddleware()
     private val accessCodeRecoveryMiddleware = AccessCodeRecoveryMiddleware()
     val detailsMiddleware: Middleware<AppState> = { _, stateProvider ->
         { next ->
@@ -67,43 +74,14 @@ class DetailsMiddleware {
         when (action) {
             is DetailsAction.ResetToFactory -> eraseWalletMiddleware.handle(action)
             is DetailsAction.ManageSecurity -> manageSecurityMiddleware.handle(action, state)
-            is DetailsAction.AppSettings -> managePrivacyMiddleware.handle(state, action)
+            is DetailsAction.AppSettings -> appSettingsMiddleware.handle(state, action)
             is DetailsAction.ReCreateTwinsWallet -> {
                 store.dispatch(TwinCardsAction.SetMode(CreateTwinWalletMode.RecreateWallet))
                 store.dispatch(NavigationAction.NavigateTo(AppScreen.OnboardingTwins))
             }
             is DetailsAction.AccessCodeRecovery -> accessCodeRecoveryMiddleware.handle(state, action)
-            DetailsAction.ScanCard -> {
-                scope.launch {
-                    store.state.daggerGraphState.get(DaggerGraphState::scanCardProcessor)
-                        .scan(allowsRequestAccessCodeFromRepository = true)
-                        .doOnSuccess { scanResponse ->
-                            // if we use biometric, scanResponse in GlobalState is null, and crashes NPE on twin cards
-                            store.dispatch(GlobalAction.SaveScanResponse(scanResponse))
-                            val currentUserWalletId = state.scanResponse
-                                ?.let { UserWalletIdBuilder.scanResponse(it).build() }
-                            val scannedUserWalletId = UserWalletIdBuilder.scanResponse(scanResponse)
-                                .build()
-                            val isSameWallet = currentUserWalletId == scannedUserWalletId
-
-                            if (isSameWallet) {
-                                store.dispatchOnMain(
-                                    DetailsAction.PrepareCardSettingsData(
-                                        scanResponse.card,
-                                        scanResponse.cardTypesResolver,
-                                    ),
-                                )
-                            } else {
-                                store.dispatchDialogShow(
-                                    AppDialog.SimpleOkDialogRes(
-                                        headerId = R.string.common_warning,
-                                        messageId = R.string.error_wrong_wallet_tapped,
-                                    ),
-                                )
-                            }
-                        }
-                }
-            }
+            is DetailsAction.ScanCard -> scanCard(state)
+            is DetailsAction.ScanAndSaveUserWallet -> scanAndSaveUserWallet()
         }
     }
 
@@ -124,6 +102,27 @@ class DetailsMiddleware {
                     scope.launch {
                         val userWalletId = UserWalletIdBuilder.card(card).build()
 
+                        // we must require a password regardless of biometric settings
+                        val policy = tangemSdkManager.userCodeRequestPolicy
+                        val doBeforeErase = {
+                            val type = if (card.isAccessCodeSet) {
+                                UserCodeType.AccessCode
+                            } else if (card.isPasscodeSet == true) {
+                                UserCodeType.Passcode
+                            } else {
+                                null
+                            }
+
+                            type?.let {
+                                tangemSdkManager.setUserCodeRequestPolicy(UserCodeRequestPolicy.Always(type))
+                            }
+                        }
+
+                        val doAfterErase = {
+                            tangemSdkManager.setUserCodeRequestPolicy(policy)
+                        }
+
+                        doBeforeErase()
                         tangemSdkManager.resetToFactorySettings(card.cardId, true)
                             .flatMap { userWalletsListManager.delete(listOfNotNull(userWalletId)) }
                             .flatMap { tangemSdkManager.deleteSavedUserCodes(setOf(card.cardId)) }
@@ -147,6 +146,9 @@ class DetailsMiddleware {
                                     Analytics.send(Settings.CardSettings.FactoryResetFinished(error))
                                 }
                             }
+                            .doOnResult {
+                                doAfterErase()
+                            }
                     }
                 }
                 else -> Unit
@@ -207,7 +209,10 @@ class DetailsMiddleware {
         }
     }
 
-    class ManagePrivacyMiddleware {
+    class AppSettingsMiddleware {
+
+        private val checkBiometricsStatusJobHolder = JobHolder()
+
         fun handle(state: DetailsState, action: DetailsAction.AppSettings) {
             when (action) {
                 is DetailsAction.AppSettings.SwitchPrivacySetting -> {
@@ -217,15 +222,22 @@ class DetailsMiddleware {
                     }
                 }
                 is DetailsAction.AppSettings.CheckBiometricsStatus -> {
-                    checkBiometricsStatus(
-                        awaitStatusChange = action.awaitStatusChange,
-                        state = state,
-                        lifecycleScope = action.lifecycleCoroutineScope,
-                    )
+                    observeBiometricsStatusChanges(state, action.lifecycleScope)
                 }
                 is DetailsAction.AppSettings.EnrollBiometrics -> {
                     enrollBiometrics()
                 }
+                is DetailsAction.AppSettings.ChangeAppThemeMode -> {
+                    changeAppThemeMode(action.appThemeMode)
+                }
+                is DetailsAction.AppSettings.ChangeBalanceHiding -> {
+                    changeBalanceHiding(action.hideBalance)
+                }
+                is DetailsAction.AppSettings.ChangeAppCurrency -> {
+                    store.dispatch(GlobalAction.ChangeAppCurrency(action.fiatCurrency))
+                    store.dispatch(DetailsAction.ChangeAppCurrency(action.fiatCurrency))
+                    store.dispatch(WalletSelectorAction.ChangeAppCurrency(action.fiatCurrency))
+                }
                 is DetailsAction.AppSettings.SwitchPrivacySetting.Success,
                 is DetailsAction.AppSettings.SwitchPrivacySetting.Failure,
                 is DetailsAction.AppSettings.BiometricsStatusChanged,
@@ -233,27 +245,20 @@ class DetailsMiddleware {
             }
         }
 
-        /**
-         * @param awaitStatusChange If true then start a new coroutine and check the biometric status every 100
-         * milliseconds until it changes
-         * */
-        private fun checkBiometricsStatus(
-            awaitStatusChange: Boolean,
-            state: DetailsState,
-            lifecycleScope: LifecycleCoroutineScope,
-        ) {
-            lifecycleScope.launch {
-                if (awaitStatusChange) {
-                    while (state.appSettingsState.needEnrollBiometrics == tangemSdkManager.needEnrollBiometrics) {
-                        delay(timeMillis = 100)
+        private fun observeBiometricsStatusChanges(state: DetailsState, lifecycleScope: LifecycleCoroutineScope) {
+            lifecycleScope.launch(Dispatchers.IO) {
+                do {
+                    val needEnrollBiometrics = runCatching(tangemSdkManager::needEnrollBiometrics).getOrNull()
+
+                    if (needEnrollBiometrics != null &&
+                        needEnrollBiometrics != state.appSettingsState.needEnrollBiometrics
+                    ) {
+                        store.dispatchWithMain(DetailsAction.AppSettings.BiometricsStatusChanged(needEnrollBiometrics))
                     }
-                }
-                store.dispatchWithMain(
-                    DetailsAction.AppSettings.BiometricsStatusChanged(
-                        needEnrollBiometrics = tangemSdkManager.needEnrollBiometrics,
-                    ),
-                )
-            }
+
+                    delay(timeMillis = 500)
+                } while (true)
+            }.saveIn(checkBiometricsStatusJobHolder)
         }
 
         private fun enrollBiometrics() {
@@ -261,9 +266,33 @@ class DetailsMiddleware {
             store.dispatchOnMain(NavigationAction.OpenBiometricsSettings)
         }
 
+        private fun changeAppThemeMode(appThemeMode: AppThemeMode) {
+            val repository = store.state.daggerGraphState.get(DaggerGraphState::appThemeModeRepository)
+
+            scope.launch {
+                repository.changeAppThemeMode(appThemeMode)
+
+                store.dispatchWithMain(GlobalAction.ChangeAppThemeMode(appThemeMode))
+            }
+        }
+
+        private fun changeBalanceHiding(hideBalance: Boolean) {
+            val repository = store.state.daggerGraphState.get(DaggerGraphState::balanceHidingRepository)
+
+            scope.launch {
+                val newState = BalanceHidingSettings(
+                    isHidingEnabledInSettings = hideBalance,
+                    isBalanceHidden = false,
+                )
+
+                repository.storeBalanceHidingSettings(newState)
+            }
+        }
+
         private fun toggleSaveWallets(state: DetailsState, enable: Boolean) = scope.launch {
             // Nothing to change
-            if (preferencesStorage.shouldSaveUserWallets == enable) {
+            val walletsRepository = store.state.daggerGraphState.get(DaggerGraphState::walletsRepository)
+            if (walletsRepository.shouldSaveUserWalletsSync() == enable) {
                 store.dispatchWithMain(DetailsAction.AppSettings.SwitchPrivacySetting.Success)
                 return@launch
             }
@@ -351,7 +380,8 @@ class DetailsMiddleware {
                     Analytics.send(Settings.AppSettings.SaveWalletSwitcherChanged(AnalyticsParam.OnOffState.On))
 
                     preferencesStorage.shouldShowSaveUserWalletScreen = false
-                    preferencesStorage.shouldSaveUserWallets = true
+                    store.state.daggerGraphState.get(DaggerGraphState::walletsRepository)
+                        .saveShouldSaveUserWallets(item = true)
 
                     store.dispatchWithMain(WalletAction.UpdateCanSaveUserWallets(canSaveUserWallets = true))
                 }
@@ -367,7 +397,8 @@ class DetailsMiddleware {
                     Analytics.send(Settings.AppSettings.SaveWalletSwitcherChanged(AnalyticsParam.OnOffState.Off))
                     deleteSavedAccessCodes()
                     updateUserWalletsListManager(enableUserWalletsSaving = false)
-                    preferencesStorage.shouldSaveUserWallets = false
+                    store.state.daggerGraphState.get(DaggerGraphState::walletsRepository)
+                        .saveShouldSaveUserWallets(item = false)
 
                     store.dispatchWithMain(WalletAction.UpdateCanSaveUserWallets(canSaveUserWallets = true))
                     store.dispatchWithMain(NavigationAction.PopBackTo(AppScreen.Home))
@@ -419,10 +450,7 @@ class DetailsMiddleware {
                 return null
             }
 
-            return UserWalletsListManager.provideBiometricImplementation(
-                context = context,
-                tangemSdkManager = tangemSdkManager,
-            )
+            return UserWalletsListManager.provideBiometricImplementation(context)
         }
     }
 
@@ -455,4 +483,97 @@ class DetailsMiddleware {
             }
         }
     }
+
+    private fun scanCard(state: DetailsState) = scope.launch {
+        store.state.daggerGraphState.get(DaggerGraphState::scanCardProcessor)
+            .scan(allowsRequestAccessCodeFromRepository = true)
+            .doOnSuccess { scanResponse ->
+                // if we use biometric, scanResponse in GlobalState is null, and crashes NPE on twin cards
+                store.dispatch(GlobalAction.SaveScanResponse(scanResponse))
+                val currentUserWalletId = state.scanResponse
+                    ?.let { UserWalletIdBuilder.scanResponse(it).build() }
+                val scannedUserWalletId = UserWalletIdBuilder.scanResponse(scanResponse)
+                    .build()
+                val isSameWallet = currentUserWalletId == scannedUserWalletId
+
+                if (isSameWallet) {
+                    store.dispatchOnMain(
+                        DetailsAction.PrepareCardSettingsData(
+                            scanResponse.card,
+                            scanResponse.cardTypesResolver,
+                        ),
+                    )
+                } else {
+                    store.dispatchDialogShow(
+                        AppDialog.SimpleOkDialogRes(
+                            headerId = R.string.common_warning,
+                            messageId = R.string.error_wrong_wallet_tapped,
+                        ),
+                    )
+                }
+            }
+    }
+
+    private fun scanAndSaveUserWallet() = scope.launch(Dispatchers.IO) {
+        val cardSdkConfigRepository = store.state.daggerGraphState.get(DaggerGraphState::cardSdkConfigRepository)
+
+        val prevUseBiometricsForAccessCode = cardSdkConfigRepository.isBiometricsRequestPolicy()
+
+        // Update access code policy for access code saving when a card was scanned
+        cardSdkConfigRepository.setAccessCodeRequestPolicy(
+            isBiometricsRequestPolicy = preferencesStorage.shouldSaveAccessCodes,
+        )
+
+        store.state.daggerGraphState.get(DaggerGraphState::scanCardProcessor).scan(
+            analyticsEvent = Basic.CardWasScanned(AnalyticsParam.ScannedFrom.MyWallets),
+            onWalletNotCreated = {
+                // No need to rollback policy, continue with the policy set before the card scan
+                store.dispatchWithMain(DetailsAction.ScanAndSaveUserWallet.Success)
+                store.dispatchWithMain(NavigationAction.PopBackTo(AppScreen.Wallet))
+            },
+            disclaimerWillShow = {
+                store.dispatchOnMain(NavigationAction.PopBackTo())
+            },
+            onSuccess = { scanResponse ->
+                saveUserWalletAndPopBackToWalletScreen(scanResponse)
+                    .doOnFailure { error ->
+                        // Rollback policy if card saving was failed
+                        cardSdkConfigRepository.setAccessCodeRequestPolicy(prevUseBiometricsForAccessCode)
+                        Timber.e(error, "Unable to save user wallet")
+
+                        store.dispatchWithMain(DetailsAction.ScanAndSaveUserWallet.Error(error.toTextReference()))
+                    }
+            },
+            onFailure = { error ->
+                // Rollback policy if card scanning was failed
+                cardSdkConfigRepository.setAccessCodeRequestPolicy(prevUseBiometricsForAccessCode)
+                Timber.e(error, "Unable to scan card")
+                store.dispatchWithMain(DetailsAction.ScanAndSaveUserWallet.Error(error.toTextReference()))
+            },
+        )
+    }
+
+    private suspend fun saveUserWalletAndPopBackToWalletScreen(scanResponse: ScanResponse): CompletionResult<Unit> {
+        val userWallet = UserWalletBuilder(scanResponse).build()
+            ?: return CompletionResult.Failure(TangemSdkError.WalletIsNotCreated())
+
+        return userWalletsListManager.save(userWallet)
+            .doOnSuccess {
+                store.dispatchWithMain(DetailsAction.ScanAndSaveUserWallet.Success)
+                store.dispatchWithMain(NavigationAction.PopBackTo(AppScreen.Wallet))
+
+                val walletFeatureToggles = store.state.daggerGraphState
+                    .get(DaggerGraphState::walletFeatureToggles)
+
+                if (!walletFeatureToggles.isRedesignedScreenEnabled) {
+                    store.onUserWalletSelected(userWallet)
+                }
+            }
+    }
+
+    private fun TangemError.toTextReference(): TextReference? {
+        if (silent) return null
+
+        return messageResId?.let(::resourceReference) ?: stringReference(customMessage)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsReducer.kt b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsReducer.kt
index e28b9cd398..ff94b5cc7a 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsReducer.kt
@@ -1,5 +1,6 @@
 package com.tangem.tap.features.details.redux
 
+import com.tangem.domain.apptheme.model.AppThemeMode
 import com.tangem.domain.common.CardTypesResolver
 import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.models.scan.CardDTO
@@ -8,13 +9,16 @@ import com.tangem.tap.domain.extensions.signedHashesCount
 import com.tangem.tap.preferencesStorage
 import com.tangem.tap.store
 import com.tangem.tap.tangemSdkManager
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.runBlocking
 import org.rekotlin.Action
-import java.util.*
+import java.util.EnumSet
 
 object DetailsReducer {
     fun reduce(action: Action, state: AppState): DetailsState = internalReduce(action, state)
 }
 
+@Suppress("CyclomaticComplexMethod")
 private fun internalReduce(action: Action, state: AppState): DetailsState {
     if (action !is DetailsAction) return state.detailsState
     val detailsState = state.detailsState
@@ -39,9 +43,25 @@ private fun internalReduce(action: Action, state: AppState): DetailsState {
         is DetailsAction.AppSettings -> {
             handlePrivacyAction(action, detailsState)
         }
-        is DetailsAction.ChangeAppCurrency ->
-            detailsState.copy(appCurrency = action.fiatCurrency)
+        is DetailsAction.ChangeAppCurrency -> detailsState.copy(
+            appSettingsState = detailsState.appSettingsState.copy(
+                selectedFiatCurrency = action.fiatCurrency,
+            ),
+        )
         is DetailsAction.AccessCodeRecovery -> handleAccessCodeRecoveryAction(action, detailsState)
+        is DetailsAction.ScanAndSaveUserWallet -> detailsState.copy(
+            isScanningInProgress = true,
+        )
+        is DetailsAction.ScanAndSaveUserWallet.Error -> detailsState.copy(
+            isScanningInProgress = false,
+            error = action.error,
+        )
+        is DetailsAction.ScanAndSaveUserWallet.Success -> detailsState.copy(
+            isScanningInProgress = false,
+        )
+        is DetailsAction.DismissError -> detailsState.copy(
+            error = null,
+        )
         else -> detailsState
     }
 }
@@ -49,13 +69,21 @@ private fun internalReduce(action: Action, state: AppState): DetailsState {
 private fun handlePrepareScreen(action: DetailsAction.PrepareScreen): DetailsState {
     return DetailsState(
         scanResponse = action.scanResponse,
-        wallets = action.wallets,
         createBackupAllowed = action.scanResponse.card.backupStatus == CardDTO.BackupStatus.NoBackup,
-        appCurrency = store.state.globalState.appCurrency,
         appSettingsState = AppSettingsState(
             isBiometricsAvailable = tangemSdkManager.canUseBiometry,
-            saveWallets = preferencesStorage.shouldSaveUserWallets,
+            saveWallets = action.shouldSaveUserWallets,
             saveAccessCodes = preferencesStorage.shouldSaveAccessCodes,
+            selectedFiatCurrency = store.state.globalState.appCurrency,
+            selectedThemeMode = runBlocking {
+                store.state.daggerGraphState
+                    .get { appThemeModeRepository }.getAppThemeMode().firstOrNull() ?: AppThemeMode.DEFAULT
+            },
+            isHidingEnabled = runBlocking {
+                store.state.daggerGraphState
+                    .get { balanceHidingRepository }.getBalanceHidingSettings().isHidingEnabledInSettings
+            },
+            darkThemeSwitchEnabled = action.darkThemeSwitchEnabled,
         ),
     )
 }
@@ -70,6 +98,9 @@ private fun handlePrepareCardSettingsScreen(
         manageSecurityState = prepareSecurityOptions(card, cardTypesResolver),
         card = card,
         resetCardAllowed = isResetToFactoryAllowedByCard(card, cardTypesResolver),
+        resetButtonEnabled = false,
+        condition1Checked = false,
+        condition2Checked = false,
         accessCodeRecovery = if (cardTypesResolver.isWallet2()) {
             val enabled = card.userSettings?.isUserCodeRecoveryAllowed ?: false
             AccessCodeRecoveryState(
@@ -122,8 +153,25 @@ private fun isResetToFactoryAllowedByCard(card: CardDTO, cardTypesResolver: Card
 
 private fun handleEraseWallet(action: DetailsAction.ResetToFactory, state: DetailsState): DetailsState {
     return when (action) {
-        is DetailsAction.ResetToFactory.Confirm ->
-            state.copy(cardSettingsState = state.cardSettingsState?.copy(resetConfirmed = action.confirmed))
+        is DetailsAction.ResetToFactory.AcceptCondition1 -> {
+            val warning1Checked = action.accepted
+            state.copy(
+                cardSettingsState = state.cardSettingsState?.copy(
+                    condition1Checked = action.accepted,
+                    resetButtonEnabled = warning1Checked && state.cardSettingsState.condition2Checked,
+                ),
+            )
+        }
+        is DetailsAction.ResetToFactory.AcceptCondition2 -> {
+            val warning2Checked = action.accepted
+            state.copy(
+                cardSettingsState = state.cardSettingsState?.copy(
+                    condition2Checked = action.accepted,
+                    resetButtonEnabled = warning2Checked && state.cardSettingsState.condition1Checked,
+                ),
+            )
+        }
+
         else -> state
     }
 }
@@ -194,6 +242,21 @@ private fun handlePrivacyAction(action: DetailsAction.AppSettings, state: Detail
                 needEnrollBiometrics = action.needEnrollBiometrics,
             ),
         )
+        is DetailsAction.AppSettings.ChangeAppThemeMode -> state.copy(
+            appSettingsState = state.appSettingsState.copy(
+                selectedThemeMode = action.appThemeMode,
+            ),
+        )
+        is DetailsAction.AppSettings.ChangeAppCurrency -> state.copy(
+            appSettingsState = state.appSettingsState.copy(
+                selectedFiatCurrency = action.fiatCurrency,
+            ),
+        )
+        is DetailsAction.AppSettings.ChangeBalanceHiding -> state.copy(
+            appSettingsState = state.appSettingsState.copy(
+                isHidingEnabled = action.hideBalance,
+            ),
+        )
         is DetailsAction.AppSettings.EnrollBiometrics,
         is DetailsAction.AppSettings.CheckBiometricsStatus,
         -> state
diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsState.kt b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsState.kt
index 6fd17a4119..3e49b20905 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsState.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsState.kt
@@ -1,20 +1,21 @@
 package com.tangem.tap.features.details.redux
 
-import com.tangem.blockchain.common.Wallet
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.domain.apptheme.model.AppThemeMode
 import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.tap.common.entities.Button
 import com.tangem.tap.common.entities.FiatCurrency
 import org.rekotlin.StateType
-import java.util.*
+import java.util.EnumSet
 
 data class DetailsState(
     val scanResponse: ScanResponse? = null,
-    val wallets: List<Wallet> = emptyList(),
     val cardSettingsState: CardSettingsState? = null,
     val privacyPolicyUrl: String? = null,
     val createBackupAllowed: Boolean = false,
-    val appCurrency: FiatCurrency = FiatCurrency.Default,
+    val isScanningInProgress: Boolean = false,
+    val error: TextReference? = null,
     val appSettingsState: AppSettingsState = AppSettingsState(),
 ) : StateType
 
@@ -40,7 +41,9 @@ data class CardSettingsState(
     val card: CardDTO,
     val manageSecurityState: ManageSecurityState?,
     val resetCardAllowed: Boolean,
-    val resetConfirmed: Boolean = false,
+    val resetButtonEnabled: Boolean,
+    val condition1Checked: Boolean,
+    val condition2Checked: Boolean,
     val accessCodeRecovery: AccessCodeRecoveryState? = null,
 )
 
@@ -56,7 +59,11 @@ data class AppSettingsState(
     val saveAccessCodes: Boolean = false,
     val isBiometricsAvailable: Boolean = false,
     val needEnrollBiometrics: Boolean = false,
+    val isHidingEnabled: Boolean = false,
     val isInProgress: Boolean = false,
+    val selectedFiatCurrency: FiatCurrency = FiatCurrency.Default,
+    val selectedThemeMode: AppThemeMode = AppThemeMode.DEFAULT,
+    val darkThemeSwitchEnabled: Boolean = false,
 )
 
 enum class SecurityOption { LongTap, PassCode, AccessCode }
diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectMiddleware.kt b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectMiddleware.kt
index a436d55d8e..4ed140a246 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectMiddleware.kt
@@ -14,6 +14,8 @@ import com.tangem.domain.common.extensions.withMainContext
 import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.common.util.derivationStyleProvider
 import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.domain.walletconnect.WalletConnectActions
+import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
@@ -32,6 +34,7 @@ import com.tangem.tap.features.wallet.redux.WalletState
 import com.tangem.tap.proxy.redux.DaggerGraphState
 import com.tangem.tap.scope
 import com.tangem.tap.store
+import com.tangem.tap.userWalletsListManager
 import kotlinx.coroutines.launch
 import org.rekotlin.Action
 import org.rekotlin.Middleware
@@ -59,6 +62,28 @@ class WalletConnectMiddleware {
         if (DemoHelper.tryHandle(state, action)) return
 
         when (action) {
+            is WalletConnectActions.New.Initialize -> {
+                val userWallet = action.userWallet
+                val cardId = if (userWallet.scanResponse.card.backupStatus?.isActive != true) {
+                    userWallet.cardId
+                } else { // if wallet has backup, any card from wallet can be used to sign
+                    null
+                }
+                scope.launch {
+                    val wcInteractor = store.state.daggerGraphState.walletConnectInteractor ?: return@launch
+                    wcInteractor.startListening(
+                        userWalletId = userWallet.walletId.stringValue,
+                        cardId = cardId,
+                    )
+                }
+            }
+            is WalletConnectActions.New.SetupUserChains -> {
+                scope.launch {
+                    val userWallet = action.userWallet
+                    val wcInteractor = store.state.daggerGraphState.walletConnectInteractor ?: return@launch
+                    wcInteractor.setUserChains(getAccountsForWc(wcInteractor, userWallet))
+                }
+            }
             is WalletConnectAction.ResetState -> walletConnectManager = WalletConnectManager()
             is WalletConnectAction.RestoreSessions -> {
                 walletConnectManager.restoreSessions(action.scanResponse)
@@ -246,47 +271,50 @@ class WalletConnectMiddleware {
                     store.dispatchOnMain(GlobalAction.ShowDialog(WalletConnectDialog.UnsupportedNetwork()))
                     return
                 }
-                val walletManager = getWalletManager(
-                    wallet = action.session.wallet,
-                    blockchain = blockchain,
-                    walletState = store.state.walletState,
-                ).guard {
-                    store.dispatchOnMain(
-                        GlobalAction.ShowDialog(
-                            WalletConnectDialog.AddNetwork(blockchain.fullName),
-                        ),
+                scope.launch {
+                    val walletManager = getWalletManager(
+                        wallet = action.session.wallet,
+                        blockchain = blockchain,
+                        walletState = store.state.walletState,
+                    ).guard {
+                        store.dispatchOnMain(
+                            GlobalAction.ShowDialog(
+                                WalletConnectDialog.AddNetwork(blockchain.fullName),
+                            ),
+                        )
+                        return@launch
+                    }
+                    val updatedWallet = action.session.wallet.copy(
+                        walletPublicKey = walletManager.wallet.publicKey.seedKey,
+                        derivedPublicKey = walletManager.wallet.publicKey.derivedKey,
+                        derivationPath = walletManager.wallet.publicKey.derivationPath,
+                        blockchain = action.blockchain,
                     )
-                    return
+                    val updatedSession = action.session.copy(wallet = updatedWallet)
+                    store.dispatchOnMain(WalletConnectAction.UpdateBlockchain(updatedSession))
                 }
-                val updatedWallet = action.session.wallet.copy(
-                    walletPublicKey = walletManager.wallet.publicKey.seedKey,
-                    derivedPublicKey = walletManager.wallet.publicKey.derivedKey,
-                    derivationPath = walletManager.wallet.publicKey.derivationPath,
-                    blockchain = action.blockchain,
-                )
-                val updatedSession = action.session.copy(wallet = updatedWallet)
-                store.dispatchOnMain(WalletConnectAction.UpdateBlockchain(updatedSession))
             }
             is WalletConnectAction.UpdateBlockchain -> {
                 walletConnectManager.updateBlockchain(action.updatedSession)
             }
             is WalletConnectAction.ApproveProposal -> {
-                val accounts = store.state.walletState.walletManagers
-                    .mapNotNull {
-                        val wallet = it.wallet
-                        val chainId = walletConnectInteractor.blockchainHelper.networkIdToChainIdOrNull(
-                            wallet.blockchain.toNetworkId(),
-                        )
-                        chainId?.let {
-                            Account(
-                                chainId,
-                                wallet.address,
-                                wallet.publicKey.derivationPath?.rawPath,
+                scope.launch {
+                    val accounts = getWalletManagers()
+                        .mapNotNull {
+                            val wallet = it.wallet
+                            val chainId = walletConnectInteractor.blockchainHelper.networkIdToChainIdOrNull(
+                                wallet.blockchain.toNetworkId(),
                             )
+                            chainId?.let {
+                                Account(
+                                    chainId,
+                                    wallet.address,
+                                    wallet.publicKey.derivationPath?.rawPath,
+                                )
+                            }
                         }
-                    }
-
-                walletConnectInteractor.approveSessionProposal(accounts)
+                    walletConnectInteractor.approveSessionProposal(accounts)
+                }
             }
             is WalletConnectAction.RejectProposal -> {
                 walletConnectInteractor.rejectSessionProposal()
@@ -345,6 +373,19 @@ class WalletConnectMiddleware {
         }
     }
 
+    private suspend fun getWalletManagers(): List<WalletManager> {
+        val walletManagerToggles = store.state.daggerGraphState
+            .get(DaggerGraphState::walletFeatureToggles)
+        return if (walletManagerToggles.isRedesignedScreenEnabled) {
+            val walletManagerFacade = store.state.daggerGraphState
+                .get(DaggerGraphState::walletManagersFacade)
+            val userWallet = userWalletsListManager.selectedUserWalletSync ?: return emptyList()
+            walletManagerFacade.getStoredWalletManagers(userWallet.walletId)
+        } else {
+            store.state.walletState.walletManagers
+        }
+    }
+
     private fun scanCard(scanResponse: ScanResponse, session: WalletConnectSession, chainId: Int?) {
         val blockchain = WalletConnectNetworkUtils.parseBlockchain(
             chainId = chainId,
@@ -430,7 +471,7 @@ class WalletConnectMiddleware {
         )
     }
 
-    private fun getWalletManager(
+    private suspend fun getWalletManager(
         wallet: WalletForSession,
         blockchain: Blockchain,
         walletState: WalletState,
@@ -440,18 +481,50 @@ class WalletConnectMiddleware {
         } else {
             blockchain
         }
+        val userWallet = userWalletsListManager.selectedUserWalletSync ?: return null
         val derivation = blockchainToMake.derivationPath(
-            style = store.state.globalState.scanResponse?.derivationStyleProvider?.getDerivationStyle(),
+            style = userWallet.scanResponse.derivationStyleProvider.getDerivationStyle(),
         )?.rawPath
-        val blockchainNetwork = BlockchainNetwork(
-            blockchain = blockchainToMake,
-            derivationPath = derivation,
-            tokens = emptyList(),
-        )
-        return walletState.getWalletManager(blockchainNetwork)
+        val walletFeatureToggles = store.state.daggerGraphState
+            .get(DaggerGraphState::walletFeatureToggles)
+
+        return if (walletFeatureToggles.isRedesignedScreenEnabled) {
+            val walletManagerFacade = store.state.daggerGraphState
+                .get(DaggerGraphState::walletManagersFacade)
+            walletManagerFacade.getOrCreateWalletManager(
+                userWalletId = userWallet.walletId,
+                blockchain = blockchainToMake,
+                derivationPath = derivation,
+            )
+        } else {
+            val blockchainNetwork = BlockchainNetwork(
+                blockchain = blockchainToMake,
+                derivationPath = derivation,
+                tokens = emptyList(),
+            )
+            walletState.getWalletManager(blockchainNetwork)
+        }
     }
 
     private fun isWalletConnectUri(uri: String): Boolean {
         return WalletConnectManager.isCorrectWcUri(uri) || walletConnectInteractor.isWalletConnectUri(uri)
     }
+
+    private suspend fun getAccountsForWc(wcInteractor: WalletConnectInteractor, userWallet: UserWallet): List<Account> {
+        val walletManagerFacade = store.state.daggerGraphState
+            .get(DaggerGraphState::walletManagersFacade)
+        return walletManagerFacade.getStoredWalletManagers(userWallet.walletId).mapNotNull {
+            val wallet = it.wallet
+            val chainId = wcInteractor.blockchainHelper.networkIdToChainIdOrNull(
+                wallet.blockchain.toNetworkId(),
+            )
+            chainId?.let {
+                Account(
+                    chainId,
+                    wallet.address,
+                    wallet.publicKey.derivationPath?.rawPath,
+                )
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorFragment.kt
new file mode 100644
index 0000000000..b9273ef99b
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorFragment.kt
@@ -0,0 +1,36 @@
+package com.tangem.tap.features.details.ui.appcurrency
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.tangem.core.ui.components.SystemBarsEffect
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.screen.ComposeFragment
+import com.tangem.core.ui.theme.AppThemeModeHolder
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+
+@AndroidEntryPoint
+internal class AppCurrencySelectorFragment : ComposeFragment() {
+
+    @Inject
+    override lateinit var appThemeModeHolder: AppThemeModeHolder
+
+    private val viewModel: AppCurrencySelectorViewModel by viewModels()
+
+    @Composable
+    override fun ScreenContent(modifier: Modifier) {
+        val systemBarsColor = TangemTheme.colors.background.secondary
+        SystemBarsEffect {
+            setSystemBarsColor(systemBarsColor)
+        }
+
+        val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+        AppCurrencySelectorScreen(
+            modifier = modifier,
+            state = uiState,
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorIntents.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorIntents.kt
new file mode 100644
index 0000000000..b6d25d03a0
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorIntents.kt
@@ -0,0 +1,14 @@
+package com.tangem.tap.features.details.ui.appcurrency
+
+internal interface AppCurrencySelectorIntents {
+
+    fun onBackClick()
+
+    fun onSearchClick()
+
+    fun onSearchInputChange(input: String)
+
+    fun onCurrencyClick(currency: AppCurrencySelectorState.Currency)
+
+    fun onDismissSearchClick()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorScreen.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorScreen.kt
new file mode 100644
index 0000000000..a38cac5c0a
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorScreen.kt
@@ -0,0 +1,363 @@
+package com.tangem.tap.features.details.ui.appcurrency
+
+import androidx.compose.foundation.LocalIndication
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
+import com.tangem.core.ui.components.CircleShimmer
+import com.tangem.core.ui.components.RectangleShimmer
+import com.tangem.core.ui.components.SpacerW
+import com.tangem.core.ui.event.EventEffect
+import com.tangem.core.ui.event.consumedEvent
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.tap.features.details.ui.appcurrency.AppCurrencySelectorState.Currency
+import com.tangem.wallet.R
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toPersistentList
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+internal fun AppCurrencySelectorScreen(state: AppCurrencySelectorState, modifier: Modifier = Modifier) {
+    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
+    val listState = rememberLazyListState()
+
+    Scaffold(
+        modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
+        containerColor = TangemTheme.colors.background.secondary,
+        topBar = {
+            TopBar(
+                modifier = Modifier.fillMaxWidth(),
+                scrollBehavior = scrollBehavior,
+                state = state,
+            )
+        },
+        content = { paddingValues ->
+            val contentModifier = Modifier
+                .padding(paddingValues)
+                .fillMaxSize()
+
+            when (state) {
+                is AppCurrencySelectorState.Loading -> LoadingList(
+                    modifier = contentModifier,
+                )
+                is AppCurrencySelectorState.Content -> CurrenciesList(
+                    modifier = contentModifier,
+                    listState = listState,
+                    currencies = state.items,
+                    selectedId = state.selectedId.orEmpty(),
+                    onCurrencyClick = state.onCurrencyClick,
+                )
+            }
+        },
+    )
+
+    if (state is AppCurrencySelectorState.Content) {
+        EventEffect(event = state.scrollToSelected) {
+            listState.scrollToItem(it)
+        }
+    }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun TopBar(
+    scrollBehavior: TopAppBarScrollBehavior,
+    state: AppCurrencySelectorState,
+    modifier: Modifier = Modifier,
+) {
+    TopAppBar(
+        modifier = modifier,
+        scrollBehavior = scrollBehavior,
+        colors = TopAppBarColors,
+        navigationIcon = {
+            IconButton(
+                modifier = Modifier
+                    .padding(start = TangemTheme.dimens.spacing8)
+                    .size(TangemTheme.dimens.size32),
+                onClick = state.onBackClick,
+            ) {
+                Icon(
+                    modifier = Modifier.size(TangemTheme.dimens.size24),
+                    painter = painterResource(id = R.drawable.ic_back_24),
+                    contentDescription = null,
+                )
+            }
+        },
+        title = {
+            when (state) {
+                is AppCurrencySelectorState.Search -> SearchBar(
+                    modifier = Modifier.fillMaxWidth(),
+                    onInputChange = state.onSearchInputChange,
+                )
+                is AppCurrencySelectorState.Loading,
+                is AppCurrencySelectorState.Default,
+                -> Text(
+                    text = stringResource(id = R.string.details_row_title_currency),
+                    style = TangemTheme.typography.subtitle1,
+                )
+            }
+        },
+        actions = {
+            when (state) {
+                is AppCurrencySelectorState.Content -> {
+                    IconButton(
+                        modifier = Modifier.size(TangemTheme.dimens.size32),
+                        onClick = state.onTopBarActionClick,
+                    ) {
+                        val iconResId = when (state) {
+                            is AppCurrencySelectorState.Default -> R.drawable.ic_search_24
+                            is AppCurrencySelectorState.Search -> R.drawable.ic_close_24
+                        }
+                        val iconTint = when (state) {
+                            is AppCurrencySelectorState.Default -> TangemTheme.colors.icon.primary1
+                            is AppCurrencySelectorState.Search -> TangemTheme.colors.icon.informative
+                        }
+
+                        Icon(
+                            modifier = Modifier.size(TangemTheme.dimens.size24),
+                            painter = painterResource(id = iconResId),
+                            tint = iconTint,
+                            contentDescription = null,
+                        )
+                    }
+                }
+                is AppCurrencySelectorState.Loading -> Unit
+            }
+            SpacerW(width = TangemTheme.dimens.spacing8)
+        },
+    )
+}
+
+@Composable
+private fun SearchBar(onInputChange: (String) -> Unit, modifier: Modifier = Modifier) {
+    val focusRequester = remember { FocusRequester() }
+    var input by remember { mutableStateOf(value = "") }
+
+    TextField(
+        modifier = modifier
+            .focusRequester(focusRequester),
+        value = input,
+        onValueChange = { input = it },
+        singleLine = true,
+        textStyle = TangemTheme.typography.subtitle2,
+        placeholder = {
+            Text(text = stringResource(id = R.string.common_search))
+        },
+        colors = SearchBarColors,
+    )
+
+    LaunchedEffect(key1 = input) {
+        onInputChange(input)
+    }
+
+    LaunchedEffect(Unit) {
+        focusRequester.requestFocus()
+    }
+}
+
+@Composable
+private fun LoadingList(modifier: Modifier = Modifier) {
+    Column(modifier = modifier) {
+        repeat(times = 10) {
+            Row(
+                modifier = Modifier
+                    .padding(
+                        start = TangemTheme.dimens.spacing16,
+                        end = TangemTheme.dimens.spacing24,
+                    )
+                    .height(TangemTheme.dimens.size56)
+                    .fillMaxWidth(),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(
+                    space = TangemTheme.dimens.spacing16,
+                    alignment = Alignment.Start,
+                ),
+            ) {
+                CircleShimmer(modifier = Modifier.size(TangemTheme.dimens.size24))
+                RectangleShimmer(
+                    modifier = Modifier
+                        .height(TangemTheme.dimens.size24)
+                        .fillMaxWidth(),
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun CurrenciesList(
+    listState: LazyListState,
+    currencies: ImmutableList<Currency>,
+    selectedId: String,
+    onCurrencyClick: (Currency) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    LazyColumn(
+        modifier = modifier,
+        state = listState,
+    ) {
+        items(
+            items = currencies,
+            key = Currency::id,
+        ) { currency ->
+            val onClick = remember(key1 = currency) {
+                { onCurrencyClick(currency) }
+            }
+
+            CurrencyItem(
+                modifier = Modifier.fillMaxWidth(),
+                name = currency.name,
+                isSelected = currency.id == selectedId,
+                onClick = onClick,
+            )
+        }
+    }
+}
+
+@Composable
+private fun CurrencyItem(name: String, isSelected: Boolean, onClick: () -> Unit, modifier: Modifier = Modifier) {
+    val interactionSource = remember { MutableInteractionSource() }
+
+    Row(
+        modifier = modifier
+            .clickable(
+                interactionSource = interactionSource,
+                indication = LocalIndication.current,
+                onClick = onClick,
+            )
+            .padding(
+                start = TangemTheme.dimens.spacing16,
+                end = TangemTheme.dimens.spacing24,
+            )
+            .heightIn(min = TangemTheme.dimens.size56),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(
+            space = TangemTheme.dimens.spacing16,
+            alignment = Alignment.Start,
+        ),
+    ) {
+        RadioButton(
+            modifier = Modifier.size(TangemTheme.dimens.size24),
+            selected = isSelected,
+            onClick = onClick,
+            interactionSource = interactionSource,
+            colors = RadioButtonColors,
+        )
+        Text(
+            text = name,
+            style = TangemTheme.typography.body1,
+            color = TangemTheme.colors.text.primary1,
+        )
+    }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+private val TopAppBarColors: TopAppBarColors
+    @Composable
+    get() = TopAppBarDefaults.topAppBarColors(
+        containerColor = TangemTheme.colors.background.secondary,
+        // Currently (08.09.23) it's not working when scrolling programmatically
+        scrolledContainerColor = TangemTheme.colors.background.secondary,
+        navigationIconContentColor = TangemTheme.colors.icon.primary1,
+        titleContentColor = TangemTheme.colors.text.primary1,
+        actionIconContentColor = TangemTheme.colors.icon.primary1,
+    )
+
+private val SearchBarColors: TextFieldColors
+    @Composable
+    get() = TextFieldDefaults.colors(
+        unfocusedContainerColor = TangemTheme.colors.background.secondary,
+        focusedContainerColor = TangemTheme.colors.background.secondary,
+        focusedTextColor = TangemTheme.colors.text.primary1,
+        unfocusedTextColor = TangemTheme.colors.text.secondary,
+        focusedPlaceholderColor = TangemTheme.colors.text.disabled,
+        unfocusedPlaceholderColor = TangemTheme.colors.text.disabled,
+        focusedIndicatorColor = TangemTheme.colors.background.secondary,
+        unfocusedIndicatorColor = TangemTheme.colors.background.secondary,
+        cursorColor = TangemTheme.colors.icon.primary1,
+    )
+
+private val RadioButtonColors: RadioButtonColors
+    @Composable
+    get() = RadioButtonDefaults.colors(
+        selectedColor = TangemTheme.colors.icon.accent,
+        unselectedColor = TangemTheme.colors.icon.secondary,
+    )
+
+// region Preview
+@Preview(showBackground = true, widthDp = 360, heightDp = 720)
+@Composable
+private fun AppCurrencySelectorScreenPreview_Light(
+    @PreviewParameter(AppCurrencySelectorStateProvider::class) param: AppCurrencySelectorState,
+) {
+    TangemTheme(isDark = false) {
+        AppCurrencySelectorScreen(param)
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360, heightDp = 720)
+@Composable
+private fun AppCurrencySelectorScreenPreview_Dark(
+    @PreviewParameter(AppCurrencySelectorStateProvider::class) param: AppCurrencySelectorState,
+) {
+    TangemTheme(isDark = true) {
+        AppCurrencySelectorScreen(param)
+    }
+}
+
+private class AppCurrencySelectorStateProvider : CollectionPreviewParameterProvider<AppCurrencySelectorState>(
+    collection = buildList {
+        val items = listOf(
+            "US Dollar (USD) – $",
+            "Inited Arab Emirates Dirham (AED) – DH",
+            "Argentine Peso (ARS) – $",
+            "Australian Dollar (AUD) – A$",
+            "Bangladeshi Taka (BDT) – ৳",
+            "Bahraini Dinar (BHD) – BD",
+            "Bermudian Dollar (BMD) – $",
+            "Brazil Real (BRL) – R$",
+            "Canadian Dollar (CAD) – CA$",
+            "Swiss Franc (CHF) – Fr",
+            "Chilean Peso (CLP) – CLP$",
+            "Chinese Yan (CNY)",
+        )
+            .mapIndexed { index, s -> Currency(index.toString(), s) }
+            .toPersistentList()
+
+        AppCurrencySelectorState.Loading(onBackClick = {}).let(::add)
+        AppCurrencySelectorState.Default(
+            selectedId = "0",
+            items = items,
+            scrollToSelected = consumedEvent(),
+            onCurrencyClick = {},
+            onBackClick = {},
+            onTopBarActionClick = {},
+        ).let(::add)
+        AppCurrencySelectorState.Search(
+            selectedId = "0",
+            items = items,
+            scrollToSelected = consumedEvent(),
+            onCurrencyClick = {},
+            onBackClick = {},
+            onSearchInputChange = {},
+            onTopBarActionClick = {},
+        ).let(::add)
+    },
+)
+// endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorState.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorState.kt
new file mode 100644
index 0000000000..b3b606c396
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorState.kt
@@ -0,0 +1,71 @@
+package com.tangem.tap.features.details.ui.appcurrency
+
+import androidx.compose.runtime.Immutable
+import com.tangem.core.ui.event.StateEvent
+import kotlinx.collections.immutable.PersistentList
+
+@Immutable
+internal sealed class AppCurrencySelectorState {
+
+    abstract val onBackClick: () -> Unit
+
+    data class Loading(
+        override val onBackClick: () -> Unit,
+    ) : AppCurrencySelectorState()
+
+    @Immutable
+    sealed class Content : AppCurrencySelectorState() {
+        abstract val selectedId: String
+        abstract val scrollToSelected: StateEvent<Int>
+        abstract val items: PersistentList<Currency>
+        abstract val onCurrencyClick: (Currency) -> Unit
+        abstract val onTopBarActionClick: () -> Unit
+
+        fun copySealed(
+            selectedId: String? = this.selectedId,
+            items: PersistentList<Currency> = this.items,
+            scrollToSelected: StateEvent<Int> = this.scrollToSelected,
+            onCurrencyClick: (Currency) -> Unit = this.onCurrencyClick,
+            onTopBarActionClick: () -> Unit = this.onTopBarActionClick,
+        ): AppCurrencySelectorState = when (this) {
+            is Default -> this.copy(
+                selectedId = selectedId.orEmpty(),
+                items = items,
+                scrollToSelected = scrollToSelected,
+                onCurrencyClick = onCurrencyClick,
+                onTopBarActionClick = onTopBarActionClick,
+            )
+            is Search -> this.copy(
+                selectedId = selectedId.orEmpty(),
+                items = items,
+                scrollToSelected = scrollToSelected,
+                onCurrencyClick = onCurrencyClick,
+                onTopBarActionClick = onTopBarActionClick,
+            )
+        }
+    }
+
+    data class Default(
+        override val selectedId: String,
+        override val items: PersistentList<Currency>,
+        override val onCurrencyClick: (Currency) -> Unit,
+        override val onBackClick: () -> Unit,
+        override val onTopBarActionClick: () -> Unit,
+        override val scrollToSelected: StateEvent<Int>,
+    ) : Content()
+
+    data class Search(
+        override val selectedId: String,
+        override val items: PersistentList<Currency>,
+        override val scrollToSelected: StateEvent<Int>,
+        override val onCurrencyClick: (Currency) -> Unit,
+        override val onBackClick: () -> Unit,
+        override val onTopBarActionClick: () -> Unit,
+        val onSearchInputChange: (String) -> Unit,
+    ) : Content()
+
+    data class Currency(
+        val id: String,
+        val name: String,
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorStateHolder.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorStateHolder.kt
new file mode 100644
index 0000000000..6f091f4376
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorStateHolder.kt
@@ -0,0 +1,125 @@
+package com.tangem.tap.features.details.ui.appcurrency
+
+import com.tangem.core.ui.event.consumedEvent
+import com.tangem.core.ui.event.triggeredEvent
+import com.tangem.domain.appcurrency.model.AppCurrency
+import com.tangem.tap.features.details.ui.appcurrency.converter.CurrencyConverter
+import kotlinx.collections.immutable.PersistentList
+import kotlinx.collections.immutable.mutate
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toPersistentList
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.*
+
+internal class AppCurrencySelectorStateHolder(
+    private val intents: AppCurrencySelectorIntents,
+    private val onSubscription: () -> Unit,
+    stateFlowScope: CoroutineScope,
+) {
+
+    private var availableCurrencies: PersistentList<AppCurrencySelectorState.Currency> = persistentListOf()
+
+    private val stateFlowInternal: MutableStateFlow<AppCurrencySelectorState> = MutableStateFlow(getInitialState())
+
+    private val currencyConverter by lazy(mode = LazyThreadSafetyMode.NONE) { CurrencyConverter() }
+
+    val stateFlow: StateFlow<AppCurrencySelectorState> = stateFlowInternal
+        .onSubscription { onSubscription() }
+        .stateIn(
+            scope = stateFlowScope,
+            started = SharingStarted.WhileSubscribed(),
+            initialValue = getInitialState(),
+        )
+
+    fun updateStateWithAvailableCurrencies(currencies: List<AppCurrency>) {
+        availableCurrencies = currencyConverter.convertList(currencies).toPersistentList()
+
+        updateState {
+            when (this) {
+                is AppCurrencySelectorState.Loading -> getContentState(availableCurrencies)
+                is AppCurrencySelectorState.Content -> copySealed(items = availableCurrencies)
+            }
+        }
+    }
+
+    fun updateStateWithSelectedCurrency(selectedCurrency: AppCurrency, selectedCurrencyIndex: Int) {
+        val selectedCurrencyId = selectedCurrency.code
+
+        updateState {
+            when (this) {
+                is AppCurrencySelectorState.Loading -> this
+                is AppCurrencySelectorState.Content -> copySealed(
+                    selectedId = selectedCurrencyId,
+                    scrollToSelected = triggeredEvent(selectedCurrencyIndex, ::consumeScrollToSelectedEvent),
+                )
+            }
+        }
+    }
+
+    fun updateStateWithSearch(input: String = "") {
+        val filteredItems = availableCurrencies.mutate { list ->
+            list.removeAll { input.lowercase() !in it.name.lowercase() }
+        }
+
+        updateState {
+            when (this) {
+                is AppCurrencySelectorState.Loading -> this
+                is AppCurrencySelectorState.Search -> copy(items = filteredItems)
+                is AppCurrencySelectorState.Default -> getSearchState(filteredItems, selectedId)
+            }
+        }
+    }
+
+    fun updateStateWithoutSearch() {
+        updateState {
+            when (this) {
+                is AppCurrencySelectorState.Search -> getContentState(availableCurrencies, selectedId)
+                is AppCurrencySelectorState.Default,
+                is AppCurrencySelectorState.Loading,
+                -> this
+            }
+        }
+    }
+
+    private fun getInitialState() = AppCurrencySelectorState.Loading(
+        onBackClick = intents::onBackClick,
+    )
+
+    private fun getContentState(
+        items: PersistentList<AppCurrencySelectorState.Currency>,
+        selectedCurrencyId: String = "",
+    ) = AppCurrencySelectorState.Default(
+        selectedId = selectedCurrencyId,
+        items = items,
+        onBackClick = intents::onBackClick,
+        onCurrencyClick = intents::onCurrencyClick,
+        onTopBarActionClick = intents::onSearchClick,
+        scrollToSelected = consumedEvent(),
+    )
+
+    private fun getSearchState(
+        filteredItems: PersistentList<AppCurrencySelectorState.Currency>,
+        selectedCurrencyId: String,
+    ) = AppCurrencySelectorState.Search(
+        selectedId = selectedCurrencyId,
+        items = filteredItems,
+        scrollToSelected = consumedEvent(),
+        onBackClick = intents::onBackClick,
+        onCurrencyClick = intents::onCurrencyClick,
+        onSearchInputChange = intents::onSearchInputChange,
+        onTopBarActionClick = intents::onDismissSearchClick,
+    )
+
+    private inline fun updateState(block: AppCurrencySelectorState.() -> AppCurrencySelectorState) {
+        stateFlowInternal.update(block)
+    }
+
+    private fun consumeScrollToSelectedEvent() {
+        updateState {
+            when (this) {
+                is AppCurrencySelectorState.Loading -> this
+                is AppCurrencySelectorState.Content -> copySealed(scrollToSelected = consumedEvent())
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorViewModel.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorViewModel.kt
new file mode 100644
index 0000000000..7b07e7d471
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorViewModel.kt
@@ -0,0 +1,80 @@
+package com.tangem.tap.features.details.ui.appcurrency
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.tangem.core.analytics.api.AnalyticsEventHandler
+import com.tangem.core.navigation.ReduxNavController
+import com.tangem.domain.appcurrency.GetAvailableCurrenciesUseCase
+import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
+import com.tangem.domain.appcurrency.SelectAppCurrencyUseCase
+import com.tangem.tap.common.analytics.events.Settings
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+internal class AppCurrencySelectorViewModel @Inject constructor(
+    private val getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase,
+    private val getAvailableCurrenciesUseCase: GetAvailableCurrenciesUseCase,
+    private val selectAppCurrencyUseCase: SelectAppCurrencyUseCase,
+    private val reduxNavController: ReduxNavController,
+    private val dispatchers: CoroutineDispatcherProvider,
+    private val analyticsEventHandler: AnalyticsEventHandler,
+) : ViewModel(), AppCurrencySelectorIntents {
+
+    private val stateController = AppCurrencySelectorStateHolder(
+        intents = this,
+        onSubscription = { fetchCurrencies() },
+        stateFlowScope = viewModelScope,
+    )
+
+    val uiState: StateFlow<AppCurrencySelectorState> = stateController.stateFlow
+
+    override fun onBackClick() {
+        reduxNavController.popBackStack()
+    }
+
+    override fun onSearchClick() {
+        stateController.updateStateWithSearch()
+    }
+
+    override fun onSearchInputChange(input: String) {
+        stateController.updateStateWithSearch(input)
+    }
+
+    override fun onCurrencyClick(currency: AppCurrencySelectorState.Currency) {
+        viewModelScope.launch(dispatchers.io) {
+            selectAppCurrencyUseCase(currency.id)
+                .onRight {
+                    analyticsEventHandler.send(
+                        event = Settings.AppSettings.MainCurrencyChanged(currencyType = currency.name),
+                    )
+                    reduxNavController.popBackStack()
+                }
+        }
+    }
+
+    override fun onDismissSearchClick() {
+        stateController.updateStateWithoutSearch()
+    }
+
+    private fun fetchCurrencies() {
+        viewModelScope.launch(dispatchers.io) {
+            val availableCurrencies = getAvailableCurrenciesUseCase()
+                .onRight(stateController::updateStateWithAvailableCurrencies)
+                .getOrNull()
+
+            getSelectedAppCurrencyUseCase().collectLatest { maybeSelectedCurrency ->
+                val selectedCurrency = maybeSelectedCurrency.getOrNull() ?: return@collectLatest
+                val selectedCurrencyIndex = availableCurrencies?.indexOfFirst { it == selectedCurrency }
+
+                if (selectedCurrencyIndex != null && selectedCurrencyIndex != -1) {
+                    stateController.updateStateWithSelectedCurrency(selectedCurrency, selectedCurrencyIndex)
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/converter/CurrencyConverter.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/converter/CurrencyConverter.kt
new file mode 100644
index 0000000000..445f24d3c8
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/converter/CurrencyConverter.kt
@@ -0,0 +1,14 @@
+package com.tangem.tap.features.details.ui.appcurrency.converter
+
+import com.tangem.domain.appcurrency.model.AppCurrency
+import com.tangem.tap.features.details.ui.appcurrency.AppCurrencySelectorState
+import com.tangem.utils.converter.Converter
+
+internal class CurrencyConverter : Converter<AppCurrency, AppCurrencySelectorState.Currency> {
+
+    override fun convert(value: AppCurrency): AppCurrencySelectorState.Currency {
+        val fullCurrencyName = with(value) { "$name ($code) — $symbol" }
+
+        return AppCurrencySelectorState.Currency(value.code, fullCurrencyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsDialogsFactory.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsDialogsFactory.kt
new file mode 100644
index 0000000000..43e66b065a
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsDialogsFactory.kt
@@ -0,0 +1,58 @@
+package com.tangem.tap.features.details.ui.appsettings
+
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.domain.apptheme.model.AppThemeMode
+import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Dialog
+import com.tangem.wallet.R
+import kotlinx.collections.immutable.toImmutableList
+
+internal class AppSettingsDialogsFactory {
+
+    fun createDeleteSavedWalletsAlert(onDelete: () -> Unit, onDismiss: () -> Unit): Dialog.Alert {
+        return Dialog.Alert(
+            title = resourceReference(R.string.common_attention),
+            description = resourceReference(R.string.app_settings_off_saved_wallet_alert_message),
+            confirmText = resourceReference(R.string.common_delete),
+            onConfirm = onDelete,
+            onDismiss = onDismiss,
+        )
+    }
+
+    fun createDeleteSavedAccessCodesAlert(onDelete: () -> Unit, onDismiss: () -> Unit): Dialog.Alert {
+        return Dialog.Alert(
+            title = resourceReference(R.string.common_attention),
+            description = resourceReference(R.string.app_settings_off_saved_access_code_alert_message),
+            confirmText = resourceReference(R.string.common_delete),
+            onConfirm = onDelete,
+            onDismiss = onDismiss,
+        )
+    }
+
+    fun createThemeModeSelectorDialog(
+        selectedModeIndex: Int,
+        onSelect: (AppThemeMode) -> Unit,
+        onDismiss: () -> Unit,
+    ): Dialog.Selector {
+        val modes = AppThemeMode.available
+
+        return Dialog.Selector(
+            title = resourceReference(R.string.app_settings_theme_selector_title),
+            selectedItemIndex = selectedModeIndex,
+            items = modes.map { mode ->
+                resourceReference(
+                    id = when (mode) {
+                        AppThemeMode.FORCE_DARK -> R.string.app_settings_theme_mode_dark
+                        AppThemeMode.FORCE_LIGHT -> R.string.app_settings_theme_mode_light
+                        AppThemeMode.FOLLOW_SYSTEM -> R.string.app_settings_theme_mode_system
+                    },
+                )
+            }.toImmutableList(),
+            onSelect = { index ->
+                val mode = AppThemeMode.available[index]
+
+                onSelect(mode)
+            },
+            onDismiss = onDismiss,
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsFragment.kt
index 2be6f7b037..122e9437d1 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsFragment.kt
@@ -1,51 +1,51 @@
 package com.tangem.tap.features.details.ui.appsettings
 
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.ui.platform.ComposeView
-import androidx.fragment.app.Fragment
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import androidx.lifecycle.lifecycleScope
-import androidx.transition.TransitionInflater
 import com.tangem.core.navigation.NavigationAction
-import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.screen.ComposeFragment
+import com.tangem.core.ui.theme.AppThemeModeHolder
+import com.tangem.domain.appcurrency.repository.AppCurrencyRepository
+import com.tangem.tap.features.details.featuretoggles.DetailsFeatureToggles
 import com.tangem.tap.features.details.redux.DetailsAction
 import com.tangem.tap.features.details.redux.DetailsState
 import com.tangem.tap.store
-import com.tangem.wallet.R
+import dagger.hilt.android.AndroidEntryPoint
 import org.rekotlin.StoreSubscriber
+import javax.inject.Inject
 
-class AppSettingsFragment : Fragment(), StoreSubscriber<DetailsState> {
-    private val viewModel = AppSettingsViewModel(store)
-    private var screenState: MutableState<AppSettingsScreenState> =
-        mutableStateOf(viewModel.updateState(store.state.detailsState))
+@AndroidEntryPoint
+internal class AppSettingsFragment : ComposeFragment(), StoreSubscriber<DetailsState> {
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        val inflater = TransitionInflater.from(requireContext())
-        enterTransition = inflater.inflateTransition(R.transition.fade)
-        exitTransition = inflater.inflateTransition(R.transition.fade)
-        viewModel.checkBiometricsStatus(lifecycleScope)
+    @Inject
+    override lateinit var appThemeModeHolder: AppThemeModeHolder
+
+    @Inject
+    lateinit var detailsFeatureToggles: DetailsFeatureToggles
+
+    @Inject
+    lateinit var appCurrencyRepository: AppCurrencyRepository
+
+    private val viewModel by lazy(mode = LazyThreadSafetyMode.NONE) {
+        AppSettingsViewModel(store, detailsFeatureToggles, appCurrencyRepository)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        return ComposeView(requireContext()).apply {
-            setContent {
-                isTransitionGroup = true
-                TangemTheme {
-                    AppSettingsScreen(
-                        state = screenState.value,
-                        onBackClick = {
-                            store.dispatch(DetailsAction.ResetCardSettingsData)
-                            store.dispatch(NavigationAction.PopBackTo())
-                        },
-                    )
-                }
-            }
-        }
+    @Composable
+    override fun ScreenContent(modifier: Modifier) {
+        AppSettingsScreen(
+            modifier = modifier,
+            state = viewModel.uiState,
+            onBackClick = {
+                store.dispatch(DetailsAction.ResetCardSettingsData)
+                store.dispatch(NavigationAction.PopBackTo())
+            },
+        )
+    }
+
+    override fun onResume() {
+        super.onResume()
+        viewModel.checkBiometricsStatus(lifecycleScope)
     }
 
     override fun onStart() {
@@ -57,11 +57,6 @@ class AppSettingsFragment : Fragment(), StoreSubscriber<DetailsState> {
         }
     }
 
-    override fun onResume() {
-        super.onResume()
-        viewModel.refreshBiometricsStatus(lifecycleScope)
-    }
-
     override fun onStop() {
         super.onStop()
         store.unsubscribe(this)
@@ -69,6 +64,6 @@ class AppSettingsFragment : Fragment(), StoreSubscriber<DetailsState> {
 
     override fun newState(state: DetailsState) {
         if (activity == null || view == null) return
-        screenState.value = viewModel.updateState(state)
+        viewModel.updateState(state)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsItemsFactory.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsItemsFactory.kt
new file mode 100644
index 0000000000..0d1f66f8bb
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsItemsFactory.kt
@@ -0,0 +1,91 @@
+package com.tangem.tap.features.details.ui.appsettings
+
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.domain.apptheme.model.AppThemeMode
+import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Item
+import com.tangem.wallet.R
+
+internal class AppSettingsItemsFactory {
+
+    fun createEnrollBiometricsCard(onClick: () -> Unit): Item.Card {
+        return Item.Card(
+            id = "enroll_biometrics_card",
+            title = resourceReference(R.string.app_settings_enable_biometrics_title),
+            description = resourceReference(R.string.app_settings_enable_biometrics_description),
+            iconResId = R.drawable.ic_alert_circle_24,
+            onClick = onClick,
+        )
+    }
+
+    fun createSaveWalletsSwitch(
+        isChecked: Boolean,
+        isEnabled: Boolean,
+        onCheckedChange: (Boolean) -> Unit,
+    ): Item.Switch {
+        return Item.Switch(
+            id = "save_wallets_switch",
+            title = resourceReference(R.string.app_settings_saved_wallet),
+            description = resourceReference(R.string.app_settings_saved_wallet_footer),
+            isEnabled = isEnabled,
+            isChecked = isChecked,
+            onCheckedChange = onCheckedChange,
+        )
+    }
+
+    fun createSaveAccessCodeSwitch(
+        isChecked: Boolean,
+        isEnabled: Boolean,
+        onCheckedChange: (Boolean) -> Unit,
+    ): Item.Switch {
+        return Item.Switch(
+            id = "save_access_codes_switch",
+            title = resourceReference(R.string.app_settings_saved_access_codes),
+            description = resourceReference(R.string.app_settings_saved_access_codes_footer),
+            isEnabled = isEnabled,
+            isChecked = isChecked,
+            onCheckedChange = onCheckedChange,
+        )
+    }
+
+    fun createFlipToHideBalanceSwitch(
+        isChecked: Boolean,
+        isEnabled: Boolean,
+        onCheckedChange: (Boolean) -> Unit,
+    ): Item.Switch {
+        return Item.Switch(
+            id = "flip_to_hide_balance_switch",
+            title = resourceReference(R.string.details_row_title_flip_to_hide),
+            description = resourceReference(R.string.details_row_description_flip_to_hide),
+            isEnabled = isEnabled,
+            isChecked = isChecked,
+            onCheckedChange = onCheckedChange,
+        )
+    }
+
+    fun createSelectAppCurrencyButton(currentAppCurrencyName: String, onClick: () -> Unit): Item.Button {
+        return Item.Button(
+            id = "select_app_currency_button",
+            title = resourceReference(R.string.details_row_title_currency),
+            description = stringReference(currentAppCurrencyName),
+            isEnabled = true,
+            onClick = onClick,
+        )
+    }
+
+    fun createSelectThemeModeButton(currentThemeMode: AppThemeMode, onClick: () -> Unit): Item.Button {
+        return Item.Button(
+            id = "select_theme_mode_button",
+            title = resourceReference(R.string.app_settings_theme_selector_title),
+            description = resourceReference(
+                id = when (currentThemeMode) {
+                    AppThemeMode.FORCE_DARK -> R.string.app_settings_theme_mode_dark
+                    AppThemeMode.FORCE_LIGHT -> R.string.app_settings_theme_mode_light
+                    AppThemeMode.FOLLOW_SYSTEM -> R.string.app_settings_theme_mode_system
+                },
+            ),
+            isEnabled = true,
+            onClick = onClick,
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreen.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreen.kt
index 9255526f4a..7c99ed8b24 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreen.kt
@@ -1,233 +1,110 @@
 package com.tangem.tap.features.details.ui.appsettings
 
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Text
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import com.tangem.core.ui.components.SpacerH24
-import com.tangem.core.ui.components.SpacerH32
-import com.tangem.core.ui.components.SpacerH4
-import com.tangem.core.ui.components.SpacerW32
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.tap.features.details.redux.AppSetting
-import com.tangem.tap.features.details.ui.appsettings.components.EnrollBiometricsCard
-import com.tangem.tap.features.details.ui.appsettings.components.SettingsAlertDialog
+import com.tangem.domain.apptheme.model.AppThemeMode
+import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Item
+import com.tangem.tap.features.details.ui.appsettings.components.*
 import com.tangem.tap.features.details.ui.common.SettingsScreensScaffold
-import com.tangem.tap.features.details.ui.common.TangemSwitch
 import com.tangem.wallet.R
+import kotlinx.collections.immutable.persistentListOf
 
 @Composable
-fun AppSettingsScreen(state: AppSettingsScreenState, onBackClick: () -> Unit) {
+internal fun AppSettingsScreen(state: AppSettingsScreenState, onBackClick: () -> Unit, modifier: Modifier = Modifier) {
     SettingsScreensScaffold(
-        content = { AppSettings(state = state) },
+        modifier = modifier,
+        content = {
+            when (state) {
+                is AppSettingsScreenState.Content -> AppSettings(state = state)
+                is AppSettingsScreenState.Loading -> Unit
+            }
+        },
         titleRes = R.string.app_settings_title,
         onBackClick = onBackClick,
     )
 }
 
 @Composable
-private fun AppSettings(state: AppSettingsScreenState) {
-    var dialogType by remember { mutableStateOf<AppSetting?>(null) }
-    val onDialogStateChange: (AppSetting?) -> Unit = { dialogType = it }
-
-    dialogType?.let {
-        SettingsAlertDialog(
-            element = it,
-            onDialogStateChange = onDialogStateChange,
-            onSettingToggle = { state.onSettingToggled(it, false) },
-        )
+private fun AppSettings(state: AppSettingsScreenState.Content) {
+    val dialog by rememberUpdatedState(newValue = state.dialog)
+    when (val safeDialog = dialog) {
+        is AppSettingsScreenState.Dialog.Alert -> SettingsAlertDialog(dialog = safeDialog)
+        is AppSettingsScreenState.Dialog.Selector -> SettingsSelectorDialog(dialog = safeDialog)
+        null -> Unit
     }
 
-    Column(modifier = Modifier.fillMaxSize()) {
-        if (state.showEnrollBiometricsCard) {
-            EnrollBiometricsCard(onClick = state.onEnrollBiometrics)
-            SpacerH24()
-        }
-
-        AppSettingsElement(
-            state = state,
-            setting = AppSetting.SaveWallets,
-            onDialogStateChange = onDialogStateChange,
-        )
-        SpacerH32()
-        AppSettingsElement(
-            state = state,
-            setting = AppSetting.SaveAccessCode,
-            onDialogStateChange = onDialogStateChange,
-        )
-    }
-}
-
-@Suppress("LongMethod")
-@Composable
-private fun AppSettingsElement(
-    state: AppSettingsScreenState,
-    setting: AppSetting,
-    onDialogStateChange: (AppSetting?) -> Unit,
-) {
-    val titleRes = when (setting) {
-        AppSetting.SaveWallets -> R.string.app_settings_saved_wallet
-        AppSetting.SaveAccessCode -> R.string.app_settings_saved_access_codes
-    }
-    val subtitleRes = when (setting) {
-        AppSetting.SaveWallets -> R.string.app_settings_saved_wallet_footer
-        AppSetting.SaveAccessCode -> R.string.app_settings_saved_access_codes_footer
-    }
-    val checked = state.settings[setting] ?: false
-
-    val titleTextColor by rememberUpdatedState(
-        newValue = if (state.isTogglesEnabled) {
-            TangemTheme.colors.text.primary1
-        } else {
-            TangemTheme.colors.text.secondary
-        },
-    )
-    val descriptionTextColor by rememberUpdatedState(
-        newValue = if (state.isTogglesEnabled) {
-            TangemTheme.colors.text.secondary
-        } else {
-            TangemTheme.colors.text.tertiary
-        },
-    )
-
-    Row(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(horizontal = TangemTheme.dimens.spacing20),
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.SpaceBetween,
-    ) {
-        Column(
-            modifier = Modifier.weight(weight = .9f),
-            verticalArrangement = Arrangement.Center,
-        ) {
-            Text(
-                text = stringResource(id = titleRes),
-                style = TangemTheme.typography.subtitle1,
-                color = titleTextColor,
-            )
-            SpacerH4()
-            Text(
-                text = stringResource(id = subtitleRes),
-                style = TangemTheme.typography.body2,
-                color = descriptionTextColor,
-            )
-        }
-        SpacerW32()
-        TangemSwitch(
-            checked = checked,
-            enabled = state.isTogglesEnabled,
-            onCheckedChange = { isChecked ->
-                onCheckedChange(
-                    element = setting,
-                    enabled = isChecked,
-                    onSettingToggled = state.onSettingToggled,
-                    onDialogStateChange = onDialogStateChange,
+    LazyColumn {
+        items(
+            items = state.items,
+            key = Item::id,
+        ) { item ->
+            when (item) {
+                is Item.Card -> SettingsCardItem(
+                    modifier = Modifier.padding(horizontal = TangemTheme.dimens.spacing16),
+                    item = item,
                 )
-            },
-        )
-    }
-}
-
-private fun onCheckedChange(
-    element: AppSetting,
-    enabled: Boolean,
-    onSettingToggled: (AppSetting, Boolean) -> Unit,
-    onDialogStateChange: (AppSetting?) -> Unit,
-) {
-    // Show warning if user wants to disable the switch
-    if (!enabled) {
-        onDialogStateChange(element)
-    } else {
-        onSettingToggled(element, true)
+                is Item.Button -> SettingsButtonItem(
+                    modifier = Modifier.padding(vertical = TangemTheme.dimens.spacing8),
+                    item = item,
+                )
+                is Item.Switch -> SettingsSwitchItem(
+                    modifier = Modifier.padding(
+                        vertical = TangemTheme.dimens.spacing16,
+                        horizontal = TangemTheme.dimens.spacing20,
+                    ),
+                    item = item,
+                )
+            }
+        }
     }
 }
 
 // region Preview
-@Composable
-private fun AppSettingsScreenSample(modifier: Modifier = Modifier) {
-    Column(
-        modifier = modifier
-            .background(TangemTheme.colors.background.primary),
-    ) {
-        AppSettingsScreen(
-            state = AppSettingsScreenState(
-                settings = mapOf(
-                    AppSetting.SaveWallets to true,
-                    AppSetting.SaveAccessCode to false,
-                ),
-                showEnrollBiometricsCard = false,
-                isTogglesEnabled = true,
-                onSettingToggled = { _, _ -> },
-                onEnrollBiometrics = {},
-            ),
-            onBackClick = { },
-        )
-    }
-}
-
 @Preview(showBackground = true, widthDp = 360)
 @Composable
-private fun AppSettingsScreenPreview_Light() {
+private fun AppSettingsScreenPreview_Light(
+    @PreviewParameter(AppSettingsScreenStateProvider::class) state: AppSettingsScreenState,
+) {
     TangemTheme {
-        AppSettingsScreenSample()
+        AppSettingsScreen(state = state, onBackClick = {})
     }
 }
 
 @Preview(showBackground = true, widthDp = 360)
 @Composable
-private fun AppSettingsScreenPreview_Dark() {
+private fun AppSettingsScreenPreview_Dark(
+    @PreviewParameter(AppSettingsScreenStateProvider::class) state: AppSettingsScreenState,
+) {
     TangemTheme(isDark = true) {
-        AppSettingsScreenSample()
+        AppSettingsScreen(state = state, onBackClick = {})
     }
 }
 
-@Composable
-private fun AppSettingsScreen_EnrollBiometrics_Sample(modifier: Modifier = Modifier) {
-    Column(modifier = modifier.background(TangemTheme.colors.background.primary)) {
-        AppSettingsScreen(
-            state = AppSettingsScreenState(
-                settings = mapOf(
-                    AppSetting.SaveWallets to true,
-                    AppSetting.SaveAccessCode to false,
-                ),
-                showEnrollBiometricsCard = true,
-                isTogglesEnabled = false,
-                onSettingToggled = { _, _ -> },
-                onEnrollBiometrics = {},
-            ),
-            onBackClick = { },
+private class AppSettingsScreenStateProvider : CollectionPreviewParameterProvider<AppSettingsScreenState>(
+    collection = buildList {
+        val itemsFactory = AppSettingsItemsFactory()
+        val items = persistentListOf(
+            itemsFactory.createEnrollBiometricsCard {},
+            itemsFactory.createSelectAppCurrencyButton(currentAppCurrencyName = "US Dollar") {},
+            itemsFactory.createSaveWalletsSwitch(isChecked = true, isEnabled = true, { _ -> }),
+            itemsFactory.createSaveAccessCodeSwitch(isChecked = false, isEnabled = true) { _ -> },
+            itemsFactory.createFlipToHideBalanceSwitch(isChecked = false, isEnabled = true) { _ -> },
+            itemsFactory.createSelectThemeModeButton(AppThemeMode.DEFAULT, {}),
         )
-    }
-}
 
-@Preview(showBackground = true, widthDp = 360)
-@Composable
-private fun AppSettingsScreen_EnrollBiometrics_Preview_Light() {
-    TangemTheme {
-        AppSettingsScreen_EnrollBiometrics_Sample()
-    }
-}
-
-@Preview(showBackground = true, widthDp = 360)
-@Composable
-private fun AppSettingsScreen_EnrollBiometrics_Preview_Dark() {
-    TangemTheme(isDark = true) {
-        AppSettingsScreen_EnrollBiometrics_Sample()
-    }
-}
+        AppSettingsScreenState.Content(
+            items = items,
+            dialog = null,
+        ).let(::add)
+    },
+)
 // endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreenState.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreenState.kt
index fbc4640e8f..108b30fec8 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreenState.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreenState.kt
@@ -1,11 +1,70 @@
 package com.tangem.tap.features.details.ui.appsettings
 
-import com.tangem.tap.features.details.redux.AppSetting
+import androidx.annotation.DrawableRes
+import androidx.compose.runtime.Immutable
+import com.tangem.core.ui.extensions.TextReference
+import kotlinx.collections.immutable.ImmutableList
 
-data class AppSettingsScreenState(
-    val settings: Map<AppSetting, Boolean> = emptyMap(),
-    val showEnrollBiometricsCard: Boolean = false,
-    val isTogglesEnabled: Boolean = false,
-    val onSettingToggled: (AppSetting, Boolean) -> Unit = { _, _ -> /* no-op */ },
-    val onEnrollBiometrics: () -> Unit = { /* no-op */ },
-)
\ No newline at end of file
+@Immutable
+internal sealed class AppSettingsScreenState {
+
+    object Loading : AppSettingsScreenState()
+
+    data class Content(
+        val items: ImmutableList<Item>,
+        val dialog: Dialog?,
+    ) : AppSettingsScreenState()
+
+    @Immutable
+    sealed class Item {
+
+        abstract val id: String
+
+        data class Card(
+            override val id: String,
+            @DrawableRes val iconResId: Int,
+            val title: TextReference,
+            val description: TextReference,
+            val onClick: () -> Unit,
+        ) : Item()
+
+        data class Switch(
+            override val id: String,
+            val title: TextReference,
+            val description: TextReference,
+            val isEnabled: Boolean,
+            val isChecked: Boolean,
+            val onCheckedChange: (Boolean) -> Unit,
+        ) : Item()
+
+        data class Button(
+            override val id: String,
+            val title: TextReference,
+            val description: TextReference,
+            val isEnabled: Boolean,
+            val onClick: () -> Unit,
+        ) : Item()
+    }
+
+    @Immutable
+    sealed class Dialog {
+
+        abstract val onDismiss: () -> Unit
+
+        data class Alert(
+            val title: TextReference,
+            val description: TextReference,
+            val confirmText: TextReference,
+            val onConfirm: () -> Unit,
+            override val onDismiss: () -> Unit,
+        ) : Dialog()
+
+        data class Selector(
+            val title: TextReference,
+            val selectedItemIndex: Int,
+            val items: ImmutableList<TextReference>,
+            val onSelect: (Int) -> Unit,
+            override val onDismiss: () -> Unit,
+        ) : Dialog()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsViewModel.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsViewModel.kt
index 857ce03b4d..b7a081674b 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsViewModel.kt
@@ -1,53 +1,200 @@
 package com.tangem.tap.features.details.ui.appsettings
 
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
 import androidx.lifecycle.LifecycleCoroutineScope
+import com.tangem.core.navigation.AppScreen
+import com.tangem.core.navigation.NavigationAction
+import com.tangem.domain.appcurrency.repository.AppCurrencyRepository
+import com.tangem.domain.apptheme.model.AppThemeMode
+import com.tangem.tap.common.entities.FiatCurrency
 import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.common.extensions.dispatchWithMain
 import com.tangem.tap.common.redux.AppState
+import com.tangem.tap.features.details.featuretoggles.DetailsFeatureToggles
 import com.tangem.tap.features.details.redux.AppSetting
+import com.tangem.tap.features.details.redux.AppSettingsState
 import com.tangem.tap.features.details.redux.DetailsAction
 import com.tangem.tap.features.details.redux.DetailsState
+import com.tangem.tap.features.wallet.redux.WalletAction
+import com.tangem.tap.scope
+import com.tangem.utils.coroutines.JobHolder
+import com.tangem.utils.coroutines.saveIn
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import org.rekotlin.Store
 
-class AppSettingsViewModel(private val store: Store<AppState>) {
+internal class AppSettingsViewModel(
+    private val store: Store<AppState>,
+    private val detailsFeatureToggles: DetailsFeatureToggles,
+    private val appCurrencyRepository: AppCurrencyRepository,
+) {
 
-    fun updateState(state: DetailsState): AppSettingsScreenState {
-        return with(state.appSettingsState) {
-            AppSettingsScreenState(
-                settings = mapOf(
-                    AppSetting.SaveWallets to saveWallets,
-                    AppSetting.SaveAccessCode to saveAccessCodes,
+    private val itemsFactory = AppSettingsItemsFactory()
+    private val dialogsFactory = AppSettingsDialogsFactory()
+
+    private val appCurrencyUpdatesJobHolder = JobHolder()
+
+    var uiState: AppSettingsScreenState by mutableStateOf(AppSettingsScreenState.Loading)
+        private set
+
+    init {
+        if (detailsFeatureToggles.isRedesignedAppCurrencySelectorEnabled) {
+            bootstrapAppCurrencyUpdates()
+        }
+    }
+
+    fun updateState(state: DetailsState) {
+        uiState = AppSettingsScreenState.Content(
+            items = buildItems(state.appSettingsState),
+            dialog = (uiState as? AppSettingsScreenState.Content)?.dialog,
+        )
+    }
+
+    fun checkBiometricsStatus(lifecycleScope: LifecycleCoroutineScope) {
+        store.dispatch(DetailsAction.AppSettings.CheckBiometricsStatus(lifecycleScope))
+    }
+
+    private fun buildItems(state: AppSettingsState): ImmutableList<AppSettingsScreenState.Item> {
+        val items = buildList {
+            if (state.needEnrollBiometrics) {
+                itemsFactory.createEnrollBiometricsCard(onClick = ::enrollBiometrics).let(::add)
+            }
+
+            itemsFactory.createSelectAppCurrencyButton(
+                currentAppCurrencyName = state.selectedFiatCurrency.name,
+                onClick = ::showAppCurrencySelector,
+            ).let(::add)
+
+            if (state.isBiometricsAvailable) {
+                val canUseBiometrics = !state.needEnrollBiometrics && !state.isInProgress
+
+                itemsFactory.createSaveWalletsSwitch(
+                    isChecked = state.saveWallets,
+                    isEnabled = canUseBiometrics,
+                    onCheckedChange = ::onSaveWalletsToggled,
+                ).let(::add)
+
+                itemsFactory.createSaveAccessCodeSwitch(
+                    isChecked = state.saveAccessCodes,
+                    isEnabled = canUseBiometrics,
+                    onCheckedChange = ::onSaveAccessCodesToggled,
+                ).let(::add)
+            }
+
+            itemsFactory.createFlipToHideBalanceSwitch(
+                isChecked = state.isHidingEnabled,
+                isEnabled = true,
+                onCheckedChange = ::onFlipToHideBalanceToggled,
+            ).let(::add)
+
+            if (state.darkThemeSwitchEnabled) {
+                itemsFactory.createSelectThemeModeButton(state.selectedThemeMode) {
+                    showThemeModeSelector(state.selectedThemeMode)
+                }.let(::add)
+            }
+        }
+
+        return items.toImmutableList()
+    }
+
+    private fun enrollBiometrics() {
+        store.dispatchOnMain(DetailsAction.AppSettings.EnrollBiometrics)
+    }
+
+    private fun showAppCurrencySelector() {
+        val action = if (detailsFeatureToggles.isRedesignedAppCurrencySelectorEnabled) {
+            NavigationAction.NavigateTo(AppScreen.AppCurrencySelector)
+        } else {
+            WalletAction.AppCurrencyAction.ChooseAppCurrency
+        }
+
+        store.dispatchOnMain(action)
+    }
+
+    private fun showThemeModeSelector(selectedMode: AppThemeMode) {
+        updateContentState {
+            copy(
+                dialog = dialogsFactory.createThemeModeSelectorDialog(
+                    selectedModeIndex = selectedMode.ordinal,
+                    onSelect = { mode ->
+                        store.dispatchOnMain(DetailsAction.AppSettings.ChangeAppThemeMode(mode))
+                        dismissDialog()
+                    },
+                    onDismiss = ::dismissDialog,
                 ),
-                showEnrollBiometricsCard = needEnrollBiometrics,
-                isTogglesEnabled = !needEnrollBiometrics && !isInProgress,
-                onSettingToggled = { privacySetting, enabled ->
-                    onSettingsToggled(privacySetting, enabled)
-                },
-                onEnrollBiometrics = {
-                    store.dispatchOnMain(DetailsAction.AppSettings.EnrollBiometrics)
-                },
             )
         }
     }
 
+    private fun onSaveWalletsToggled(isChecked: Boolean) {
+        if (isChecked) {
+            onSettingsToggled(AppSetting.SaveWallets, enable = true)
+        } else {
+            updateContentState {
+                copy(
+                    dialog = dialogsFactory.createDeleteSavedWalletsAlert(
+                        onDelete = {
+                            onSettingsToggled(AppSetting.SaveWallets, enable = false)
+                            dismissDialog()
+                        },
+                        onDismiss = ::dismissDialog,
+                    ),
+                )
+            }
+        }
+    }
+
+    private fun onSaveAccessCodesToggled(isChecked: Boolean) {
+        if (isChecked) {
+            onSettingsToggled(AppSetting.SaveAccessCode, enable = true)
+        } else {
+            updateContentState {
+                copy(
+                    dialog = dialogsFactory.createDeleteSavedAccessCodesAlert(
+                        onDelete = {
+                            onSettingsToggled(AppSetting.SaveAccessCode, enable = false)
+                            dismissDialog()
+                        },
+                        onDismiss = ::dismissDialog,
+                    ),
+                )
+            }
+        }
+    }
+
     private fun onSettingsToggled(setting: AppSetting, enable: Boolean) {
         store.dispatch(DetailsAction.AppSettings.SwitchPrivacySetting(enable = enable, setting = setting))
     }
 
-    fun checkBiometricsStatus(lifecycleScope: LifecycleCoroutineScope) {
-        store.dispatch(
-            DetailsAction.AppSettings.CheckBiometricsStatus(
-                awaitStatusChange = false,
-                lifecycleCoroutineScope = lifecycleScope,
-            ),
-        )
+    private fun onFlipToHideBalanceToggled(enable: Boolean) {
+        store.dispatch(DetailsAction.AppSettings.ChangeBalanceHiding(hideBalance = enable))
     }
 
-    fun refreshBiometricsStatus(lifecycleScope: LifecycleCoroutineScope) {
-        store.dispatch(
-            DetailsAction.AppSettings.CheckBiometricsStatus(
-                awaitStatusChange = true,
-                lifecycleCoroutineScope = lifecycleScope,
-            ),
-        )
+    private fun dismissDialog() {
+        updateContentState { copy(dialog = null) }
+    }
+
+    private fun bootstrapAppCurrencyUpdates() {
+        appCurrencyRepository
+            .getSelectedAppCurrency()
+            .onEach {
+                if (it.code == store.state.globalState.appCurrency.code) return@onEach
+
+                val fiatCurrency = with(it) { FiatCurrency(code, name, symbol) }
+                store.dispatchWithMain(DetailsAction.AppSettings.ChangeAppCurrency(fiatCurrency))
+            }
+            .launchIn(scope)
+            .saveIn(appCurrencyUpdatesJobHolder)
+    }
+
+    private fun updateContentState(block: AppSettingsScreenState.Content.() -> AppSettingsScreenState.Content) {
+        uiState = when (val state = uiState) {
+            is AppSettingsScreenState.Content -> block(state)
+            is AppSettingsScreenState.Loading -> state
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsAlertDialog.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsAlertDialog.kt
index c82113133b..1dce42e622 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsAlertDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsAlertDialog.kt
@@ -1,97 +1,60 @@
 package com.tangem.tap.features.details.ui.appsettings.components
 
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.AlertDialog
-import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import com.tangem.core.ui.components.TextButton
-import com.tangem.core.ui.components.WarningTextButton
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
+import com.tangem.core.ui.components.BasicDialog
+import com.tangem.core.ui.components.DialogButton
+import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.tap.features.details.redux.AppSetting
+import com.tangem.tap.features.details.ui.appsettings.AppSettingsDialogsFactory
+import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Dialog
 import com.tangem.wallet.R
 
 @Composable
-internal fun SettingsAlertDialog(
-    element: AppSetting,
-    onDialogStateChange: (AppSetting?) -> Unit,
-    onSettingToggle: () -> Unit,
-) {
-    val text = when (element) {
-        AppSetting.SaveWallets -> R.string.app_settings_off_saved_wallet_alert_message
-        AppSetting.SaveAccessCode -> R.string.app_settings_off_saved_access_code_alert_message
-    }
-
-    AlertDialog(
-        onDismissRequest = { onDialogStateChange(null) },
-        confirmButton = {
-            TextButton(
-                modifier = Modifier.padding(bottom = TangemTheme.dimens.spacing12),
-                text = stringResource(id = R.string.common_cancel),
-                onClick = {
-                    onDialogStateChange(null)
-                },
-            )
-        },
-        dismissButton = {
-            WarningTextButton(
-                text = stringResource(id = R.string.common_delete),
-                onClick = {
-                    onDialogStateChange(null)
-                    onSettingToggle()
-                },
-            )
-        },
-        title = {
-            Text(
-                text = stringResource(id = R.string.common_attention),
-                color = TangemTheme.colors.text.primary1,
-                style = TangemTheme.typography.h2,
-            )
-        },
-        text = {
-            Text(
-                text = stringResource(id = text),
-                color = TangemTheme.colors.text.secondary,
-                style = TangemTheme.typography.body2,
-            )
-        },
-        shape = TangemTheme.shapes.roundedCornersLarge,
+internal fun SettingsAlertDialog(dialog: Dialog.Alert) {
+    BasicDialog(
+        title = dialog.title.resolveReference(),
+        message = dialog.description.resolveReference(),
+        isDismissable = false,
+        confirmButton = DialogButton(
+            title = dialog.confirmText.resolveReference(),
+            warning = true,
+            onClick = dialog.onConfirm,
+        ),
+        dismissButton = DialogButton(
+            title = stringResource(id = R.string.common_cancel),
+            onClick = dialog.onDismiss,
+        ),
+        onDismissDialog = dialog.onDismiss,
     )
 }
 
 // region Preview
-@Composable
-private fun SettingsAlertDialogSample(modifier: Modifier = Modifier) {
-    Column(
-        modifier = modifier
-            .background(TangemTheme.colors.background.primary),
-    ) {
-        SettingsAlertDialog(
-            element = AppSetting.SaveAccessCode,
-            onDialogStateChange = {},
-            onSettingToggle = { },
-        )
-    }
-}
-
 @Preview(showBackground = true, widthDp = 360)
 @Composable
-private fun SettingsAlertDialogPreview_Light() {
+private fun AlertDialogPreview_Light(@PreviewParameter(AlertDialogProvider::class) dialog: Dialog.Alert) {
     TangemTheme {
-        SettingsAlertDialogSample()
+        SettingsAlertDialog(dialog = dialog)
     }
 }
 
 @Preview(showBackground = true, widthDp = 360)
 @Composable
-private fun SettingsAlertDialogPreview_Dark() {
+private fun AlertDialogPreview_Dark(@PreviewParameter(AlertDialogProvider::class) dialog: Dialog.Alert) {
     TangemTheme(isDark = true) {
-        SettingsAlertDialogSample()
+        SettingsAlertDialog(dialog = dialog)
     }
 }
+
+private class AlertDialogProvider : CollectionPreviewParameterProvider<Dialog.Alert>(
+    collection = buildList {
+        val dialogsFactory = AppSettingsDialogsFactory()
+
+        dialogsFactory.createDeleteSavedAccessCodesAlert({}, {}).let(::add)
+        dialogsFactory.createDeleteSavedWalletsAlert({}, {}).let(::add)
+    },
+)
 // endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsButtonItem.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsButtonItem.kt
new file mode 100644
index 0000000000..946c62d2f2
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsButtonItem.kt
@@ -0,0 +1,80 @@
+package com.tangem.tap.features.details.ui.appsettings.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
+import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.tap.features.details.ui.appsettings.AppSettingsItemsFactory
+import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Item
+
+@OptIn(ExperimentalMaterialApi::class)
+@Composable
+internal fun SettingsButtonItem(item: Item.Button, modifier: Modifier = Modifier) {
+    Surface(
+        modifier = modifier.fillMaxWidth(),
+        color = TangemTheme.colors.background.secondary,
+        onClick = item.onClick,
+    ) {
+        Column(
+            modifier = Modifier.padding(
+                horizontal = TangemTheme.dimens.spacing20,
+                vertical = TangemTheme.dimens.spacing8,
+            ),
+            verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing4),
+            horizontalAlignment = Alignment.Start,
+        ) {
+            Text(
+                modifier = Modifier.fillMaxWidth(),
+                text = item.title.resolveReference(),
+                style = TangemTheme.typography.subtitle1,
+                color = TangemTheme.colors.text.primary1,
+            )
+            Text(
+                modifier = Modifier.fillMaxWidth(),
+                text = item.description.resolveReference(),
+                style = TangemTheme.typography.body2,
+                color = TangemTheme.colors.text.secondary,
+            )
+        }
+    }
+}
+
+// region Preview
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun ButtonItemPreview_Light(@PreviewParameter(ButtonItemProvider::class) item: Item.Button) {
+    TangemTheme {
+        SettingsButtonItem(item = item)
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun ButtonItemPreview_Dark(@PreviewParameter(ButtonItemProvider::class) item: Item.Button) {
+    TangemTheme(isDark = true) {
+        SettingsButtonItem(item = item)
+    }
+}
+
+private class ButtonItemProvider : CollectionPreviewParameterProvider<Item.Button>(
+    collection = buildList {
+        val itemsFactory = AppSettingsItemsFactory()
+
+        itemsFactory.createSelectAppCurrencyButton(
+            currentAppCurrencyName = "US Dollar",
+            onClick = { /* no-op */ },
+        ).let(::add)
+    },
+)
+// endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/EnrollBiometricsCard.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsCardItem.kt
similarity index 56%
rename from app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/EnrollBiometricsCard.kt
rename to app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsCardItem.kt
index 1386a364d7..1560b14a43 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/EnrollBiometricsCard.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsCardItem.kt
@@ -1,11 +1,6 @@
 package com.tangem.tap.features.details.ui.appsettings.components
 
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.*
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.Icon
 import androidx.compose.material.Surface
@@ -14,24 +9,25 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
 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.dp
 import com.tangem.core.ui.components.SpacerH4
 import com.tangem.core.ui.components.SpacerW16
+import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.wallet.R
+import com.tangem.tap.features.details.ui.appsettings.AppSettingsItemsFactory
+import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Item
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
-internal fun EnrollBiometricsCard(onClick: () -> Unit) {
+internal fun SettingsCardItem(item: Item.Card, modifier: Modifier = Modifier) {
     Surface(
-        modifier = Modifier
-            .padding(horizontal = TangemTheme.dimens.spacing8)
-            .fillMaxWidth(),
-        color = TangemTheme.colors.background.primary,
+        modifier = modifier.fillMaxWidth(),
+        color = TangemTheme.colors.button.disabled,
         shape = TangemTheme.shapes.roundedCornersLarge,
-        onClick = onClick,
+        onClick = item.onClick,
     ) {
         Row(
             modifier = Modifier.padding(all = 16.dp),
@@ -39,20 +35,20 @@ internal fun EnrollBiometricsCard(onClick: () -> Unit) {
             horizontalArrangement = Arrangement.SpaceEvenly,
         ) {
             Icon(
-                painter = painterResource(id = R.drawable.ic_alert_circle_24),
+                painter = painterResource(id = item.iconResId),
                 tint = TangemTheme.colors.icon.attention,
                 contentDescription = null,
             )
             SpacerW16()
             Column {
                 Text(
-                    text = stringResource(id = R.string.app_settings_enable_biometrics_title),
+                    text = item.title.resolveReference(),
                     style = TangemTheme.typography.subtitle1,
                     color = TangemTheme.colors.text.primary1,
                 )
                 SpacerH4()
                 Text(
-                    text = stringResource(id = R.string.app_settings_enable_biometrics_description),
+                    text = item.description.resolveReference(),
                     style = TangemTheme.typography.body2,
                     color = TangemTheme.colors.text.secondary,
                 )
@@ -62,28 +58,29 @@ internal fun EnrollBiometricsCard(onClick: () -> Unit) {
 }
 
 // region Preview
-@Composable
-private fun EnrollBiometricsCardSample(modifier: Modifier = Modifier) {
-    Column(
-        modifier = modifier.background(TangemTheme.colors.background.secondary),
-    ) {
-        EnrollBiometricsCard(onClick = {})
-    }
-}
-
 @Preview(showBackground = true, widthDp = 360)
 @Composable
-private fun EnrollBiometricsCardPreview_Light() {
+private fun CardItemPreview_Light(@PreviewParameter(CardItemProvider::class) item: Item.Card) {
     TangemTheme {
-        EnrollBiometricsCardSample()
+        SettingsCardItem(item = item)
     }
 }
 
 @Preview(showBackground = true, widthDp = 360)
 @Composable
-private fun EnrollBiometricsCardPreview_Dark() {
+private fun CardItemPreview_Dark(@PreviewParameter(CardItemProvider::class) item: Item.Card) {
     TangemTheme(isDark = true) {
-        EnrollBiometricsCardSample()
+        SettingsCardItem(item = item)
     }
 }
+
+private class CardItemProvider : CollectionPreviewParameterProvider<Item.Card>(
+    collection = buildList {
+        val itemsFactory = AppSettingsItemsFactory()
+
+        itemsFactory.createEnrollBiometricsCard(
+            onClick = { /* no-op */ },
+        ).let(::add)
+    },
+)
 // endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsSelectorDialog.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsSelectorDialog.kt
new file mode 100644
index 0000000000..8c1a93e307
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsSelectorDialog.kt
@@ -0,0 +1,58 @@
+package com.tangem.tap.features.details.ui.appsettings.components
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
+import com.tangem.core.ui.components.DialogButton
+import com.tangem.core.ui.components.SelectorDialog
+import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.tap.features.details.ui.appsettings.AppSettingsDialogsFactory
+import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Dialog
+import com.tangem.wallet.R
+import kotlinx.collections.immutable.toImmutableList
+
+@Composable
+internal fun SettingsSelectorDialog(dialog: Dialog.Selector) {
+    SelectorDialog(
+        title = dialog.title.resolveReference(),
+        selectedItemIndex = dialog.selectedItemIndex,
+        items = dialog.items.map { it.resolveReference() }.toImmutableList(),
+        confirmButton = DialogButton(
+            title = stringResource(R.string.common_cancel),
+            onClick = dialog.onDismiss,
+        ),
+        onSelect = dialog.onSelect,
+        onDismissDialog = dialog.onDismiss,
+    )
+}
+
+// region Preview
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun SettingsSelectorDialogPreview_Light(@PreviewParameter(DialogProvider::class) param: Dialog.Selector) {
+    TangemTheme(isDark = false) {
+        SettingsSelectorDialog(param)
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun SettingsSelectorDialogPreview_Dark(@PreviewParameter(DialogProvider::class) param: Dialog.Selector) {
+    TangemTheme(isDark = true) {
+        SettingsSelectorDialog(param)
+    }
+}
+
+private class DialogProvider : CollectionPreviewParameterProvider<Dialog.Selector>(
+    collection = listOf(
+        AppSettingsDialogsFactory().createThemeModeSelectorDialog(
+            selectedModeIndex = 0,
+            onSelect = {},
+            onDismiss = {},
+        ),
+    ),
+)
+// endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsSwitchItem.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsSwitchItem.kt
new file mode 100644
index 0000000000..78084743b7
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsSwitchItem.kt
@@ -0,0 +1,113 @@
+package com.tangem.tap.features.details.ui.appsettings.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
+import com.tangem.core.ui.components.SpacerH4
+import com.tangem.core.ui.components.SpacerW32
+import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.tap.features.details.ui.appsettings.AppSettingsItemsFactory
+import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Item
+import com.tangem.tap.features.details.ui.common.TangemSwitch
+
+@Composable
+internal fun SettingsSwitchItem(item: Item.Switch, modifier: Modifier = Modifier) {
+    val titleTextColor by rememberUpdatedState(
+        newValue = if (item.isEnabled) {
+            TangemTheme.colors.text.primary1
+        } else {
+            TangemTheme.colors.text.secondary
+        },
+    )
+    val descriptionTextColor by rememberUpdatedState(
+        newValue = if (item.isEnabled) {
+            TangemTheme.colors.text.secondary
+        } else {
+            TangemTheme.colors.text.tertiary
+        },
+    )
+
+    Row(
+        modifier = modifier,
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.SpaceBetween,
+    ) {
+        Column(
+            modifier = Modifier.weight(weight = .9f),
+            verticalArrangement = Arrangement.Center,
+        ) {
+            Text(
+                text = item.title.resolveReference(),
+                style = TangemTheme.typography.subtitle1,
+                color = titleTextColor,
+            )
+            SpacerH4()
+            Text(
+                text = item.description.resolveReference(),
+                style = TangemTheme.typography.body2,
+                color = descriptionTextColor,
+            )
+        }
+        SpacerW32()
+        TangemSwitch(
+            checked = item.isChecked,
+            enabled = item.isEnabled,
+            onCheckedChange = item.onCheckedChange,
+        )
+    }
+}
+
+// region Preview
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun SwitchItemPreview_Light(@PreviewParameter(SwitchItemProvider::class) item: Item.Switch) {
+    TangemTheme {
+        SettingsSwitchItem(item = item)
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun SwitchItemPreview_Dark(@PreviewParameter(SwitchItemProvider::class) item: Item.Switch) {
+    TangemTheme(isDark = true) {
+        SettingsSwitchItem(item = item)
+    }
+}
+
+private class SwitchItemProvider : CollectionPreviewParameterProvider<Item.Switch>(
+    collection = buildList {
+        val itemsFactory = AppSettingsItemsFactory()
+
+        itemsFactory.createSaveAccessCodeSwitch(
+            isChecked = true,
+            isEnabled = true,
+            onCheckedChange = { /* no-op */ },
+        ).let(::add)
+        itemsFactory.createSaveAccessCodeSwitch(
+            isChecked = false,
+            isEnabled = true,
+            onCheckedChange = { /* no-op */ },
+        ).let(::add)
+        itemsFactory.createSaveAccessCodeSwitch(
+            isChecked = true,
+            isEnabled = false,
+            onCheckedChange = { /* no-op */ },
+        ).let(::add)
+        itemsFactory.createSaveAccessCodeSwitch(
+            isChecked = false,
+            isEnabled = false,
+            onCheckedChange = { /* no-op */ },
+        ).let(::add)
+    },
+)
+// endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsFragment.kt
index 90c489ab41..82431ec211 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsFragment.kt
@@ -1,69 +1,36 @@
 package com.tangem.tap.features.details.ui.cardsettings
 
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.ui.platform.ComposeView
-import androidx.fragment.app.Fragment
-import androidx.transition.TransitionInflater
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.fragment.app.viewModels
 import com.tangem.core.navigation.NavigationAction
-import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.screen.ComposeFragment
+import com.tangem.core.ui.theme.AppThemeModeHolder
 import com.tangem.tap.features.details.redux.DetailsAction
-import com.tangem.tap.features.details.redux.DetailsState
 import com.tangem.tap.store
-import org.rekotlin.StoreSubscriber
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 
-class CardSettingsFragment : Fragment(), StoreSubscriber<DetailsState> {
+@AndroidEntryPoint
+internal class CardSettingsFragment : ComposeFragment() {
 
-    private val viewModel = CardSettingsViewModel(store)
+    @Inject
+    override lateinit var appThemeModeHolder: AppThemeModeHolder
 
-    private var screenState: MutableState<CardSettingsScreenState> =
-        mutableStateOf(viewModel.updateState(store.state.detailsState.cardSettingsState))
+    private val viewModel: CardSettingsViewModel by viewModels()
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+    @Composable
+    override fun ScreenContent(modifier: Modifier) {
+        LocalLifecycleOwner.current.lifecycle.addObserver(viewModel)
 
-        val inflater = TransitionInflater.from(requireContext())
-        enterTransition = inflater.inflateTransition(android.R.transition.fade)
-        exitTransition = inflater.inflateTransition(android.R.transition.fade)
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        return ComposeView(requireContext()).apply {
-            setContent {
-                isTransitionGroup = true
-                TangemTheme {
-                    CardSettingsScreen(
-                        state = screenState.value,
-                        onBackClick = {
-                            store.dispatch(DetailsAction.ResetCardSettingsData)
-                            store.dispatch(NavigationAction.PopBackTo())
-                        },
-                    )
-                }
-            }
-        }
-    }
-
-    override fun onStart() {
-        super.onStart()
-        store.subscribe(this) { state ->
-            state.skipRepeats { oldState, newState ->
-                oldState.detailsState == newState.detailsState
-            }.select { it.detailsState }
-        }
-    }
-
-    override fun onStop() {
-        super.onStop()
-        store.unsubscribe(this)
-    }
-
-    override fun newState(state: DetailsState) {
-        if (activity == null || view == null) return
-        screenState.value = viewModel.updateState(state.cardSettingsState)
+        CardSettingsScreen(
+            modifier = modifier,
+            state = viewModel.screenState.value,
+            onBackClick = {
+                store.dispatch(DetailsAction.ResetCardSettingsData)
+                store.dispatch(NavigationAction.PopBackTo())
+            },
+        )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsScreen.kt b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsScreen.kt
index 29906fd0e0..759e966ed5 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsScreen.kt
@@ -1,102 +1,109 @@
 package com.tangem.tap.features.details.ui.cardsettings
 
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.*
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.rotate
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.res.colorResource
-import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import coil.compose.SubcomposeAsyncImage
+import coil.request.ImageRequest
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.domain.userwallets.Artwork
 import com.tangem.tap.features.details.ui.common.DetailsMainButton
 import com.tangem.tap.features.details.ui.common.SettingsScreensScaffold
 import com.tangem.wallet.R
 
 @Composable
-fun CardSettingsScreen(state: CardSettingsScreenState, onBackClick: () -> Unit) {
+internal fun CardSettingsScreen(
+    state: CardSettingsScreenState,
+    onBackClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
     val needReadCard = state.cardDetails == null
 
     SettingsScreensScaffold(
+        modifier = modifier,
         content = {
             if (needReadCard) {
-                CardSettingsReadCard(state.onScanCardClick)
+                CardSettingsReadCard(state.onScanCardClick, state.cardImage)
             } else {
                 CardSettings(state = state)
             }
         },
         titleRes = R.string.card_settings_title,
-        backgroundColor = TangemTheme.colors.background.secondary,
         onBackClick = onBackClick,
     )
 }
 
 @Suppress("MagicNumber")
 @Composable
-fun CardSettingsReadCard(onScanCardClick: () -> Unit) {
+private fun CardSettingsReadCard(onScanCardClick: () -> Unit, cardArtwork: Artwork?) {
     Column(
-        modifier = Modifier.fillMaxSize(),
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(top = TangemTheme.dimens.size70),
     ) {
         Box(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(bottom = 40.dp),
+                .padding(start = TangemTheme.dimens.size16, end = TangemTheme.dimens.size16),
         ) {
-            Image(
+            val circleColor = TangemTheme.colors.stroke.primary
+            Canvas(
                 modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(start = 80.dp, end = 80.dp, top = 70.dp)
-                    .rotate(-15f),
-                painter = painterResource(id = R.drawable.card_placeholder_secondary),
-                contentDescription = "",
-                contentScale = ContentScale.FillWidth,
-            )
-            Image(
+                    .size(300.dp)
+                    .align(Alignment.Center),
+            ) {
+                drawCircle(
+                    color = circleColor,
+                    radius = size.minDimension / 2.0f,
+                )
+            }
+            SubcomposeAsyncImage(
+                model = ImageRequest.Builder(context = LocalContext.current)
+                    .data(cardArtwork?.artworkId)
+                    .crossfade(enable = true)
+                    .build(),
                 modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(start = 60.dp, end = 60.dp)
-                    .rotate(-1f),
-                painter = painterResource(id = R.drawable.card_placeholder_black),
-                contentDescription = "",
-                contentScale = ContentScale.FillWidth,
+                    .align(Alignment.Center)
+                    .fillMaxWidth(),
+                loading = { /* no-op */ },
+                error = { /* no-op */ },
+                contentDescription = null,
             )
         }
         Spacer(modifier = Modifier.weight(1f))
         Column(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(start = 16.dp, end = 16.dp, bottom = 32.dp),
+                .padding(
+                    start = TangemTheme.dimens.size16,
+                    end = TangemTheme.dimens.size16,
+                    bottom = TangemTheme.dimens.size32,
+                ),
         ) {
             Text(
                 text = stringResource(id = R.string.scan_card_settings_title),
-                color = colorResource(id = R.color.text_primary_1),
+                color = TangemTheme.colors.text.primary1,
                 style = TangemTheme.typography.h3,
             )
-            Spacer(modifier = Modifier.size(20.dp))
+            Spacer(modifier = Modifier.size(TangemTheme.dimens.size20))
             Text(
                 text = stringResource(id = R.string.scan_card_settings_message),
-                color = colorResource(id = R.color.text_secondary),
+                color = TangemTheme.colors.text.secondary,
                 style = TangemTheme.typography.body1,
                 modifier = Modifier
                     .verticalScroll(rememberScrollState())
                     .weight(weight = 1f, fill = false),
             )
-            Spacer(modifier = Modifier.size(29.dp))
+            Spacer(modifier = Modifier.size(TangemTheme.dimens.size28))
             DetailsMainButton(
                 title = stringResource(id = R.string.scan_card_settings_button),
                 onClick = onScanCardClick,
@@ -107,7 +114,7 @@ fun CardSettingsReadCard(onScanCardClick: () -> Unit) {
 
 @Suppress("ComplexMethod")
 @Composable
-fun CardSettings(state: CardSettingsScreenState) {
+private fun CardSettings(state: CardSettingsScreenState) {
     if (state.cardDetails == null) return
 
     LazyColumn(
@@ -166,8 +173,25 @@ fun CardSettings(state: CardSettingsScreenState) {
     }
 }
 
+// region Preview
 @Composable
-@Preview
-private fun CardSettingsPreview() {
-    CardSettingsScreen(state = CardSettingsScreenState(onScanCardClick = {}) {}, {})
-}
\ No newline at end of file
+private fun CardSettingsScreenStateSample() {
+    CardSettingsScreen(state = CardSettingsScreenState(onScanCardClick = {}, onElementClick = {}), {})
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun CardSettingsScreenStatePreview_Light() {
+    TangemTheme {
+        CardSettingsScreenStateSample()
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun CardSettingsScreenStatePreview_Dark() {
+    TangemTheme(isDark = true) {
+        CardSettingsScreenStateSample()
+    }
+}
+// endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsScreenState.kt b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsScreenState.kt
index e09b4e7c2b..1cf79ec5e4 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsScreenState.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsScreenState.kt
@@ -4,6 +4,7 @@ import androidx.annotation.StringRes
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.ui.res.stringResource
+import com.tangem.domain.userwallets.Artwork
 import com.tangem.tap.features.details.redux.AccessCodeRecoveryState
 import com.tangem.tap.features.details.redux.SecurityOption
 import com.tangem.tap.features.details.ui.securitymode.toTitleRes
@@ -11,14 +12,15 @@ import com.tangem.tap.features.details.ui.utils.toResetCardDescriptionText
 import com.tangem.wallet.R
 import com.tangem.tap.features.details.redux.CardInfo as ReduxCardInfo
 
-data class CardSettingsScreenState(
+internal data class CardSettingsScreenState(
     val cardDetails: List<CardInfo>? = null,
     val accessCodeRecoveryState: AccessCodeRecoveryState? = null,
     val onScanCardClick: () -> Unit,
     val onElementClick: (CardInfo) -> Unit,
+    val cardImage: Artwork? = null,
 )
 
-sealed class CardInfo(
+internal sealed class CardInfo(
     val titleRes: TextReference,
     val subtitle: TextReference,
     val clickable: Boolean = false,
@@ -68,7 +70,7 @@ sealed class CardInfo(
 }
 
 // TODO("Remove and use the same from coreUI")
-sealed interface TextReference {
+internal sealed interface TextReference {
     class Res(@StringRes val id: Int, val formatArgs: List<Any> = emptyList()) : TextReference {
         constructor(@StringRes id: Int, vararg formatArgs: Any) : this(id, formatArgs.toList())
     }
@@ -78,7 +80,7 @@ sealed interface TextReference {
 
 @Composable
 @ReadOnlyComposable
-fun TextReference.resolveReference(): String {
+internal fun TextReference.resolveReference(): String {
     return when (this) {
         is TextReference.Res -> stringResource(this.id, *this.formatArgs.toTypedArray())
         is TextReference.Str -> this.value
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsViewModel.kt b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsViewModel.kt
index 805f373605..732f7aa06d 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsViewModel.kt
@@ -1,18 +1,64 @@
 package com.tangem.tap.features.details.ui.cardsettings
 
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.ViewModel
+import arrow.core.Either
 import com.tangem.core.analytics.Analytics
 import com.tangem.domain.common.TapWorkarounds.isTangemTwins
 import com.tangem.domain.common.getTwinCardIdForUser
+import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.Settings
-import com.tangem.tap.common.redux.AppState
+import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.features.details.redux.CardSettingsState
 import com.tangem.tap.features.details.redux.DetailsAction
-import org.rekotlin.Store
+import com.tangem.tap.features.details.redux.DetailsState
+import com.tangem.tap.features.wallet.redux.WalletAction
+import com.tangem.tap.store
+import dagger.hilt.android.lifecycle.HiltViewModel
+import org.rekotlin.StoreSubscriber
+import timber.log.Timber
+import javax.inject.Inject
 
-class CardSettingsViewModel(private val store: Store<AppState>) {
+@HiltViewModel
+internal class CardSettingsViewModel @Inject constructor(
+    private val getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase,
+) :
+    ViewModel(), DefaultLifecycleObserver, StoreSubscriber<DetailsState> {
 
-    fun updateState(state: CardSettingsState?): CardSettingsScreenState {
+    var screenState: MutableState<CardSettingsScreenState> =
+        mutableStateOf(updateState(store.state.detailsState.cardSettingsState))
+
+    override fun onStart(owner: LifecycleOwner) {
+        when (val selectedWalletEither = getSelectedWalletSyncUseCase()) {
+            is Either.Left -> {
+                Timber.e(selectedWalletEither.value.toString())
+            }
+            is Either.Right -> {
+                store.dispatchOnMain(WalletAction.UpdateUserWalletArtwork(selectedWalletEither.value.walletId))
+            }
+        }
+
+        store.subscribe(this) { state ->
+            state.skipRepeats { oldState, newState ->
+                oldState.detailsState == newState.detailsState &&
+                    oldState.walletState == newState.walletState
+            }.select { it.detailsState }
+        }
+    }
+
+    override fun onStop(owner: LifecycleOwner) {
+        store.unsubscribe(this)
+    }
+
+    override fun newState(state: DetailsState) {
+        screenState.value = updateState(state.cardSettingsState)
+    }
+
+    private fun updateState(state: CardSettingsState?): CardSettingsScreenState {
         return if (state?.manageSecurityState == null) {
             CardSettingsScreenState(
                 cardDetails = null,
@@ -21,6 +67,7 @@ class CardSettingsViewModel(private val store: Store<AppState>) {
                 onScanCardClick = {
                     store.dispatch(DetailsAction.ScanCard)
                 },
+                cardImage = store.state.walletState.cardImage,
             )
         } else {
             val cardId = if (state.card.isTangemTwins) {
@@ -58,6 +105,7 @@ class CardSettingsViewModel(private val store: Store<AppState>) {
                 onElementClick = {
                     handleClickingItem(it)
                 },
+                cardImage = store.state.walletState.cardImage,
             )
         }
     }
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/common/DetailsComposeElements.kt b/app/src/main/java/com/tangem/tap/features/details/ui/common/DetailsComposeElements.kt
index c92047d0bc..35b36c0f00 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/common/DetailsComposeElements.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/common/DetailsComposeElements.kt
@@ -1,33 +1,41 @@
 package com.tangem.tap.features.details.ui.common
 
 import androidx.activity.compose.BackHandler
+import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.material.*
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.components.PrimaryButtonIconEnd
+import com.tangem.core.ui.components.SystemBarsEffect
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.wallet.R
 
 @Composable
-fun SettingsScreensScaffold(
-    modifier: Modifier = Modifier,
-    content: @Composable () -> Unit,
-    background: @Composable (() -> Unit)? = null,
-    fab: @Composable (() -> Unit)? = null,
-    backgroundColor: Color = TangemTheme.colors.background.secondary,
-    titleRes: Int? = null,
+internal fun SettingsScreensScaffold(
     onBackClick: () -> Unit,
+    content: @Composable () -> Unit,
+    modifier: Modifier = Modifier,
+    @StringRes titleRes: Int? = null,
+    snackbarHostState: SnackbarHostState = remember { SnackbarHostState() },
+    fab: @Composable () -> Unit = {},
 ) {
-    BackHandler(true, onBackClick)
+    val state = rememberScaffoldState(snackbarHostState = snackbarHostState)
+    val backgroundColor = TangemTheme.colors.background.secondary
+
+    BackHandler(onBack = onBackClick)
+    SystemBarsEffect {
+        setSystemBarsColor(backgroundColor)
+    }
 
     Scaffold(
+        scaffoldState = state,
         topBar = {
             EmptyTopBarWithNavigation(
                 onBackClick = onBackClick,
@@ -36,34 +44,32 @@ fun SettingsScreensScaffold(
         },
         modifier = modifier.systemBarsPadding(),
         backgroundColor = backgroundColor,
-        floatingActionButton = { fab?.invoke() },
-    ) {
-        if (titleRes != null) {
-            Box(modifier = modifier.fillMaxSize()) {
-                background?.invoke()
-
-                Column(modifier = modifier.fillMaxWidth()) {
+        floatingActionButton = fab,
+        content = { paddings ->
+            Column(
+                modifier = Modifier
+                    .padding(paddings)
+                    .fillMaxSize(),
+            ) {
+                if (titleRes != null) {
                     Text(
                         text = stringResource(id = titleRes),
-                        modifier = modifier.padding(
-                            start = TangemTheme.dimens.spacing20,
-                            end = TangemTheme.dimens.spacing20,
-                            bottom = TangemTheme.dimens.spacing54,
-                        ),
+                        modifier = Modifier
+                            .padding(horizontal = TangemTheme.dimens.spacing20)
+                            .padding(bottom = TangemTheme.dimens.spacing36),
                         style = TangemTheme.typography.h1,
                         color = TangemTheme.colors.text.primary1,
                     )
-                    content()
                 }
+
+                content()
             }
-        } else {
-            content()
-        }
-    }
+        },
+    )
 }
 
 @Composable
-fun ScreenTitle(titleRes: Int, modifier: Modifier = Modifier) {
+internal fun ScreenTitle(titleRes: Int, modifier: Modifier = Modifier) {
     Text(
         text = stringResource(id = titleRes),
         modifier = modifier.padding(start = 20.dp, end = 20.dp),
@@ -73,7 +79,7 @@ fun ScreenTitle(titleRes: Int, modifier: Modifier = Modifier) {
 }
 
 @Composable
-fun EmptyTopBarWithNavigation(
+internal fun EmptyTopBarWithNavigation(
     onBackClick: () -> Unit,
     backgroundColor: Color = TangemTheme.colors.background.primary,
 ) {
@@ -95,7 +101,12 @@ fun EmptyTopBarWithNavigation(
 }
 
 @Composable
-fun DetailsMainButton(title: String, onClick: () -> Unit, modifier: Modifier = Modifier, enabled: Boolean = true) {
+internal fun DetailsMainButton(
+    title: String,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    enabled: Boolean = true,
+) {
     PrimaryButtonIconEnd(
         text = title,
         enabled = enabled,
@@ -107,7 +118,7 @@ fun DetailsMainButton(title: String, onClick: () -> Unit, modifier: Modifier = M
 }
 
 @Composable
-fun DetailsRadioButtonElement(title: String, subtitle: String, selected: Boolean, onClick: () -> Unit) {
+internal fun DetailsRadioButtonElement(title: String, subtitle: String, selected: Boolean, onClick: () -> Unit) {
     Row(
         modifier = Modifier
             .fillMaxWidth()
@@ -122,8 +133,8 @@ fun DetailsRadioButtonElement(title: String, subtitle: String, selected: Boolean
             onClick = null,
             modifier = Modifier.padding(end = 20.dp),
             colors = RadioButtonDefaults.colors(
-                unselectedColor = colorResource(id = R.color.icon_secondary),
-                selectedColor = colorResource(id = R.color.icon_accent),
+                unselectedColor = TangemTheme.colors.icon.secondary,
+                selectedColor = TangemTheme.colors.icon.accent,
             ),
         )
 
@@ -131,13 +142,13 @@ fun DetailsRadioButtonElement(title: String, subtitle: String, selected: Boolean
             Text(
                 text = title,
                 style = TangemTheme.typography.subtitle1,
-                color = colorResource(id = R.color.text_primary_1),
+                color = TangemTheme.colors.text.primary1,
             )
             Spacer(modifier = Modifier.size(4.dp))
             Text(
                 text = subtitle,
                 style = TangemTheme.typography.body2,
-                color = colorResource(id = R.color.text_secondary),
+                color = TangemTheme.colors.text.secondary,
             )
         }
     }
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/common/TangemSwitch.kt b/app/src/main/java/com/tangem/tap/features/details/ui/common/TangemSwitch.kt
index c6c8e82cf4..9839280049 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/common/TangemSwitch.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/common/TangemSwitch.kt
@@ -1,22 +1,12 @@
 package com.tangem.tap.features.details.ui.common
 
 import androidx.compose.animation.animateColor
-import androidx.compose.animation.core.FastOutLinearInEasing
-import androidx.compose.animation.core.LinearOutSlowInEasing
-import androidx.compose.animation.core.animateDp
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.core.updateTransition
+import androidx.compose.animation.core.*
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.indication
 import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxWithConstraints
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.runtime.Composable
@@ -25,17 +15,16 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import com.tangem.wallet.R
+import com.tangem.core.ui.res.TangemTheme
 
 @Suppress("MagicNumber")
 @Composable
 fun TangemSwitch(
     onCheckedChange: (Boolean) -> Unit,
-    checkedColor: Color = colorResource(id = R.color.control_checked),
-    uncheckedColor: Color = colorResource(id = R.color.icon_informative),
+    checkedColor: Color = TangemTheme.colors.icon.accent,
+    uncheckedColor: Color = TangemTheme.colors.icon.informative,
     size: Dp = 48.dp,
     checked: Boolean = false,
     enabled: Boolean = true,
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsFragment.kt
index 371b571cdd..d3d215551c 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsFragment.kt
@@ -1,45 +1,48 @@
 package com.tangem.tap.features.details.ui.details
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.ui.platform.ComposeView
-import androidx.fragment.app.Fragment
-import androidx.transition.TransitionInflater
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import com.tangem.core.analytics.Analytics
 import com.tangem.core.navigation.NavigationAction
-import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.screen.ComposeFragment
+import com.tangem.core.ui.theme.AppThemeModeHolder
+import com.tangem.domain.wallets.repository.WalletsRepository
 import com.tangem.tap.common.analytics.events.Settings
+import com.tangem.tap.features.details.DarkThemeFeatureToggle
 import com.tangem.tap.features.details.redux.DetailsState
 import com.tangem.tap.store
-import com.tangem.wallet.R
+import dagger.hilt.android.AndroidEntryPoint
 import org.rekotlin.StoreSubscriber
+import javax.inject.Inject
 
-class DetailsFragment : Fragment(), StoreSubscriber<DetailsState> {
+@AndroidEntryPoint
+internal class DetailsFragment : ComposeFragment(), StoreSubscriber<DetailsState> {
 
-    private val detailsViewModel = DetailsViewModel(store)
+    @Inject
+    override lateinit var appThemeModeHolder: AppThemeModeHolder
+
+    @Inject
+    lateinit var darkThemeFeatureToggle: DarkThemeFeatureToggle
+
+    @Inject
+    lateinit var walletsRepository: WalletsRepository
+
+    private lateinit var detailsViewModel: DetailsViewModel
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        detailsViewModel = DetailsViewModel(store, darkThemeFeatureToggle, walletsRepository)
         Analytics.send(Settings.ScreenOpened())
-        val inflater = TransitionInflater.from(requireContext())
-        enterTransition = inflater.inflateTransition(R.transition.fade)
-        exitTransition = inflater.inflateTransition(R.transition.fade)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        return ComposeView(requireContext()).apply {
-            setContent {
-                isTransitionGroup = true
-                TangemTheme {
-                    DetailsScreen(
-                        state = detailsViewModel.detailsScreenState.value,
-                        onBackClick = { store.dispatch(NavigationAction.PopBackTo()) },
-                    )
-                }
-            }
-        }
+    @Composable
+    override fun ScreenContent(modifier: Modifier) {
+        DetailsScreen(
+            modifier = modifier,
+            state = detailsViewModel.detailsScreenState.value,
+            onBackClick = { store.dispatch(NavigationAction.PopBackTo()) },
+        )
     }
 
     override fun onStart() {
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreen.kt b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreen.kt
index f05682f878..8a65d0e7bd 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreen.kt
@@ -1,156 +1,133 @@
 package com.tangem.tap.features.details.ui.details
 
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxScope
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.defaultMinSize
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Icon
-import androidx.compose.material.SnackbarHost
-import androidx.compose.material.SnackbarHostState
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.material.*
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import com.tangem.core.ui.components.SystemBarsEffect
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
+import com.tangem.core.ui.components.SpacerH
+import com.tangem.core.ui.components.SpacerHMax
+import com.tangem.core.ui.event.EventEffect
+import com.tangem.core.ui.event.StateEvent
+import com.tangem.core.ui.event.consumedEvent
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.res.TangemColorPalette
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.tap.features.details.ui.common.ScreenTitle
 import com.tangem.tap.features.details.ui.common.SettingsScreensScaffold
 import com.tangem.wallet.R
-import kotlinx.coroutines.launch
+import kotlinx.collections.immutable.toImmutableList
 
 @Composable
-fun DetailsScreen(state: DetailsScreenState, onBackClick: () -> Unit) {
-    SystemBarsEffect {
-        setSystemBarsColor(color = TangemColorPalette.Light1)
-    }
+internal fun DetailsScreen(state: DetailsScreenState, onBackClick: () -> Unit, modifier: Modifier = Modifier) {
+    val snackbarHostState = remember { SnackbarHostState() }
 
     SettingsScreensScaffold(
+        modifier = modifier,
+        snackbarHostState = snackbarHostState,
         content = { Content(state = state) },
         onBackClick = onBackClick,
     )
+
+    ShowSnackbarIfNeeded(
+        snackbarHostState = snackbarHostState,
+        messageEvent = state.showSnackbar,
+    )
 }
 
 @Composable
-fun Content(state: DetailsScreenState) {
-    Box {
+private fun Content(state: DetailsScreenState, modifier: Modifier = Modifier) {
+    Box(modifier = modifier) {
         Column(
             modifier = Modifier
                 .fillMaxSize()
                 .verticalScroll(rememberScrollState()),
         ) {
-            ScreenTitle(titleRes = R.string.details_title, Modifier.padding(bottom = 52.dp))
-            state.elements.map { element ->
-                if (element == SettingsElement.WalletConnect) {
-                    WalletConnectDetailsItem(onItemsClick = state.onItemsClick)
-                } else {
-                    DetailsItem(
-                        item = element,
-                        appCurrency = state.appCurrency,
-                        onItemsClick = { state.onItemsClick(element) },
-                    )
-                }
-            }
-            Spacer(modifier = Modifier.weight(1f))
-            TangemSocialAccounts(state.tangemLinks, state.onSocialNetworkClick)
-            Spacer(modifier = Modifier.size(12.dp))
-            Text(
-                text = "${stringResource(id = state.appNameRes)} ${state.tangemVersion}",
-                style = TangemTheme.typography.caption,
-                color = colorResource(id = R.color.text_tertiary),
-                modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 40.dp),
+            ScreenTitle(titleRes = R.string.details_title)
+            SpacerH(height = TangemTheme.dimens.spacing36)
+            SettingsItems(
+                items = state.elements,
             )
+            SpacerHMax()
+            TangemSocialAccounts(
+                links = state.tangemLinks,
+                onSocialNetworkClick = state.onSocialNetworkClick,
+            )
+            SpacerH(height = TangemTheme.dimens.spacing12)
+            TangemAppVersion(
+                appNameRes = state.appNameRes,
+                version = state.tangemVersion,
+            )
+            SpacerH(height = TangemTheme.dimens.spacing16)
         }
-        ShowSnackbarIfNeeded(state.showErrorSnackbar.value)
     }
 }
 
 @Composable
-fun WalletConnectDetailsItem(onItemsClick: (SettingsElement) -> Unit) {
+private fun SettingsItems(items: List<SettingsItem>) {
+    items.forEach { item ->
+        if (item.isLarge) {
+            LargeDetailsItem(item)
+        } else {
+            DetailsItem(item)
+        }
+    }
+}
+
+@Composable
+private fun LargeDetailsItem(item: SettingsItem) {
     Row(
         modifier = Modifier
-            .defaultMinSize(minHeight = 84.dp)
-            .fillMaxWidth()
-            .clickable { onItemsClick(SettingsElement.WalletConnect) },
-        horizontalArrangement = Arrangement.Start,
+            .clickable(onClick = item.onClick)
+            .padding(horizontal = TangemTheme.dimens.spacing20)
+            .heightIn(min = TangemTheme.dimens.size84)
+            .fillMaxWidth(),
+        horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing20),
         verticalAlignment = Alignment.CenterVertically,
     ) {
-        Icon(
-            painter = painterResource(id = R.drawable.ic_walletconnect),
-            contentDescription = stringResource(id = R.string.wallet_connect_title),
-            modifier = Modifier.padding(start = 20.dp, end = 20.dp),
-            tint = colorResource(id = R.color.all_colors_azure),
-        )
+        if (item.showProgress) {
+            CircularProgressIndicator(
+                modifier = Modifier.size(TangemTheme.dimens.size24),
+                color = TangemTheme.colors.icon.informative,
+            )
+        } else {
+            Icon(
+                modifier = Modifier.size(TangemTheme.dimens.size24),
+                painter = painterResource(id = item.iconResId),
+                contentDescription = item.title.resolveReference(),
+                tint = TangemColorPalette.Azure,
+            )
+        }
         Column(
-            modifier = Modifier.defaultMinSize(minHeight = 56.dp),
+            modifier = Modifier.heightIn(min = TangemTheme.dimens.size56),
             horizontalAlignment = Alignment.Start,
-            verticalArrangement = Arrangement.Center,
+            verticalArrangement = Arrangement.spacedBy(
+                space = TangemTheme.dimens.spacing4,
+                alignment = Alignment.CenterVertically,
+            ),
         ) {
             Text(
-                text = stringResource(id = R.string.wallet_connect_title),
-                modifier = Modifier.padding(end = 20.dp, bottom = 4.dp),
+                text = item.title.resolveReference(),
                 style = TangemTheme.typography.h3,
-                color = colorResource(id = R.color.text_primary_1),
+                color = TangemTheme.colors.text.primary1,
             )
-            Text(
-                text = stringResource(id = R.string.wallet_connect_subtitle),
-                modifier = Modifier.padding(end = 20.dp, bottom = 4.dp),
-                style = TangemTheme.typography.body1,
-                color = colorResource(id = R.color.text_secondary),
-            )
-        }
-    }
-}
 
-@Composable
-fun DetailsItem(item: SettingsElement, appCurrency: String, onItemsClick: () -> Unit) {
-    Row(
-        modifier = Modifier
-            .height(56.dp)
-            .fillMaxWidth()
-            .clickable(onClick = onItemsClick),
-        horizontalArrangement = Arrangement.Start,
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        Icon(
-            painter = painterResource(id = item.iconRes),
-            contentDescription = stringResource(id = item.titleRes),
-            modifier = Modifier.padding(start = 20.dp, end = 20.dp),
-            tint = colorResource(id = R.color.icon_secondary),
-        )
-        Column(modifier = Modifier.padding(end = 20.dp)) {
-            Text(
-                text = stringResource(id = item.titleRes),
-                modifier = Modifier,
-                style = TangemTheme.typography.subtitle1,
-                color = colorResource(id = R.color.text_primary_1),
-            )
-            if (item == SettingsElement.AppCurrency) {
+            if (item.subtitle != null) {
                 Text(
-                    text = appCurrency,
-                    style = TangemTheme.typography.body2,
-                    color = colorResource(id = R.color.text_secondary),
+                    text = item.subtitle.resolveReference(),
+                    style = TangemTheme.typography.body1,
+                    color = TangemTheme.colors.text.secondary,
                 )
             }
         }
@@ -158,66 +135,159 @@ fun DetailsItem(item: SettingsElement, appCurrency: String, onItemsClick: () ->
 }
 
 @Composable
-fun TangemSocialAccounts(links: List<SocialNetworkLink>, onSocialNetworkClick: (SocialNetworkLink) -> Unit) {
-    LazyRow(
-        modifier = Modifier.padding(start = 8.dp, end = 8.dp),
+private fun DetailsItem(item: SettingsItem) {
+    Row(
+        modifier = Modifier
+            .clickable(enabled = !item.showProgress, onClick = item.onClick)
+            .padding(horizontal = TangemTheme.dimens.spacing20)
+            .heightIn(min = TangemTheme.dimens.size56)
+            .fillMaxWidth(),
+        horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing20),
         verticalAlignment = Alignment.CenterVertically,
     ) {
-        items(links) {
+        if (item.showProgress) {
+            CircularProgressIndicator(
+                modifier = Modifier.size(TangemTheme.dimens.size24),
+                color = TangemTheme.colors.icon.informative,
+            )
+        } else {
             Icon(
-                painter = painterResource(id = it.network.iconRes),
-                contentDescription = "",
-                modifier = Modifier
-                    .padding(8.dp)
-                    .clickable { onSocialNetworkClick(it) },
-                tint = colorResource(id = R.color.icon_informative),
+                modifier = Modifier.size(TangemTheme.dimens.size24),
+                painter = painterResource(id = item.iconResId),
+                contentDescription = item.title.resolveReference(),
+                tint = TangemTheme.colors.icon.secondary,
             )
         }
-    }
-}
 
-@Composable
-fun BoxScope.ShowSnackbarIfNeeded(snackbarErrorState: EventError) {
-    val snackbarHostState = remember { SnackbarHostState() }
-    val coroutineScope = rememberCoroutineScope()
-    SnackbarHost(
-        modifier = Modifier
-            .align(Alignment.BottomCenter)
-            .padding(vertical = TangemTheme.dimens.spacing16)
-            .fillMaxWidth(),
-        hostState = snackbarHostState,
-    )
-    val errorTitle = when (snackbarErrorState) {
-        is EventError.DemoReferralNotAvailable -> stringResource(id = R.string.alert_demo_feature_disabled)
-        EventError.Empty -> ""
-    }
-    if (snackbarErrorState != EventError.Empty) {
-        SideEffect {
-            coroutineScope.launch {
-                snackbarHostState.showSnackbar(errorTitle)
-            }
-            when (snackbarErrorState) {
-                is EventError.DemoReferralNotAvailable -> snackbarErrorState.onErrorShow.invoke()
-                else -> {
-                    /*no-op*/
-                }
+        Column(
+            horizontalAlignment = Alignment.Start,
+            verticalArrangement = Arrangement.SpaceAround,
+        ) {
+            Text(
+                text = item.title.resolveReference(),
+                style = TangemTheme.typography.subtitle1,
+                color = TangemTheme.colors.text.primary1,
+            )
+
+            if (item.subtitle != null) {
+                Text(
+                    text = item.subtitle.resolveReference(),
+                    style = TangemTheme.typography.body2,
+                    color = TangemTheme.colors.text.secondary,
+                )
             }
         }
     }
 }
 
 @Composable
-@Preview
-private fun Preview() {
-    DetailsScreen(
-        state = DetailsScreenState(
-            elements = SettingsElement.values().toList(),
+private fun TangemSocialAccounts(links: List<SocialNetworkLink>, onSocialNetworkClick: (SocialNetworkLink) -> Unit) {
+    LazyRow(
+        verticalAlignment = Alignment.CenterVertically,
+        contentPadding = PaddingValues(horizontal = TangemTheme.dimens.spacing8),
+    ) {
+        items(links) {
+            val onClick = remember(it) {
+                { onSocialNetworkClick(it) }
+            }
+
+            IconButton(
+                modifier = Modifier
+                    .padding(horizontal = TangemTheme.dimens.spacing4)
+                    .size(TangemTheme.dimens.size32),
+                onClick = onClick,
+            ) {
+                Icon(
+                    modifier = Modifier.size(TangemTheme.dimens.size24),
+                    painter = painterResource(id = it.network.iconRes),
+                    tint = TangemTheme.colors.icon.informative,
+                    contentDescription = null,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun ShowSnackbarIfNeeded(snackbarHostState: SnackbarHostState, messageEvent: StateEvent<TextReference>) {
+    var message: TextReference? by remember { mutableStateOf(value = null) }
+    val resolvedMessage by rememberUpdatedState(newValue = message?.resolveReference())
+
+    LaunchedEffect(resolvedMessage) {
+        resolvedMessage?.let {
+            snackbarHostState.showSnackbar(it)
+        }
+    }
+
+    EventEffect(messageEvent) {
+        message = it
+    }
+}
+
+@Composable
+private fun TangemAppVersion(appNameRes: Int, version: String, modifier: Modifier = Modifier) {
+    Text(
+        modifier = modifier.padding(horizontal = TangemTheme.dimens.spacing16),
+        text = "${stringResource(id = appNameRes)} $version",
+        style = TangemTheme.typography.caption2,
+        color = TangemTheme.colors.text.tertiary,
+    )
+}
+
+// region Preview
+@Preview(showBackground = true, widthDp = 360, heightDp = 900)
+@Composable
+private fun DetailsScreenPreview_Light(
+    @PreviewParameter(DetailsScreenStateProvider::class) param: DetailsScreenState,
+) {
+    TangemTheme(isDark = false) {
+        DetailsScreen(param, onBackClick = {})
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360, heightDp = 900)
+@Composable
+private fun DetailsScreenPreview_Dark(@PreviewParameter(DetailsScreenStateProvider::class) param: DetailsScreenState) {
+    TangemTheme(isDark = true) {
+        DetailsScreen(param, onBackClick = {})
+    }
+}
+
+private class DetailsScreenStateProvider : CollectionPreviewParameterProvider<DetailsScreenState>(
+    collection = buildList {
+        DetailsScreenState(
+            elements = buildList {
+                SettingsItem.WalletConnect({}).let(::add)
+                SettingsItem.AddWallet(showProgress = false, {}).let(::add)
+                SettingsItem.LinkMoreCards({}).let(::add)
+                SettingsItem.CardSettings({}).let(::add)
+                SettingsItem.AppSettings({}).let(::add)
+                SettingsItem.Chat({}).let(::add)
+                SettingsItem.SendFeedback({}).let(::add)
+                SettingsItem.ReferralProgram({}).let(::add)
+                SettingsItem.TermsOfService({}).let(::add)
+            }.toImmutableList(),
             tangemLinks = TangemSocialAccounts.accountsEn,
             tangemVersion = "Tangem 2.14.12 (343)",
-            appCurrency = "Dollar",
-            onItemsClick = {},
+            showSnackbar = consumedEvent(),
             onSocialNetworkClick = {},
-        ),
-        onBackClick = {},
-    )
-}
\ No newline at end of file
+        ).let(::add)
+
+        DetailsScreenState(
+            elements = buildList {
+                SettingsItem.WalletConnect({}).let(::add)
+                SettingsItem.AddWallet(showProgress = true, {}).let(::add)
+                SettingsItem.CardSettings({}).let(::add)
+                SettingsItem.AppSettings({}).let(::add)
+                SettingsItem.Chat({}).let(::add)
+                SettingsItem.SendFeedback({}).let(::add)
+                SettingsItem.TermsOfService({}).let(::add)
+            }.toImmutableList(),
+            tangemLinks = TangemSocialAccounts.accountsRu,
+            tangemVersion = "Tangem 2.14.12 (343)",
+            showSnackbar = consumedEvent(),
+            onSocialNetworkClick = {},
+        ).let(::add)
+    },
+)
+// endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreenState.kt b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreenState.kt
index c0dd629819..6675322128 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreenState.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreenState.kt
@@ -1,82 +1,163 @@
 package com.tangem.tap.features.details.ui.details
 
+import androidx.annotation.DrawableRes
 import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.mutableStateOf
+import com.tangem.core.ui.event.StateEvent
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.wallet.R
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
 
 @Immutable
-data class DetailsScreenState(
-    val elements: List<SettingsElement>,
-    val tangemLinks: List<SocialNetworkLink>,
+internal data class DetailsScreenState(
+    val elements: ImmutableList<SettingsItem>,
+    val tangemLinks: ImmutableList<SocialNetworkLink>,
     val tangemVersion: String,
-    val appCurrency: String,
-    val onItemsClick: (SettingsElement) -> Unit,
+    val showSnackbar: StateEvent<TextReference>,
     val onSocialNetworkClick: (SocialNetworkLink) -> Unit,
-    val showErrorSnackbar: MutableState<EventError> = mutableStateOf(EventError.Empty),
 ) {
     val appNameRes: Int = R.string.tangem_app_name
 }
 
 @Immutable
-enum class SettingsElement(
-    val iconRes: Int,
-    val titleRes: Int,
+internal sealed class SettingsItem(
+    @DrawableRes val iconResId: Int,
+    val title: TextReference,
+    val subtitle: TextReference? = null,
+    val isLarge: Boolean = false,
 ) {
-    WalletConnect(R.drawable.ic_walletconnect, R.string.wallet_connect_title),
-    Chat(R.drawable.ic_chat, R.string.details_chat),
-    SendFeedback(R.drawable.ic_comment, R.string.details_row_title_send_feedback),
-    ReferralProgram(R.drawable.ic_add_friends, R.string.details_referral_title),
-    CardSettings(R.drawable.ic_card_settings, R.string.card_settings_title),
-    AppCurrency(R.drawable.ic_currency, R.string.details_row_title_currency),
-    AppSettings(R.drawable.ic_settings, R.string.app_settings_title),
-    LinkMoreCards(R.drawable.ic_more_cards, R.string.details_row_title_create_backup),
-    TermsOfService(R.drawable.ic_text, R.string.disclaimer_title), // General Terms of Service of the App
-    PrivacyPolicy(R.drawable.ic_lock_24, R.string.details_row_privacy_policy),
-    TesterMenu(R.drawable.ic_alert_24, R.string.tester_menu),
+
+    abstract val onClick: () -> Unit
+
+    open val showProgress: Boolean = false
+
+    data class WalletConnect(
+        override val onClick: () -> Unit,
+    ) : SettingsItem(
+        iconResId = R.drawable.ic_walletconnect,
+        title = resourceReference(R.string.wallet_connect_title),
+        subtitle = resourceReference(R.string.wallet_connect_subtitle),
+        isLarge = true,
+    )
+
+    data class AddWallet(
+        override val showProgress: Boolean,
+        override val onClick: () -> Unit,
+    ) : SettingsItem(
+        iconResId = R.drawable.ic_plus_24,
+        title = resourceReference(R.string.user_wallet_list_add_button),
+    )
+
+    data class ScanWallet(
+        override val showProgress: Boolean,
+        override val onClick: () -> Unit,
+    ) : SettingsItem(
+        iconResId = R.drawable.ic_plus_24,
+        title = resourceReference(R.string.scan_card_settings_button),
+    )
+
+    data class LinkMoreCards(
+        override val onClick: () -> Unit,
+    ) : SettingsItem(
+        iconResId = R.drawable.ic_more_cards,
+        title = resourceReference(R.string.details_row_title_create_backup),
+    )
+
+    data class CardSettings(
+        override val onClick: () -> Unit,
+    ) : SettingsItem(
+        iconResId = R.drawable.ic_card_settings,
+        title = resourceReference(R.string.card_settings_title),
+    )
+
+    data class AppSettings(
+        override val onClick: () -> Unit,
+    ) : SettingsItem(
+        iconResId = R.drawable.ic_settings,
+        title = resourceReference(R.string.app_settings_title),
+    )
+
+    data class Chat(
+        override val onClick: () -> Unit,
+    ) : SettingsItem(
+        iconResId = R.drawable.ic_chat,
+        title = resourceReference(R.string.details_chat),
+    )
+
+    data class SendFeedback(
+        override val onClick: () -> Unit,
+    ) : SettingsItem(
+        iconResId = R.drawable.ic_comment,
+        title = resourceReference(R.string.details_row_title_send_feedback),
+    )
+
+    data class ReferralProgram(
+        override val onClick: () -> Unit,
+    ) : SettingsItem(
+        iconResId = R.drawable.ic_add_friends,
+        title = resourceReference(R.string.details_referral_title),
+    )
+
+    data class TermsOfService(
+        override val onClick: () -> Unit,
+    ) : SettingsItem(
+        iconResId = R.drawable.ic_text,
+        title = resourceReference(R.string.disclaimer_title),
+    )
+
+    data class TesterMenu(
+        override val onClick: () -> Unit,
+    ) : SettingsItem(
+        iconResId = R.drawable.ic_alert_24,
+        title = resourceReference(R.string.tester_menu),
+    )
 }
 
 @Immutable
-data class SocialNetworkLink(
+internal data class SocialNetworkLink(
     val network: SocialNetwork,
     val url: String,
 )
 
-sealed class EventError {
+internal sealed class EventError {
     object Empty : EventError()
     data class DemoReferralNotAvailable(val onErrorShow: () -> Unit) : EventError()
 }
 
 sealed class SocialNetwork(val id: String, val iconRes: Int) {
-    object Telegram : SocialNetwork("Telegram", R.drawable.ic_telegram)
     object Twitter : SocialNetwork("Twitter", R.drawable.ic_twitter)
-    object Facebook : SocialNetwork("Facebook", R.drawable.ic_facebook)
+    object Telegram : SocialNetwork("Telegram", R.drawable.ic_telegram)
+    object Discord : SocialNetwork("Discord", R.drawable.ic_discord)
+    object Reddit : SocialNetwork("Reddit", R.drawable.ic_reddit)
     object Instagram : SocialNetwork("Instagram", R.drawable.ic_instagram)
     object GitHub : SocialNetwork("GitHub", R.drawable.ic_github)
-    object YouTube : SocialNetwork("YouTube", R.drawable.ic_youtube)
+    object Facebook : SocialNetwork("Facebook", R.drawable.ic_facebook)
     object LinkedIn : SocialNetwork("LinkedIn", R.drawable.ic_linkedin)
-    object Discord : SocialNetwork("Discord", R.drawable.ic_discord)
+    object YouTube : SocialNetwork("YouTube", R.drawable.ic_youtube)
 }
 
-object TangemSocialAccounts {
-    val accountsEn: List<SocialNetworkLink> = listOf(
+internal object TangemSocialAccounts {
+    val accountsEn: ImmutableList<SocialNetworkLink> = persistentListOf(
+        SocialNetworkLink(SocialNetwork.Twitter, "https://x.com/tangem"),
         SocialNetworkLink(SocialNetwork.Telegram, "https://t.me/tangem_chat"),
-        SocialNetworkLink(SocialNetwork.Twitter, "https://twitter.com/tangem"),
-        SocialNetworkLink(SocialNetwork.Facebook, "https://m.facebook.com/TangemCards/"),
+        SocialNetworkLink(SocialNetwork.Discord, "https://discord.gg/tangem"),
+        SocialNetworkLink(SocialNetwork.Reddit, "https://www.reddit.com/r/Tangem/"),
         SocialNetworkLink(SocialNetwork.Instagram, "https://instagram.com/tangemcards"),
         SocialNetworkLink(SocialNetwork.GitHub, "https://github.com/tangem"),
-        SocialNetworkLink(SocialNetwork.YouTube, "https://youtube.com/channel/UCFGwLS7yggzVkP6ozte0m1w"),
+        SocialNetworkLink(SocialNetwork.Facebook, "https://facebook.com/TangemCards/"),
         SocialNetworkLink(SocialNetwork.LinkedIn, "https://www.linkedin.com/company/tangem"),
-        SocialNetworkLink(SocialNetwork.Discord, "https://discord.gg/7AqTVyqdGS"),
+        SocialNetworkLink(SocialNetwork.YouTube, "https://youtube.com/@tangem3890"),
     )
-    val accountsRu: List<SocialNetworkLink> = listOf(
+    val accountsRu: ImmutableList<SocialNetworkLink> = persistentListOf(
+        SocialNetworkLink(SocialNetwork.Twitter, "https://x.com/tangem"),
         SocialNetworkLink(SocialNetwork.Telegram, "https://t.me/tangem_chat_ru"),
-        SocialNetworkLink(SocialNetwork.Twitter, "https://twitter.com/tangem"),
-        SocialNetworkLink(SocialNetwork.Facebook, "https://m.facebook.com/TangemCards/"),
+        SocialNetworkLink(SocialNetwork.Discord, "https://discord.gg/tangem"),
+        SocialNetworkLink(SocialNetwork.Reddit, "https://www.reddit.com/r/Tangem/"),
         SocialNetworkLink(SocialNetwork.Instagram, "https://instagram.com/tangemcards"),
         SocialNetworkLink(SocialNetwork.GitHub, "https://github.com/tangem"),
-        SocialNetworkLink(SocialNetwork.YouTube, "https://youtube.com/channel/UCFGwLS7yggzVkP6ozte0m1w"),
+        SocialNetworkLink(SocialNetwork.Facebook, "https://facebook.com/TangemCards/"),
         SocialNetworkLink(SocialNetwork.LinkedIn, "https://www.linkedin.com/company/tangem"),
-        SocialNetworkLink(SocialNetwork.Discord, "https://discord.gg/7AqTVyqdGS"),
+        SocialNetworkLink(SocialNetwork.YouTube, "https://youtube.com/@tangem3890"),
     )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsViewModel.kt b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsViewModel.kt
index 8301791338..8e9fb4ce18 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsViewModel.kt
@@ -5,111 +5,115 @@ import androidx.compose.runtime.mutableStateOf
 import com.tangem.core.analytics.Analytics
 import com.tangem.core.navigation.AppScreen
 import com.tangem.core.navigation.NavigationAction
+import com.tangem.core.ui.event.StateEvent
+import com.tangem.core.ui.event.consumedEvent
+import com.tangem.core.ui.event.triggeredEvent
+import com.tangem.core.ui.extensions.TextReference
 import com.tangem.domain.common.util.cardTypesResolver
+import com.tangem.domain.wallets.repository.WalletsRepository
 import com.tangem.tap.common.analytics.events.Settings
+import com.tangem.tap.common.extensions.dispatchWithMain
 import com.tangem.tap.common.feedback.FeedbackEmail
 import com.tangem.tap.common.feedback.SupportInfo
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
+import com.tangem.tap.features.details.DarkThemeFeatureToggle
+import com.tangem.tap.features.details.redux.DetailsAction
 import com.tangem.tap.features.details.redux.DetailsState
 import com.tangem.tap.features.disclaimer.redux.DisclaimerAction
 import com.tangem.tap.features.home.LocaleRegionProvider
 import com.tangem.tap.features.home.RUSSIA_COUNTRY_CODE
 import com.tangem.tap.features.wallet.redux.WalletAction
+import com.tangem.tap.scope
+import com.tangem.tap.userWalletsListManager
 import com.tangem.wallet.BuildConfig
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import org.rekotlin.Store
 
-class DetailsViewModel(private val store: Store<AppState>) {
+// TODO: change to Android ViewModel [REDACTED_JIRA]
+internal class DetailsViewModel(
+    private val store: Store<AppState>,
+    private val darkThemeFeatureToggle: DarkThemeFeatureToggle,
+    private val walletsRepository: WalletsRepository,
+) {
 
     var detailsScreenState: MutableState<DetailsScreenState> = mutableStateOf(updateState(store.state.detailsState))
         private set
 
-    @Suppress("ComplexMethod")
-    fun updateState(state: DetailsState): DetailsScreenState {
-        val cardTypesResolver = state.scanResponse?.cardTypesResolver
-        val settings = SettingsElement.values().mapNotNull {
-            when (it) {
-                SettingsElement.WalletConnect -> {
-                    if (cardTypesResolver?.isMultiwalletAllowed() == true) it else null
-                }
-                SettingsElement.SendFeedback -> it
-                SettingsElement.LinkMoreCards -> if (state.createBackupAllowed) it else null
-                SettingsElement.PrivacyPolicy -> {
-                    if (state.privacyPolicyUrl != null) it else null
-                }
-                SettingsElement.AppSettings -> if (state.appSettingsState.isBiometricsAvailable) it else null
-                SettingsElement.AppCurrency -> if (cardTypesResolver?.isMultiwalletAllowed() != true) it else null
-                SettingsElement.ReferralProgram -> if (cardTypesResolver?.isTangemWallet() == true) it else null
-                SettingsElement.TesterMenu -> if (BuildConfig.TESTER_MENU_ENABLED) it else null
-                else -> it
-            }
-        }
+    init {
+        bootstrapScreenState()
+    }
 
+    fun updateState(state: DetailsState): DetailsScreenState {
         return DetailsScreenState(
-            elements = settings,
+            elements = createSettingsItems(state),
             tangemLinks = getSocialLinks(),
             tangemVersion = getTangemAppVersion(),
-            appCurrency = state.appCurrency.name,
-            onItemsClick = { handleClickingSettingsItem(it) },
-            onSocialNetworkClick = { handleSocialNetworkClick(it) },
+            showSnackbar = triggerErrorSnackbarIfNeeded(state.error),
+            onSocialNetworkClick = ::handleSocialNetworkClick,
         )
     }
 
-    private fun handleSocialNetworkClick(link: SocialNetworkLink) {
-        Analytics.send(Settings.ButtonSocialNetwork(link.network))
-        store.dispatch(NavigationAction.OpenUrl(link.url))
+    private fun createSettingsItems(state: DetailsState): ImmutableList<SettingsItem> {
+        val scanResponse = state.scanResponse ?: return persistentListOf()
+        val cardTypesResolver = scanResponse.cardTypesResolver
+
+        return buildList {
+            SettingsItem.WalletConnect(::navigateToWalletConnect)
+                .takeIf { cardTypesResolver.isMultiwalletAllowed() }
+                ?.let(::add)
+
+            SettingsItem.AddWallet(showProgress = state.isScanningInProgress, ::scanAndSaveUserWallet)
+                .takeIf { state.appSettingsState.saveWallets }
+                ?.let(::add)
+
+            SettingsItem.ScanWallet(showProgress = state.isScanningInProgress, ::scanAndSaveUserWallet)
+                .takeUnless { state.appSettingsState.saveWallets }
+                ?.let(::add)
+
+            SettingsItem.LinkMoreCards(::linkMoreCards)
+                .takeIf { state.createBackupAllowed }
+                ?.let(::add)
+
+            SettingsItem.CardSettings(::navigateToCardSettings)
+                .let(::add)
+
+            SettingsItem.AppSettings(::navigateToAppSettings)
+                .let(::add)
+
+            SettingsItem.Chat(::navigateToChat)
+                .let(::add)
+
+            SettingsItem.SendFeedback(::sendFeedback)
+                .let(::add)
+
+            SettingsItem.ReferralProgram(::navigateToReferralProgram)
+                .takeIf { cardTypesResolver.isTangemWallet() }
+                ?.let(::add)
+
+            SettingsItem.TermsOfService(::navigateToToS)
+                .let(::add)
+
+            SettingsItem.TesterMenu(::navigateToTesterMenu)
+                .takeIf { BuildConfig.TESTER_MENU_ENABLED }
+                ?.let(::add)
+        }.toImmutableList()
     }
 
-    private fun handleClickingSettingsItem(item: SettingsElement) {
-        when (item) {
-            SettingsElement.WalletConnect -> {
-                Analytics.send(Settings.ButtonWalletConnect())
-                store.dispatch(NavigationAction.NavigateTo(AppScreen.WalletConnectSessions))
-            }
-            SettingsElement.Chat -> {
-                Analytics.send(Settings.ButtonChat())
-                store.dispatch(GlobalAction.OpenChat(SupportInfo()))
-            }
-            SettingsElement.SendFeedback -> {
-                Analytics.send(Settings.ButtonSendFeedback())
-                store.dispatch(GlobalAction.SendEmail(FeedbackEmail()))
-            }
-            SettingsElement.CardSettings -> {
-                Analytics.send(Settings.ButtonCardSettings())
-                store.dispatch(NavigationAction.NavigateTo(AppScreen.CardSettings))
-            }
-            SettingsElement.AppCurrency -> {
-                store.dispatch(WalletAction.AppCurrencyAction.ChooseAppCurrency)
-            }
-            SettingsElement.AppSettings -> {
-                Analytics.send(Settings.ButtonAppSettings())
-                store.dispatch(NavigationAction.NavigateTo(AppScreen.AppSettings))
-            }
-            SettingsElement.LinkMoreCards -> {
-                Analytics.send(Settings.ButtonCreateBackup())
-                store.dispatch(WalletAction.MultiWallet.BackupWallet)
-            }
-            SettingsElement.TermsOfService -> {
-                store.dispatch(DisclaimerAction.Show(AppScreen.Details))
-            }
-            SettingsElement.PrivacyPolicy -> {
-                // TODO: To be available later
-            }
-            SettingsElement.ReferralProgram -> {
-                store.dispatch(NavigationAction.NavigateTo(AppScreen.ReferralProgram))
-            }
-            SettingsElement.TesterMenu -> {
-                store.state.daggerGraphState.testerRouter?.startTesterScreen()
-            }
-        }
-    }
-
-    private fun getSocialLinks(): List<SocialNetworkLink> {
-        val locale = LocaleRegionProvider().getRegion()
-        return if (locale.lowercase() == RUSSIA_COUNTRY_CODE) {
-            TangemSocialAccounts.accountsRu
+    private fun triggerErrorSnackbarIfNeeded(text: TextReference?): StateEvent<TextReference> {
+        return if (text == null) {
+            consumedEvent()
         } else {
-            TangemSocialAccounts.accountsEn
+            triggeredEvent(text) {
+                store.dispatch(DetailsAction.DismissError)
+            }
         }
     }
 
@@ -118,4 +122,81 @@ class DetailsViewModel(private val store: Store<AppState>) {
         val versionName: String = BuildConfig.VERSION_NAME
         return "$versionName ($versionCode)"
     }
+
+    private fun navigateToTesterMenu() {
+        store.state.daggerGraphState.testerRouter?.startTesterScreen()
+    }
+
+    private fun navigateToToS() {
+        store.dispatch(DisclaimerAction.Show(AppScreen.Details))
+    }
+
+    private fun navigateToReferralProgram() {
+        store.dispatch(NavigationAction.NavigateTo(AppScreen.ReferralProgram))
+    }
+
+    private fun sendFeedback() {
+        Analytics.send(Settings.ButtonSendFeedback())
+        store.dispatch(GlobalAction.SendEmail(FeedbackEmail()))
+    }
+
+    private fun navigateToChat() {
+        Analytics.send(Settings.ButtonChat())
+        store.dispatch(GlobalAction.OpenChat(SupportInfo()))
+    }
+
+    private fun navigateToAppSettings() {
+        Analytics.send(Settings.ButtonAppSettings())
+        store.dispatch(NavigationAction.NavigateTo(AppScreen.AppSettings))
+    }
+
+    private fun navigateToCardSettings() {
+        Analytics.send(Settings.ButtonCardSettings())
+        store.dispatch(NavigationAction.NavigateTo(AppScreen.CardSettings))
+    }
+
+    private fun linkMoreCards() {
+        Analytics.send(Settings.ButtonCreateBackup())
+        store.dispatch(WalletAction.MultiWallet.BackupWallet)
+    }
+
+    private fun scanAndSaveUserWallet() {
+        Analytics.send(Settings.ScanNewCard)
+        store.dispatch(DetailsAction.ScanAndSaveUserWallet)
+    }
+
+    private fun navigateToWalletConnect() {
+        Analytics.send(Settings.ButtonWalletConnect())
+        store.dispatch(NavigationAction.NavigateTo(AppScreen.WalletConnectSessions))
+    }
+
+    private fun handleSocialNetworkClick(link: SocialNetworkLink) {
+        Analytics.send(Settings.ButtonSocialNetwork(link.network))
+        store.dispatch(NavigationAction.OpenUrl(link.url))
+    }
+
+    private fun getSocialLinks(): ImmutableList<SocialNetworkLink> {
+        val locale = LocaleRegionProvider().getRegion()
+        return if (locale.lowercase() == RUSSIA_COUNTRY_CODE) {
+            TangemSocialAccounts.accountsRu
+        } else {
+            TangemSocialAccounts.accountsEn
+        }
+    }
+
+    private fun bootstrapScreenState() {
+        userWalletsListManager.selectedUserWallet
+            .distinctUntilChanged()
+            .onEach { selectedUserWallet ->
+                store.dispatchWithMain(
+                    DetailsAction.PrepareScreen(
+                        scanResponse = selectedUserWallet.scanResponse,
+                        darkThemeSwitchEnabled = darkThemeFeatureToggle.isDarkThemeEnabled,
+                        shouldSaveUserWallets = walletsRepository.shouldSaveUserWalletsSync(),
+                    ),
+                )
+            }
+            .flowOn(Dispatchers.IO)
+            .launchIn(scope)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardFragment.kt
index 7a7c723779..9ac4c1f3d3 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardFragment.kt
@@ -1,47 +1,36 @@
 package com.tangem.tap.features.details.ui.resetcard
 
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
+import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.ui.platform.ComposeView
-import androidx.fragment.app.Fragment
-import androidx.transition.TransitionInflater
+import androidx.compose.ui.Modifier
 import com.tangem.core.navigation.NavigationAction
-import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.screen.ComposeFragment
+import com.tangem.core.ui.theme.AppThemeModeHolder
 import com.tangem.tap.features.details.redux.DetailsState
 import com.tangem.tap.store
+import dagger.hilt.android.AndroidEntryPoint
 import org.rekotlin.StoreSubscriber
+import javax.inject.Inject
 
-class ResetCardFragment : Fragment(), StoreSubscriber<DetailsState> {
+@AndroidEntryPoint
+internal class ResetCardFragment : ComposeFragment(), StoreSubscriber<DetailsState> {
+
+    @Inject
+    override lateinit var appThemeModeHolder: AppThemeModeHolder
 
     private val viewModel = ResetCardViewModel(store)
 
     private var screenState: MutableState<ResetCardScreenState> =
         mutableStateOf(viewModel.updateState(store.state.detailsState.cardSettingsState))
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val inflater = TransitionInflater.from(requireContext())
-        enterTransition = inflater.inflateTransition(android.R.transition.fade)
-        exitTransition = inflater.inflateTransition(android.R.transition.fade)
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        return ComposeView(requireContext()).apply {
-            setContent {
-                isTransitionGroup = true
-                TangemTheme {
-                    ResetCardScreen(
-                        state = screenState.value,
-                        onBackClick = { store.dispatch(NavigationAction.PopBackTo()) },
-                    )
-                }
-            }
-        }
+    @Composable
+    override fun ScreenContent(modifier: Modifier) {
+        ResetCardScreen(
+            modifier = modifier,
+            state = screenState.value,
+            onBackClick = { store.dispatch(NavigationAction.PopBackTo()) },
+        )
     }
 
     override fun onStart() {
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreen.kt b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreen.kt
index d64bf444ca..aa76d59a80 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreen.kt
@@ -1,24 +1,17 @@
 package com.tangem.tap.features.details.ui.resetcard
 
-import androidx.compose.foundation.Image
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Icon
 import androidx.compose.material.IconToggleButton
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
@@ -34,32 +27,37 @@ import com.tangem.tap.features.details.ui.common.SettingsScreensScaffold
 import com.tangem.wallet.R
 
 @Composable
-fun ResetCardScreen(state: ResetCardScreenState, onBackClick: () -> Unit) {
+internal fun ResetCardScreen(state: ResetCardScreenState, onBackClick: () -> Unit, modifier: Modifier = Modifier) {
     SettingsScreensScaffold(
+        modifier = modifier,
         content = { ResetCardView(state = state) },
         onBackClick = onBackClick,
-        backgroundColor = Color.Transparent,
     )
 }
 
+@OptIn(ExperimentalAnimationApi::class)
 @Suppress("LongMethod", "MagicNumber")
 @Composable
-fun ResetCardView(state: ResetCardScreenState) {
+private fun ResetCardView(state: ResetCardScreenState) {
     Column(
         modifier = Modifier
             .fillMaxSize()
             .verticalScroll(rememberScrollState()),
         verticalArrangement = Arrangement.SpaceBetween,
     ) {
-        Box {
-            Image(
-                painter = painterResource(id = R.drawable.ill_reset_background),
-                contentDescription = null,
-                modifier = Modifier.offset(y = (-82).dp),
+        ScreenTitle(titleRes = R.string.card_settings_reset_card_to_factory)
+        Box(
+            modifier = Modifier
+                .weight(1f)
+                .padding(horizontal = 21.dp),
+            contentAlignment = Alignment.CenterStart,
+        ) {
+            Icon(
+                painter = painterResource(id = R.drawable.img_alert),
+                contentDescription = "",
+                tint = Color.Unspecified,
             )
-            ScreenTitle(titleRes = R.string.card_settings_reset_card_to_factory)
         }
-        Spacer(modifier = Modifier.weight(1f))
         Column(
             modifier = Modifier.offset(y = (-32).dp),
             verticalArrangement = Arrangement.Bottom,
@@ -81,54 +79,78 @@ fun ResetCardView(state: ResetCardScreenState) {
             )
 
             Spacer(modifier = Modifier.size(28.dp))
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .clickable(
-                        onClick = { state.onAcceptWarningToggleClick(!state.accepted) },
-                    )
-                    .padding(top = 16.dp, bottom = 16.dp),
-            ) {
-                IconToggleButton(
-                    checked = state.accepted,
-                    onCheckedChange = state.onAcceptWarningToggleClick,
-                    modifier = Modifier.padding(start = 20.dp, end = 20.dp),
-                ) {
-                    Icon(
-                        painter = painterResource(
-                            if (state.accepted) {
-                                R.drawable.ic_accepted
-                            } else {
-                                R.drawable.ic_unticked
-                            },
-                        ),
-                        contentDescription = null,
-                        tint = if (state.accepted) {
-                            TangemTheme.colors.icon.accent
-                        } else {
-                            TangemTheme.colors.icon.secondary
-                        },
-                    )
-                }
-                Text(
-                    text = stringResource(id = R.string.reset_card_to_factory_warning_message),
-                    style = TangemTheme.typography.body2,
-                    color = TangemTheme.colors.text.secondary,
-                    modifier = Modifier.padding(end = 20.dp),
-                )
-            }
+
+            ConditionCheckBox(
+                checkedState = state.acceptCondition1Checked,
+                onCheckedChange = state.onAcceptCondition1ToggleClick,
+                description = TextReference.Res(R.string.reset_card_to_factory_condition_1),
+            )
+
+            ConditionCheckBox(
+                checkedState = state.acceptCondition2Checked,
+                onCheckedChange = state.onAcceptCondition2ToggleClick,
+                description = TextReference.Res(R.string.reset_card_to_factory_condition_2),
+            )
 
             Spacer(modifier = Modifier.size(16.dp))
             Box(
                 modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 32.dp),
             ) {
-                DetailsMainButton(
-                    title = stringResource(id = R.string.reset_card_to_factory_button_title),
-                    onClick = state.onResetButtonClick,
-                    enabled = state.resetButtonEnabled,
+                AnimatedContent(
+                    targetState = state.resetButtonEnabled,
+                    label = "Update checked state",
+                ) { buttonEnabled ->
+                    DetailsMainButton(
+                        title = stringResource(id = R.string.reset_card_to_factory_button_title),
+                        onClick = state.onResetButtonClick,
+                        enabled = buttonEnabled,
+                    )
+                }
+            }
+        }
+    }
+}
+
+@OptIn(ExperimentalAnimationApi::class)
+@Composable
+private fun ConditionCheckBox(checkedState: Boolean, onCheckedChange: (Boolean) -> Unit, description: TextReference) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable(
+                onClick = { onCheckedChange.invoke(!checkedState) },
+            )
+            .padding(top = TangemTheme.dimens.size16, bottom = TangemTheme.dimens.size16),
+    ) {
+        IconToggleButton(
+            checked = checkedState,
+            onCheckedChange = onCheckedChange,
+            modifier = Modifier.padding(start = TangemTheme.dimens.size20, end = TangemTheme.dimens.size20),
+        ) {
+            AnimatedContent(targetState = checkedState, label = "Update checked state") { checked ->
+                Icon(
+                    painter = painterResource(
+                        if (checked) {
+                            R.drawable.ic_accepted
+                        } else {
+                            R.drawable.ic_unticked
+                        },
+                    ),
+                    contentDescription = null,
+                    tint = if (checked) {
+                        TangemTheme.colors.icon.accent
+                    } else {
+                        TangemTheme.colors.icon.secondary
+                    },
                 )
             }
         }
+        Text(
+            text = description.resolveReference(),
+            style = TangemTheme.typography.body2,
+            color = TangemTheme.colors.text.secondary,
+            modifier = Modifier.padding(end = TangemTheme.dimens.size20),
+        )
     }
 }
 
@@ -143,7 +165,8 @@ private fun ResetCardScreenSample(modifier: Modifier = Modifier) {
             state = ResetCardScreenState(
                 accepted = true,
                 descriptionText = TextReference.Res(R.string.reset_card_with_backup_to_factory_message),
-                onAcceptWarningToggleClick = {},
+                onAcceptCondition1ToggleClick = {},
+                onAcceptCondition2ToggleClick = {},
                 onResetButtonClick = {},
             ),
             onBackClick = {},
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreenState.kt b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreenState.kt
index fee3e41a5b..97f7a9776e 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreenState.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreenState.kt
@@ -2,10 +2,13 @@ package com.tangem.tap.features.details.ui.resetcard
 
 import com.tangem.tap.features.details.ui.cardsettings.TextReference
 
-data class ResetCardScreenState(
+internal data class ResetCardScreenState(
     val accepted: Boolean = false,
     val descriptionText: TextReference,
-    val onAcceptWarningToggleClick: (Boolean) -> Unit,
+    val acceptCondition1Checked: Boolean = false,
+    val acceptCondition2Checked: Boolean = false,
+    val onAcceptCondition1ToggleClick: (Boolean) -> Unit,
+    val onAcceptCondition2ToggleClick: (Boolean) -> Unit,
     val onResetButtonClick: () -> Unit,
 ) {
     val resetButtonEnabled: Boolean
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardViewModel.kt b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardViewModel.kt
index 9ba899bc7d..00d9f515e2 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardViewModel.kt
@@ -7,7 +7,7 @@ import com.tangem.tap.features.details.ui.cardsettings.TextReference
 import com.tangem.tap.features.details.ui.utils.toResetCardDescriptionText
 import org.rekotlin.Store
 
-class ResetCardViewModel(private val store: Store<AppState>) {
+internal class ResetCardViewModel(private val store: Store<AppState>) {
 
     fun updateState(state: CardSettingsState?): ResetCardScreenState {
         val descriptionText = state?.cardInfo
@@ -15,9 +15,12 @@ class ResetCardViewModel(private val store: Store<AppState>) {
             ?: TextReference.Str(value = "")
 
         return ResetCardScreenState(
-            accepted = state?.resetConfirmed ?: false,
+            accepted = state?.resetButtonEnabled ?: false,
             descriptionText = descriptionText,
-            onAcceptWarningToggleClick = { store.dispatch(DetailsAction.ResetToFactory.Confirm(it)) },
+            acceptCondition1Checked = state?.condition1Checked ?: false,
+            acceptCondition2Checked = state?.condition2Checked ?: false,
+            onAcceptCondition1ToggleClick = { store.dispatch(DetailsAction.ResetToFactory.AcceptCondition1(it)) },
+            onAcceptCondition2ToggleClick = { store.dispatch(DetailsAction.ResetToFactory.AcceptCondition2(it)) },
             onResetButtonClick = { store.dispatch(DetailsAction.ResetToFactory.Proceed) },
         )
     }
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeFragment.kt
index c3b2015297..2767f56545 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeFragment.kt
@@ -1,47 +1,36 @@
 package com.tangem.tap.features.details.ui.securitymode
 
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
+import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.ui.platform.ComposeView
-import androidx.fragment.app.Fragment
-import androidx.transition.TransitionInflater
+import androidx.compose.ui.Modifier
 import com.tangem.core.navigation.NavigationAction
-import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.screen.ComposeFragment
+import com.tangem.core.ui.theme.AppThemeModeHolder
 import com.tangem.tap.features.details.redux.DetailsState
 import com.tangem.tap.store
+import dagger.hilt.android.AndroidEntryPoint
 import org.rekotlin.StoreSubscriber
+import javax.inject.Inject
 
-class SecurityModeFragment : Fragment(), StoreSubscriber<DetailsState> {
+@AndroidEntryPoint
+internal class SecurityModeFragment : ComposeFragment(), StoreSubscriber<DetailsState> {
+
+    @Inject
+    override lateinit var appThemeModeHolder: AppThemeModeHolder
 
     private val viewModel = SecurityModeViewModel(store)
 
     private var screenState: MutableState<SecurityModeScreenState> =
         mutableStateOf(viewModel.updateState(store.state.detailsState.cardSettingsState?.manageSecurityState))
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val inflater = TransitionInflater.from(requireContext())
-        enterTransition = inflater.inflateTransition(android.R.transition.fade)
-        exitTransition = inflater.inflateTransition(android.R.transition.fade)
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        return ComposeView(requireContext()).apply {
-            setContent {
-                isTransitionGroup = true
-                TangemTheme {
-                    SecurityModeScreen(
-                        state = screenState.value,
-                        onBackClick = { store.dispatch(NavigationAction.PopBackTo()) },
-                    )
-                }
-            }
-        }
+    @Composable
+    override fun ScreenContent(modifier: Modifier) {
+        SecurityModeScreen(
+            modifier = modifier,
+            state = screenState.value,
+            onBackClick = { store.dispatch(NavigationAction.PopBackTo()) },
+        )
     }
 
     override fun onStart() {
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeScreen.kt b/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeScreen.kt
index ba9c01e84d..fe5164bf2f 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeScreen.kt
@@ -1,10 +1,6 @@
 package com.tangem.tap.features.details.ui.securitymode
 
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
@@ -20,8 +16,13 @@ import com.tangem.tap.features.details.ui.common.SettingsScreensScaffold
 import com.tangem.wallet.R
 
 @Composable
-fun SecurityModeScreen(state: SecurityModeScreenState, onBackClick: () -> Unit) {
+internal fun SecurityModeScreen(
+    state: SecurityModeScreenState,
+    onBackClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
     SettingsScreensScaffold(
+        modifier = modifier,
         content = { SecurityModeOptions(state = state) },
         // titleRes = R.string.card_settings_security_mode,
         onBackClick = onBackClick,
@@ -29,7 +30,7 @@ fun SecurityModeScreen(state: SecurityModeScreenState, onBackClick: () -> Unit)
 }
 
 @Composable
-fun SecurityModeOptions(state: SecurityModeScreenState) {
+private fun SecurityModeOptions(state: SecurityModeScreenState) {
     Column(
         modifier = Modifier
             .fillMaxSize()
@@ -55,7 +56,7 @@ fun SecurityModeOptions(state: SecurityModeScreenState) {
 }
 
 @Composable
-fun SecurityOption(option: SecurityOption, state: SecurityModeScreenState) {
+private fun SecurityOption(option: SecurityOption, state: SecurityModeScreenState) {
     val selected = option == state.selectedSecurityMode
 
     val title = option.toTitleRes()
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeScreenState.kt b/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeScreenState.kt
index 97482c7c01..27c7629382 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeScreenState.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeScreenState.kt
@@ -3,7 +3,7 @@ package com.tangem.tap.features.details.ui.securitymode
 import com.tangem.tap.features.details.redux.SecurityOption
 import com.tangem.wallet.R
 
-data class SecurityModeScreenState(
+internal data class SecurityModeScreenState(
     val availableOptions: List<SecurityOption>,
     val selectedSecurityMode: SecurityOption,
     val isSaveChangesEnabled: Boolean,
@@ -11,7 +11,7 @@ data class SecurityModeScreenState(
     val onSaveChangesClicked: () -> Unit,
 )
 
-fun SecurityOption.toTitleRes(): Int {
+internal fun SecurityOption.toTitleRes(): Int {
     return when (this) {
         SecurityOption.LongTap -> R.string.details_manage_security_long_tap
         SecurityOption.PassCode -> R.string.details_manage_security_passcode
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeViewModel.kt b/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeViewModel.kt
index a0666ff19d..7aa863a7df 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeViewModel.kt
@@ -6,7 +6,7 @@ import com.tangem.tap.features.details.redux.ManageSecurityState
 import com.tangem.tap.features.details.redux.SecurityOption
 import org.rekotlin.Store
 
-class SecurityModeViewModel(val store: Store<AppState>) {
+internal class SecurityModeViewModel(val store: Store<AppState>) {
 
     fun updateState(state: ManageSecurityState?): SecurityModeScreenState {
         if (state == null) {
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectFragment.kt
index 2c7ebdea6e..6100201d98 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectFragment.kt
@@ -1,24 +1,28 @@
 package com.tangem.tap.features.details.ui.walletconnect
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
+import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.ui.platform.ComposeView
-import androidx.fragment.app.Fragment
-import androidx.transition.TransitionInflater
+import androidx.compose.ui.Modifier
 import com.tangem.core.analytics.Analytics
 import com.tangem.core.navigation.NavigationAction
-import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.screen.ComposeFragment
+import com.tangem.core.ui.theme.AppThemeModeHolder
 import com.tangem.tap.common.analytics.events.WalletConnect
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectState
 import com.tangem.tap.store
+import dagger.hilt.android.AndroidEntryPoint
 import org.rekotlin.StoreSubscriber
+import javax.inject.Inject
+
+@AndroidEntryPoint
+internal class WalletConnectFragment : ComposeFragment(), StoreSubscriber<WalletConnectState> {
+
+    @Inject
+    override lateinit var appThemeModeHolder: AppThemeModeHolder
 
-class WalletConnectFragment : Fragment(), StoreSubscriber<WalletConnectState> {
     private val viewModel = WalletConnectViewModel(store)
     private var screenState: MutableState<WalletConnectScreenState> =
         mutableStateOf(viewModel.updateState(store.state.walletConnectState))
@@ -26,32 +30,24 @@ class WalletConnectFragment : Fragment(), StoreSubscriber<WalletConnectState> {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         Analytics.send(WalletConnect.ScreenOpened())
-        val inflater = TransitionInflater.from(requireContext())
-        enterTransition = inflater.inflateTransition(android.R.transition.fade)
-        exitTransition = inflater.inflateTransition(android.R.transition.fade)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        return ComposeView(requireContext()).apply {
-            setContent {
-                isTransitionGroup = true
-                TangemTheme {
-                    WalletConnectScreen(
-                        state = screenState.value,
-                        onBackClick = {
-                            if (screenState.value.isLoading) {
-                                store.dispatch(
-                                    WalletConnectAction.FailureEstablishingSession(
-                                        store.state.walletConnectState.newSessionData?.session?.session,
-                                    ),
-                                )
-                            }
-                            store.dispatch(NavigationAction.PopBackTo())
-                        },
+    @Composable
+    override fun ScreenContent(modifier: Modifier) {
+        WalletConnectScreen(
+            modifier = modifier,
+            state = screenState.value,
+            onBackClick = {
+                if (screenState.value.isLoading) {
+                    store.dispatch(
+                        WalletConnectAction.FailureEstablishingSession(
+                            store.state.walletConnectState.newSessionData?.session?.session,
+                        ),
                     )
                 }
-            }
-        }
+                store.dispatch(NavigationAction.PopBackTo())
+            },
+        )
     }
 
     override fun onStart() {
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectScreen.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectScreen.kt
index c9f4292991..79e8b38b23 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectScreen.kt
@@ -12,7 +12,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -26,10 +25,15 @@ import com.tangem.wallet.R
 import kotlinx.collections.immutable.persistentListOf
 
 @Composable
-fun WalletConnectScreen(state: WalletConnectScreenState, onBackClick: () -> Unit) {
+internal fun WalletConnectScreen(
+    state: WalletConnectScreenState,
+    onBackClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
     val context = LocalContext.current
 
     SettingsScreensScaffold(
+        modifier = modifier,
         content = {
             if (state.sessions.isEmpty()) {
                 EmptyScreen(state)
@@ -56,8 +60,8 @@ fun WalletConnectScreen(state: WalletConnectScreenState, onBackClick: () -> Unit
 private fun AddSessionFab(onAddSession: () -> Unit, modifier: Modifier = Modifier) {
     FloatingActionButton(
         onClick = onAddSession,
-        backgroundColor = colorResource(id = R.color.button_primary),
-        contentColor = colorResource(id = R.color.icon_primary_2),
+        backgroundColor = TangemTheme.colors.button.primary,
+        contentColor = TangemTheme.colors.icon.primary2,
         shape = RoundedCornerShape(16.dp),
         modifier = modifier,
     ) {
@@ -73,7 +77,7 @@ private fun EmptyScreen(state: WalletConnectScreenState) {
     if (state.isLoading) {
         LinearProgressIndicator(
             modifier = Modifier.fillMaxWidth(),
-            color = colorResource(id = R.color.icon_accent),
+            color = TangemTheme.colors.icon.accent,
         )
     }
     Column(
@@ -86,7 +90,7 @@ private fun EmptyScreen(state: WalletConnectScreenState) {
         Image(
             painter = painterResource(id = R.drawable.ic_walletconnect),
             contentDescription = "",
-            colorFilter = ColorFilter.tint(colorResource(id = R.color.icon_inactive)),
+            colorFilter = ColorFilter.tint(TangemTheme.colors.icon.inactive),
             contentScale = ContentScale.FillWidth,
             modifier = Modifier.width(width = 100.dp),
         )
@@ -94,7 +98,7 @@ private fun EmptyScreen(state: WalletConnectScreenState) {
         Text(
             text = stringResource(id = R.string.wallet_connect_subtitle),
             style = TangemTheme.typography.body2,
-            color = colorResource(id = R.color.text_tertiary),
+            color = TangemTheme.colors.text.tertiary,
         )
     }
 }
@@ -106,7 +110,7 @@ private fun WalletConnectSessions(state: WalletConnectScreenState) {
             modifier = Modifier
                 .fillMaxWidth()
                 .height(2.dp),
-            color = colorResource(id = R.color.icon_accent),
+            color = TangemTheme.colors.icon.accent,
         )
     } else {
         Spacer(modifier = Modifier.height(2.dp))
@@ -127,7 +131,7 @@ private fun WalletConnectSessions(state: WalletConnectScreenState) {
                 Text(
                     text = session.description,
                     style = TangemTheme.typography.subtitle1,
-                    color = colorResource(id = R.color.text_primary_1),
+                    color = TangemTheme.colors.text.primary1,
                     modifier = Modifier.weight(1f),
                 )
                 IconButton(
@@ -139,7 +143,7 @@ private fun WalletConnectSessions(state: WalletConnectScreenState) {
                     Icon(
                         painter = painterResource(id = R.drawable.ic_cross_rounded_24),
                         contentDescription = "",
-                        tint = colorResource(id = R.color.icon_warning),
+                        tint = TangemTheme.colors.icon.warning,
                     )
                 }
             }
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectScreenState.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectScreenState.kt
index 24878f3183..d0a711e3f0 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectScreenState.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectScreenState.kt
@@ -3,7 +3,7 @@ package com.tangem.tap.features.details.ui.walletconnect
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectSession
 import kotlinx.collections.immutable.ImmutableList
 
-data class WalletConnectScreenState(
+internal data class WalletConnectScreenState(
     val sessions: ImmutableList<WcSessionForScreen>,
     val isLoading: Boolean = false,
     val onRemoveSession: (String) -> Unit = {},
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectViewModel.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectViewModel.kt
index 4707547c51..9713a5da28 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectViewModel.kt
@@ -8,7 +8,7 @@ import kotlinx.collections.immutable.toImmutableList
 import org.rekotlin.Store
 import timber.log.Timber
 
-class WalletConnectViewModel(private val store: Store<AppState>) {
+internal class WalletConnectViewModel(private val store: Store<AppState>) {
     fun updateState(state: WalletConnectState): WalletConnectScreenState {
         Timber.d("WC2 Sessions: ${state.wc2Sessions}")
         val sessions = state.sessions.map { wcSession -> WcSessionForScreen.fromSession(wcSession) } + state.wc2Sessions
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ApproveWcSessionDialog.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ApproveWcSessionDialog.kt
index aba68641df..d49a684033 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ApproveWcSessionDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ApproveWcSessionDialog.kt
@@ -2,6 +2,7 @@ package com.tangem.tap.features.details.ui.walletconnect.dialogs
 
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction
@@ -18,7 +19,7 @@ object ApproveWcSessionDialog {
             sessionBlockchain.fullName,
             session.peerMeta.url,
         )
-        return AlertDialog.Builder(context).apply {
+        return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog).apply {
             setTitle(context.getString(R.string.wallet_connect_title))
             setMessage(message)
             setPositiveButton(context.getText(R.string.common_start)) { _, _ ->
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/BnbTransactionDialog.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/BnbTransactionDialog.kt
index 27b3abdb23..cddaab442a 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/BnbTransactionDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/BnbTransactionDialog.kt
@@ -2,6 +2,7 @@ package com.tangem.tap.features.details.ui.walletconnect.dialogs
 
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.walletconnect2.domain.WcPreparedRequest
 import com.tangem.tap.features.details.redux.walletconnect.BinanceMessageData
@@ -37,7 +38,7 @@ object BnbTransactionDialog {
         )
         val positiveButtonTitle = context.getText(R.string.common_sign)
 
-        return AlertDialog.Builder(context).apply {
+        return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog).apply {
             setTitle(context.getString(R.string.wallet_connect_title))
             setMessage(fullMessage)
             setPositiveButton(positiveButtonTitle) { _, _ ->
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ChooseNetworkDialog.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ChooseNetworkDialog.kt
index ba70ae5a54..b99df2b02e 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ChooseNetworkDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ChooseNetworkDialog.kt
@@ -2,6 +2,7 @@ package com.tangem.tap.features.details.ui.walletconnect.dialogs
 
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction
@@ -11,7 +12,7 @@ import com.tangem.wallet.R
 
 object ChooseNetworkDialog {
     fun create(session: WalletConnectSession, networks: List<Blockchain>, context: Context): AlertDialog {
-        return AlertDialog.Builder(context)
+        return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog)
             .setTitle(context.getString(R.string.wallet_connect_select_network))
             .setNegativeButton(context.getString(R.string.common_cancel)) { _, _ ->
                 store.dispatch(WalletConnectAction.FailureEstablishingSession(session.session))
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ClipboardOrScanQrDialog.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ClipboardOrScanQrDialog.kt
index ce79d75c14..301435433b 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ClipboardOrScanQrDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ClipboardOrScanQrDialog.kt
@@ -2,6 +2,7 @@ package com.tangem.tap.features.details.ui.walletconnect.dialogs
 
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.tangem.core.navigation.AppScreen
 import com.tangem.core.navigation.NavigationAction
 import com.tangem.tap.common.redux.global.GlobalAction
@@ -11,7 +12,7 @@ import com.tangem.wallet.R
 
 object ClipboardOrScanQrDialog {
     fun create(wcUri: String, context: Context): AlertDialog {
-        return AlertDialog.Builder(context).apply {
+        return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog).apply {
             setTitle(context.getString(R.string.common_select_action))
             setMessage(context.getText(R.string.wallet_connect_clipboard_alert))
             setPositiveButton(context.getText(R.string.wallet_connect_paste_from_clipboard)) { _, _ ->
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/PersonalSignDialog.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/PersonalSignDialog.kt
index 2e354e9f0a..4230afdeaf 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/PersonalSignDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/PersonalSignDialog.kt
@@ -2,6 +2,7 @@ package com.tangem.tap.features.details.ui.walletconnect.dialogs
 
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.walletconnect2.domain.WcPreparedRequest
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction
@@ -12,7 +13,7 @@ object PersonalSignDialog {
     fun create(preparedData: WcPreparedRequest.EthSign, context: Context): AlertDialog {
         val data = preparedData.preparedRequestData.dialogData
         val message = context.getString(R.string.wallet_connect_alert_sign_message, data.message)
-        return AlertDialog.Builder(context).apply {
+        return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog).apply {
             setTitle(context.getString(R.string.wallet_connect_title))
             setMessage(message)
             setPositiveButton(context.getText(R.string.common_sign)) { _, _ ->
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/SessionProposalDialog.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/SessionProposalDialog.kt
index ee1ab06996..1dd8aff5a7 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/SessionProposalDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/SessionProposalDialog.kt
@@ -2,6 +2,7 @@ package com.tangem.tap.features.details.ui.walletconnect.dialogs
 
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.walletconnect2.domain.models.WalletConnectEvents
 import com.tangem.tap.store
@@ -21,7 +22,7 @@ object SessionProposalDialog {
             networks,
             sessionProposal.url,
         )
-        return AlertDialog.Builder(context).apply {
+        return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog).apply {
             setTitle(context.getString(R.string.wallet_connect_title))
             setMessage(message)
             setPositiveButton(context.getText(R.string.common_start)) { _, _ ->
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/TransactionDialog.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/TransactionDialog.kt
index 21ca09c15c..608eebc130 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/TransactionDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/TransactionDialog.kt
@@ -2,6 +2,7 @@ package com.tangem.tap.features.details.ui.walletconnect.dialogs
 
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.walletconnect2.domain.WcPreparedRequest
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction
@@ -26,7 +27,7 @@ object TransactionDialog {
             WcEthTransactionType.EthSignTransaction -> context.getText(R.string.common_sign)
             WcEthTransactionType.EthSendTransaction -> context.getText(R.string.common_sign_and_send)
         }
-        return AlertDialog.Builder(context).apply {
+        return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog).apply {
             setTitle(context.getString(R.string.wallet_connect_title))
             setMessage(message)
             setPositiveButton(positiveButtonTitle) { _, _ ->
diff --git a/app/src/main/java/com/tangem/tap/features/disclaimer/ui/DisclaimerFragment.kt b/app/src/main/java/com/tangem/tap/features/disclaimer/ui/DisclaimerFragment.kt
index 930f33afe6..e2865c1aee 100644
--- a/app/src/main/java/com/tangem/tap/features/disclaimer/ui/DisclaimerFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/disclaimer/ui/DisclaimerFragment.kt
@@ -56,7 +56,7 @@ class DisclaimerFragment : BaseFragment(R.layout.fragment_disclaimer), StoreSubs
 
     override fun onStart() {
         super.onStart()
-        setStatusBarColor(R.color.backgroundLightGray)
+        setStatusBarColor(R.color.background_secondary)
 
         webViewClient.onProgressStateChanged = { store.dispatch(DisclaimerAction.OnProgressStateChanged(it)) }
         store.subscribe(subscriber = this) { state ->
@@ -80,10 +80,11 @@ class DisclaimerFragment : BaseFragment(R.layout.fragment_disclaimer), StoreSubs
                 exitTransition = inflater.inflateTransition(android.R.transition.slide_top)
             }
             AppScreen.Details -> {
-                enterTransition = inflater.inflateTransition(android.R.transition.fade)
-                exitTransition = inflater.inflateTransition(android.R.transition.fade)
+                super.configureTransitions()
+            }
+            else -> {
+                /* no-op */
             }
-            else -> {}
         }
     }
 
@@ -122,6 +123,7 @@ class DisclaimerFragment : BaseFragment(R.layout.fragment_disclaimer), StoreSubs
                 webView.loadLocalTermsOfServices()
             }
             else -> {
+                webView.setBackgroundColor(resources.getColor(R.color.transparent, null))
                 webView.loadUrl(disclaimer.getUri().toString())
             }
         }
diff --git a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
index ceb3ead5f5..22f5ad49d0 100644
--- a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
@@ -8,6 +8,7 @@ import androidx.activity.compose.BackHandler
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.ComposeView
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsControllerCompat
@@ -16,15 +17,16 @@ import androidx.lifecycle.lifecycleScope
 import com.tangem.core.analytics.Analytics
 import com.tangem.core.navigation.AppScreen
 import com.tangem.core.navigation.NavigationAction
+import com.tangem.core.ui.components.SystemBarsEffect
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.domain.tokens.TokensAction
 import com.tangem.tap.common.analytics.events.IntroductionProcess
+import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.features.home.compose.StoriesScreen
 import com.tangem.tap.features.home.redux.HomeAction
 import com.tangem.tap.features.home.redux.HomeState
-import com.tangem.tap.features.tokens.legacy.redux.TokensAction
 import com.tangem.tap.store
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
 import org.rekotlin.StoreSubscriber
 
 @AndroidEntryPoint
@@ -49,8 +51,9 @@ class HomeFragment : Fragment(), StoreSubscriber<HomeState> {
         return ComposeView(inflater.context).apply {
             setContent {
                 TangemTheme {
-                    BackHandler {
-                        requireActivity().finish()
+                    BackHandler(onBack = requireActivity()::finish)
+                    SystemBarsEffect {
+                        setSystemBarsColor(color = Color.Transparent, darkIcons = false)
                     }
                     ScreenContent()
                 }
@@ -62,10 +65,10 @@ class HomeFragment : Fragment(), StoreSubscriber<HomeState> {
         super.onStart()
         activity?.window?.let { WindowCompat.setDecorFitsSystemWindows(it, false) }
 
-        store.subscribe(this) { state ->
-            state.skipRepeats { oldState, newState ->
-                oldState.homeState == newState.homeState
-            }.select { it.homeState }
+        store.subscribe(subscriber = this) { state ->
+            state
+                .skipRepeats { oldState, newState -> oldState.homeState == newState.homeState }
+                .select(AppState::homeState)
         }
     }
 
@@ -93,11 +96,7 @@ class HomeFragment : Fragment(), StoreSubscriber<HomeState> {
             onLearn2earnClick = {}, // learn2earnViewModel.uiState.storyScreenState.onClick,
             onScanButtonClick = {
                 Analytics.send(IntroductionProcess.ButtonScanCard())
-                lifecycleScope.launch {
-                    store.dispatch(
-                        HomeAction.ReadCard(lifecycleCoroutineScope = lifecycleScope),
-                    )
-                }
+                store.dispatch(action = HomeAction.ReadCard(scope = requireActivity().lifecycleScope))
             },
             onShopButtonClick = {
                 Analytics.send(IntroductionProcess.ButtonBuyCards())
diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/StoriesAnimation.kt b/app/src/main/java/com/tangem/tap/features/home/compose/StoriesAnimation.kt
index 76ef1a643e..5265c91db4 100644
--- a/app/src/main/java/com/tangem/tap/features/home/compose/StoriesAnimation.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/compose/StoriesAnimation.kt
@@ -96,6 +96,8 @@ fun StoriesTextAnimation(
 @Composable
 fun StoriesBottomImageAnimation(
     initialScale: Float = 2.5f,
+    secondStageScale: Float = SCALE_SWITCH_BARRIER,
+    targetScale: Float = 1.0f,
     firstStepDuration: Int,
     totalDuration: Int,
     content: @Composable (Modifier) -> Unit,
@@ -117,7 +119,7 @@ fun StoriesBottomImageAnimation(
             )
         },
         label = "Appearing scale",
-    ) { value -> if (value) SCALE_SWITCH_BARRIER else initialScale }
+    ) { value -> if (value) secondStageScale else initialScale }
 
     val secondTransition = updateTransition(
         targetState = isSecondStepLaunched.value,
@@ -131,14 +133,14 @@ fun StoriesBottomImageAnimation(
             )
         },
         label = "Outgoing scale",
-    ) { value -> if (value) 1f else SCALE_SWITCH_BARRIER }
+    ) { value -> if (value) targetScale else secondStageScale }
 
     val fadeIn = firstTransition.animateFloat(
         transitionSpec = { tween(durationMillis = 400) },
         label = "Fade in on start",
     ) { value -> if (value) 1f else 0f }
 
-    if (firstScaleStep.value == SCALE_SWITCH_BARRIER) {
+    if (firstScaleStep.value == secondStageScale) {
         isSecondStepLaunched.value = true
     }
 
diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt b/app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt
index cd4af4ff04..456084062b 100644
--- a/app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt
@@ -12,18 +12,13 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 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.dp
-import com.google.accompanist.systemuicontroller.rememberSystemUiController
-import com.tangem.core.ui.res.TangemColorPalette
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.feature.learn2earn.presentation.ui.Learn2earnStoriesScreen
 import com.tangem.tap.features.home.compose.content.*
@@ -43,7 +38,6 @@ fun StoriesScreen(
     onShopButtonClick: () -> Unit,
     onSearchTokensClick: () -> Unit,
 ) {
-    val systemUiController = rememberSystemUiController()
     val state = homeState.value
 
     var currentStory by remember { mutableStateOf(state.firstStory) }
@@ -62,13 +56,6 @@ fun StoriesScreen(
         }
     }
 
-    LaunchedEffect(key1 = currentStory.isDarkBackground) {
-        systemUiController.setSystemBarsColor(
-            color = Color.Transparent,
-            darkIcons = !currentStory.isDarkBackground,
-        )
-    }
-
     StoriesScreenContent(
         modifier = Modifier.fillMaxSize(),
         config = StoriesScreenContentConfig(
@@ -90,13 +77,12 @@ fun StoriesScreen(
 @Composable
 private fun StoriesScreenContent(config: StoriesScreenContentConfig, modifier: Modifier = Modifier) {
     var isPressed by remember { mutableStateOf(value = false) }
-    var hideContent by remember { mutableStateOf(value = true) }
 
     val isPaused = isPressed || config.isScanInProgress
     val currentStoryDuration = config.currentStory.duration
 
     Box(
-        modifier = modifier.background(Color(0xFF090E13)),
+        modifier = modifier.background(Color(0xFF010101)),
     ) {
         Row(
             modifier = Modifier.fillMaxSize(),
@@ -138,14 +124,6 @@ private fun StoriesScreenContent(config: StoriesScreenContentConfig, modifier: M
                     },
             )
         }
-        if (!config.currentStory.isDarkBackground) {
-            Image(
-                modifier = Modifier.fillMaxSize(),
-                painter = painterResource(id = R.drawable.ic_overlay),
-                contentDescription = null,
-                contentScale = ContentScale.FillBounds,
-            )
-        }
 
         Column(
             modifier = Modifier
@@ -166,30 +144,23 @@ private fun StoriesScreenContent(config: StoriesScreenContentConfig, modifier: M
                 contentDescription = null,
                 contentScale = ContentScale.FillHeight,
                 modifier = Modifier
-                    .padding(start = 16.dp, top = 10.dp)
-                    .height(17.dp)
-                    .alpha(if (hideContent) 0f else 1f)
+                    .padding(
+                        start = TangemTheme.dimens.spacing16,
+                        top = TangemTheme.dimens.spacing16,
+                    )
+                    .height(TangemTheme.dimens.size18)
                     .align(Alignment.Start),
-                colorFilter = if (config.currentStory.isDarkBackground) {
-                    null
-                } else {
-                    ColorFilter.tint(TangemColorPalette.Dark6)
-                },
             )
             when (config.currentStory) {
                 Stories.OneInchPromo -> Learn2earnStoriesScreen(config.onLearn2earnClick)
                 Stories.TangemIntro -> FirstStoriesContent(
                     isPaused = isPaused,
                     duration = currentStoryDuration,
-                    isNewWalletAvailable = config.currentStory.isNewWalletAvailable,
-                ) {
-                    hideContent = it
-                }
-                Stories.RevolutionaryWallet -> StoriesRevolutionaryWallet(currentStoryDuration)
+                )
+                Stories.RevolutionaryWallet -> StoriesRevolutionaryWallet()
                 is Stories.UltraSecureBackup -> StoriesUltraSecureBackup(
                     isPaused = isPaused,
                     stepDuration = currentStoryDuration,
-                    isNewWalletAvailable = config.currentStory.isNewWalletAvailable,
                 )
                 Stories.Currencies -> StoriesCurrencies(isPaused, currentStoryDuration)
                 Stories.Web3 -> StoriesWeb3(isPaused, currentStoryDuration)
@@ -223,7 +194,6 @@ private fun StoriesScreenContent(config: StoriesScreenContentConfig, modifier: M
             ) {
                 HomeButtons(
                     modifier = Modifier.fillMaxWidth(),
-                    isDarkBackground = config.currentStory.isDarkBackground,
                     btnScanStateInProgress = config.isScanInProgress,
                     onScanButtonClick = config.onScanButtonClick,
                     onShopButtonClick = config.onShopButtonClick,
diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/content/Content.kt b/app/src/main/java/com/tangem/tap/features/home/compose/content/Content.kt
index 406064b704..198f6930da 100644
--- a/app/src/main/java/com/tangem/tap/features/home/compose/content/Content.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/compose/content/Content.kt
@@ -5,79 +5,56 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.buildAnnotatedString
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
+import com.tangem.core.ui.components.SpacerH
 import com.tangem.core.ui.components.SpacerH16
 import com.tangem.core.ui.components.SpacerH32
+import com.tangem.core.ui.res.TangemColorPalette
+import com.tangem.core.ui.res.TangemTheme
 import com.tangem.tap.features.home.compose.StoriesBottomImageAnimation
 import com.tangem.tap.features.home.compose.StoriesTextAnimation
 import com.tangem.wallet.R
 
 @Composable
-fun StoriesRevolutionaryWallet(stepDuration: Int) {
+fun StoriesRevolutionaryWallet() {
     SplitContent(
         topContent = {
             TopContent(
                 titleText = stringResource(id = R.string.story_awe_title),
-                subtitleText = stringResource(id = R.string.story_awe_description).annotated(),
-                isDarkBackground = true,
+                subtitleText = stringResource(id = R.string.story_awe_description),
             )
         },
         bottomContent = {
-            StoriesBottomImageAnimation(
-                totalDuration = stepDuration,
-                firstStepDuration = 300,
-            ) { modifier ->
-                StoriesImage(
-                    modifier = modifier,
-                    drawableResId = R.drawable.revolutionary_wallet,
-                    isDarkBackground = true,
-                )
-            }
+            SpacerH32()
+            StoriesImage(
+                modifier = Modifier,
+                drawableResId = R.drawable.img_revolutionary_wallet,
+            )
         },
     )
 }
 
 @Composable
-fun StoriesUltraSecureBackup(isPaused: Boolean, stepDuration: Int, isNewWalletAvailable: MutableState<Boolean>) {
-    val subtitleText = buildAnnotatedString {
-        append(stringResource(id = R.string.story_backup_description_1))
-        append(" ")
-        withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) {
-            append(stringResource(id = R.string.story_backup_description_2_bold))
-        }
-        append(" ")
-        append(stringResource(id = R.string.story_backup_description_3))
-    }
+fun StoriesUltraSecureBackup(isPaused: Boolean, stepDuration: Int) {
     SplitContent(
         topContent = {
             TopContent(
                 titleText = stringResource(id = R.string.story_backup_title),
-                subtitleText = subtitleText,
-                isDarkBackground = false,
+                subtitleText = stringResource(id = R.string.story_backup_description),
             )
         },
         bottomContent = {
+            SpacerH32()
             FloatingCardsContent(
                 isPaused = isPaused,
                 stepDuration = stepDuration,
-                isNewWalletAvailable = isNewWalletAvailable,
             )
         },
     )
@@ -89,11 +66,11 @@ fun StoriesCurrencies(isPaused: Boolean, stepDuration: Int) {
         topContent = {
             TopContent(
                 titleText = stringResource(id = R.string.story_currencies_title),
-                subtitleText = stringResource(id = R.string.story_currencies_description).annotated(),
-                isDarkBackground = false,
+                subtitleText = stringResource(id = R.string.story_currencies_description),
             )
         },
         bottomContent = {
+            SpacerH32()
             StoriesCurrenciesContent(paused = isPaused, duration = stepDuration)
         },
     )
@@ -105,11 +82,11 @@ fun StoriesWeb3(isPaused: Boolean, stepDuration: Int) {
         topContent = {
             TopContent(
                 titleText = stringResource(id = R.string.story_web3_title),
-                subtitleText = stringResource(id = R.string.story_web3_description).annotated(),
-                isDarkBackground = false,
+                subtitleText = stringResource(id = R.string.story_web3_description),
             )
         },
         bottomContent = {
+            SpacerH(TangemTheme.dimens.spacing70)
             StoriesWeb3Content(paused = isPaused, duration = stepDuration)
         },
     )
@@ -121,20 +98,24 @@ fun StoriesWalletForEveryone(stepDuration: Int) {
         topContent = {
             TopContent(
                 titleText = stringResource(id = R.string.story_finish_title),
-                subtitleText = stringResource(id = R.string.story_finish_description).annotated(),
-                isDarkBackground = true,
+                subtitleText = stringResource(id = R.string.story_finish_description),
             )
         },
         bottomContent = {
-            StoriesBottomImageAnimation(
-                totalDuration = stepDuration,
-                firstStepDuration = 500,
-            ) { modifier ->
-                StoriesImage(
-                    modifier = modifier,
-                    drawableResId = R.drawable.wallet_for_everyone,
-                    isDarkBackground = true,
-                )
+            SpacerH32()
+            BoxWithGradient {
+                StoriesBottomImageAnimation(
+                    initialScale = 2.6f,
+                    secondStageScale = 1.2f,
+                    targetScale = 1.1f,
+                    totalDuration = stepDuration,
+                    firstStepDuration = 500,
+                ) { modifier ->
+                    StoriesImage(
+                        modifier = modifier,
+                        drawableResId = R.drawable.img_tangem_for_everyone,
+                    )
+                }
             }
         },
     )
@@ -154,22 +135,20 @@ private fun SplitContent(topContent: @Composable () -> Unit, bottomContent: @Com
 }
 
 @Composable
-private fun TopContent(titleText: String, subtitleText: AnnotatedString, isDarkBackground: Boolean) {
-    SpacerH32()
+private fun TopContent(titleText: String, subtitleText: String) {
+    SpacerH(TangemTheme.dimens.spacing36)
     StoriesTitleText(
         text = titleText,
-        isDarkBackground = isDarkBackground,
     )
     SpacerH16()
     StoriesSubtitleText(
         subtitleText = subtitleText,
     )
-    SpacerH32()
 }
 
 @Suppress("MagicNumber")
 @Composable
-private fun StoriesTitleText(text: String, isDarkBackground: Boolean) {
+private fun StoriesTitleText(text: String) {
     StoriesTextAnimation(
         slideInDuration = 500,
         slideInDelay = 150,
@@ -178,10 +157,8 @@ private fun StoriesTitleText(text: String, isDarkBackground: Boolean) {
             modifier = modifier
                 .padding(start = 40.dp, end = 40.dp),
             text = text,
-            fontSize = 32.sp,
-            lineHeight = 38.sp,
-            fontWeight = FontWeight.SemiBold,
-            color = if (isDarkBackground) Color.White else Color(0xFF090E13),
+            style = TangemTheme.typography.head,
+            color = TangemColorPalette.White,
             textAlign = TextAlign.Center,
         )
     }
@@ -189,9 +166,7 @@ private fun StoriesTitleText(text: String, isDarkBackground: Boolean) {
 
 @Suppress("MagicNumber")
 @Composable
-private fun StoriesSubtitleText(subtitleText: AnnotatedString) {
-    val color = Color(0xFFA6AAAD)
-
+private fun StoriesSubtitleText(subtitleText: String) {
     StoriesTextAnimation(
         slideInDuration = 500,
         slideInDelay = 400,
@@ -199,35 +174,28 @@ private fun StoriesSubtitleText(subtitleText: AnnotatedString) {
         Text(
             modifier = modifier
                 .padding(start = 40.dp, end = 40.dp),
-            fontWeight = FontWeight.Normal,
             text = subtitleText,
-            fontSize = 20.sp,
-            lineHeight = 26.sp,
-            color = color,
+            style = TangemTheme.typography.body1,
+            color = TangemColorPalette.Dark1,
             textAlign = TextAlign.Center,
         )
     }
 }
 
 @Composable
-private fun StoriesImage(@DrawableRes drawableResId: Int, isDarkBackground: Boolean, modifier: Modifier = Modifier) {
+private fun StoriesImage(@DrawableRes drawableResId: Int, modifier: Modifier = Modifier) {
     Image(
         painter = painterResource(id = drawableResId),
         contentDescription = null,
-        contentScale = if (isDarkBackground) ContentScale.Inside else ContentScale.FillWidth,
-        modifier = modifier.fillMaxWidth(),
+        contentScale = ContentScale.Inside,
+        modifier = modifier.fillMaxSize(),
     )
 }
 
-private fun String.annotated(): AnnotatedString {
-    val source = this
-    return buildAnnotatedString { append(source) }
-}
-
 @Preview
 @Composable
 private fun RevolutionaryWalletPreview() {
-    StoriesRevolutionaryWallet(6000)
+    StoriesRevolutionaryWallet()
 }
 
 @Preview
@@ -236,9 +204,6 @@ private fun UltraSecureBackupPreview() {
     StoriesUltraSecureBackup(
         false,
         6000,
-        remember {
-            mutableStateOf(true)
-        },
     )
 }
 
diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/content/CurrenciesWeb3Content.kt b/app/src/main/java/com/tangem/tap/features/home/compose/content/CurrenciesWeb3Content.kt
index 7eb1b156ad..ec1cb88957 100644
--- a/app/src/main/java/com/tangem/tap/features/home/compose/content/CurrenciesWeb3Content.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/compose/content/CurrenciesWeb3Content.kt
@@ -40,7 +40,7 @@ fun StoriesCurrenciesContent(paused: Boolean, duration: Int) {
     val decreaseRate = remember { 1f / currencyDrawableList.size }
     val designItemHeight = remember { 82.dp }
 
-    LightenBox {
+    BoxWithGradient {
         Column(modifier = Modifier.graphicsLayer(clip = false)) {
             currencyDrawableList.forEachIndexed { index, drawableResId ->
                 val painter = painterResource(id = drawableResId)
@@ -72,7 +72,7 @@ fun StoriesCurrenciesContent(paused: Boolean, duration: Int) {
 fun StoriesWeb3Content(paused: Boolean, duration: Int) {
     val dappsItemList = remember {
         listOf(
-            R.drawable.dapps0,
+            R.drawable.dapps1,
             R.drawable.dapps1,
             R.drawable.dapps2,
             R.drawable.dapps3,
@@ -84,7 +84,7 @@ fun StoriesWeb3Content(paused: Boolean, duration: Int) {
     val decreaseRate = remember { 1f / dappsItemList.size }
     val designItemHeight = 75.dp
 
-    LightenBox {
+    BoxWithGradient {
         Column(modifier = Modifier.graphicsLayer(clip = false)) {
             dappsItemList.forEachIndexed { index, drawableResId ->
                 val painter = painterResource(id = drawableResId)
@@ -111,7 +111,7 @@ fun StoriesWeb3Content(paused: Boolean, duration: Int) {
 }
 
 @Composable
-private fun LightenBox(content: @Composable () -> Unit) {
+internal fun BoxWithGradient(content: @Composable () -> Unit) {
     val bottomInsetsPx = WindowInsets.navigationBars.getBottom(LocalDensity.current)
 
     Box(modifier = Modifier.fillMaxSize()) {
@@ -133,9 +133,9 @@ private fun scaleToDesignSize(itemSize: DpSize, designItemHeight: Dp): DpSize {
 
 private val BottomGradient: Brush = Brush.verticalGradient(
     colors = listOf(
-        TangemColorPalette.White.copy(alpha = 0f),
-        TangemColorPalette.White.copy(alpha = 0.75f),
-        TangemColorPalette.White.copy(alpha = 0.95f),
-        TangemColorPalette.White,
+        TangemColorPalette.Black.copy(alpha = 0f),
+        TangemColorPalette.Black.copy(alpha = 0.75f),
+        TangemColorPalette.Black.copy(alpha = 0.95f),
+        TangemColorPalette.Black,
     ),
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/content/FirstStoriesContent.kt b/app/src/main/java/com/tangem/tap/features/home/compose/content/FirstStoriesContent.kt
index 14f51add03..1577eecad8 100644
--- a/app/src/main/java/com/tangem/tap/features/home/compose/content/FirstStoriesContent.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/compose/content/FirstStoriesContent.kt
@@ -1,46 +1,36 @@
 package com.tangem.tap.features.home.compose.content
 
-import androidx.annotation.StringRes
 import androidx.compose.animation.core.Animatable
 import androidx.compose.animation.core.LinearEasing
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.runtime.*
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.tangem.core.ui.components.SpacerH
 import com.tangem.core.ui.res.TangemColorPalette
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.tap.common.compose.FontSizeRange
-import com.tangem.tap.common.compose.TextAutoSize
-import com.tangem.tap.features.home.compose.StoriesBottomImageAnimation
 import com.tangem.tap.features.home.compose.StoriesTextAnimation
 import com.tangem.wallet.R
 
 @Suppress("LongMethod", "ComplexMethod", "MagicNumber")
 @Composable
-fun FirstStoriesContent(
-    isPaused: Boolean,
-    duration: Int,
-    isNewWalletAvailable: MutableState<Boolean>,
-    onHideContent: (Boolean) -> Unit,
-) {
-    val bottomInsetsPx = WindowInsets.navigationBars.getBottom(LocalDensity.current)
-
-    val screenState = remember { mutableStateOf(StartingScreenState.INIT) }
+fun FirstStoriesContent(isPaused: Boolean, duration: Int) {
     val progress = remember { Animatable(0f) }
 
     LaunchedEffect(isPaused) {
@@ -57,142 +47,47 @@ fun FirstStoriesContent(
         }
     }
 
-    when (progress.value) {
-        in 0f..0.2f -> screenState.value = StartingScreenState.INIT
-        in 0.2f..0.3f -> screenState.value = StartingScreenState.BUY
-        in 0.3f..0.4f -> screenState.value = StartingScreenState.STORE
-        in 0.4f..0.5f -> screenState.value = StartingScreenState.SEND
-        in 0.5f..0.6f -> screenState.value = StartingScreenState.PAY
-        in 0.6f..0.7f -> screenState.value = StartingScreenState.EXCHANGE
-        in 0.7f..0.8f -> screenState.value = StartingScreenState.BORROW
-        in 0.8f..1f -> screenState.value = StartingScreenState.LEND
-        in 1f..1.2f -> screenState.value = StartingScreenState.SHOW_CARD
-        in 1.2f..2f -> screenState.value = StartingScreenState.MEET_TANGEM
-    }
-
-    if (screenState.value == StartingScreenState.INIT) onHideContent(true)
-    if (screenState.value == StartingScreenState.BUY) onHideContent(false)
-
     val style = TextStyle(
-        fontSize = 60.sp,
+        fontSize = 46.sp,
         fontWeight = FontWeight.SemiBold,
         color = Color.White,
         textAlign = TextAlign.Center,
     )
-    val textId = screenState.textId()
 
-    Box(modifier = Modifier.fillMaxSize()) {
-        if (screenState.isSplashingTextDisplaying()) {
-            TextAutoSize(
-                modifier = Modifier
-                    .align(Alignment.Center)
-                    .padding(start = 20.dp, end = 20.dp, bottom = 100.dp),
-                text = textId?.let { stringResource(textId) } ?: "",
-                textStyle = style,
-                fontSizeRange = FontSizeRange(20.sp, 60.sp),
+    Column(
+        modifier = Modifier
+            .fillMaxSize(),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        SpacerH(TangemTheme.dimens.spacing94)
+        StoriesTextAnimation(
+            slideInDuration = 500,
+            slideInDelay = 150,
+        ) { modifier ->
+            Text(
+                modifier = modifier,
+                text = stringResource(R.string.story_meet_title),
+                style = style,
+                color = TangemColorPalette.White,
+                textAlign = TextAlign.Center,
             )
-        } else {
-            Column(
-                horizontalAlignment = Alignment.CenterHorizontally,
-            ) {
-                Box(
-                    modifier = Modifier
-                        .weight(0.7f),
-                ) {
-                    if (screenState.isMeetTangemDisplaying()) {
-                        StoriesTextAnimation(
-                            slideInDelay = 0,
-                        ) { modifier ->
-                            TextAutoSize(
-                                modifier = modifier
-                                    .padding(start = 20.dp, end = 20.dp, top = 50.dp)
-                                    .alpha(if (screenState.value == StartingScreenState.SHOW_CARD) 0f else 1f),
-                                text = textId?.let { stringResource(textId) } ?: "",
-                                textStyle = style,
-                                fontSizeRange = FontSizeRange(30.sp, 50.sp),
-                            )
-                        }
-                    }
-                }
-                Box(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .weight(1.2f)
-                        .wrapContentSize(),
-                ) {
-                    val painter = if (isNewWalletAvailable.value) {
-                        painterResource(id = R.drawable.img_meet_tangem2)
-                    } else {
-                        painterResource(id = R.drawable.img_meet_tangem)
-                    }
-                    StoriesBottomImageAnimation(
-                        totalDuration = duration,
-                        firstStepDuration = 400,
-                    ) { modifier ->
-                        Image(
-                            modifier = modifier.fillMaxWidth(),
-                            painter = painter,
-                            contentDescription = "Tangem Wallet card",
-                        )
-                    }
-                }
-            }
         }
-
-        Box(
+        SpacerH(TangemTheme.dimens.spacing46)
+        Image(
             modifier = Modifier
-                .align(Alignment.BottomCenter)
-                .fillMaxWidth()
-                .height(TangemTheme.dimens.size72 + bottomInsetsPx.dp)
-                .background(BottomGradient),
+                .fillMaxWidth(),
+            painter = painterResource(R.drawable.img_meet_tangem),
+            contentScale = ContentScale.Inside,
+            contentDescription = "Tangem Wallet card",
         )
     }
 }
 
-private val BottomGradient: Brush = Brush.verticalGradient(
-    colors = listOf(
-        TangemColorPalette.Black.copy(alpha = 0f),
-        TangemColorPalette.Black.copy(alpha = 0.75f),
-        TangemColorPalette.Black.copy(alpha = 0.95f),
-        TangemColorPalette.Black,
-    ),
-)
-
-private enum class StartingScreenState {
-    INIT, BUY, STORE, SEND, PAY, EXCHANGE, BORROW, LEND, SHOW_CARD, MEET_TANGEM
-}
-
-@StringRes
-private fun MutableState<StartingScreenState>.textId(): Int? = when (this.value) {
-    StartingScreenState.INIT -> null
-    StartingScreenState.BUY -> R.string.story_meet_buy
-    StartingScreenState.STORE -> R.string.story_meet_store
-    StartingScreenState.SEND -> R.string.story_meet_send
-    StartingScreenState.PAY -> R.string.story_meet_pay
-    StartingScreenState.EXCHANGE -> R.string.story_meet_exchange
-    StartingScreenState.BORROW -> R.string.story_meet_borrow
-    StartingScreenState.LEND -> R.string.story_meet_lend
-    StartingScreenState.SHOW_CARD -> R.string.story_meet_title
-    StartingScreenState.MEET_TANGEM -> R.string.story_meet_title
-}
-
-private fun MutableState<StartingScreenState>.isSplashingTextDisplaying(): Boolean {
-    return this.value != StartingScreenState.MEET_TANGEM &&
-        this.value != StartingScreenState.SHOW_CARD
-}
-
-private fun MutableState<StartingScreenState>.isMeetTangemDisplaying(): Boolean {
-    return this.value == StartingScreenState.MEET_TANGEM
-}
-
 @Preview
 @Composable
 private fun FirstStoriesPreview() {
     FirstStoriesContent(
         false,
         8000,
-        remember {
-            mutableStateOf(false)
-        },
-    ) {}
+    )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/content/FloatingCardsContent.kt b/app/src/main/java/com/tangem/tap/features/home/compose/content/FloatingCardsContent.kt
index 3731a0e13c..6a010d28ed 100644
--- a/app/src/main/java/com/tangem/tap/features/home/compose/content/FloatingCardsContent.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/compose/content/FloatingCardsContent.kt
@@ -1,18 +1,11 @@
 package com.tangem.tap.features.home.compose.content
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.dp
-import com.tangem.core.ui.res.TangemColorPalette
 import com.tangem.tap.common.compose.extensions.AnimatedValue
 import com.tangem.tap.common.compose.extensions.asImageBitmap
 import com.tangem.tap.common.compose.extensions.toAnimatable
@@ -22,13 +15,8 @@ import com.tangem.wallet.R
 [REDACTED_AUTHOR]
  */
 @Composable
-fun FloatingCardsContent(isPaused: Boolean, stepDuration: Int, isNewWalletAvailable: MutableState<Boolean>) {
-    val bottomInsetsPx = WindowInsets.navigationBars.getBottom(LocalDensity.current)
-    val imageBitmap = if (isNewWalletAvailable.value) {
-        asImageBitmap(R.drawable.img_card_placeholder_wallet_2)
-    } else {
-        asImageBitmap(R.drawable.card_placeholder_wallet)
-    }
+fun FloatingCardsContent(isPaused: Boolean, stepDuration: Int) {
+    val imageBitmap = asImageBitmap(R.drawable.img_card_placeholder_wallet_2)
     val cards = listOf(
         FloatingCard.first(),
         FloatingCard.second(),
@@ -44,14 +32,6 @@ fun FloatingCardsContent(isPaused: Boolean, stepDuration: Int, isNewWalletAvaila
                 stepDuration = stepDuration,
             )
         }
-
-        Box(
-            modifier = Modifier
-                .align(Alignment.BottomCenter)
-                .fillMaxWidth()
-                .height(bottomInsetsPx.dp)
-                .background(BottomGradient),
-        )
     }
 }
 
@@ -114,12 +94,4 @@ private object FloatingCard {
         rotationZ = -45f to -30f,
         scale = 0.6f to 0.75f,
     )
-}
-
-private val BottomGradient: Brush = Brush.verticalGradient(
-    colors = listOf(
-        TangemColorPalette.White.copy(alpha = 0f),
-        TangemColorPalette.White.copy(alpha = 0.75f),
-        TangemColorPalette.White.copy(alpha = 0.95f),
-    ),
-)
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/views/HomeButtons.kt b/app/src/main/java/com/tangem/tap/features/home/compose/views/HomeButtons.kt
index e6ae78c415..1bd1a192c6 100644
--- a/app/src/main/java/com/tangem/tap/features/home/compose/views/HomeButtons.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/compose/views/HomeButtons.kt
@@ -24,7 +24,6 @@ import com.tangem.wallet.R
 @Suppress("MagicNumber")
 @Composable
 internal fun HomeButtons(
-    isDarkBackground: Boolean,
     btnScanStateInProgress: Boolean,
     onScanButtonClick: () -> Unit,
     onShopButtonClick: () -> Unit,
@@ -36,31 +35,24 @@ internal fun HomeButtons(
     ) {
         ScanCardButton(
             modifier = Modifier.weight(weight = 1f),
-            isDarkBackground = isDarkBackground,
             showProgress = btnScanStateInProgress,
             onClick = onScanButtonClick,
         )
         SpacerW8()
         OrderCardButton(
             modifier = Modifier.weight(weight = 1f),
-            isDarkBackground = isDarkBackground,
             onClick = onShopButtonClick,
         )
     }
 }
 
 @Composable
-private fun ScanCardButton(
-    isDarkBackground: Boolean,
-    showProgress: Boolean,
-    onClick: () -> Unit,
-    modifier: Modifier = Modifier,
-) {
+private fun ScanCardButton(showProgress: Boolean, onClick: () -> Unit, modifier: Modifier = Modifier) {
     TangemButton(
         modifier = modifier,
         text = stringResource(id = R.string.home_button_scan),
         icon = TangemButtonIconPosition.End(iconResId = R.drawable.ic_tangem_24),
-        colors = if (isDarkBackground) DarkBgScanCardButtonColors else LightBgScanCardButtonColors,
+        colors = LightBgScanCardButtonColors,
         showProgress = showProgress,
         enabled = true,
         onClick = onClick,
@@ -68,12 +60,12 @@ private fun ScanCardButton(
 }
 
 @Composable
-private fun OrderCardButton(isDarkBackground: Boolean, onClick: () -> Unit, modifier: Modifier = Modifier) {
+private fun OrderCardButton(onClick: () -> Unit, modifier: Modifier = Modifier) {
     TangemButton(
         modifier = modifier,
         text = stringResource(id = R.string.home_button_order),
         icon = TangemButtonIconPosition.None,
-        colors = if (isDarkBackground) DarkBgOrderCardButtonColors else LightBgOrderCardButtonColors,
+        colors = LightBgOrderCardButtonColors,
         showProgress = false,
         enabled = true,
         onClick = onClick,
@@ -87,13 +79,6 @@ private val LightBgScanCardButtonColors: ButtonColors = TangemButtonColors(
     disabledContentColor = TangemColorPalette.Dark6,
 )
 
-private val DarkBgScanCardButtonColors: ButtonColors = TangemButtonColors(
-    backgroundColor = TangemColorPalette.Dark5,
-    contentColor = TangemColorPalette.White,
-    disabledBackgroundColor = TangemColorPalette.Dark5,
-    disabledContentColor = TangemColorPalette.White,
-)
-
 private val LightBgOrderCardButtonColors: ButtonColors = TangemButtonColors(
     backgroundColor = TangemColorPalette.Dark6,
     contentColor = TangemColorPalette.White,
@@ -101,24 +86,16 @@ private val LightBgOrderCardButtonColors: ButtonColors = TangemButtonColors(
     disabledContentColor = TangemColorPalette.White,
 )
 
-private val DarkBgOrderCardButtonColors: ButtonColors = TangemButtonColors(
-    backgroundColor = TangemColorPalette.Light1,
-    contentColor = TangemColorPalette.Dark6,
-    disabledBackgroundColor = TangemColorPalette.Light1,
-    disabledContentColor = TangemColorPalette.Dark6,
-)
-
 // region Preview
 @Preview(showBackground = true, widthDp = 360)
 @Composable
 private fun HomeButtonsPreview(@PreviewParameter(HomeButtonsParameterProvider::class) state: HomeButtonsState) {
     TangemTheme {
         Box(
-            modifier = Modifier.background(if (state.isDarkBackground) Color.Black else Color.White),
+            modifier = Modifier.background(Color.Black),
         ) {
             HomeButtons(
                 modifier = Modifier.padding(all = TangemTheme.dimens.spacing16),
-                isDarkBackground = state.isDarkBackground,
                 btnScanStateInProgress = state.btnScanStateInProgress,
                 onScanButtonClick = {},
                 onShopButtonClick = {},
@@ -130,26 +107,15 @@ private fun HomeButtonsPreview(@PreviewParameter(HomeButtonsParameterProvider::c
 private class HomeButtonsParameterProvider : CollectionPreviewParameterProvider<HomeButtonsState>(
     collection = listOf(
         HomeButtonsState(
-            isDarkBackground = false,
             btnScanStateInProgress = false,
         ),
         HomeButtonsState(
-            isDarkBackground = true,
-            btnScanStateInProgress = false,
-        ),
-        HomeButtonsState(
-            isDarkBackground = false,
-            btnScanStateInProgress = true,
-        ),
-        HomeButtonsState(
-            isDarkBackground = true,
             btnScanStateInProgress = true,
         ),
     ),
 )
 
 private data class HomeButtonsState(
-    val isDarkBackground: Boolean,
     val btnScanStateInProgress: Boolean,
 )
 // endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/views/SearchCurrenciesButton.kt b/app/src/main/java/com/tangem/tap/features/home/compose/views/SearchCurrenciesButton.kt
index c00e0bed32..722dd4f481 100644
--- a/app/src/main/java/com/tangem/tap/features/home/compose/views/SearchCurrenciesButton.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/compose/views/SearchCurrenciesButton.kt
@@ -24,8 +24,8 @@ internal fun SearchCurrenciesButton(onClick: () -> Unit, modifier: Modifier = Mo
 }
 
 private val SearchCurrenciesButtonColors: ButtonColors = TangemButtonColors(
-    backgroundColor = TangemColorPalette.Light2,
-    contentColor = TangemColorPalette.Dark6,
-    disabledBackgroundColor = TangemColorPalette.Light2,
-    disabledContentColor = TangemColorPalette.Dark6,
+    backgroundColor = TangemColorPalette.Dark5,
+    contentColor = TangemColorPalette.White,
+    disabledBackgroundColor = TangemColorPalette.Dark5,
+    disabledContentColor = TangemColorPalette.White,
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/views/StoriesProgressBar.kt b/app/src/main/java/com/tangem/tap/features/home/compose/views/StoriesProgressBar.kt
index 2774f0f683..a8a1fd7bc1 100644
--- a/app/src/main/java/com/tangem/tap/features/home/compose/views/StoriesProgressBar.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/compose/views/StoriesProgressBar.kt
@@ -1,19 +1,26 @@
 package com.tangem.tap.features.home.compose.views
 
+import android.provider.Settings
 import androidx.compose.animation.core.Animatable
 import androidx.compose.animation.core.LinearEasing
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.components.SpacerW4
+import com.tangem.core.ui.res.TangemTheme
+import kotlinx.coroutines.delay
+
+private const val STORIES_ANIMATION_SPEED_ZERO_DURATION = 3000L
 
 @Composable
 fun StoriesProgressBar(
@@ -25,18 +32,30 @@ fun StoriesProgressBar(
 ) {
     val progress = remember(currentStep) { Animatable(0f) }
 
-    LaunchedEffect(paused, currentStep) {
+    val context = LocalContext.current
+    val animatorSpeed = Settings.Global.getFloat(
+        context.contentResolver,
+        Settings.Global.ANIMATOR_DURATION_SCALE,
+        1f,
+    )
+
+    LaunchedEffect(paused, currentStep, animatorSpeed) {
         if (paused) {
             progress.stop()
         } else {
-            progress.animateTo(
-                targetValue = 1f,
-                animationSpec = tween(
-                    durationMillis = (stepDuration * (1f - progress.value)).toInt(),
-                    easing = LinearEasing,
-                ),
-            )
-            progress.snapTo(0f)
+            if (animatorSpeed == 0f) {
+                progress.snapTo(1f)
+                delay(STORIES_ANIMATION_SPEED_ZERO_DURATION)
+            } else {
+                progress.animateTo(
+                    targetValue = 1f,
+                    animationSpec = tween(
+                        durationMillis = (stepDuration * (1f - progress.value)).toInt(),
+                        easing = LinearEasing,
+                    ),
+                )
+                progress.snapTo(0f)
+            }
             onStepFinish()
         }
     }
@@ -44,18 +63,23 @@ fun StoriesProgressBar(
     Row(
         verticalAlignment = Alignment.CenterVertically,
         modifier = Modifier
-//            .height()
-            .padding(start = 9.dp, end = 9.dp, top = 16.dp),
+            .padding(
+                start = TangemTheme.dimens.spacing16,
+                end = TangemTheme.dimens.spacing16,
+                top = TangemTheme.dimens.spacing16,
+            ),
     ) {
         for (index in 0..steps) {
             Row(
                 modifier = Modifier
-                    .height(2.dp)
+                    .height(TangemTheme.dimens.size2)
                     .weight(1f)
+                    .clip(RoundedCornerShape(TangemTheme.dimens.radius2))
                     .background(Color.White.copy(alpha = 0.4f)),
             ) {
                 Box(
                     modifier = Modifier
+                        .clip(RoundedCornerShape(TangemTheme.dimens.radius2))
                         .background(Color.White)
                         .fillMaxHeight().let {
                             when (index) {
diff --git a/app/src/main/java/com/tangem/tap/features/home/redux/HomeAction.kt b/app/src/main/java/com/tangem/tap/features/home/redux/HomeAction.kt
index 033171c4f4..4b83396c14 100644
--- a/app/src/main/java/com/tangem/tap/features/home/redux/HomeAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/redux/HomeAction.kt
@@ -1,10 +1,10 @@
 package com.tangem.tap.features.home.redux
 
-import androidx.lifecycle.LifecycleCoroutineScope
 import com.tangem.core.analytics.models.AnalyticsEvent
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.Basic
 import com.tangem.tap.common.entities.IndeterminateProgressButton
+import kotlinx.coroutines.CoroutineScope
 import org.rekotlin.Action
 
 sealed class HomeAction : Action {
@@ -17,13 +17,12 @@ sealed class HomeAction : Action {
     /**
      * Action for scanning card
      *
-     * @property analyticsEvent          analytics event
-     * @property lifecycleCoroutineScope lifecycle scope. It will be canceled when lifecycle-aware component is
-     * destroyed.
+     * @property analyticsEvent analytics event
+     * @property scope          lifecycle scope. It will be canceled when lifecycle-aware component is destroyed
      */
     data class ReadCard(
         val analyticsEvent: AnalyticsEvent? = Basic.CardWasScanned(AnalyticsParam.ScannedFrom.Introduction),
-        val lifecycleCoroutineScope: LifecycleCoroutineScope,
+        val scope: CoroutineScope,
     ) : HomeAction()
 
     data class ScanInProgress(val scanInProgress: Boolean) : HomeAction()
diff --git a/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt b/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
index 48f2f37be5..e13c8cff2e 100644
--- a/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
@@ -1,6 +1,5 @@
 package com.tangem.tap.features.home.redux
 
-import androidx.lifecycle.LifecycleCoroutineScope
 import com.tangem.common.doOnFailure
 import com.tangem.common.doOnResult
 import com.tangem.common.doOnSuccess
@@ -63,7 +62,9 @@ private fun handleHomeAction(action: Action) {
             store.dispatch(GlobalAction.FetchUserCountry)
         }
         is HomeAction.ReadCard -> {
-            readCard(action.analyticsEvent, action.lifecycleCoroutineScope)
+            action.scope.launch {
+                readCard(action.analyticsEvent)
+            }
         }
         is HomeAction.GoToShop -> {
             Analytics.send(Shop.ScreenOpened())
@@ -78,34 +79,31 @@ private fun handleHomeAction(action: Action) {
     }
 }
 
-private fun readCard(analyticsEvent: AnalyticsEvent?, lifecycleCoroutineScope: LifecycleCoroutineScope) {
-    lifecycleCoroutineScope.launch {
-        delay(timeMillis = 200)
-        store.state.daggerGraphState.get(DaggerGraphState::cardSdkConfigRepository).setAccessCodeRequestPolicy(
-            isBiometricsRequestPolicy = preferencesStorage.shouldSaveAccessCodes,
-        )
+private suspend fun readCard(analyticsEvent: AnalyticsEvent?) {
+    store.state.daggerGraphState.get(DaggerGraphState::cardSdkConfigRepository).setAccessCodeRequestPolicy(
+        isBiometricsRequestPolicy = preferencesStorage.shouldSaveAccessCodes,
+    )
 
-        store.state.daggerGraphState.get(DaggerGraphState::scanCardProcessor).scan(
-            analyticsEvent = analyticsEvent,
-            onProgressStateChange = { showProgress ->
-                if (showProgress) {
-                    changeButtonState(ButtonState.PROGRESS)
-                } else {
-                    changeButtonState(ButtonState.ENABLED)
-                }
-            },
-            onScanStateChange = { scanInProgress ->
-                store.dispatch(HomeAction.ScanInProgress(scanInProgress))
-            },
-            onFailure = {
-                Timber.e(it, "Unable to scan card")
+    store.state.daggerGraphState.get(DaggerGraphState::scanCardProcessor).scan(
+        analyticsEvent = analyticsEvent,
+        onProgressStateChange = { showProgress ->
+            if (showProgress) {
+                changeButtonState(ButtonState.PROGRESS)
+            } else {
                 changeButtonState(ButtonState.ENABLED)
-            },
-            onSuccess = { scanResponse ->
-                proceedWithScanResponse(scanResponse)
-            },
-        )
-    }
+            }
+        },
+        onScanStateChange = { scanInProgress ->
+            store.dispatch(HomeAction.ScanInProgress(scanInProgress))
+        },
+        onFailure = {
+            Timber.e(it, "Unable to scan card")
+            changeButtonState(ButtonState.ENABLED)
+        },
+        onSuccess = { scanResponse ->
+            proceedWithScanResponse(scanResponse)
+        },
+    )
 }
 
 private fun proceedWithScanResponse(scanResponse: ScanResponse) = scope.launch {
diff --git a/app/src/main/java/com/tangem/tap/features/home/redux/HomeState.kt b/app/src/main/java/com/tangem/tap/features/home/redux/HomeState.kt
index 3456bafb5d..d2674c5f2a 100644
--- a/app/src/main/java/com/tangem/tap/features/home/redux/HomeState.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/redux/HomeState.kt
@@ -49,15 +49,14 @@ data class HomeState(
 }
 
 sealed class Stories(
-    val isDarkBackground: Boolean,
     val duration: Int,
     val isNewWalletAvailable: MutableState<Boolean> = mutableStateOf(HomeState.isNewWalletAvailableInit()),
 ) {
-    object OneInchPromo : Stories(true, duration = 8000)
-    object TangemIntro : Stories(true, duration = 8000)
-    object RevolutionaryWallet : Stories(true, duration = 6000)
-    object UltraSecureBackup : Stories(false, duration = 6000)
-    object Currencies : Stories(false, duration = 6000)
-    object Web3 : Stories(false, duration = 6000)
-    object WalletForEveryone : Stories(true, duration = 6000)
+    object OneInchPromo : Stories(duration = 8000)
+    object TangemIntro : Stories(duration = 6000)
+    object RevolutionaryWallet : Stories(duration = 6000)
+    object UltraSecureBackup : Stories(duration = 6000)
+    object Currencies : Stories(duration = 6000)
+    object Web3 : Stories(duration = 6000)
+    object WalletForEveryone : Stories(duration = 6000)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/intentHandler/IntentHandler.kt b/app/src/main/java/com/tangem/tap/features/intentHandler/IntentHandler.kt
index ba008d4e5a..7458f759ba 100644
--- a/app/src/main/java/com/tangem/tap/features/intentHandler/IntentHandler.kt
+++ b/app/src/main/java/com/tangem/tap/features/intentHandler/IntentHandler.kt
@@ -6,5 +6,6 @@ import android.content.Intent
 [REDACTED_AUTHOR]
  */
 interface IntentHandler {
-    suspend fun handleIntent(intent: Intent?): Boolean
+
+    fun handleIntent(intent: Intent?): Boolean
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/intentHandler/handlers/BackgroundScanIntentHandler.kt b/app/src/main/java/com/tangem/tap/features/intentHandler/handlers/BackgroundScanIntentHandler.kt
index 09a682cdb5..cd46a39fad 100644
--- a/app/src/main/java/com/tangem/tap/features/intentHandler/handlers/BackgroundScanIntentHandler.kt
+++ b/app/src/main/java/com/tangem/tap/features/intentHandler/handlers/BackgroundScanIntentHandler.kt
@@ -4,21 +4,19 @@ import android.content.Intent
 import android.nfc.NfcAdapter
 import android.nfc.Tag
 import android.os.Build
-import androidx.lifecycle.LifecycleCoroutineScope
-import com.tangem.tap.common.extensions.dispatchWithMain
+import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.features.home.redux.HomeAction
 import com.tangem.tap.features.intentHandler.IntentHandler
 import com.tangem.tap.features.welcome.redux.WelcomeAction
 import com.tangem.tap.store
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.CoroutineScope
 
 /**
 [REDACTED_AUTHOR]
  */
 class BackgroundScanIntentHandler(
     private val hasSavedUserWalletsProvider: () -> Boolean,
-    private val lifecycleCoroutineScope: LifecycleCoroutineScope,
+    private val scope: CoroutineScope,
 ) : IntentHandler {
 
     private val nfcActions = arrayOf(
@@ -27,7 +25,7 @@ class BackgroundScanIntentHandler(
         NfcAdapter.ACTION_TAG_DISCOVERED,
     )
 
-    override suspend fun handleIntent(intent: Intent?): Boolean {
+    override fun handleIntent(intent: Intent?): Boolean {
         if (intent == null || intent.action !in nfcActions) return false
 
         val tag: Tag? = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
@@ -40,13 +38,9 @@ class BackgroundScanIntentHandler(
 
         intent.action = null
         if (hasSavedUserWalletsProvider.invoke()) {
-            // TODO: Remove delay after [REDACTED_JIRA]
-            lifecycleCoroutineScope.launch {
-                delay(timeMillis = 200)
-                store.dispatchWithMain(WelcomeAction.ProceedWithCard(lifecycleCoroutineScope))
-            }
+            store.dispatchOnMain(WelcomeAction.ProceedWithCard)
         } else {
-            store.dispatchWithMain(HomeAction.ReadCard(lifecycleCoroutineScope = lifecycleCoroutineScope))
+            store.dispatchOnMain(HomeAction.ReadCard(scope = scope))
         }
 
         return true
diff --git a/app/src/main/java/com/tangem/tap/features/intentHandler/handlers/BuyCurrencyIntentHandler.kt b/app/src/main/java/com/tangem/tap/features/intentHandler/handlers/BuyCurrencyIntentHandler.kt
index 39dda7cd24..e0c509b3ff 100644
--- a/app/src/main/java/com/tangem/tap/features/intentHandler/handlers/BuyCurrencyIntentHandler.kt
+++ b/app/src/main/java/com/tangem/tap/features/intentHandler/handlers/BuyCurrencyIntentHandler.kt
@@ -3,8 +3,8 @@ package com.tangem.tap.features.intentHandler.handlers
 import android.content.Intent
 import android.net.Uri
 import com.tangem.core.analytics.Analytics
+import com.tangem.domain.tokens.models.analytics.TokenScreenAnalyticsEvent
 import com.tangem.tap.common.analytics.events.AnalyticsParam
-import com.tangem.tap.common.analytics.events.Token
 import com.tangem.tap.features.intentHandler.IntentHandler
 import com.tangem.tap.network.exchangeServices.ExchangeUrlBuilder
 import com.tangem.tap.store
@@ -14,14 +14,14 @@ import com.tangem.tap.store
  */
 class BuyCurrencyIntentHandler : IntentHandler {
 
-    override suspend fun handleIntent(intent: Intent?): Boolean {
+    override fun handleIntent(intent: Intent?): Boolean {
         val data = intent?.data ?: return false
         val currency = store.state.walletState.selectedCurrency ?: return false
 
         val successUri = Uri.parse(ExchangeUrlBuilder.SUCCESS_URL)
         return if (data.host == successUri.host && data.authority == successUri.authority) {
             val currencyType = AnalyticsParam.CurrencyType.Currency(currency)
-            Analytics.send(Token.Bought(currencyType))
+            Analytics.send(TokenScreenAnalyticsEvent.Bought(currencyType.value))
             true
         } else {
             false
diff --git a/app/src/main/java/com/tangem/tap/features/intentHandler/handlers/SellCurrencyIntentHandler.kt b/app/src/main/java/com/tangem/tap/features/intentHandler/handlers/SellCurrencyIntentHandler.kt
index 2879f9ef13..da1c6cc68a 100644
--- a/app/src/main/java/com/tangem/tap/features/intentHandler/handlers/SellCurrencyIntentHandler.kt
+++ b/app/src/main/java/com/tangem/tap/features/intentHandler/handlers/SellCurrencyIntentHandler.kt
@@ -2,7 +2,7 @@ package com.tangem.tap.features.intentHandler.handlers
 
 import android.content.Intent
 import com.tangem.domain.tokens.legacy.TradeCryptoAction
-import com.tangem.tap.common.extensions.dispatchWithMain
+import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.features.intentHandler.IntentHandler
 import com.tangem.tap.store
 import timber.log.Timber
@@ -12,7 +12,7 @@ import timber.log.Timber
  */
 class SellCurrencyIntentHandler : IntentHandler {
 
-    override suspend fun handleIntent(intent: Intent?): Boolean {
+    override fun handleIntent(intent: Intent?): Boolean {
         return try {
             val intentData = intent?.data ?: return false
             val transactionID = intentData.getQueryParameter(TRANSACTION_ID_PARAM) ?: return false
@@ -21,7 +21,7 @@ class SellCurrencyIntentHandler : IntentHandler {
             val destinationAddress = intentData.getQueryParameter(DEPOSIT_WALLET_ADDRESS_PARAM) ?: return false
 
             Timber.d("MoonPay Sell: $amount $currency to $destinationAddress")
-            store.dispatchWithMain(
+            store.dispatchOnMain(
                 TradeCryptoAction.SendCrypto(
                     currencyId = currency,
                     amount = amount,
diff --git a/app/src/main/java/com/tangem/tap/features/intentHandler/handlers/WalletConnectLinkIntentHandler.kt b/app/src/main/java/com/tangem/tap/features/intentHandler/handlers/WalletConnectLinkIntentHandler.kt
index 95d2e3abe7..23f8ec2235 100644
--- a/app/src/main/java/com/tangem/tap/features/intentHandler/handlers/WalletConnectLinkIntentHandler.kt
+++ b/app/src/main/java/com/tangem/tap/features/intentHandler/handlers/WalletConnectLinkIntentHandler.kt
@@ -1,7 +1,7 @@
 package com.tangem.tap.features.intentHandler.handlers
 
 import android.content.Intent
-import com.tangem.tap.common.extensions.dispatchWithMain
+import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.removePrefixOrNull
 import com.tangem.tap.domain.walletconnect.WalletConnectManager
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction
@@ -15,7 +15,7 @@ import java.net.URLDecoder
  */
 class WalletConnectLinkIntentHandler : IntentHandler {
 
-    override suspend fun handleIntent(intent: Intent?): Boolean {
+    override fun handleIntent(intent: Intent?): Boolean {
         val intentData = intent?.data ?: return false
         val scheme = intent.scheme ?: return false
 
@@ -34,7 +34,7 @@ class WalletConnectLinkIntentHandler : IntentHandler {
                 Timber.e(e)
                 return false
             }
-            store.dispatchWithMain(WalletConnectAction.HandleDeepLink(decodedWcUri))
+            store.dispatchOnMain(WalletConnectAction.HandleDeepLink(decodedWcUri))
             true
         }
     }
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt
index b27217cca3..5b24d36caa 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt
@@ -17,6 +17,7 @@ import com.tangem.tap.common.extensions.onUserWalletSelected
 import com.tangem.tap.common.extensions.removeContext
 import com.tangem.tap.common.extensions.setContext
 import com.tangem.tap.features.saveWallet.redux.SaveWalletAction
+import com.tangem.tap.proxy.redux.DaggerGraphState
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import timber.log.Timber
@@ -73,40 +74,39 @@ object OnboardingHelper {
         backupCardsIds: List<String>? = null,
     ) {
         Analytics.setContext(scanResponse)
-        when {
-            // When should save user wallets, then save card without navigate to save wallet screen
-            preferencesStorage.shouldSaveUserWallets -> scope.launch {
-                proceedWithScanResponse(scanResponse, backupCardsIds)
+        scope.launch {
+            when {
+                // When should save user wallets, then save card without navigate to save wallet screen
+                store.state.daggerGraphState.get(DaggerGraphState::walletsRepository).shouldSaveUserWalletsSync() -> {
+                    proceedWithScanResponse(scanResponse, backupCardsIds)
 
-                store.dispatchOnMain(
-                    SaveWalletAction.ProvideBackupInfo(
-                        scanResponse = scanResponse,
-                        accessCode = accessCode,
-                        backupCardsIds = backupCardsIds?.toSet(),
-                    ),
-                )
-                store.dispatchOnMain(SaveWalletAction.Save)
-            }
-            // When should not save user wallets but device has biometry and save wallet screen has not been shown,
-            // then open save wallet screen
-            tangemSdkManager.canUseBiometry &&
-                preferencesStorage.shouldShowSaveUserWalletScreen -> scope.launch {
-                proceedWithScanResponse(scanResponse, backupCardsIds)
+                    store.dispatchOnMain(
+                        SaveWalletAction.ProvideBackupInfo(
+                            scanResponse = scanResponse,
+                            accessCode = accessCode,
+                            backupCardsIds = backupCardsIds?.toSet(),
+                        ),
+                    )
+                    store.dispatchOnMain(SaveWalletAction.Save)
+                }
+                // When should not save user wallets but device has biometry and save wallet screen has not been shown,
+                // then open save wallet screen
+                tangemSdkManager.canUseBiometry && preferencesStorage.shouldShowSaveUserWalletScreen -> {
+                    proceedWithScanResponse(scanResponse, backupCardsIds)
 
-                delay(timeMillis = 1_200)
+                    delay(timeMillis = 1_200)
 
-                store.dispatchOnMain(
-                    SaveWalletAction.ProvideBackupInfo(
-                        scanResponse = scanResponse,
-                        accessCode = accessCode,
-                        backupCardsIds = backupCardsIds?.toSet(),
-                    ),
-                )
-                store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.SaveWallet))
-            }
-            // If device has no biometry and save wallet screen has been shown, then go through old scenario
-            else -> scope.launch {
-                proceedWithScanResponse(scanResponse, backupCardsIds)
+                    store.dispatchOnMain(
+                        SaveWalletAction.ProvideBackupInfo(
+                            scanResponse = scanResponse,
+                            accessCode = accessCode,
+                            backupCardsIds = backupCardsIds?.toSet(),
+                        ),
+                    )
+                    store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.SaveWallet))
+                }
+                // If device has no biometry and save wallet screen has been shown, then go through old scenario
+                else -> proceedWithScanResponse(scanResponse, backupCardsIds)
             }
         }
 
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteMiddleware.kt
index 711c5acc69..675eb82581 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteMiddleware.kt
@@ -6,7 +6,6 @@ import com.tangem.core.analytics.Analytics
 import com.tangem.core.navigation.NavigationAction
 import com.tangem.domain.common.extensions.makePrimaryWalletManager
 import com.tangem.domain.common.extensions.withMainContext
-import com.tangem.tap.DELAY_SDK_DIALOG_CLOSE
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.Onboarding
 import com.tangem.tap.common.extensions.*
@@ -26,6 +25,7 @@ import com.tangem.tap.features.wallet.redux.models.WalletDialog
 import com.tangem.tap.scope
 import com.tangem.tap.store
 import com.tangem.tap.tangemSdkManager
+import com.tangem.utils.extensions.DELAY_SDK_DIALOG_CLOSE
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.rekotlin.Action
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/redux/OnboardingOtherCardsMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/redux/OnboardingOtherCardsMiddleware.kt
index 9a76813cab..faf34114d6 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/redux/OnboardingOtherCardsMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/redux/OnboardingOtherCardsMiddleware.kt
@@ -7,13 +7,17 @@ import com.tangem.domain.common.BlockchainNetwork
 import com.tangem.domain.common.extensions.withMainContext
 import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.common.util.derivationStyleProvider
-import com.tangem.tap.*
 import com.tangem.tap.common.analytics.events.Onboarding
 import com.tangem.tap.common.postUi
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.features.onboarding.OnboardingHelper
 import com.tangem.tap.features.wallet.models.toCurrencies
+import com.tangem.tap.scope
+import com.tangem.tap.store
+import com.tangem.tap.tangemSdkManager
+import com.tangem.tap.userTokensRepository
+import com.tangem.utils.extensions.DELAY_SDK_DIALOG_CLOSE
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.rekotlin.Action
@@ -113,6 +117,7 @@ private fun handleOtherCardsAction(action: Action) {
                             }
 
                             scope.launch {
+                                // TODO: Use new repo [REDACTED_JIRA]
                                 userTokensRepository.saveUserTokens(
                                     card = result.data.card,
                                     tokens = blockchainNetworks.toCurrencies(),
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt
index f68fa7e806..441798d55f 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt
@@ -12,7 +12,6 @@ import com.tangem.domain.common.util.twinsIsTwinned
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.userwallets.UserWalletIdBuilder
 import com.tangem.domain.wallets.legacy.isLockedSync
-import com.tangem.tap.*
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.Onboarding
 import com.tangem.tap.common.extensions.*
@@ -29,6 +28,12 @@ import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.features.wallet.redux.ProgressState
 import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.features.wallet.redux.models.WalletDialog
+import com.tangem.tap.preferencesStorage
+import com.tangem.tap.proxy.redux.DaggerGraphState
+import com.tangem.tap.scope
+import com.tangem.tap.store
+import com.tangem.tap.userWalletsListManager
+import com.tangem.utils.extensions.DELAY_SDK_DIALOG_CLOSE
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.rekotlin.Action
@@ -292,10 +297,14 @@ private fun handle(action: Action, dispatch: DispatchFunction) {
                     OnboardingHelper.trySaveWalletAndNavigateToWalletScreen(scanResponse)
                 }
                 CreateTwinWalletMode.RecreateWallet -> {
-                    if (preferencesStorage.shouldSaveUserWallets) {
-                        OnboardingHelper.trySaveWalletAndNavigateToWalletScreen(scanResponse)
-                    } else {
-                        store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Home))
+                    scope.launch {
+                        val walletsRepository = store.state.daggerGraphState.get(DaggerGraphState::walletsRepository)
+
+                        if (walletsRepository.shouldSaveUserWalletsSync()) {
+                            OnboardingHelper.trySaveWalletAndNavigateToWalletScreen(scanResponse)
+                        } else {
+                            store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Home))
+                        }
                     }
                 }
             }
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt
index a4b12b434c..70c389c322 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt
@@ -5,10 +5,8 @@ import android.util.TypedValue
 import android.view.View
 import android.view.animation.OvershootInterpolator
 import androidx.annotation.LayoutRes
-import androidx.appcompat.content.res.AppCompatResources
 import androidx.constraintlayout.widget.ConstraintSet
 import androidx.core.view.isVisible
-import androidx.transition.TransitionInflater
 import androidx.transition.TransitionManager
 import coil.load
 import com.tangem.Message
@@ -59,11 +57,11 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
 
     override fun configureTransitions() {
         when (store.state.twinCardsState.mode) {
-            CreateTwinWalletMode.CreateWallet -> super.configureTransitions()
+            CreateTwinWalletMode.CreateWallet -> {
+                super.configureTransitions()
+            }
             CreateTwinWalletMode.RecreateWallet -> {
-                val inflater = TransitionInflater.from(requireContext())
-                enterTransition = inflater.inflateTransition(R.transition.slide_right)
-                exitTransition = inflater.inflateTransition(R.transition.fade)
+                configureDefaultTransactions()
             }
         }
     }
@@ -105,7 +103,7 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
 
     override fun onStart() {
         super.onStart()
-        setStatusBarColor(R.color.backgroundWhite)
+        setStatusBarColor(R.color.background_primary)
     }
 
     private fun reconfigureLayoutForTwins(containerBinding: LayoutOnboardingContainerTopBinding) =
@@ -195,11 +193,7 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
             )
 
             btnMainAction.setText(R.string.common_continue)
-            btnMainAction.icon = when (state.currentStep) {
-                is TwinCardsStep.WelcomeOnly -> null
-                is TwinCardsStep.Welcome -> AppCompatResources.getDrawable(requireContext(), R.drawable.ic_tangem_24)
-                else -> null
-            }
+            btnMainAction.icon = null
             btnMainAction.setOnClickListener { onMainButtonClick() }
         }
 
@@ -347,7 +341,6 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
             btnMainAction.setOnClickListener {
                 store.dispatch(TwinCardsAction.TopUp)
             }
-
             btnAlternativeAction.isVisible = true
             btnAlternativeAction.setText(R.string.onboarding_top_up_button_show_wallet_address)
             btnAlternativeAction.setOnClickListener {
@@ -355,7 +348,6 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
             }
         } else {
             btnMainAction.setText(R.string.onboarding_button_receive_crypto)
-            btnMainAction.icon = null
             btnMainAction.setOnClickListener {
                 store.dispatch(TwinCardsAction.ShowAddressInfoDialog)
             }
@@ -365,6 +357,7 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
 
         tvHeader.setText(R.string.onboarding_topup_title)
         tvBody.setText(R.string.onboarding_top_up_body)
+        btnMainAction.icon = null
 
         btnRefreshBalanceWidget.changeState(state.walletBalance.state)
         if (btnRefreshBalanceWidget.isShowing != true) {
@@ -375,6 +368,9 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
         mainBinding.onboardingTopContainer.imvCardBackground.setBackgroundDrawable(
             requireContext().getDrawableCompat(R.drawable.shape_rectangle_rounded_8),
         )
+        mainBinding.onboardingTopContainer.imvCardBackground.backgroundTintList =
+            requireContext().resources.getColorStateList(R.color.onboarding_card_background, null)
+
         updateConstraints(state.currentStep, R.layout.lp_onboarding_topup_wallet_twins)
     }
 
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/dialog/TwinningProcessNotCompletedDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/dialog/TwinningProcessNotCompletedDialog.kt
index 2a074debb7..60faf916d7 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/dialog/TwinningProcessNotCompletedDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/dialog/TwinningProcessNotCompletedDialog.kt
@@ -12,7 +12,7 @@ import com.tangem.wallet.R
  */
 object TwinningProcessNotCompletedDialog {
     fun create(context: Context): AlertDialog {
-        return MaterialAlertDialogBuilder(context)
+        return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog)
             .setMessage(R.string.onboarding_twin_exit_warning)
             .setPositiveButton(R.string.warning_button_ok) { _, _ -> }
             .setOnDismissListener { store.dispatchDialogHide() }
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletAction.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletAction.kt
index 9446f718c1..ce2c8784a8 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletAction.kt
@@ -1,11 +1,11 @@
 package com.tangem.tap.features.onboarding.products.wallet.redux
 
 import android.net.Uri
-import androidx.lifecycle.LifecycleCoroutineScope
 import com.tangem.common.CompletionResult
 import com.tangem.feature.onboarding.data.model.CreateWalletResponse
 import com.tangem.feature.onboarding.presentation.wallet2.analytics.SeedPhraseSource
 import com.tangem.tap.domain.tasks.product.CreateProductWalletTaskResponse
+import kotlinx.coroutines.CoroutineScope
 import org.rekotlin.Action
 
 sealed class OnboardingWalletAction : Action {
@@ -18,7 +18,7 @@ sealed class OnboardingWalletAction : Action {
     ) : OnboardingWalletAction()
 
     object Done : OnboardingWalletAction()
-    data class FinishOnboarding(val lifecycleCoroutineScope: LifecycleCoroutineScope) : OnboardingWalletAction()
+    data class FinishOnboarding(val scope: CoroutineScope) : OnboardingWalletAction()
 
     object ResumeBackup : OnboardingWalletAction()
 
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
index ad3f9d9ff2..f76de961e7 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
@@ -136,6 +136,7 @@ private fun handleWalletAction(action: Action) {
                     }
 
                     scope.launch {
+                        // TODO: Use new repo [REDACTED_JIRA]
                         userTokensRepository.saveUserTokens(
                             card = result.data.card,
                             tokens = blockchainNetworks.toCurrencies(),
@@ -152,7 +153,7 @@ private fun handleWalletAction(action: Action) {
 
             if (scanResponse == null) {
                 store.dispatch(NavigationAction.PopBackTo())
-                store.dispatch(HomeAction.ReadCard(lifecycleCoroutineScope = action.lifecycleCoroutineScope))
+                store.dispatch(HomeAction.ReadCard(scope = action.scope))
             } else {
                 val backupState = store.state.onboardingWalletState.backupState
                 val updatedScanResponse = updateScanResponseAfterBackup(scanResponse, backupState)
@@ -237,7 +238,12 @@ private fun handleWallet2Action(action: OnboardingWallet2Action) {
                             SeedPhraseSource.IMPORTED -> AnalyticsParam.WalletCreationType.SeedImport
                             SeedPhraseSource.GENERATED -> AnalyticsParam.WalletCreationType.NewSeed
                         }
-                        Analytics.send(Onboarding.CreateWallet.WalletCreatedSuccessfully(creationType))
+                        Analytics.send(
+                            event = Onboarding.CreateWallet.WalletCreatedSuccessfully(
+                                creationType = creationType,
+                                seedPhraseLength = action.mnemonicComponents.size,
+                            ),
+                        )
                         val response = CreateWalletResponse(
                             card = result.data.card,
                             derivedKeys = result.data.derivedKeys,
@@ -460,6 +466,23 @@ private fun handleBackupAction(appState: () -> AppState?, action: BackupAction)
                 Analytics.send(Onboarding.Backup.Finished(backupState.backupCardsNumber))
             }
 
+            userWalletsListManager.selectedUserWalletSync?.walletId?.let {
+                scope.launch {
+                    userWalletsListManager.update(
+                        userWalletId = it,
+                        update = { wallet ->
+                            wallet.copy(
+                                scanResponse = updateScanResponseAfterBackup(
+                                    scanResponse = wallet.scanResponse,
+                                    backupState = backupState,
+                                ),
+                            )
+                        },
+                    )
+                    store.dispatchOnMain(GlobalAction.UpdateUserWalletsListManager(userWalletsListManager))
+                }
+            }
+
             val notActivatedCardIds = gatherCardIds(backupState, card)
                 .mapNotNull { if (cardActivationIsFinished(it)) null else it }
 
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
index 75d9b4dc87..bed2a5abf6 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
@@ -12,7 +12,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.MenuProvider
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
-import androidx.transition.TransitionInflater
 import androidx.transition.TransitionManager
 import by.kirich1409.viewbindingdelegate.viewBinding
 import coil.load
@@ -22,8 +21,10 @@ import com.tangem.common.CardIdFormatter
 import com.tangem.common.CompletionResult
 import com.tangem.common.core.CardIdDisplayFormat
 import com.tangem.core.analytics.Analytics
+import com.tangem.core.ui.extensions.setStatusBarColor
 import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.feature.onboarding.data.model.CreateWalletResponse
+import com.tangem.feature.onboarding.navigation.OnboardingRouter
 import com.tangem.feature.onboarding.presentation.wallet2.analytics.SeedPhraseSource
 import com.tangem.feature.onboarding.presentation.wallet2.viewmodel.SeedPhraseMediator
 import com.tangem.feature.onboarding.presentation.wallet2.viewmodel.SeedPhraseRouter
@@ -62,6 +63,8 @@ class OnboardingWalletFragment :
 
     internal val bindingSeedPhrase: LayoutOnboardingSeedPhraseBinding by lazy { binding.onboardingSeedPhraseContainer }
 
+    private val canSkipBackup by lazy { arguments?.getBoolean(OnboardingRouter.CAN_SKIP_BACKUP) ?: true }
+
     private val seedPhraseStateHandler: OnboardingSeedPhraseStateHandler = OnboardingSeedPhraseStateHandler()
     private val seedPhraseViewModel by viewModels<SeedPhraseViewModel>()
 
@@ -71,12 +74,6 @@ class OnboardingWalletFragment :
 
     private lateinit var animator: BackupAnimator
 
-    override fun configureTransitions() {
-        val inflater = TransitionInflater.from(requireContext())
-        enterTransition = inflater.inflateTransition(R.transition.fade)
-        exitTransition = inflater.inflateTransition(R.transition.fade)
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -158,6 +155,7 @@ class OnboardingWalletFragment :
                 oldState.onboardingWalletState == newState.onboardingWalletState
             }.select { it.onboardingWalletState }
         }
+        setStatusBarColor(R.color.background_primary)
     }
 
     override fun onStop() {
@@ -201,7 +199,7 @@ class OnboardingWalletFragment :
         }
     }
 
-    internal fun loadImageIntoImageView(uri: Uri?, view: ImageView) {
+    private fun loadImageIntoImageView(uri: Uri?, view: ImageView) {
         view.load(uri) {
             placeholder(R.drawable.card_placeholder_black)
             error(R.drawable.card_placeholder_black)
@@ -268,7 +266,7 @@ class OnboardingWalletFragment :
 
             btnWalletAlternativeAction.text = getText(R.string.onboarding_button_skip_backup)
             btnWalletAlternativeAction.setOnClickListener { store.dispatch(BackupAction.SkipBackup) }
-            btnWalletAlternativeAction.show(state.canSkipBackup)
+            btnWalletAlternativeAction.show(state.canSkipBackup && canSkipBackup)
         }
         animator.showBackupIntro(state)
     }
@@ -422,7 +420,7 @@ class OnboardingWalletFragment :
         animator.showWriteBackupCard(state, cardNumber)
     }
 
-    internal fun showSuccess() = with(binding) {
+    private fun showSuccess() = with(binding) {
         toolbar.title = getString(R.string.onboarding_done_header)
         tvHeader.text = getText(R.string.onboarding_done_header)
 
@@ -437,9 +435,7 @@ class OnboardingWalletFragment :
         layoutButtonsCommon.btnWalletAlternativeAction.hide()
         layoutButtonsCommon.btnWalletMainAction.setOnClickListener {
             showConfetti(false)
-            lifecycleScope.launch {
-                store.dispatch(OnboardingWalletAction.FinishOnboarding(lifecycleCoroutineScope = lifecycleScope))
-            }
+            store.dispatch(OnboardingWalletAction.FinishOnboarding(scope = requireActivity().lifecycleScope))
         }
 
         animator.showSuccess {
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/AddMoreBackupCardsDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/AddMoreBackupCardsDialog.kt
index f8b2c0bf66..07a64cc81e 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/AddMoreBackupCardsDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/AddMoreBackupCardsDialog.kt
@@ -2,6 +2,7 @@ package com.tangem.tap.features.onboarding.products.wallet.ui.dialogs
 
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.features.onboarding.products.wallet.redux.BackupAction
 import com.tangem.tap.store
@@ -9,7 +10,7 @@ import com.tangem.wallet.R
 
 object AddMoreBackupCardsDialog {
     fun create(context: Context): AlertDialog {
-        return AlertDialog.Builder(context).apply {
+        return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog).apply {
             setTitle(R.string.common_warning)
             setMessage(R.string.onboarding_alert_message_not_max_backup_cards_added)
             setPositiveButton(R.string.common_continue) { _, _ ->
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/BackupInProgressDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/BackupInProgressDialog.kt
index ed4e32a0a4..5094c1f4e9 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/BackupInProgressDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/BackupInProgressDialog.kt
@@ -2,13 +2,14 @@ package com.tangem.tap.features.onboarding.products.wallet.ui.dialogs
 
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.store
 import com.tangem.wallet.R
 
 object BackupInProgressDialog {
     fun create(context: Context): AlertDialog {
-        return AlertDialog.Builder(context).apply {
+        return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog).apply {
             setTitle(R.string.common_warning)
             setMessage(R.string.onboarding_backup_exit_warning)
             setPositiveButton(R.string.warning_button_ok) { _, _ ->
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ConfirmDiscardingBackupDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ConfirmDiscardingBackupDialog.kt
index 557c955bb1..de833bc7f7 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ConfirmDiscardingBackupDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ConfirmDiscardingBackupDialog.kt
@@ -2,6 +2,7 @@ package com.tangem.tap.features.onboarding.products.wallet.ui.dialogs
 
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.features.onboarding.products.wallet.redux.BackupAction
 import com.tangem.tap.store
@@ -9,7 +10,7 @@ import com.tangem.wallet.R
 
 object ConfirmDiscardingBackupDialog {
     fun create(context: Context): AlertDialog {
-        return AlertDialog.Builder(context).apply {
+        return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog).apply {
             setTitle(R.string.welcome_interrupted_backup_discard_title)
             setMessage(R.string.welcome_interrupted_backup_discard_message)
             setPositiveButton(R.string.welcome_interrupted_backup_discard_resume) { _, _ ->
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/InterruptOnboardingDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/InterruptOnboardingDialog.kt
index 678c2ca2df..f0249cfcd2 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/InterruptOnboardingDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/InterruptOnboardingDialog.kt
@@ -2,7 +2,7 @@ package com.tangem.tap.features.onboarding.products.wallet.ui.dialogs
 
 import android.app.Dialog
 import android.content.Context
-import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.tangem.tap.common.extensions.dispatchDialogHide
 import com.tangem.tap.features.onboarding.OnboardingDialog
 import com.tangem.tap.store
@@ -13,7 +13,7 @@ import com.tangem.wallet.R
  */
 object InterruptOnboardingDialog {
     fun create(context: Context, dialog: OnboardingDialog.InterruptOnboarding): Dialog {
-        return AlertDialog.Builder(context).apply {
+        return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog).apply {
             setTitle(context.getString(R.string.onboarding_exit_alert_title))
             setMessage(context.getString(R.string.onboarding_exit_alert_message))
             setPositiveButton(R.string.common_ok) { _, _ -> dialog.onOk() }
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ResetBackupCardDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ResetBackupCardDialog.kt
index c8e883cdb8..90458e6f63 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ResetBackupCardDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ResetBackupCardDialog.kt
@@ -2,6 +2,7 @@ package com.tangem.tap.features.onboarding.products.wallet.ui.dialogs
 
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.tangem.core.analytics.Analytics
 import com.tangem.tap.common.analytics.events.Onboarding
 import com.tangem.tap.common.redux.global.GlobalAction
@@ -11,13 +12,13 @@ import com.tangem.wallet.R
 
 object ResetBackupCardDialog {
     fun create(context: Context, cardId: String): AlertDialog {
-        return AlertDialog.Builder(context).apply {
+        return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog).apply {
             setTitle(R.string.common_attention)
             setMessage(R.string.onboarding_linking_error_card_with_wallets)
             setPositiveButton(R.string.common_cancel) { _, _ ->
                 Analytics.send(Onboarding.Backup.ResetCancelEvent)
             }
-            setNegativeButton(R.string.common_reset) { _, _ ->
+            setNegativeButton(R.string.card_settings_action_sheet_reset) { _, _ ->
                 Analytics.send(Onboarding.Backup.ResetPerformEvent)
                 store.dispatch(BackupAction.ResetBackupCard(cardId))
             }
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/UnfinishedBackupFoundDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/UnfinishedBackupFoundDialog.kt
index 6576a36fce..c7c4c30450 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/UnfinishedBackupFoundDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/UnfinishedBackupFoundDialog.kt
@@ -2,6 +2,7 @@ package com.tangem.tap.features.onboarding.products.wallet.ui.dialogs
 
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.features.onboarding.products.wallet.redux.BackupAction
 import com.tangem.tap.features.onboarding.products.wallet.redux.BackupDialog
@@ -10,7 +11,7 @@ import com.tangem.wallet.R
 
 object UnfinishedBackupFoundDialog {
     fun create(context: Context): AlertDialog {
-        return AlertDialog.Builder(context).apply {
+        return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog).apply {
             setTitle(R.string.common_warning)
             setMessage(R.string.welcome_interrupted_backup_alert_message)
             setPositiveButton(R.string.welcome_interrupted_backup_alert_resume) { _, _ ->
diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
index 5305d35dfb..1a1bdd7dd9 100644
--- a/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
@@ -107,7 +107,9 @@ internal class SaveWalletMiddleware {
                     store.dispatchWithMain(SaveWalletAction.Save.Error(error))
                 }
                 .doOnSuccess {
-                    preferencesStorage.shouldSaveUserWallets = true
+                    store.state.daggerGraphState.get(DaggerGraphState::walletsRepository)
+                        .saveShouldSaveUserWallets(item = true)
+
                     // Enable saving access codes only if this is the first time user save the wallet
                     if (isFirstSavedWallet) {
                         preferencesStorage.shouldSaveAccessCodes = true
@@ -140,10 +142,7 @@ internal class SaveWalletMiddleware {
             store.dispatchWithMain(SaveWalletAction.Save.Error(TangemSdkError.ExceptionError(error)))
             return
         }
-        val manager = UserWalletsListManager.provideBiometricImplementation(
-            context = context,
-            tangemSdkManager = tangemSdkManager,
-        )
+        val manager = UserWalletsListManager.provideBiometricImplementation(context)
 
         store.dispatchWithMain(GlobalAction.UpdateUserWalletsListManager(manager))
     }
diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletViewModel.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletViewModel.kt
index ae186c4912..4c56a3b9b4 100644
--- a/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletViewModel.kt
@@ -1,18 +1,26 @@
 package com.tangem.tap.features.saveWallet.ui
 
 import androidx.lifecycle.ViewModel
+import com.tangem.core.analytics.api.AnalyticsEventHandler
+import com.tangem.core.analytics.models.AnalyticsParam
+import com.tangem.feature.wallet.presentation.wallet.analytics.WalletScreenAnalyticsEvent
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.features.details.ui.cardsettings.TextReference
 import com.tangem.tap.features.saveWallet.redux.SaveWalletAction
 import com.tangem.tap.features.saveWallet.redux.SaveWalletState
 import com.tangem.tap.features.saveWallet.ui.models.EnrollBiometricsDialog
 import com.tangem.tap.store
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
 import org.rekotlin.StoreSubscriber
+import javax.inject.Inject
 
-internal class SaveWalletViewModel : ViewModel(), StoreSubscriber<SaveWalletState> {
+@HiltViewModel
+internal class SaveWalletViewModel @Inject constructor(
+    private val analyticsEventHandler: AnalyticsEventHandler,
+) : ViewModel(), StoreSubscriber<SaveWalletState> {
     private val stateInternal = MutableStateFlow(SaveWalletScreenState())
     val state: StateFlow<SaveWalletScreenState> = stateInternal
 
@@ -22,10 +30,14 @@ internal class SaveWalletViewModel : ViewModel(), StoreSubscriber<SaveWalletStat
     }
 
     fun saveWallet() {
+        analyticsEventHandler.send(WalletScreenAnalyticsEvent.MainScreen.EnableBiometrics(AnalyticsParam.OnOffState.On))
         store.dispatch(SaveWalletAction.Save)
     }
 
     fun cancelOrClose() {
+        analyticsEventHandler.send(
+            WalletScreenAnalyticsEvent.MainScreen.EnableBiometrics(AnalyticsParam.OnOffState.Off),
+        )
         store.dispatch(SaveWalletAction.Dismiss)
     }
 
diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/ui/components/SaveWalletScreenContent.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/components/SaveWalletScreenContent.kt
index a20a0edf59..a8bbc46f02 100644
--- a/app/src/main/java/com/tangem/tap/features/saveWallet/ui/components/SaveWalletScreenContent.kt
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/components/SaveWalletScreenContent.kt
@@ -144,7 +144,7 @@ private fun Footer(showProgress: Boolean, onSaveWalletClick: () -> Unit) {
         Text(
             modifier = Modifier.fillMaxWidth(fraction = .7f),
             text = stringResource(R.string.save_user_wallet_agreement_notice),
-            style = TangemTheme.typography.caption,
+            style = TangemTheme.typography.caption2,
             color = TangemTheme.colors.text.tertiary,
             textAlign = TextAlign.Center,
         )
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/SendScreenAction.kt b/app/src/main/java/com/tangem/tap/features/send/redux/SendScreenAction.kt
index 4c9eaf36a5..094136bb80 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/SendScreenAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/SendScreenAction.kt
@@ -102,6 +102,7 @@ sealed class AmountAction : SendScreenAction {
     data class SetAmount(val amountCrypto: BigDecimal, val isUserInput: Boolean) : AmountAction()
     data class SetAmountError(val error: TapError?) : AmountAction()
     data class SetDecimalSeparator(val separator: String) : AmountAction()
+    data class HideBalance(val hide: Boolean) : AmountAction()
 }
 
 // Fee
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressMiddleware.kt b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressMiddleware.kt
index 576497222e..96cf7c9c6f 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressMiddleware.kt
@@ -2,6 +2,7 @@ package com.tangem.tap.features.send.redux.middlewares
 
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.Wallet
+import com.tangem.blockchain.common.WalletManager
 import com.tangem.core.analytics.Analytics
 import com.tangem.tap.common.analytics.events.Token.Send.AddressEntered
 import com.tangem.tap.common.redux.AppState
@@ -9,6 +10,10 @@ import com.tangem.tap.features.send.redux.*
 import com.tangem.tap.features.send.redux.AddressVerifyAction.AddressVerification.SetAddressError
 import com.tangem.tap.features.send.redux.AddressVerifyAction.AddressVerification.SetWalletAddress
 import com.tangem.tap.features.send.redux.AddressVerifyAction.Error
+import com.tangem.tap.mainScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.rekotlin.Action
 import org.rekotlin.DispatchFunction
 
@@ -17,6 +22,8 @@ import org.rekotlin.DispatchFunction
  */
 internal class AddressMiddleware {
 
+    private val addressValidator = AddressValidator()
+
     fun handle(action: AddressActionUi, appState: AppState?, dispatch: (Action) -> Unit) {
         when (action) {
             is AddressActionUi.HandleUserInput -> handleUserInput(action.data, appState, dispatch)
@@ -54,13 +61,13 @@ internal class AddressMiddleware {
         dispatch: (Action) -> Unit,
     ) {
         val sendState = appState?.sendState ?: return
-        val wallet = sendState.walletManager?.wallet ?: return
+        val walletManager = sendState.walletManager ?: return
         val address = sendState.addressState.normalFieldValue ?: return
         val isUserInput = sendState.addressState.viewFieldValue.isFromUserInput
 
         verifyAddress(
             address = address,
-            wallet = wallet,
+            walletManager = walletManager,
             isUserInput = isUserInput,
             dispatch = dispatch,
             sourceType = sourceType,
@@ -68,6 +75,38 @@ internal class AddressMiddleware {
     }
 
     private fun verifyAddress(
+        address: String,
+        walletManager: WalletManager,
+        sourceType: AddressEntered.SourceType?,
+        isUserInput: Boolean,
+        dispatch: (Action) -> Unit,
+    ) {
+        val wallet = walletManager.wallet
+
+        mainScope.launch {
+            val failReason = withContext(Dispatchers.IO) {
+                addressValidator.validateAddress(walletManager, address)
+            }
+
+            if (failReason == null) {
+                dispatchSuccessValidationActions(
+                    address = address,
+                    wallet = wallet,
+                    sourceType = sourceType,
+                    isUserInput = isUserInput,
+                    dispatch = dispatch,
+                )
+            } else {
+                dispatchFailedValidationActions(
+                    failReason = failReason,
+                    sourceType = sourceType,
+                    dispatch = dispatch,
+                )
+            }
+        }
+    }
+
+    private fun dispatchSuccessValidationActions(
         address: String,
         wallet: Wallet,
         sourceType: AddressEntered.SourceType?,
@@ -113,57 +152,49 @@ internal class AddressMiddleware {
 
         val supposedAddress = noSchemeAddress.removeShareUriQuery() // TODO: parse query?
 
-        val failReason = isValidBlockchainAddressAndNotTheSameAsWallet(wallet, supposedAddress)
-        if (failReason == null) {
-            noSchemeAddress.getQueryParameter("amount")?.toBigDecimalOrNull()?.let {
-                dispatch(AmountAction.SetAmount(it, false))
-                dispatch(AmountActionUi.CheckAmountToSend)
-            }
-            dispatch(SetWalletAddress(supposedAddress, isUserInput))
-            dispatch(TransactionExtrasAction.Prepare(wallet.blockchain, address, null))
-            dispatch(FeeAction.RequestFee)
-            sourceType?.let {
-                Analytics.send(
-                    event = AddressEntered(
-                        sourceType = sourceType,
-                        validationResult = AddressEntered.ValidationResult.Success,
-                    ),
-                )
-            }
-        } else {
-            dispatch(SetAddressError(failReason))
-            dispatch(TransactionExtrasAction.Release)
-            sourceType?.let {
-                Analytics.send(
-                    event = AddressEntered(
-                        sourceType = sourceType,
-                        validationResult = AddressEntered.ValidationResult.Fail,
-                    ),
-                )
-            }
+        noSchemeAddress.getQueryParameter("amount")?.toBigDecimalOrNull()?.let {
+            dispatch(AmountAction.SetAmount(it, false))
+            dispatch(AmountActionUi.CheckAmountToSend)
+        }
+        dispatch(SetWalletAddress(supposedAddress, isUserInput))
+        dispatch(TransactionExtrasAction.Prepare(wallet.blockchain, address, null))
+        dispatch(FeeAction.RequestFee)
+        sourceType?.let {
+            Analytics.send(
+                event = AddressEntered(
+                    sourceType = sourceType,
+                    validationResult = AddressEntered.ValidationResult.Success,
+                ),
+            )
         }
     }
 
-    private fun isValidBlockchainAddressAndNotTheSameAsWallet(wallet: Wallet, address: String): Error? {
-        return if (wallet.blockchain.validateAddress(address)) {
-            if (wallet.addresses.all { it.value != address }) {
-                null
-            } else {
-                Error.ADDRESS_SAME_AS_WALLET
-            }
-        } else {
-            Error.ADDRESS_INVALID_OR_UNSUPPORTED_BY_BLOCKCHAIN
+    private fun dispatchFailedValidationActions(
+        failReason: Error,
+        sourceType: AddressEntered.SourceType?,
+        dispatch: (Action) -> Unit,
+    ) {
+        dispatch(SetAddressError(failReason))
+        dispatch(TransactionExtrasAction.Release)
+        sourceType?.let {
+            Analytics.send(
+                event = AddressEntered(
+                    sourceType = sourceType,
+                    validationResult = AddressEntered.ValidationResult.Fail,
+                ),
+            )
         }
     }
 
     private fun String.removeShareUriQuery(): String = this.substringBefore("?")
+
     private fun String.getQueryParameter(name: String): String? {
         return this.substringAfter("?").splitToMap("&", "=")[name]
     }
 
     private fun verifyClipboard(input: String?, appState: AppState?, dispatch: DispatchFunction) {
         val address = input ?: return
-        val wallet = appState?.sendState?.walletManager?.wallet ?: return
+        val walletManager = appState?.sendState?.walletManager ?: return
 
         val internalDispatcher: (Action) -> Unit = {
             when (it) {
@@ -178,7 +209,7 @@ internal class AddressMiddleware {
 
         verifyAddress(
             address = address,
-            wallet = wallet,
+            walletManager = walletManager,
             sourceType = null,
             isUserInput = false,
             dispatch = internalDispatcher,
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressValidator.kt b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressValidator.kt
new file mode 100644
index 0000000000..4c99c1e5c8
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressValidator.kt
@@ -0,0 +1,52 @@
+package com.tangem.tap.features.send.redux.middlewares
+
+import com.tangem.blockchain.blockchains.near.NearWalletManager
+import com.tangem.blockchain.blockchains.near.network.NearAccount
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchain.common.Wallet
+import com.tangem.blockchain.common.WalletManager
+import com.tangem.blockchain.extensions.Result
+import com.tangem.tap.features.send.redux.AddressVerifyAction
+
+internal class AddressValidator {
+
+    suspend fun validateAddress(walletManager: WalletManager, address: String): AddressVerifyAction.Error? {
+        val blockchain = walletManager.wallet.blockchain
+        val wallet = walletManager.wallet
+        return if ((blockchain == Blockchain.Near || blockchain == Blockchain.NearTestnet) &&
+            address.length != NEAR_IMPLICIT_ADDRESS_LENGTH
+        ) {
+            validateNearAddress(walletManager, address)
+        } else {
+            validateAddress(wallet, address)
+        }
+    }
+
+    private suspend fun validateNearAddress(
+        walletManager: WalletManager,
+        address: String,
+    ): AddressVerifyAction.Error? {
+        val result = (walletManager as? NearWalletManager)?.getAccount(address)
+        return if (result is Result.Success && result.data is NearAccount.Full) {
+            null
+        } else {
+            AddressVerifyAction.Error.ADDRESS_INVALID_OR_UNSUPPORTED_BY_BLOCKCHAIN
+        }
+    }
+
+    private fun validateAddress(wallet: Wallet, address: String): AddressVerifyAction.Error? {
+        return if (wallet.blockchain.validateAddress(address)) {
+            if (wallet.addresses.all { it.value != address }) {
+                null
+            } else {
+                AddressVerifyAction.Error.ADDRESS_SAME_AS_WALLET
+            }
+        } else {
+            AddressVerifyAction.Error.ADDRESS_INVALID_OR_UNSUPPORTED_BY_BLOCKCHAIN
+        }
+    }
+
+    companion object {
+        private const val NEAR_IMPLICIT_ADDRESS_LENGTH = 64
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt
index eeb7c0cf20..0dfd830ce1 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt
@@ -12,7 +12,6 @@ import com.tangem.blockchain.common.transaction.Fee
 import com.tangem.blockchain.extensions.SimpleResult
 import com.tangem.common.core.TangemSdkError
 import com.tangem.common.extensions.guard
-import com.tangem.common.services.Result
 import com.tangem.core.analytics.Analytics
 import com.tangem.core.navigation.NavigationAction
 import com.tangem.domain.common.TapWorkarounds.isStart2Coin
@@ -20,13 +19,15 @@ import com.tangem.domain.common.extensions.minimalAmount
 import com.tangem.domain.common.extensions.withMainContext
 import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.tokens.legacy.TradeCryptoAction
-import com.tangem.tap.*
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.Basic
 import com.tangem.tap.common.analytics.events.Basic.TransactionSent.MemoType
 import com.tangem.tap.common.analytics.events.Token
 import com.tangem.tap.common.analytics.events.Token.Send.SelectedCurrency.CurrencyType
-import com.tangem.tap.common.extensions.*
+import com.tangem.tap.common.extensions.dispatchDialogShow
+import com.tangem.tap.common.extensions.dispatchErrorNotification
+import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.common.extensions.stripZeroPlainString
 import com.tangem.tap.common.redux.AppDialog
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
@@ -40,6 +41,11 @@ import com.tangem.tap.features.send.redux.FeeAction.RequestFee
 import com.tangem.tap.features.send.redux.states.*
 import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.proxy.redux.DaggerGraphState
+import com.tangem.tap.scope
+import com.tangem.tap.store
+import com.tangem.tap.userWalletsListManager
+import com.tangem.tap.walletCurrenciesManager
+import com.tangem.utils.extensions.DELAY_SDK_DIALOG_CLOSE
 import com.tangem.wallet.R
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
@@ -174,33 +180,35 @@ private fun sendTransaction(
     transactionExtras.tonMemoState?.memo?.let { txData = txData.copy(extras = TonTransactionExtras(it)) }
 
     scope.launch {
-        val updateWalletResult = walletManager.safeUpdate()
-        if (updateWalletResult is Result.Failure) {
-            withMainContext {
-                when (val error = updateWalletResult.error) {
-                    is TapError -> store.dispatchErrorNotification(error)
-                    is BlockchainSdkError -> {
-                        updateFeedbackManagerInfo(
-                            walletManager = walletManager,
-                            amountToSend = amountToSend,
-                            feeAmount = fee.amount,
-                            destinationAddress = destinationAddress,
-                        )
-                        dispatch(SendAction.Dialog.SendTransactionFails.BlockchainSdkError(error = error))
-                    }
-                    else -> {
-                        val tapError = if (error.message == null) {
-                            TapError.UnknownError
-                        } else {
-                            TapError.CustomError(error.message!!)
-                        }
-                        store.dispatchErrorNotification(tapError)
-                    }
-                }
-                dispatch(SendAction.ChangeSendButtonState(ButtonState.ENABLED))
-            }
-            return@launch
-        }
+        // TODO: Risky commented this part, unknown logic, need to test if removed
+        // TODO: [REDACTED_JIRA]
+        // val updateWalletResult = walletManager.safeUpdate()
+        // if (updateWalletResult is Result.Failure) {
+        //     withMainContext {
+        //         when (val error = updateWalletResult.error) {
+        //             is TapError -> store.dispatchErrorNotification(error)
+        //             is BlockchainSdkError -> {
+        //                 updateFeedbackManagerInfo(
+        //                     walletManager = walletManager,
+        //                     amountToSend = amountToSend,
+        //                     feeAmount = fee.amount,
+        //                     destinationAddress = destinationAddress,
+        //                 )
+        //                 dispatch(SendAction.Dialog.SendTransactionFails.BlockchainSdkError(error = error))
+        //             }
+        //             else -> {
+        //                 val tapError = if (error.message == null) {
+        //                     TapError.UnknownError
+        //                 } else {
+        //                     TapError.CustomError(error.message!!)
+        //                 }
+        //                 store.dispatchErrorNotification(tapError)
+        //             }
+        //         }
+        //         dispatch(SendAction.ChangeSendButtonState(ButtonState.ENABLED))
+        //     }
+        //     return@launch
+        // }
 
         val tangemSdk = store.state.daggerGraphState.get(DaggerGraphState::cardSdkConfigRepository).sdk
         val linkedTerminalState = tangemSdk.config.linkedTerminal
@@ -270,9 +278,7 @@ private fun sendTransaction(
                         dispatch(NavigationAction.PopBackTo())
                     }
                     scope.launch(Dispatchers.IO) {
-                        updateWallet(walletManager)
-                        delay(timeMillis = 11000) // more than 10000 to avoid throttling
-                        updateWallet(walletManager)
+                        updateAfterTransaction(walletManager)
                     }
                 }
                 is SimpleResult.Failure -> {
@@ -414,6 +420,19 @@ private fun updateWarnings(dispatch: (Action) -> Unit) {
     dispatch(SendAction.Warnings.Set(warnings))
 }
 
+private suspend fun updateAfterTransaction(walletManager: WalletManager) {
+    val walletFeatureToggles = store.state.daggerGraphState.get(DaggerGraphState::walletFeatureToggles)
+    if (!walletFeatureToggles.isRedesignedScreenEnabled) {
+        updateWalletsLegacy(walletManager)
+    }
+}
+
+private suspend fun updateWalletsLegacy(walletManager: WalletManager) {
+    updateWallet(walletManager)
+    delay(timeMillis = 11000) // more than 10000 to avoid throttling
+    updateWallet(walletManager)
+}
+
 private suspend fun updateWallet(walletManager: WalletManager) {
     val selectedUserWallet = userWalletsListManager.selectedUserWalletSync.guard {
         Timber.e("Unable to update wallet, no user wallet selected")
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/AmountReducer.kt b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/AmountReducer.kt
index 9221d5ef60..1f3b82b267 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/AmountReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/AmountReducer.kt
@@ -1,5 +1,6 @@
 package com.tangem.tap.features.send.redux.reducers
 
+import com.tangem.common.Strings.STARS
 import com.tangem.common.extensions.isZero
 import com.tangem.tap.common.extensions.stripZeroPlainString
 import com.tangem.tap.features.send.redux.AmountAction
@@ -38,8 +39,8 @@ class AmountReducer : SendInternalReducer {
                         val viewValue = state.restoreDecimalSeparator(fiatToSend.stripZeroPlainString())
                         state.copy(
                             viewAmountValue = InputViewValue(viewValue),
-                            viewBalanceValue = rescaledBalance.stripZeroPlainString(),
-                            mainCurrency = state.createMainCurrency(currency, currencyCanBeSwitched),
+                            viewBalanceValue = if (state.hideBalance) STARS else rescaledBalance.stripZeroPlainString(),
+                            mainCurrency = state.createMainCurrency(currency, true),
                             maxLengthOfAmount = sendState.getDecimals(currency),
                             cursorAtTheSamePosition = false,
                         )
@@ -80,6 +81,18 @@ class AmountReducer : SendInternalReducer {
             }
             is AmountAction.SetAmountError -> state.copy(error = action.error)
             is AmountAction.SetDecimalSeparator -> state.copy(decimalSeparator = action.separator)
+            is AmountAction.HideBalance -> {
+                val rescaledBalance = if (state.mainCurrency.type == MainCurrencyType.CRYPTO) {
+                    state.balanceCrypto
+                } else {
+                    sendState.convertExtractCryptoToFiat(state.balanceCrypto, true)
+                }
+
+                state.copy(
+                    hideBalance = action.hide,
+                    viewBalanceValue = if (action.hide) STARS else rescaledBalance.stripZeroPlainString(),
+                )
+            }
         }
         return updateLastState(sendState.copy(amountState = result), result)
     }
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/SendScreenReducer.kt b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/SendScreenReducer.kt
index 8a9cab2329..f2d05ab0c2 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/SendScreenReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/SendScreenReducer.kt
@@ -53,6 +53,7 @@ private class SendReducer : SendInternalReducer {
             is SendAction.Dialog.Hide -> sendState.copy(dialog = null)
             is SendAction.Warnings.Set -> sendState.copy(sendWarningsList = action.warningList)
             is SendAction.SendSpecificTransaction -> handleSendSpecificTransactionAction(action, sendState)
+            is SendAction.SendSuccess -> sendState.copy(isSuccessSend = true)
             else -> return sendState
         }
 
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/states/SendState.kt b/app/src/main/java/com/tangem/tap/features/send/redux/states/SendState.kt
index 8400f07c87..34553ec931 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/states/SendState.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/states/SendState.kt
@@ -43,6 +43,7 @@ data class SendState(
     val sendButtonState: IndeterminateProgressButton = IndeterminateProgressButton(ButtonState.DISABLED),
     val dialog: StateDialog? = null,
     val externalTransactionData: ExternalTransactionData? = null,
+    val isSuccessSend: Boolean = false,
 ) : SendScreenState {
 
     override val stateId: StateId = StateId.SEND_SCREEN
@@ -130,6 +131,7 @@ data class AmountState(
     val mainCurrency: MainCurrency = MainCurrency(MainCurrencyType.FIAT, FiatCurrency.Default.code),
     val amountToSendCrypto: BigDecimal = BigDecimal.ZERO,
     val balanceCrypto: BigDecimal = BigDecimal.ZERO,
+    val hideBalance: Boolean = false,
     val cursorAtTheSamePosition: Boolean = true,
     val maxLengthOfAmount: Int = 2,
     val decimalSeparator: String = ".",
diff --git a/app/src/main/java/com/tangem/tap/features/send/ui/SendFragment.kt b/app/src/main/java/com/tangem/tap/features/send/ui/SendFragment.kt
index 0e963d3ac5..e115eff66d 100644
--- a/app/src/main/java/com/tangem/tap/features/send/ui/SendFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/ui/SendFragment.kt
@@ -11,6 +11,7 @@ import android.view.inputmethod.EditorInfo
 import android.widget.EditText
 import androidx.core.view.postDelayed
 import androidx.core.widget.addTextChangedListener
+import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import by.kirich1409.viewbindingdelegate.viewBinding
@@ -45,6 +46,7 @@ import com.tangem.tap.mainScope
 import com.tangem.tap.store
 import com.tangem.wallet.R
 import com.tangem.wallet.databinding.FragmentSendBinding
+import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.*
@@ -56,8 +58,11 @@ private const val EDIT_TEXT_INPUT_DEBOUNCE = 400L
 [REDACTED_AUTHOR]
  */
 @OptIn(FlowPreview::class)
+@AndroidEntryPoint
 class SendFragment : BaseStoreFragment(R.layout.fragment_send) {
 
+    private val viewModel by viewModels<SendViewModel>()
+
     lateinit var sendBtn: ViewStateWidget
 
     private lateinit var etAmountToSend: TextInputEditText
@@ -70,6 +75,8 @@ class SendFragment : BaseStoreFragment(R.layout.fragment_send) {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        lifecycle.addObserver(viewModel)
+        sendSubscriber.initViewModel(viewModel)
         Analytics.send(Token.Send.ScreenOpened())
     }
 
@@ -348,6 +355,7 @@ class SendFragment : BaseStoreFragment(R.layout.fragment_send) {
 
     override fun onDestroy() {
         store.dispatch(ReleaseSendState)
+        lifecycle.removeObserver(viewModel)
         super.onDestroy()
     }
 }
diff --git a/app/src/main/java/com/tangem/tap/features/send/ui/SendViewModel.kt b/app/src/main/java/com/tangem/tap/features/send/ui/SendViewModel.kt
new file mode 100644
index 0000000000..806cb70f74
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/send/ui/SendViewModel.kt
@@ -0,0 +1,96 @@
+package com.tangem.tap.features.send.ui
+
+import androidx.lifecycle.*
+import com.tangem.domain.balancehiding.IsBalanceHiddenUseCase
+import com.tangem.domain.balancehiding.ListenToFlipsUseCase
+import com.tangem.domain.tokens.FetchPendingTransactionsUseCase
+import com.tangem.domain.tokens.UpdateDelayedNetworkStatusUseCase
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.Network
+import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
+import com.tangem.features.send.navigation.SendRouter
+import com.tangem.tap.di.DelayedWork
+import com.tangem.tap.features.send.redux.AmountAction
+import com.tangem.tap.proxy.AppStateHolder
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import javax.inject.Inject
+
+@Suppress("LongParameterList")
+@HiltViewModel
+internal class SendViewModel @Inject constructor(
+    private val dispatchers: CoroutineDispatcherProvider,
+    private val appStateHolder: AppStateHolder,
+    private val isBalanceHiddenUseCase: IsBalanceHiddenUseCase,
+    private val listenToFlipsUseCase: ListenToFlipsUseCase,
+    private val updateDelayedCurrencyStatusUseCase: UpdateDelayedNetworkStatusUseCase,
+    private val getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase,
+    private val fetchPendingTransactionsUseCase: FetchPendingTransactionsUseCase,
+    @DelayedWork private val coroutineScope: CoroutineScope,
+    savedStateHandle: SavedStateHandle,
+) : ViewModel(), DefaultLifecycleObserver {
+
+    private val cryptoCurrency: CryptoCurrency? = savedStateHandle[SendRouter.CRYPTO_CURRENCY_KEY]
+
+    override fun onCreate(owner: LifecycleOwner) {
+        isBalanceHiddenUseCase()
+            .flowWithLifecycle(owner.lifecycle)
+            .onEach { isBalanceHidden ->
+                withContext(dispatchers.main) {
+                    appStateHolder.mainStore?.dispatch(AmountAction.HideBalance(isBalanceHidden))
+                }
+            }
+            .launchIn(viewModelScope)
+
+        viewModelScope.launch {
+            listenToFlipsUseCase()
+                .flowWithLifecycle(owner.lifecycle)
+                .collect()
+        }
+    }
+
+    fun updateCurrencyDelayed() {
+        if (cryptoCurrency != null) {
+            coroutineScope.launch {
+                getSelectedWalletSyncUseCase()
+                    .fold(
+                        ifLeft = { Timber.e(it.toString()) },
+                        ifRight = { wallet ->
+                            // we should update network to find pending tx after 1 sec
+                            updateForPendingTx(wallet, cryptoCurrency.network)
+                            // we should update network for new balance
+                            updateForBalance(wallet, cryptoCurrency.network)
+                        },
+                    )
+            }
+        } else {
+            Timber.w("$TAG: cryptoCurrency is null, legacy flow")
+        }
+    }
+
+    private suspend fun updateForPendingTx(userWallet: UserWallet, network: Network) {
+        fetchPendingTransactionsUseCase(userWallet.walletId, setOf(network))
+    }
+
+    private suspend fun updateForBalance(userWallet: UserWallet, network: Network) {
+        updateDelayedCurrencyStatusUseCase(
+            userWalletId = userWallet.walletId,
+            network = network,
+            delayMillis = UPDATE_BALANCE_DELAY_MILLIS,
+            refresh = true,
+        )
+    }
+
+    companion object {
+        private const val UPDATE_BALANCE_DELAY_MILLIS = 11000L
+        private const val TAG = "SendViewModel"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt b/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt
index e05278fceb..d71adc7cc8 100644
--- a/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt
@@ -18,6 +18,7 @@ import com.tangem.tap.features.send.redux.SendAction
 import com.tangem.tap.features.send.redux.states.*
 import com.tangem.tap.features.send.ui.FeeUiHelper
 import com.tangem.tap.features.send.ui.SendFragment
+import com.tangem.tap.features.send.ui.SendViewModel
 import com.tangem.tap.features.send.ui.dialogs.*
 import com.tangem.tap.features.wallet.redux.ProgressState
 import com.tangem.tap.features.wallet.redux.utils.ROUGH_SIGN
@@ -29,13 +30,23 @@ import com.tangem.wallet.R
 [REDACTED_AUTHOR]
  */
 @Suppress("LargeClass")
-class SendStateSubscriber(fragment: BaseStoreFragment) : FragmentStateSubscriber<SendState>(fragment) {
+internal class SendStateSubscriber(
+    fragment: BaseStoreFragment,
+) : FragmentStateSubscriber<SendState>(fragment) {
 
     private var dialog: Dialog? = null
+    private var sendViewModel: SendViewModel? = null
+    fun initViewModel(viewModel: SendViewModel) {
+        sendViewModel = viewModel
+    }
 
     override fun updateWithNewState(fg: BaseStoreFragment, state: SendState) {
         fg.view ?: return
         if (fg !is SendFragment) return
+        if (state.isSuccessSend) {
+            sendViewModel?.updateCurrencyDelayed()
+            return
+        }
 
         val lastChangedStates = state.lastChangedStates.toList()
         state.lastChangedStates.clear()
@@ -260,7 +271,7 @@ class SendStateSubscriber(fragment: BaseStoreFragment) : FragmentStateSubscriber
 
         val imageRes = if (state.inputIsEnabled) R.drawable.ic_arrows_up_down else 0
         tvAmountCurrency.setCompoundDrawablesWithIntrinsicBounds(0, 0, imageRes, 0)
-        val textColor = if (state.inputIsEnabled) R.color.blue else R.color.textGray
+        val textColor = if (state.inputIsEnabled) R.color.accent else R.color.text_secondary
         tvAmountCurrency.setTextColor(fg.getColor(textColor))
     }
 
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/data/DefaultTokensListRepository.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/data/DefaultTokensListRepository.kt
index 7ff7b78228..114990f05b 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/data/DefaultTokensListRepository.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/data/DefaultTokensListRepository.kt
@@ -6,26 +6,26 @@ import androidx.paging.PagingData
 import com.tangem.datasource.api.tangemTech.TangemTechApi
 import com.tangem.datasource.local.testnet.TestnetTokensStorage
 import com.tangem.domain.common.TapWorkarounds.isTestCard
+import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
 import com.tangem.tap.features.tokens.impl.domain.TokensListRepository
 import com.tangem.tap.features.tokens.impl.domain.models.Token
-import com.tangem.tap.proxy.AppStateHolder
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.coroutines.flow.Flow
 
 /**
  * Default repository implementation of tokens list feature
  *
- * @property tangemTechApi        Tangem Tech API
- * @property dispatchers          coroutine dispatchers provider
- * @property reduxStateHolder     redux state holder
- * @property testnetTokensStorage storage for getting testnet tokens data
+ * @property tangemTechApi                Tangem Tech API
+ * @property dispatchers                  coroutine dispatchers provider
+ * @property getSelectedWalletSyncUseCase use case that returns selected wallet
+ * @property testnetTokensStorage         storage for getting testnet tokens data
  *
 [REDACTED_AUTHOR]
  */
 internal class DefaultTokensListRepository(
     private val tangemTechApi: TangemTechApi,
     private val dispatchers: CoroutineDispatcherProvider,
-    private val reduxStateHolder: AppStateHolder,
+    private val getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase,
     private val testnetTokensStorage: TestnetTokensStorage,
 ) : TokensListRepository {
 
@@ -37,16 +37,23 @@ internal class DefaultTokensListRepository(
                 enablePlaceholders = false,
             ),
             pagingSourceFactory = {
-                if (reduxStateHolder.scanResponse?.card?.isTestCard == true) {
-                    TestnetTokensPagingSource(testnetTokensStorage, searchText)
-                } else {
-                    TangemApiTokensPagingSource(
-                        api = tangemTechApi,
-                        dispatchers = dispatchers,
-                        reduxStateHolder = reduxStateHolder,
-                        searchText = searchText,
-                    )
-                }
+                val defaultSource = TangemApiTokensPagingSource(
+                    api = tangemTechApi,
+                    dispatchers = dispatchers,
+                    getSelectedWalletSyncUseCase = getSelectedWalletSyncUseCase,
+                    searchText = searchText,
+                )
+
+                getSelectedWalletSyncUseCase().fold(
+                    ifLeft = { defaultSource },
+                    ifRight = {
+                        if (it.scanResponse.card.isTestCard) {
+                            TestnetTokensPagingSource(testnetTokensStorage, searchText)
+                        } else {
+                            defaultSource
+                        }
+                    },
+                )
             },
         ).flow
     }
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/data/TangemApiTokensPagingSource.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/data/TangemApiTokensPagingSource.kt
index fb04538ee2..5a65f98b6b 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/data/TangemApiTokensPagingSource.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/data/TangemApiTokensPagingSource.kt
@@ -7,24 +7,24 @@ import com.tangem.datasource.api.tangemTech.TangemTechApi
 import com.tangem.domain.common.extensions.supportedBlockchains
 import com.tangem.domain.common.extensions.toNetworkId
 import com.tangem.domain.common.util.cardTypesResolver
+import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
 import com.tangem.tap.features.tokens.impl.data.converters.CoinsResponseConverter
 import com.tangem.tap.features.tokens.impl.domain.models.Token
-import com.tangem.tap.proxy.AppStateHolder
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import com.tangem.utils.coroutines.runCatching
 
 /**
  * Paging source that get tokens by Tangem Tech API
  *
- * @property api              Tangem Tech API
- * @property dispatchers      coroutine dispatchers provider
- * @property reduxStateHolder redux state holder
- * @property searchText       search text
+ * @property api                          Tangem Tech API
+ * @property dispatchers                  coroutine dispatchers provider
+ * @property getSelectedWalletSyncUseCase use case that returns selected wallet
+ * @property searchText                   search text
  */
 internal class TangemApiTokensPagingSource(
     private val api: TangemTechApi,
     private val dispatchers: CoroutineDispatcherProvider,
-    private val reduxStateHolder: AppStateHolder,
+    private val getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase,
     private val searchText: String?,
 ) : PagingSource<Int, Token>() {
 
@@ -39,9 +39,10 @@ internal class TangemApiTokensPagingSource(
         val page = params.key ?: 0
 
         return runCatching(dispatchers.io) {
-            val scanResponse = reduxStateHolder.scanResponse
-            val supportedBlockchains = scanResponse?.card?.supportedBlockchains(scanResponse.cardTypesResolver)
-                ?: Blockchain.values().toList()
+            val supportedBlockchains = getSelectedWalletSyncUseCase().fold(
+                ifLeft = { Blockchain.values().toList() },
+                ifRight = { it.scanResponse.card.supportedBlockchains(it.scanResponse.cardTypesResolver) },
+            )
 
             api.getCoins(
                 networkIds = supportedBlockchains.joinToString(separator = ",", transform = Blockchain::toNetworkId),
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListInteractorModule.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListInteractorModule.kt
index ddc7a2a15b..464420346b 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListInteractorModule.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListInteractorModule.kt
@@ -2,10 +2,10 @@ package com.tangem.tap.features.tokens.impl.di
 
 import com.tangem.datasource.api.tangemTech.TangemTechApi
 import com.tangem.datasource.local.testnet.TestnetTokensStorage
+import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
 import com.tangem.tap.features.tokens.impl.data.DefaultTokensListRepository
 import com.tangem.tap.features.tokens.impl.domain.DefaultTokensListInteractor
 import com.tangem.tap.features.tokens.impl.domain.TokensListInteractor
-import com.tangem.tap.proxy.AppStateHolder
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.Module
 import dagger.Provides
@@ -25,17 +25,16 @@ internal object TokensListInteractorModule {
     fun provideTokensListInteractor(
         tangemTechApi: TangemTechApi,
         dispatchers: CoroutineDispatcherProvider,
-        reduxStateHolder: AppStateHolder,
+        getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase,
         testnetTokensStorage: TestnetTokensStorage,
     ): TokensListInteractor {
         return DefaultTokensListInteractor(
             repository = DefaultTokensListRepository(
                 tangemTechApi = tangemTechApi,
                 dispatchers = dispatchers,
-                reduxStateHolder = reduxStateHolder,
+                getSelectedWalletSyncUseCase = getSelectedWalletSyncUseCase,
                 testnetTokensStorage = testnetTokensStorage,
             ),
-            reduxStateHolder = reduxStateHolder,
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListRepositoryModule.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListRepositoryModule.kt
index dbba8fe0dd..186545138b 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListRepositoryModule.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListRepositoryModule.kt
@@ -2,9 +2,9 @@ package com.tangem.tap.features.tokens.impl.di
 
 import com.tangem.datasource.api.tangemTech.TangemTechApi
 import com.tangem.datasource.local.testnet.TestnetTokensStorage
+import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
 import com.tangem.tap.features.tokens.impl.data.DefaultTokensListRepository
 import com.tangem.tap.features.tokens.impl.domain.TokensListRepository
-import com.tangem.tap.proxy.AppStateHolder
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.Module
 import dagger.Provides
@@ -24,13 +24,13 @@ internal object TokensListRepositoryModule {
     fun providesTokensListRepository(
         tangemTechApi: TangemTechApi,
         dispatchers: CoroutineDispatcherProvider,
-        reduxStateHolder: AppStateHolder,
+        getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase,
         testnetTokensStorage: TestnetTokensStorage,
     ): TokensListRepository {
         return DefaultTokensListRepository(
             tangemTechApi = tangemTechApi,
             dispatchers = dispatchers,
-            reduxStateHolder = reduxStateHolder,
+            getSelectedWalletSyncUseCase = getSelectedWalletSyncUseCase,
             testnetTokensStorage = testnetTokensStorage,
         )
     }
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListRouterModule.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListRouterModule.kt
index 07a7a3412d..2a7da5cca4 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListRouterModule.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListRouterModule.kt
@@ -1,6 +1,5 @@
 package com.tangem.tap.features.tokens.impl.di
 
-import com.tangem.tap.features.customtoken.api.featuretoggles.CustomTokenFeatureToggles
 import com.tangem.tap.features.tokens.impl.presentation.router.DefaultTokensListRouter
 import com.tangem.tap.features.tokens.impl.presentation.router.TokensListRouter
 import dagger.Module
@@ -18,7 +17,5 @@ internal object TokensListRouterModule {
 
     @Provides
     @ViewModelScoped
-    fun provideTokensListRouter(customTokenFeatureToggles: CustomTokenFeatureToggles): TokensListRouter {
-        return DefaultTokensListRouter(customTokenFeatureToggles)
-    }
+    fun provideTokensListRouter(): TokensListRouter = DefaultTokensListRouter()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/domain/DefaultTokensListInteractor.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/domain/DefaultTokensListInteractor.kt
index 64bd577f52..c470316894 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/domain/DefaultTokensListInteractor.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/domain/DefaultTokensListInteractor.kt
@@ -1,262 +1,17 @@
 package com.tangem.tap.features.tokens.impl.domain
 
 import androidx.paging.PagingData
-import com.tangem.blockchain.blockchains.cardano.CardanoUtils
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.blockchain.common.derivation.DerivationStyle
-import com.tangem.common.CompletionResult
-import com.tangem.common.card.EllipticCurve
-import com.tangem.common.extensions.ByteArrayKey
-import com.tangem.common.extensions.guard
-import com.tangem.common.extensions.toMapKey
-import com.tangem.common.flatMap
-import com.tangem.crypto.hdWallet.DerivationPath
-import com.tangem.domain.common.configs.CardConfig
-import com.tangem.domain.common.util.derivationStyleProvider
-import com.tangem.domain.common.util.supportsHdWallet
-import com.tangem.domain.models.scan.ScanResponse
-import com.tangem.operations.derivation.ExtendedPublicKeysMap
-import com.tangem.tap.*
-import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
-import com.tangem.tap.common.extensions.dispatchOnMain
-import com.tangem.tap.common.redux.global.GlobalAction
-import com.tangem.tap.domain.TapError
-import com.tangem.tap.domain.model.WalletDataModel
 import com.tangem.tap.features.tokens.impl.domain.models.Token
-import com.tangem.tap.features.tokens.legacy.redux.TokenWithBlockchain
-import com.tangem.tap.features.tokens.legacy.redux.TokensMiddleware
-import com.tangem.tap.features.wallet.models.Currency
-import com.tangem.tap.proxy.AppStateHolder
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
-import timber.log.Timber
 
 /**
  * Default implementation of tokens list interactor
- * FIXME("Necessary to avoid using redux actions")
  *
- * @property repository       repository of tokens list feature
- * @property reduxStateHolder redux state holder
+ * @property repository repository of tokens list feature
  */
-internal class DefaultTokensListInteractor(
-    private val repository: TokensListRepository,
-    private val reduxStateHolder: AppStateHolder,
-) : TokensListInteractor {
+internal class DefaultTokensListInteractor(private val repository: TokensListRepository) : TokensListInteractor {
 
     override fun getTokensList(searchText: String): Flow<PagingData<Token>> {
         return repository.getAvailableTokens(searchText = searchText.ifBlank(defaultValue = { null }))
     }
-
-    override suspend fun saveChanges(tokens: List<TokenWithBlockchain>, blockchains: List<Blockchain>) {
-        val scanResponse = requireNotNull(reduxStateHolder.scanResponse)
-
-        val derivationStyle = scanResponse.derivationStyleProvider.getDerivationStyle()
-        val currentTokens = store.state.tokensState.addedWallets
-            .toNonCustomTokensWithBlockchains(derivationStyle = derivationStyle)
-
-        val currentBlockchains = store.state.tokensState.addedWallets
-            .toNonCustomBlockchains(derivationStyle = derivationStyle)
-
-        val blockchainsToAdd = blockchains.filterNot(currentBlockchains::contains)
-        val blockchainsToRemove = currentBlockchains.filterNot(blockchains::contains)
-
-        val tokensToAdd = tokens.filterNot(currentTokens::contains)
-        val tokensToRemove = currentTokens.filterNot { token -> tokens.any { it.token == token.token } }
-
-        val isNothingToDoWithTokens = tokensToAdd.isEmpty() && tokensToRemove.isEmpty()
-        val isNothingToDoWithBlockchain = blockchainsToAdd.isEmpty() && blockchainsToRemove.isEmpty()
-        if (isNothingToDoWithTokens && isNothingToDoWithBlockchain) {
-            store.dispatchDebugErrorNotification(message = "Nothing to save")
-            return
-        }
-
-        remove(
-            tokens = tokensToRemove,
-            blockchains = blockchainsToRemove,
-            derivationStyle = scanResponse.derivationStyleProvider.getDerivationStyle(),
-        )
-
-        add(tokens = tokensToAdd, blockchains = blockchainsToAdd, scanResponse = scanResponse)
-    }
-
-    private fun List<WalletDataModel>.toNonCustomTokensWithBlockchains(
-        derivationStyle: DerivationStyle?,
-    ): List<TokenWithBlockchain> {
-        return this.map(WalletDataModel::currency)
-            .mapNotNull { currency ->
-                if (currency !is Currency.Token || currency.isCustomCurrency(derivationStyle)) return@mapNotNull null
-                TokenWithBlockchain(token = currency.token, blockchain = currency.blockchain)
-            }
-            .distinct()
-    }
-
-    private fun List<WalletDataModel>.toNonCustomBlockchains(derivationStyle: DerivationStyle?): List<Blockchain> {
-        return this.map(WalletDataModel::currency)
-            .mapNotNull { currency ->
-                if (currency.isCustomCurrency(derivationStyle)) return@mapNotNull null
-                (currency as? Currency.Blockchain)?.blockchain
-            }
-            .distinct()
-    }
-
-    private suspend fun remove(
-        tokens: List<TokenWithBlockchain>,
-        blockchains: List<Blockchain>,
-        derivationStyle: DerivationStyle?,
-    ) {
-        val currencies = convertToCurrencies(tokens, blockchains, derivationStyle)
-        if (currencies.isEmpty()) return
-
-        val selectedUserWallet = userWalletsListManager.selectedUserWalletSync.guard {
-            Timber.e("Unable to remove currencies, no user wallet selected")
-            return
-        }
-
-        walletCurrenciesManager.removeCurrencies(userWallet = selectedUserWallet, currenciesToRemove = currencies)
-    }
-
-    private suspend fun add(
-        tokens: List<TokenWithBlockchain>,
-        blockchains: List<Blockchain>,
-        scanResponse: ScanResponse,
-    ) {
-        val currenciesToAdd = convertToCurrencies(
-            tokens = tokens,
-            blockchains = blockchains,
-            derivationStyle = scanResponse.derivationStyleProvider.getDerivationStyle(),
-        )
-
-        // TODO("[REDACTED_TASK_KEY] use DerivationManager")
-        if (scanResponse.supportsHdWallet()) {
-            deriveMissingBlockchains(scanResponse, currenciesToAdd)
-        } else {
-            submitAdd(scanResponse, currenciesToAdd)
-            return
-        }
-    }
-
-    private suspend fun deriveMissingBlockchains(scanResponse: ScanResponse, currencies: List<Currency>) {
-        val config = CardConfig.createConfig(scanResponse.card)
-        val derivationDataList = currencies.mapNotNull { currency ->
-            val curve = config.primaryCurve(currency.blockchain)
-            curve?.let { getDerivations(curve, scanResponse, currency) }
-        }
-
-        val derivations = buildMap<ByteArrayKey, MutableList<DerivationPath>> {
-            derivationDataList.forEach {
-                val current = this[it.derivations.first]
-                if (current != null) {
-                    current.addAll(it.derivations.second)
-                    current.distinct()
-                } else {
-                    this[it.derivations.first] = it.derivations.second.toMutableList()
-                }
-            }
-        }
-        if (derivations.isEmpty()) {
-            submitAdd(scanResponse, currencies)
-            return
-        }
-
-        when (val result = tangemSdkManager.derivePublicKeys(cardId = null, derivations = derivations)) {
-            is CompletionResult.Success -> {
-                val newDerivedKeys = result.data.entries
-                val oldDerivedKeys = scanResponse.derivedKeys
-
-                val walletKeys = (newDerivedKeys.keys + oldDerivedKeys.keys).toSet()
-
-                val updatedDerivedKeys = walletKeys.associateWith { walletKey ->
-                    val oldDerivations = ExtendedPublicKeysMap(map = oldDerivedKeys[walletKey] ?: emptyMap())
-                    val newDerivations = newDerivedKeys[walletKey] ?: ExtendedPublicKeysMap(map = emptyMap())
-                    ExtendedPublicKeysMap(map = oldDerivations + newDerivations)
-                }
-
-                val updatedScanResponse = scanResponse.copy(derivedKeys = updatedDerivedKeys)
-
-                store.dispatchOnMain(GlobalAction.SaveScanResponse(updatedScanResponse))
-                delay(DELAY_SDK_DIALOG_CLOSE)
-
-                submitAdd(scanResponse, currencies)
-                return
-            }
-            is CompletionResult.Failure -> {
-                store.dispatchDebugErrorNotification(TapError.CustomError(customMessage = "Error adding tokens"))
-            }
-        }
-    }
-
-    private fun getDerivations(
-        curve: EllipticCurve,
-        scanResponse: ScanResponse,
-        currency: Currency,
-    ): TokensMiddleware.DerivationData? {
-        val wallet = scanResponse.card.wallets.firstOrNull { it.curve == curve } ?: return null
-
-        val supportedCurves = currency.blockchain.getSupportedCurves()
-        val path = currency.blockchain.derivationPath(scanResponse.derivationStyleProvider.getDerivationStyle())
-            .takeIf { supportedCurves.contains(curve) }
-
-        val customPath = currency.derivationPath?.let {
-            DerivationPath(it)
-        }.takeIf { supportedCurves.contains(curve) }
-
-        val bothCandidates = listOfNotNull(path, customPath).distinct().toMutableList()
-        if (bothCandidates.isEmpty()) return null
-
-        if (currency is Currency.Blockchain && currency.blockchain == Blockchain.Cardano) {
-            currency.derivationPath?.let {
-                bothCandidates.add(CardanoUtils.extendedDerivationPath(DerivationPath(it)))
-            }
-        }
-
-        val mapKeyOfWalletPublicKey = wallet.publicKey.toMapKey()
-        val alreadyDerivedKeys: ExtendedPublicKeysMap =
-            scanResponse.derivedKeys[mapKeyOfWalletPublicKey] ?: ExtendedPublicKeysMap(emptyMap())
-        val alreadyDerivedPaths = alreadyDerivedKeys.keys.toList()
-
-        val toDerive = bothCandidates.filterNot { alreadyDerivedPaths.contains(it) }
-        if (toDerive.isEmpty()) return null
-
-        return TokensMiddleware.DerivationData(derivations = mapKeyOfWalletPublicKey to toDerive)
-    }
-
-    private suspend fun submitAdd(scanResponse: ScanResponse, currencies: List<Currency>) {
-        val selectedUserWallet = userWalletsListManager.selectedUserWalletSync.guard {
-            Timber.e("Unable to add currencies, no user wallet selected")
-            return
-        }
-
-        userWalletsListManager
-            .update(
-                userWalletId = selectedUserWallet.walletId,
-                update = { userWallet -> userWallet.copy(scanResponse = scanResponse) },
-            )
-            .flatMap { updatedUserWallet ->
-                walletCurrenciesManager.addCurrencies(
-                    userWallet = updatedUserWallet,
-                    currenciesToAdd = currencies,
-                )
-            }
-    }
-
-    private fun convertToCurrencies(
-        tokens: List<TokenWithBlockchain>,
-        blockchains: List<Blockchain>,
-        derivationStyle: DerivationStyle?,
-    ): List<Currency> {
-        return tokens.map { tokenWithBlockchain ->
-            Currency.Token(
-                token = tokenWithBlockchain.token,
-                blockchain = tokenWithBlockchain.blockchain,
-                derivationPath = tokenWithBlockchain.blockchain.derivationPath(derivationStyle)?.rawPath,
-            )
-        }.plus(
-            blockchains.map { blockchain ->
-                Currency.Blockchain(
-                    blockchain = blockchain,
-                    derivationPath = blockchain.derivationPath(derivationStyle)?.rawPath,
-                )
-            },
-        )
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/domain/TokensListInteractor.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/domain/TokensListInteractor.kt
index fee08220bf..c363dfc3c2 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/domain/TokensListInteractor.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/domain/TokensListInteractor.kt
@@ -1,9 +1,7 @@
 package com.tangem.tap.features.tokens.impl.domain
 
 import androidx.paging.PagingData
-import com.tangem.blockchain.common.Blockchain
 import com.tangem.tap.features.tokens.impl.domain.models.Token
-import com.tangem.tap.features.tokens.legacy.redux.TokenWithBlockchain
 import kotlinx.coroutines.flow.Flow
 
 /**
@@ -15,12 +13,4 @@ internal interface TokensListInteractor {
 
     /** Get tokens list using filter by text [searchText] */
     fun getTokensList(searchText: String): Flow<PagingData<Token>>
-
-    /**
-     * Save added tokens
-     *
-     * @param tokens      tokens list that need to save
-     * @param blockchains blockchains list that need to save
-     */
-    suspend fun saveChanges(tokens: List<TokenWithBlockchain>, blockchains: List<Blockchain>)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/TokensListFragment.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/TokensListFragment.kt
index 417a308de0..a6f68a2097 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/TokensListFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/TokensListFragment.kt
@@ -1,22 +1,18 @@
 package com.tangem.tap.features.tokens.impl.presentation
 
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.compose.foundation.layout.systemBarsPadding
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.LocalLifecycleOwner
-import androidx.fragment.app.Fragment
 import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.transition.TransitionInflater
 import com.tangem.core.ui.components.SystemBarsEffect
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.screen.ComposeFragment
+import com.tangem.core.ui.theme.AppThemeModeHolder
 import com.tangem.tap.features.tokens.impl.presentation.ui.TokensListScreen
 import com.tangem.tap.features.tokens.impl.presentation.viewmodels.TokensListViewModel
-import com.tangem.wallet.R
 import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 
 /**
  * Fragment with list of tokens
@@ -24,33 +20,23 @@ import dagger.hilt.android.AndroidEntryPoint
 [REDACTED_AUTHOR]
  */
 @AndroidEntryPoint
-internal class TokensListFragment : Fragment() {
+internal class TokensListFragment : ComposeFragment() {
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        with(TransitionInflater.from(requireContext())) {
-            enterTransition = inflateTransition(R.transition.fade)
-            exitTransition = inflateTransition(R.transition.fade)
+    @Inject
+    override lateinit var appThemeModeHolder: AppThemeModeHolder
+
+    @Composable
+    override fun ScreenContent(modifier: Modifier) {
+        val viewModel = hiltViewModel<TokensListViewModel>().apply {
+            LocalLifecycleOwner.current.lifecycle.addObserver(this)
         }
-
-        return ComposeView(inflater.context).apply {
-            setContent {
-                isTransitionGroup = true
-
-                val viewModel = hiltViewModel<TokensListViewModel>().apply {
-                    LocalLifecycleOwner.current.lifecycle.addObserver(this)
-                }
-
-                TangemTheme {
-                    val statusBarColor = TangemTheme.colors.background.secondary
-                    SystemBarsEffect {
-                        setSystemBarsColor(color = statusBarColor)
-                    }
-                    TokensListScreen(
-                        modifier = Modifier.systemBarsPadding(),
-                        stateHolder = viewModel.uiState,
-                    )
-                }
-            }
+        val statusBarColor = TangemTheme.colors.background.secondary
+        SystemBarsEffect {
+            setSystemBarsColor(color = statusBarColor)
         }
+        TokensListScreen(
+            modifier = Modifier.systemBarsPadding(),
+            stateHolder = viewModel.uiState,
+        )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/models/TokensListArgs.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/models/TokensListArgs.kt
deleted file mode 100644
index 207976d628..0000000000
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/models/TokensListArgs.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.tangem.tap.features.tokens.impl.presentation.models
-
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.tap.features.tokens.legacy.redux.TokenWithBlockchain
-import com.tangem.tap.store
-
-/**
- * Required data for tokens list screen
- * FIXME("Necessary to avoid using redux state")
- *
-[REDACTED_AUTHOR]
- */
-class TokensListArgs {
-    /** Tokens list screen mode */
-    val isManageAccess: Boolean get() = store.state.tokensState.isManageAccess
-
-    /** Tokens list that accessible from the main screen */
-    val mainScreenTokenList: List<TokenWithBlockchain> get() = store.state.tokensState.addedTokens
-
-    /** Blockchains list that accessible from the main screen */
-    val mainScreenBlockchainList: List<Blockchain> get() = store.state.tokensState.addedBlockchains
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt
index 93ae4e1b17..68b277ea7e 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt
@@ -6,8 +6,6 @@ import com.tangem.core.navigation.NavigationAction
 import com.tangem.tap.common.extensions.dispatchDialogShow
 import com.tangem.tap.common.extensions.dispatchNotification
 import com.tangem.tap.common.redux.AppDialog
-import com.tangem.tap.features.customtoken.api.featuretoggles.CustomTokenFeatureToggles
-import com.tangem.tap.features.tokens.legacy.redux.TokensAction
 import com.tangem.tap.features.wallet.redux.models.WalletDialog
 import com.tangem.tap.store
 import com.tangem.wallet.R
@@ -18,20 +16,14 @@ import com.tangem.wallet.R
  *
 [REDACTED_AUTHOR]
  */
-internal class DefaultTokensListRouter(
-    private val customTokenFeatureToggles: CustomTokenFeatureToggles,
-) : TokensListRouter {
+internal class DefaultTokensListRouter : TokensListRouter {
 
     override fun popBackStack() {
         store.dispatch(NavigationAction.PopBackTo())
     }
 
     override fun openAddCustomTokenScreen() {
-        if (customTokenFeatureToggles.isRedesignedScreenEnabled) {
-            store.dispatch(NavigationAction.NavigateTo(AppScreen.AddCustomToken))
-        } else {
-            store.dispatch(TokensAction.PrepareAndNavigateToAddCustomToken)
-        }
+        store.dispatch(NavigationAction.NavigateTo(AppScreen.AddCustomToken))
     }
 
     override fun showAddressCopiedNotification() {
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/BriefNetworksList.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/BriefNetworksList.kt
index 104ebf9d8c..ea2c77ed2a 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/BriefNetworksList.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/BriefNetworksList.kt
@@ -3,21 +3,21 @@ package com.tangem.tap.features.tokens.impl.presentation.ui
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.Icon
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.key
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
-import com.tangem.core.ui.res.TangemColorPalette
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.tap.features.tokens.impl.presentation.states.NetworkItemState
 import kotlinx.collections.immutable.ImmutableCollection
@@ -70,11 +70,21 @@ internal fun BriefNetworksList(
  */
 @Composable
 internal fun BriefNetworkItem(model: NetworkItemState, modifier: Modifier = Modifier) {
+    val isAdded = model is NetworkItemState.ManageContent && model.isAdded.value
     Box(modifier = modifier.size(size = TangemTheme.dimens.size20)) {
-        Image(
+        if (!isAdded) {
+            Box(
+                modifier = Modifier
+                    .size(TangemTheme.dimens.size20)
+                    .clip(CircleShape)
+                    .background(TangemTheme.colors.control.unchecked),
+            )
+        }
+        Icon(
             painter = painterResource(id = model.iconResId.value),
             contentDescription = null,
             modifier = Modifier.size(size = TangemTheme.dimens.size20),
+            tint = if (isAdded) Color.Unspecified else TangemTheme.colors.text.tertiary,
         )
 
         if (model.isMainNetwork) {
@@ -83,14 +93,14 @@ internal fun BriefNetworkItem(model: NetworkItemState, modifier: Modifier = Modi
                     .align(Alignment.TopEnd)
                     .size(TangemTheme.dimens.size7)
                     .clip(CircleShape)
-                    .background(TangemColorPalette.White),
+                    .background(TangemTheme.colors.background.primary),
                 contentAlignment = Alignment.Center,
             ) {
                 Box(
                     modifier = Modifier
                         .size(TangemTheme.dimens.size5)
                         .clip(CircleShape)
-                        .background(TangemColorPalette.Meadow),
+                        .background(TangemTheme.colors.icon.accent),
                 )
             }
         }
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/DetailedNetworksList.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/DetailedNetworksList.kt
index bfe5cb5d3b..806c161a01 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/DetailedNetworksList.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/DetailedNetworksList.kt
@@ -21,7 +21,6 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.sp
-import com.tangem.core.ui.res.TangemColorPalette
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.tap.features.tokens.impl.presentation.states.NetworkItemState
 import com.tangem.tap.features.tokens.impl.presentation.states.TokenItemState
@@ -95,7 +94,10 @@ private fun DetailedNetworkItem(token: TokenItemState, network: NetworkItemState
                 },
                 modifier = Modifier.padding(start = TangemTheme.dimens.spacing16, end = TangemTheme.dimens.spacing8),
                 colors = SwitchDefaults.colors(
-                    checkedThumbColor = TangemColorPalette.Meadow,
+                    checkedThumbColor = TangemTheme.colors.control.key,
+                    checkedTrackColor = TangemTheme.colors.icon.accent,
+                    uncheckedThumbColor = TangemTheme.colors.control.key,
+                    uncheckedTrackColor = TangemTheme.colors.icon.informative,
                 ),
             )
         }
@@ -112,7 +114,11 @@ private fun RowScope.NetworkTitle(model: NetworkItemState) {
             withStyle(
                 style = SpanStyle(
                     fontWeight = FontWeight.Normal,
-                    color = if (model.isMainNetwork) TangemColorPalette.Meadow else TangemColorPalette.Dark2,
+                    color = if (model.isMainNetwork) {
+                        TangemTheme.colors.icon.accent
+                    } else {
+                        TangemTheme.colors.icon.secondary
+                    },
                 ),
             ) {
                 append(text = model.protocolName)
@@ -121,16 +127,16 @@ private fun RowScope.NetworkTitle(model: NetworkItemState) {
         fontWeight = FontWeight.SemiBold,
         fontSize = 13.sp,
         color = if (model is NetworkItemState.ManageContent && model.isAdded.value) {
-            TangemColorPalette.Black
+            TangemTheme.colors.text.primary1
         } else {
-            TangemColorPalette.Dark2
+            TangemTheme.colors.text.secondary
         },
     )
 }
 
 @Preview
 @Composable
-private fun Preview_DetailedNetworksList_ManageAccess() {
+private fun Preview_DetailedNetworksList_ManageAccess_Light() {
     TangemTheme {
         DetailedNetworksList(
             isExpanded = true,
@@ -142,7 +148,31 @@ private fun Preview_DetailedNetworksList_ManageAccess() {
 
 @Preview
 @Composable
-private fun Preview_DetailedNetworksList_ReadAccess() {
+private fun Preview_DetailedNetworksList_ManageAccess_Dark() {
+    TangemTheme {
+        DetailedNetworksList(
+            isExpanded = true,
+            token = TokenListPreviewData.createManageToken(),
+            networks = TokenListPreviewData.createManageNetworksList(),
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun Preview_DetailedNetworksList_ReadAccess_Light() {
+    TangemTheme {
+        DetailedNetworksList(
+            isExpanded = true,
+            token = TokenListPreviewData.createReadToken(),
+            networks = TokenListPreviewData.createReadNetworksList(),
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun Preview_DetailedNetworksList_ReadAccess_Dark() {
     TangemTheme {
         DetailedNetworksList(
             isExpanded = true,
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/NetworkItemArrow.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/NetworkItemArrow.kt
index 6e9be1c229..671961ab61 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/NetworkItemArrow.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/NetworkItemArrow.kt
@@ -1,12 +1,7 @@
 package com.tangem.tap.features.tokens.impl.presentation.ui
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.*
 import androidx.compose.material.Icon
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -45,8 +40,24 @@ internal fun NetworkItemArrow(itemHeight: Dp, isLastItem: Boolean) {
 
 @Preview
 @Composable
-private fun Preview_NetworkItemArrow_Column() {
-    TangemTheme {
+private fun Preview_NetworkItemArrow_Column_Light() {
+    TangemTheme(isDark = false) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(color = TangemTheme.colors.background.primary)
+                .padding(start = TangemTheme.dimens.size36),
+        ) {
+            NetworkItemArrow(itemHeight = TangemTheme.dimens.size62, isLastItem = false)
+            NetworkItemArrow(itemHeight = TangemTheme.dimens.size62, isLastItem = true)
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun Preview_NetworkItemArrow_Column_Dark() {
+    TangemTheme(isDark = true) {
         Column(
             modifier = Modifier
                 .fillMaxWidth()
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokenItem.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokenItem.kt
index 46fc3f7554..862b0c874f 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokenItem.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokenItem.kt
@@ -1,27 +1,17 @@
 package com.tangem.tap.features.tokens.impl.presentation.ui
 
-import androidx.compose.animation.AnimatedContent
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.ExperimentalAnimationApi
-import androidx.compose.animation.expandVertically
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.scaleIn
-import androidx.compose.animation.scaleOut
-import androidx.compose.animation.shrinkVertically
-import androidx.compose.animation.with
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
+import androidx.compose.animation.*
+import androidx.compose.foundation.background
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.*
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -33,20 +23,25 @@ import coil.compose.SubcomposeAsyncImage
 import coil.request.ImageRequest
 import com.tangem.core.ui.components.CurrencyPlaceholderIcon
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.utils.ImageBackgroundContrastChecker
 import com.tangem.tap.common.compose.extensions.toPx
 import com.tangem.tap.features.tokens.impl.presentation.states.TokenItemState
 import com.tangem.wallet.R
+import kotlinx.coroutines.launch
 
 /**
 [REDACTED_AUTHOR]
  */
+@Suppress("LongMethod")
 @Composable
 internal fun TokenItem(model: TokenItemState) {
     var isExpanded by rememberSaveable { mutableStateOf(value = false) }
+    var iconBackgroundColor by remember { mutableStateOf(Color.Transparent) }
 
     ConstraintLayout(
         modifier = Modifier
             .fillMaxWidth()
+            .background(color = TangemTheme.colors.background.primary)
             .padding(top = TangemTheme.dimens.spacing16),
     ) {
         val (icon, title, availableNetworksText) = createRefs()
@@ -55,14 +50,24 @@ internal fun TokenItem(model: TokenItemState) {
         val spacing16 = TangemTheme.dimens.spacing16
         val spacing6 = TangemTheme.dimens.spacing6
 
-        Icon(
-            name = model.fullName,
-            iconUrl = model.iconUrl,
-            modifier = Modifier.constrainAs(icon) {
-                top.linkTo(parent.top)
-                start.linkTo(anchor = parent.start, margin = spacing16)
-            },
-        )
+        Box(
+            modifier = Modifier
+                .background(
+                    color = iconBackgroundColor,
+                    shape = TangemTheme.shapes.roundedCorners8,
+                )
+                .size(TangemTheme.dimens.size46)
+                .constrainAs(icon) {
+                    top.linkTo(parent.top)
+                    start.linkTo(anchor = parent.start, margin = spacing16)
+                },
+        ) {
+            Icon(
+                name = model.fullName,
+                iconUrl = model.iconUrl,
+                onContrastCalculate = { iconBackgroundColor = it },
+            )
+        }
 
         Title(
             title = model.fullName,
@@ -119,8 +124,11 @@ internal fun TokenItem(model: TokenItemState) {
 }
 
 @Composable
-private fun Icon(name: String, iconUrl: String, modifier: Modifier = Modifier) {
+private fun Icon(name: String, iconUrl: String, onContrastCalculate: (Color) -> Unit, modifier: Modifier = Modifier) {
     val iconModifier = modifier.size(size = TangemTheme.dimens.size46)
+    val screenBackgroundColor = TangemTheme.colors.background.primary.toArgb()
+    val isDarkTheme = isSystemInDarkTheme()
+    val coroutineScope = rememberCoroutineScope()
 
     SubcomposeAsyncImage(
         modifier = iconModifier,
@@ -128,6 +136,20 @@ private fun Icon(name: String, iconUrl: String, modifier: Modifier = Modifier) {
             .size(size = TangemTheme.dimens.size46.toPx().toInt())
             .data(data = iconUrl)
             .crossfade(enable = true)
+            .allowHardware(false)
+            .listener(
+                onSuccess = { _, result ->
+                    if (isDarkTheme) {
+                        coroutineScope.launch {
+                            val color = ImageBackgroundContrastChecker(
+                                drawable = result.drawable,
+                                backgroundColor = screenBackgroundColor,
+                            ).getContrastColorIfNeeded(isDarkTheme)
+                            onContrastCalculate(color)
+                        }
+                    }
+                },
+            )
             .build(),
         contentDescription = null,
         loading = { CurrencyPlaceholderIcon(id = name, modifier = iconModifier) },
@@ -183,18 +205,34 @@ private fun ChangeNetworksViewButton(isExpanded: Boolean, onClick: () -> Unit, m
     }
 }
 
-@Preview
+@Preview(showBackground = true)
 @Composable
-private fun Preview_TokenItem_ManageAccess() {
-    TangemTheme {
+private fun Preview_TokenItem_ManageAccess_Light() {
+    TangemTheme(isDark = false) {
         TokenItem(model = TokenListPreviewData.createManageToken())
     }
 }
 
-@Preview
+@Preview()
 @Composable
-private fun Preview_TokenItem_ReadAccess() {
-    TangemTheme {
+private fun Preview_TokenItem_ManageAccess_Dark() {
+    TangemTheme(isDark = true) {
+        TokenItem(model = TokenListPreviewData.createManageToken())
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun Preview_TokenItem_ReadAccess_Light() {
+    TangemTheme(isDark = false) {
+        TokenItem(model = TokenListPreviewData.createReadToken())
+    }
+}
+
+@Preview()
+@Composable
+private fun Preview_TokenItem_ReadAccess_Dark() {
+    TangemTheme(isDark = true) {
         TokenItem(model = TokenListPreviewData.createReadToken())
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListScreen.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListScreen.kt
index ea6ab16083..b28517d8a1 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListScreen.kt
@@ -1,9 +1,7 @@
 package com.tangem.tap.features.tokens.impl.presentation.ui
 
 import androidx.activity.compose.BackHandler
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
+import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
@@ -24,6 +22,8 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 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.Dp
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.TextUnitType
@@ -31,7 +31,6 @@ import androidx.compose.ui.unit.dp
 import androidx.paging.PagingData
 import androidx.paging.compose.*
 import com.tangem.core.ui.components.PrimaryButton
-import com.tangem.core.ui.res.TangemColorPalette
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.tap.features.tokens.impl.presentation.states.TokenItemState
 import com.tangem.tap.features.tokens.impl.presentation.states.TokensListStateHolder
@@ -70,24 +69,25 @@ internal fun TokensListScreen(stateHolder: TokensListStateHolder, modifier: Modi
             }
         },
         floatingActionButtonPosition = FabPosition.Center,
+        backgroundColor = TangemTheme.colors.background.primary,
     ) { scaffoldPadding ->
         val tokens = stateHolder.tokens.collectAsLazyPagingItems()
 
         TokensListContent(
-            isDifferentAddressesBlockVisible = stateHolder.isDifferentAddressesBlockVisible,
+            isDifferentAddressesBlockVisible = stateHolder.isDifferentAddressesBlockVisible && !stateHolder.isLoading,
             tokens = tokens,
             scaffoldPadding = scaffoldPadding,
             bottomMarginDp = floatingButtonHeight,
         )
 
-        stateHolder.onTokensLoadStateChanged(tokens.loadState.refresh)
+        Crossfade(targetState = stateHolder.isLoading, label = "Update progress bar visibility") {
+            if (it) {
+                LoadingContent()
+            }
+        }
 
-        AnimatedVisibility(
-            visible = stateHolder.isLoading,
-            enter = fadeIn(),
-            exit = fadeOut(),
-        ) {
-            LoadingContent()
+        LaunchedEffect(key1 = tokens.loadState.refresh) {
+            stateHolder.onTokensLoadStateChanged(tokens.loadState.refresh)
         }
     }
 }
@@ -97,10 +97,10 @@ private fun LoadingContent() {
     Box(
         modifier = Modifier
             .fillMaxSize()
-            .background(color = TangemColorPalette.White),
+            .background(color = TangemTheme.colors.background.primary),
         contentAlignment = Alignment.Center,
     ) {
-        CircularProgressIndicator(color = TangemColorPalette.Meadow)
+        CircularProgressIndicator(color = TangemTheme.colors.icon.accent)
     }
 }
 
@@ -144,19 +144,19 @@ private fun DifferentAddressesWarning() {
         modifier = Modifier
             .padding(TangemTheme.dimens.spacing16)
             .background(
-                color = TangemColorPalette.Light1,
+                color = TangemTheme.colors.button.disabled,
                 shape = RoundedCornerShape(TangemTheme.dimens.radius10),
             ),
         contentAlignment = Alignment.Center,
     ) {
-        val text = stringResource(id = R.string.alert_manage_tokens_addresses_message)
+        val text = stringResource(id = R.string.warning_manage_tokens_legacy_derivation_message)
         Text(
             text = text,
             modifier = Modifier.padding(
                 horizontal = TangemTheme.dimens.spacing16,
                 vertical = TangemTheme.dimens.spacing8,
             ),
-            color = TangemColorPalette.Dark1,
+            color = TangemTheme.colors.text.tertiary,
             textAlign = TextAlign.Start,
             style = TangemTheme.typography.body2.copy(
                 letterSpacing = TextUnit(value = 0.5f, type = TextUnitType.Sp),
@@ -178,73 +178,71 @@ private fun SaveChangesButton(onClick: () -> Unit, modifier: Modifier = Modifier
     )
 }
 
-@Preview
+@Preview(showSystemUi = true)
 @Composable
-private fun Preview_TokensListScreen_Loading() {
-    TangemTheme {
-        TokensListScreen(
-            stateHolder = TokensListStateHolder.ReadContent(
-                toolbarState = TokensListToolbarState.Title.Manage(
-                    titleResId = R.string.main_manage_tokens,
-                    onBackButtonClick = {},
-                    onSearchButtonClick = {},
-                    onAddCustomTokenClick = {},
-                ),
-                isLoading = true,
-                isDifferentAddressesBlockVisible = false,
-                tokens = emptyFlow(),
-                onTokensLoadStateChanged = {},
-            ),
-        )
+private fun Preview_TokensListScreen_Light(
+    @PreviewParameter(TokensListScreenProvider::class) stateHolder: TokensListStateHolder,
+) {
+    TangemTheme(isDark = false) {
+        TokensListScreen(stateHolder)
     }
 }
 
-@Preview
+@Preview(showSystemUi = true)
 @Composable
-private fun Preview_TokensListScreen_Manage() {
-    TangemTheme {
-        TokensListScreen(
-            stateHolder = TokensListStateHolder.ManageContent(
-                toolbarState = TokensListToolbarState.Title.Manage(
-                    titleResId = R.string.main_manage_tokens,
-                    onBackButtonClick = {},
-                    onSearchButtonClick = {},
-                    onAddCustomTokenClick = {},
-                ),
-                isLoading = false,
-                isDifferentAddressesBlockVisible = true,
-                tokens = flowOf(
-                    PagingData.from(
-                        listOf(TokenListPreviewData.createManageToken()),
-                    ),
-                ),
-                onSaveButtonClick = {},
-                onTokensLoadStateChanged = {},
-            ),
-        )
+private fun Preview_TokensListScreen_Dark(
+    @PreviewParameter(TokensListScreenProvider::class) stateHolder: TokensListStateHolder,
+) {
+    TangemTheme(isDark = true) {
+        TokensListScreen(stateHolder)
     }
 }
 
-@Preview
-@Composable
-private fun Preview_TokensListScreen_Read() {
-    TangemTheme {
-        TokensListScreen(
-            stateHolder = TokensListStateHolder.ReadContent(
-                toolbarState = TokensListToolbarState.Title.Read(
-                    titleResId = R.string.common_search_tokens,
-                    onBackButtonClick = {},
-                    onSearchButtonClick = {},
-                ),
-                isLoading = false,
-                isDifferentAddressesBlockVisible = false,
-                tokens = flowOf(
-                    PagingData.from(
-                        listOf(TokenListPreviewData.createManageToken()),
-                    ),
-                ),
-                onTokensLoadStateChanged = {},
+private class TokensListScreenProvider : CollectionPreviewParameterProvider<TokensListStateHolder>(
+    collection = listOf(
+        TokensListStateHolder.ReadContent(
+            toolbarState = TokensListToolbarState.Title.Manage(
+                titleResId = R.string.main_manage_tokens,
+                onBackButtonClick = {},
+                onSearchButtonClick = {},
+                onAddCustomTokenClick = {},
             ),
-        )
-    }
-}
\ No newline at end of file
+            isLoading = true,
+            isDifferentAddressesBlockVisible = false,
+            tokens = emptyFlow(),
+            onTokensLoadStateChanged = {},
+        ),
+        TokensListStateHolder.ManageContent(
+            toolbarState = TokensListToolbarState.Title.Manage(
+                titleResId = R.string.main_manage_tokens,
+                onBackButtonClick = {},
+                onSearchButtonClick = {},
+                onAddCustomTokenClick = {},
+            ),
+            isLoading = false,
+            isDifferentAddressesBlockVisible = true,
+            tokens = flowOf(
+                PagingData.from(
+                    listOf(TokenListPreviewData.createManageToken()),
+                ),
+            ),
+            onSaveButtonClick = {},
+            onTokensLoadStateChanged = {},
+        ),
+        TokensListStateHolder.ReadContent(
+            toolbarState = TokensListToolbarState.Title.Read(
+                titleResId = R.string.common_search_tokens,
+                onBackButtonClick = {},
+                onSearchButtonClick = {},
+            ),
+            isLoading = false,
+            isDifferentAddressesBlockVisible = false,
+            tokens = flowOf(
+                PagingData.from(
+                    listOf(TokenListPreviewData.createManageToken()),
+                ),
+            ),
+            onTokensLoadStateChanged = {},
+        ),
+    ),
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListToolbar.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListToolbar.kt
index f5db5aa1a1..71aba31a33 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListToolbar.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListToolbar.kt
@@ -1,5 +1,6 @@
 package com.tangem.tap.features.tokens.impl.presentation.ui
 
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
@@ -7,10 +8,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.Text
-import androidx.compose.material.TopAppBar
+import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
@@ -26,7 +24,6 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.sp
-import com.tangem.core.ui.res.TangemColorPalette
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.tap.features.tokens.impl.presentation.states.TokensListToolbarState
 import com.tangem.tap.features.tokens.impl.presentation.states.TokensListToolbarState.InputField
@@ -39,12 +36,20 @@ import kotlinx.coroutines.delay
  */
 @Composable
 internal fun TokensListToolbar(state: TokensListToolbarState) {
-    TopAppBar(backgroundColor = TangemTheme.colors.background.secondary) {
+    val toolbarElevation = if (isSystemInDarkTheme()) {
+        TangemTheme.dimens.elevation0
+    } else {
+        AppBarDefaults.TopAppBarElevation
+    }
+    TopAppBar(
+        backgroundColor = TangemTheme.colors.background.secondary,
+        elevation = toolbarElevation,
+    ) {
         IconButton(onClick = state.onBackButtonClick) {
             Icon(
                 painter = painterResource(id = R.drawable.ic_back_24),
                 contentDescription = "Go back",
-                tint = TangemTheme.colors.icon.secondary,
+                tint = TangemTheme.colors.icon.primary1,
             )
         }
 
@@ -69,7 +74,7 @@ private fun TitleContent(state: Title, modifier: Modifier = Modifier) {
         Icon(
             painter = painterResource(id = R.drawable.ic_search_24),
             contentDescription = "Search",
-            tint = TangemTheme.colors.icon.secondary,
+            tint = TangemTheme.colors.icon.primary1,
         )
     }
 
@@ -78,7 +83,7 @@ private fun TitleContent(state: Title, modifier: Modifier = Modifier) {
             Icon(
                 painter = painterResource(id = R.drawable.ic_plus_24),
                 contentDescription = "Add custom token",
-                tint = TangemTheme.colors.icon.secondary,
+                tint = TangemTheme.colors.icon.primary1,
             )
         }
     }
@@ -94,7 +99,10 @@ private fun InputContent(state: InputField, modifier: Modifier = Modifier) {
         value = state.value,
         onValueChange = state.onValueChange,
         modifier = modifier.focusRequester(focusRequester),
-        textStyle = TangemTheme.typography.subtitle1.copy(fontWeight = FontWeight.Normal),
+        textStyle = TangemTheme.typography.subtitle1.copy(
+            fontWeight = FontWeight.Normal,
+            color = TangemTheme.colors.text.primary1,
+        ),
         keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Text, imeAction = ImeAction.Search),
         keyboardActions = KeyboardActions(onSearch = { keyboardController?.hide() }),
         singleLine = true,
@@ -146,7 +154,7 @@ private fun Hint(value: String) {
             Icon(
                 painter = painterResource(id = R.drawable.ic_search_24),
                 contentDescription = null,
-                tint = TangemColorPalette.Dark1,
+                tint = TangemTheme.colors.icon.secondary,
             )
             Text(
                 text = stringResource(id = R.string.common_search),
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListCryptoCurrencies.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListCryptoCurrencies.kt
new file mode 100644
index 0000000000..da83face06
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListCryptoCurrencies.kt
@@ -0,0 +1,9 @@
+package com.tangem.tap.features.tokens.impl.presentation.viewmodels
+
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.domain.tokens.TokenWithBlockchain
+
+internal data class TokensListCryptoCurrencies(
+    val coins: List<Blockchain>,
+    val tokens: List<TokenWithBlockchain>,
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListMigration.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListMigration.kt
new file mode 100644
index 0000000000..d4af20b4ea
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListMigration.kt
@@ -0,0 +1,187 @@
+package com.tangem.tap.features.tokens.impl.presentation.viewmodels
+
+import arrow.core.Either
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchain.common.Token
+import com.tangem.blockchain.common.derivation.DerivationStyle
+import com.tangem.data.tokens.utils.CryptoCurrencyFactory
+import com.tangem.domain.common.util.derivationStyleProvider
+import com.tangem.domain.tokens.GetCryptoCurrenciesUseCase
+import com.tangem.domain.tokens.TokenWithBlockchain
+import com.tangem.domain.tokens.TokensAction
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
+import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles
+import com.tangem.tap.domain.model.WalletDataModel
+import com.tangem.tap.features.wallet.models.Currency
+import com.tangem.tap.store
+import timber.log.Timber
+import kotlin.properties.Delegates
+
+/**
+ * Class that divide a new and legacy logic when user uses tokens list screen
+ *
+ * @property walletFeatureToggles         wallet feature toggles
+ * @property getSelectedWalletSyncUseCase use case that returns selected wallet
+ * @property getCurrenciesUseCase         use case that returns crypto currencies of a specified wallet
+ */
+internal class TokensListMigration(
+    private val walletFeatureToggles: WalletFeatureToggles,
+    private val getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase,
+    private val getCurrenciesUseCase: GetCryptoCurrenciesUseCase,
+) {
+
+    private var currentNewCoins: List<CryptoCurrency.Coin> by Delegates.notNull()
+    private var currentNewTokens: List<CryptoCurrency.Token> by Delegates.notNull()
+    private var currentUserWallet: UserWallet by Delegates.notNull()
+
+    private val cryptoCurrencyFactory by lazy { CryptoCurrencyFactory() }
+
+    suspend fun getCurrentCryptoCurrencies(): TokensListCryptoCurrencies {
+        return if (walletFeatureToggles.isRedesignedScreenEnabled) {
+            getNewCryptoCurrencies()
+        } else {
+            getLegacyCryptoCurrencies()
+        }
+    }
+
+    private suspend fun getNewCryptoCurrencies(): TokensListCryptoCurrencies {
+        return when (val selectedWalletEither = getSelectedWalletSyncUseCase()) {
+            is Either.Left -> {
+                Timber.e(selectedWalletEither.value.toString())
+                TokensListCryptoCurrencies(coins = emptyList(), tokens = emptyList())
+            }
+            is Either.Right -> {
+                currentUserWallet = selectedWalletEither.value
+
+                when (val currenciesEither = getCurrenciesUseCase(userWalletId = selectedWalletEither.value.walletId)) {
+                    is Either.Left -> {
+                        Timber.e(currenciesEither.value.toString())
+                        TokensListCryptoCurrencies(coins = emptyList(), tokens = emptyList())
+                    }
+                    is Either.Right -> {
+                        TokensListCryptoCurrencies(
+                            coins = currenciesEither.value
+                                .filterIsInstance<CryptoCurrency.Coin>()
+                                .filterNot { it.isCustom }
+                                .also { currentNewCoins = it }
+                                .map { Blockchain.fromId(it.network.id.value) },
+                            tokens = currenciesEither.value
+                                .filterIsInstance<CryptoCurrency.Token>()
+                                .filterNot(CryptoCurrency.Token::isCustom)
+                                .also { currentNewTokens = it }
+                                .map { token ->
+                                    TokenWithBlockchain(
+                                        token = Token(
+                                            name = token.name,
+                                            symbol = token.symbol,
+                                            contractAddress = token.contractAddress,
+                                            decimals = token.decimals,
+                                            id = token.id.rawCurrencyId,
+                                        ),
+                                        blockchain = Blockchain.fromId(token.network.id.value),
+                                    )
+                                },
+                        )
+                    }
+                }
+            }
+        }
+    }
+
+    private fun getLegacyCryptoCurrencies(): TokensListCryptoCurrencies {
+        val wallets = store.state.walletState.walletsDataFromStores
+        val derivationStyle = store.state.globalState.scanResponse?.derivationStyleProvider?.getDerivationStyle()
+
+        return TokensListCryptoCurrencies(
+            coins = wallets.toNonCustomBlockchains(derivationStyle),
+            tokens = wallets.toNonCustomTokensWithBlockchains(derivationStyle),
+        )
+    }
+
+    private fun List<WalletDataModel>.toNonCustomBlockchains(derivationStyle: DerivationStyle?): List<Blockchain> {
+        return this
+            .mapNotNull { walletDataModel ->
+                if (walletDataModel.currency.isCustomCurrency(derivationStyle)) {
+                    null
+                } else {
+                    (walletDataModel.currency as? Currency.Blockchain)?.blockchain
+                }
+            }
+            .distinct()
+    }
+
+    private fun List<WalletDataModel>.toNonCustomTokensWithBlockchains(
+        derivationStyle: DerivationStyle?,
+    ): List<TokenWithBlockchain> {
+        return this
+            .mapNotNull { walletDataModel ->
+                if (walletDataModel.currency !is Currency.Token) return@mapNotNull null
+                if (walletDataModel.currency.isCustomCurrency(derivationStyle)) return@mapNotNull null
+
+                TokenWithBlockchain(walletDataModel.currency.token, walletDataModel.currency.blockchain)
+            }
+            .distinct()
+    }
+
+    fun onSaveButtonClick(
+        currentTokensList: List<TokenWithBlockchain>,
+        currentBlockchainList: List<Blockchain>,
+        changedTokensList: MutableList<TokenWithBlockchain>,
+        changedBlockchainList: List<Blockchain>,
+    ) {
+        if (walletFeatureToggles.isRedesignedScreenEnabled) {
+            saveByNewWay(changedTokensList = changedTokensList, changedBlockchainList = changedBlockchainList)
+        } else {
+            saveByOldWay(currentTokensList, currentBlockchainList, changedTokensList, changedBlockchainList)
+        }
+    }
+
+    private fun saveByNewWay(
+        changedTokensList: MutableList<TokenWithBlockchain>,
+        changedBlockchainList: List<Blockchain>,
+    ) {
+        store.dispatch(
+            action = TokensAction.NewSaveChanges(
+                currentTokens = currentNewTokens,
+                currentCoins = currentNewCoins,
+                changedTokens = changedTokensList.mapNotNull {
+                    cryptoCurrencyFactory.createToken(
+                        sdkToken = it.token,
+                        blockchain = it.blockchain,
+                        extraDerivationPath = null,
+                        derivationStyleProvider = currentUserWallet.scanResponse.derivationStyleProvider,
+                    )
+                },
+                changedCoins = changedBlockchainList.mapNotNull {
+                    cryptoCurrencyFactory.createCoin(
+                        blockchain = it,
+                        extraDerivationPath = null,
+                        derivationStyleProvider = currentUserWallet.scanResponse.derivationStyleProvider,
+                    )
+                },
+                userWallet = currentUserWallet,
+            ),
+        )
+    }
+
+    private fun saveByOldWay(
+        currentTokensList: List<TokenWithBlockchain>,
+        currentBlockchainList: List<Blockchain>,
+        changedTokensList: MutableList<TokenWithBlockchain>,
+        changedBlockchainList: List<Blockchain>,
+    ) {
+        val scanResponse = store.state.globalState.scanResponse ?: return
+
+        store.dispatch(
+            action = TokensAction.LegacySaveChanges(
+                currentTokens = currentTokensList,
+                currentBlockchains = currentBlockchainList,
+                changedTokens = changedTokensList,
+                changedBlockchains = changedBlockchainList,
+                scanResponse = scanResponse,
+            ),
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt
index 78ff6ff6ce..06d6c0ce2e 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt
@@ -1,15 +1,11 @@
 package com.tangem.tap.features.tokens.impl.presentation.viewmodels
 
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import androidx.paging.LoadState
-import androidx.paging.PagingData
-import androidx.paging.map
+import androidx.lifecycle.*
+import androidx.paging.*
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.core.ui.extensions.getActiveIconRes
@@ -19,6 +15,10 @@ import com.tangem.domain.common.extensions.canHandleToken
 import com.tangem.domain.common.extensions.fromNetworkId
 import com.tangem.domain.common.extensions.supportedTokens
 import com.tangem.domain.common.util.cardTypesResolver
+import com.tangem.domain.tokens.GetCryptoCurrenciesUseCase
+import com.tangem.domain.tokens.TokenWithBlockchain
+import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
+import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles
 import com.tangem.tap.common.extensions.fullNameWithoutTestnet
 import com.tangem.tap.common.extensions.getGreyedOutIconRes
 import com.tangem.tap.common.extensions.getNetworkName
@@ -26,49 +26,49 @@ import com.tangem.tap.features.tokens.impl.domain.TokensListInteractor
 import com.tangem.tap.features.tokens.impl.domain.models.Token
 import com.tangem.tap.features.tokens.impl.domain.models.Token.Network
 import com.tangem.tap.features.tokens.impl.presentation.models.SupportTokensState
-import com.tangem.tap.features.tokens.impl.presentation.models.TokensListArgs
 import com.tangem.tap.features.tokens.impl.presentation.router.TokensListRouter
 import com.tangem.tap.features.tokens.impl.presentation.states.NetworkItemState
 import com.tangem.tap.features.tokens.impl.presentation.states.TokenItemState
 import com.tangem.tap.features.tokens.impl.presentation.states.TokensListStateHolder
 import com.tangem.tap.features.tokens.impl.presentation.states.TokensListToolbarState
-import com.tangem.tap.features.tokens.legacy.redux.TokenWithBlockchain
-import com.tangem.tap.features.tokens.legacy.redux.TokensAction
-import com.tangem.tap.proxy.AppStateHolder
 import com.tangem.tap.store
 import com.tangem.utils.coroutines.AppCoroutineDispatcherProvider
 import com.tangem.utils.coroutines.Debouncer
 import com.tangem.wallet.R
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.collections.immutable.toImmutableList
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
 import timber.log.Timber
 import javax.inject.Inject
+import kotlin.properties.Delegates
 import com.tangem.blockchain.common.Token as BlockchainToken
 
 /**
  * ViewModel for tokens list screen
  *
- * @property interactor         feature interactor
- * @property router             feature router
- * @property dispatchers        coroutine dispatchers provider
- * @property reduxStateHolder   redux state holder
- * @param analyticsEventHandler analytics event handler
+ * @property interactor                   feature interactor
+ * @property router                       feature router
+ * @property dispatchers                  coroutine dispatchers provider
+ * @property getSelectedWalletSyncUseCase use case that returns selected wallet
+ * @param analyticsEventHandler           analytics event handler
  *
 [REDACTED_AUTHOR]
  */
+@Suppress("LongParameterList")
 @HiltViewModel
 internal class TokensListViewModel @Inject constructor(
     private val interactor: TokensListInteractor,
     private val router: TokensListRouter,
     private val dispatchers: AppCoroutineDispatcherProvider,
-    private val reduxStateHolder: AppStateHolder,
+    private val getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase,
     analyticsEventHandler: AnalyticsEventHandler,
+    getCurrenciesUseCase: GetCryptoCurrenciesUseCase,
+    walletFeatureToggles: WalletFeatureToggles,
 ) : ViewModel(), DefaultLifecycleObserver {
 
-    private val args = TokensListArgs()
+    private val isManageAccess = store.state.tokensState.isManageAccess
     private val analyticsSender = TokensListAnalyticsSender(analyticsEventHandler)
     private val actionsHandler = ActionsHandler(router = router, debouncer = Debouncer())
 
@@ -76,15 +76,38 @@ internal class TokensListViewModel @Inject constructor(
     var uiState by mutableStateOf(value = getInitialUiState())
         private set
 
-    private val changedTokensList: MutableList<TokenWithBlockchain> = args.mainScreenTokenList.toMutableList()
-    private val changedBlockchainList: MutableList<Blockchain> = args.mainScreenBlockchainList.toMutableList()
+    private var currentTokensList: List<TokenWithBlockchain> by Delegates.notNull()
+    private var currentBlockchainList: List<Blockchain> by Delegates.notNull()
+
+    private var changedTokensList: MutableList<TokenWithBlockchain> = mutableListOf()
+    private var changedBlockchainList: MutableList<Blockchain> = mutableListOf()
+
+    private val tokensListMigration = TokensListMigration(
+        walletFeatureToggles = walletFeatureToggles,
+        getSelectedWalletSyncUseCase = getSelectedWalletSyncUseCase,
+        getCurrenciesUseCase = getCurrenciesUseCase,
+    )
+
+    init {
+        viewModelScope.launch(dispatchers.main) {
+            val (currentCoins, currentTokens) = tokensListMigration.getCurrentCryptoCurrencies()
+
+            currentBlockchainList = currentCoins
+            currentTokensList = currentTokens
+
+            changedBlockchainList = currentCoins.toMutableList()
+            changedTokensList = currentTokens.toMutableList()
+
+            uiState = uiState.copySealed(tokens = getTokensListBySearchText(text = ""))
+        }
+    }
 
     override fun onCreate(owner: LifecycleOwner) {
-        if (args.isManageAccess) analyticsSender.sendWhenScreenOpened()
+        if (isManageAccess) analyticsSender.sendWhenScreenOpened()
     }
 
     private fun getInitialUiState(): TokensListStateHolder {
-        return if (args.isManageAccess) {
+        return if (isManageAccess) {
             TokensListStateHolder.ManageContent(
                 toolbarState = getInitialToolbarState(),
                 isLoading = true,
@@ -105,7 +128,7 @@ internal class TokensListViewModel @Inject constructor(
     }
 
     private fun getInitialToolbarState(): TokensListToolbarState {
-        return if (args.isManageAccess) {
+        return if (isManageAccess) {
             TokensListToolbarState.Title.Manage(
                 titleResId = R.string.add_tokens_title,
                 onBackButtonClick = actionsHandler::onBackButtonClick,
@@ -122,17 +145,19 @@ internal class TokensListViewModel @Inject constructor(
     }
 
     private fun isDifferentAddressesBlockVisible(): Boolean {
-        return reduxStateHolder.scanResponse?.card?.useOldStyleDerivation == true
+        return getSelectedWalletSyncUseCase().fold(
+            ifLeft = { false },
+            ifRight = { it.scanResponse.card.useOldStyleDerivation },
+        )
     }
 
-    private fun getInitialTokensList(searchText: String = ""): Flow<PagingData<TokenItemState>> {
-        if (searchText.isNotEmpty()) analyticsSender.sendWhenTokenSearched()
-
-        return interactor.getTokensList(searchText = searchText).map {
-            it.map { token ->
-                if (args.isManageAccess) createManageTokenContent(token) else createReadTokenContent(token)
-            }
-        }
+    private fun getInitialTokensList(): Flow<PagingData<TokenItemState>> {
+        return flowOf(
+            value = PagingData.empty(
+                sourceLoadStates = LoadStates(LoadState.Loading, LoadState.Loading, LoadState.Loading),
+                mediatorLoadStates = LoadStates(LoadState.Loading, LoadState.Loading, LoadState.Loading),
+            ),
+        )
     }
 
     private fun createManageTokenContent(token: Token): TokenItemState.ManageContent {
@@ -152,9 +177,7 @@ internal class TokensListViewModel @Inject constructor(
         return NetworkItemState.ManageContent(
             name = network.blockchain.fullNameWithoutTestnet.uppercase(),
             protocolName = getNetworkProtocolName(network),
-            iconResId = mutableStateOf(
-                getNetworkIconResId(network.address, network.blockchain),
-            ),
+            iconResId = mutableIntStateOf(value = getNetworkIconResId(network.address, network.blockchain)),
             isMainNetwork = isMainNetwork(network),
             isAdded = mutableStateOf(
                 isAdded(address = network.address, blockchain = network.blockchain),
@@ -183,7 +206,7 @@ internal class TokensListViewModel @Inject constructor(
         return NetworkItemState.ReadContent(
             name = network.blockchain.fullNameWithoutTestnet.uppercase(),
             protocolName = getNetworkProtocolName(network),
-            iconResId = mutableStateOf(getNetworkIconResId(network.address, network.blockchain)),
+            iconResId = mutableIntStateOf(value = getNetworkIconResId(network.address, network.blockchain)),
             isMainNetwork = isMainNetwork(network),
         )
     }
@@ -218,6 +241,20 @@ internal class TokensListViewModel @Inject constructor(
         }
     }
 
+    private fun getTokensListBySearchText(text: String): Flow<PagingData<TokenItemState>> {
+        return interactor.getTokensList(searchText = text)
+            .mapToTokenItemState()
+            .cachedIn(viewModelScope)
+    }
+
+    private fun Flow<PagingData<Token>>.mapToTokenItemState(): Flow<PagingData<TokenItemState>> {
+        return map { pagingData ->
+            pagingData.map { token ->
+                if (isManageAccess) createManageTokenContent(token) else createReadTokenContent(token)
+            }
+        }
+    }
+
     private inner class ActionsHandler(
         private val router: TokensListRouter,
         private val debouncer: Debouncer,
@@ -264,7 +301,12 @@ internal class TokensListViewModel @Inject constructor(
 
         fun onSaveButtonClick() {
             analyticsSender.sendWhenSaveButtonClicked()
-            store.dispatch(TokensAction.SaveChanges(changedTokensList, changedBlockchainList))
+            tokensListMigration.onSaveButtonClick(
+                currentTokensList = currentTokensList,
+                currentBlockchainList = currentBlockchainList,
+                changedTokensList = changedTokensList,
+                changedBlockchainList = changedBlockchainList,
+            )
         }
 
         private fun onSearchValueChange(newValue: String) {
@@ -272,10 +314,15 @@ internal class TokensListViewModel @Inject constructor(
             uiState = uiState.copySealed(toolbarState = state.copy(value = newValue))
 
             debouncer.debounce(waitMs = 800L, coroutineScope = viewModelScope + dispatchers.io) {
-                uiState = uiState.copySealed(tokens = getInitialTokensList(newValue))
+                uiState = uiState.copySealed(tokens = getSearchedTokensList(newValue))
             }
         }
 
+        private fun getSearchedTokensList(searchText: String): Flow<PagingData<TokenItemState>> {
+            analyticsSender.sendWhenTokenSearched()
+            return getTokensListBySearchText(text = searchText)
+        }
+
         private fun onCleanButtonClick() {
             val state = requireNotNull(uiState.toolbarState as? TokensListToolbarState.InputField)
 
@@ -291,7 +338,7 @@ internal class TokensListViewModel @Inject constructor(
 
             if (isRemoveAction) {
                 val isTokenWithSameBlockchainFound = changedTokensList.any { it.blockchain == blockchain }
-                val isAddedOnMainScreen = args.mainScreenBlockchainList.contains(blockchain)
+                val isAddedOnMainScreen = currentBlockchainList.contains(blockchain)
 
                 if (isTokenWithSameBlockchainFound) {
                     router.openUnableHideMainTokenAlert(
@@ -341,7 +388,7 @@ internal class TokensListViewModel @Inject constructor(
             val isRemoveAction = changedTokensList.contains(token)
 
             if (isRemoveAction) {
-                val isAddedOnMainScreen = args.mainScreenTokenList.contains(token)
+                val isAddedOnMainScreen = currentTokensList.contains(token)
 
                 if (isAddedOnMainScreen) {
                     router.openRemoveWalletAlert(
@@ -373,32 +420,39 @@ internal class TokensListViewModel @Inject constructor(
     }
 
     private fun isUnsupportedToken(blockchain: Blockchain): SupportTokensState? {
-        val scanResponse = reduxStateHolder.scanResponse
-        val cardTypesResolver = scanResponse?.cardTypesResolver ?: return null
-        val supportedTokens = scanResponse.card.supportedTokens(cardTypesResolver)
+        return getSelectedWalletSyncUseCase().fold(
+            ifLeft = { null },
+            ifRight = {
+                val cardTypesResolver = it.scanResponse.cardTypesResolver
+                val supportedTokens = it.scanResponse.card.supportedTokens(cardTypesResolver)
 
-        // refactor this later by moving all this logic in card config
-        if (blockchain == Blockchain.Solana && !supportedTokens.contains(Blockchain.Solana)) {
-            return SupportTokensState.SolanaNetworkUnsupported
-        }
-        val canHandleToken = scanResponse.card.canHandleToken(
-            supportedTokens = supportedTokens,
-            blockchain = blockchain,
-            cardTypesResolver = cardTypesResolver,
+                // refactor this later by moving all this logic in card config
+                if (blockchain == Blockchain.Solana && !supportedTokens.contains(Blockchain.Solana)) {
+                    return SupportTokensState.SolanaNetworkUnsupported
+                }
+                val canHandleToken = it.scanResponse.card.canHandleToken(
+                    supportedTokens = supportedTokens,
+                    blockchain = blockchain,
+                    cardTypesResolver = cardTypesResolver,
+                )
+                if (!canHandleToken) {
+                    return SupportTokensState.UnsupportedCurve
+                }
+                return SupportTokensState.SupportedToken
+            },
         )
-        if (!canHandleToken) {
-            return SupportTokensState.UnsupportedCurve
-        }
-        return SupportTokensState.SupportedToken
     }
 
     private fun isUnsupportedBlockchain(blockchain: Blockchain): Boolean {
-        val scanResponse = reduxStateHolder.scanResponse
-        val canHandleToken = scanResponse?.card?.canHandleBlockchain(
-            blockchain = blockchain,
-            cardTypesResolver = scanResponse.cardTypesResolver,
-        ) ?: false
-        return !canHandleToken
+        return getSelectedWalletSyncUseCase().fold(
+            ifLeft = { false },
+            ifRight = {
+                !it.scanResponse.card.canHandleBlockchain(
+                    blockchain = blockchain,
+                    cardTypesResolver = it.scanResponse.cardTypesResolver,
+                )
+            },
+        )
     }
 
     private companion object {
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensAction.kt b/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensAction.kt
deleted file mode 100644
index c24f982fca..0000000000
--- a/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensAction.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.tangem.tap.features.tokens.legacy.redux
-
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.blockchain.common.derivation.DerivationStyle
-import com.tangem.tap.domain.model.WalletDataModel
-import org.rekotlin.Action
-
-sealed interface TokensAction : Action {
-
-    /** Single way to pass data to the screen */
-    sealed interface SetArgs : TokensAction {
-
-        data class ManageAccess(val wallets: List<WalletDataModel>, val derivationStyle: DerivationStyle?) : SetArgs
-
-        object ReadAccess : SetArgs
-    }
-
-    // TODO: [REDACTED_TASK_KEY] Remove this action
-    data class SaveChanges(val tokens: List<TokenWithBlockchain>, val blockchains: List<Blockchain>) : TokensAction
-
-    // TODO: Remove this action in 4.7 release
-    object PrepareAndNavigateToAddCustomToken : TokensAction
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensMiddleware.kt b/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensMiddleware.kt
index 2785c63857..c108b2602f 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensMiddleware.kt
@@ -9,63 +9,105 @@ import com.tangem.common.extensions.ByteArrayKey
 import com.tangem.common.extensions.guard
 import com.tangem.common.extensions.toMapKey
 import com.tangem.common.flatMap
-import com.tangem.core.analytics.Analytics
-import com.tangem.core.navigation.AppScreen
 import com.tangem.core.navigation.NavigationAction
 import com.tangem.crypto.hdWallet.DerivationPath
-import com.tangem.domain.DomainWrapped
 import com.tangem.domain.common.configs.CardConfig
 import com.tangem.domain.common.util.derivationStyleProvider
-import com.tangem.domain.common.util.hasDerivation
 import com.tangem.domain.common.util.supportsHdWallet
-import com.tangem.domain.features.addCustomToken.CustomCurrency
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction
 import com.tangem.domain.models.scan.ScanResponse
-import com.tangem.domain.redux.domainStore
+import com.tangem.domain.tokens.TokenWithBlockchain
+import com.tangem.domain.tokens.TokensAction
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.operations.derivation.ExtendedPublicKeysMap
 import com.tangem.tap.*
-import com.tangem.tap.common.analytics.events.ManageTokens
 import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.TapError
-import com.tangem.tap.domain.model.WalletDataModel
 import com.tangem.tap.features.wallet.models.Currency
+import com.tangem.tap.proxy.redux.DaggerGraphState
+import com.tangem.utils.extensions.DELAY_SDK_DIALOG_CLOSE
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.rekotlin.Middleware
 import timber.log.Timber
 
+@Suppress("LargeClass")
 object TokensMiddleware {
 
     val tokensMiddleware: Middleware<AppState> = { _, _ ->
         { next ->
             { action ->
                 when (action) {
-                    is TokensAction.SaveChanges -> handleSaveChanges(action)
-                    is TokensAction.PrepareAndNavigateToAddCustomToken -> handleAddingCustomToken()
+                    is TokensAction.LegacySaveChanges -> handleLegacySaveChanges(action)
+                    is TokensAction.NewSaveChanges -> handleNewSaveChanges(action)
                 }
                 next(action)
             }
         }
     }
 
-    private fun handleSaveChanges(action: TokensAction.SaveChanges) {
+    private fun handleNewSaveChanges(action: TokensAction.NewSaveChanges) {
         scope.launch {
-            val scanResponse = store.state.globalState.scanResponse ?: return@launch
+            val scanResponse = action.userWallet.scanResponse
 
-            val currentTokens = store.state.tokensState.addedTokens
-            val currentBlockchains = store.state.tokensState.addedBlockchains
+            val currentTokens = action.currentTokens
+            val currentBlockchains = action.currentCoins
 
-            val blockchainsToAdd = action.blockchains.filterNot(currentBlockchains::contains)
-            val blockchainsToRemove =
-                store.state.tokensState.addedBlockchains.filterNot(action.blockchains::contains)
+            val blockchainsToAdd = action.changedCoins.filterNot(currentBlockchains::contains)
+            val blockchainsToRemove = currentBlockchains.filterNot(action.changedCoins::contains)
 
-            val tokensToAdd = action.tokens.filterNot(currentTokens::contains)
-            val tokensToRemove = currentTokens.filterNot { token -> action.tokens.any { it.token == token.token } }
+            val tokensToAdd = action.changedTokens.filterNot(currentTokens::contains)
+            val tokensToRemove = currentTokens.filterNot { token -> action.changedTokens.any { it == token } }
 
-            removeCurrenciesIfNeeded(
+            removeNewCurrenciesIfNeeded(
+                userWalletId = action.userWallet.walletId,
+                currencies = blockchainsToRemove + tokensToRemove,
+            )
+
+            val isNothingToDoWithTokens = tokensToAdd.isEmpty() && tokensToRemove.isEmpty()
+            val isNothingToDoWithBlockchain = blockchainsToAdd.isEmpty() && blockchainsToRemove.isEmpty()
+            if (isNothingToDoWithTokens && isNothingToDoWithBlockchain) {
+                store.dispatchDebugErrorNotification(message = "Nothing to save")
+                store.dispatchOnMain(NavigationAction.PopBackTo())
+                return@launch
+            }
+
+            val currencyList = blockchainsToAdd + tokensToAdd
+
+            if (scanResponse.supportsHdWallet()) {
+                deriveMissingCoins(scanResponse = scanResponse, currencyList = currencyList) {
+                    submitNewAdd(
+                        userWalletId = action.userWallet.walletId,
+                        updatedScanResponse = it,
+                        currencyList = currencyList,
+                    )
+                    store.dispatchOnMain(NavigationAction.PopBackTo())
+                }
+            } else {
+                submitNewAdd(userWalletId = action.userWallet.walletId, scanResponse, currencyList = currencyList)
+                store.dispatchOnMain(NavigationAction.PopBackTo())
+            }
+        }
+    }
+
+    private fun handleLegacySaveChanges(action: TokensAction.LegacySaveChanges) {
+        scope.launch {
+            val scanResponse = action.scanResponse
+
+            val currentTokens = action.currentTokens
+            val currentBlockchains = action.currentBlockchains
+
+            val blockchainsToAdd = action.changedBlockchains.filterNot(currentBlockchains::contains)
+            val blockchainsToRemove = currentBlockchains.filterNot(action.changedBlockchains::contains)
+
+            val tokensToAdd = action.changedTokens.filterNot(currentTokens::contains)
+            val tokensToRemove =
+                currentTokens.filterNot { token -> action.changedTokens.any { it.token == token.token } }
+
+            removeLegacyCurrenciesIfNeeded(
                 currencies = convertToCurrencies(
                     blockchains = blockchainsToRemove,
                     tokens = tokensToRemove,
@@ -89,11 +131,11 @@ object TokensMiddleware {
 
             if (scanResponse.supportsHdWallet()) {
                 deriveMissingBlockchains(scanResponse, currencyList) {
-                    submitAdd(it, currencyList)
+                    submitLegacyAdd(it, currencyList)
                     store.dispatchOnMain(NavigationAction.PopBackTo())
                 }
             } else {
-                submitAdd(scanResponse, currencyList)
+                submitLegacyAdd(scanResponse, currencyList)
                 store.dispatchOnMain(NavigationAction.PopBackTo())
             }
         }
@@ -104,15 +146,14 @@ object TokensMiddleware {
         tokens: List<TokenWithBlockchain>,
         derivationStyle: DerivationStyle?,
     ): List<Currency> {
-        return blockchains.map {
-            Currency.Blockchain(it, it.derivationPath(derivationStyle)?.rawPath)
-        } + tokens.map {
-            Currency.Token(
-                it.token,
-                it.blockchain,
-                it.blockchain.derivationPath(derivationStyle)?.rawPath,
-            )
-        }
+        return blockchains.map { Currency.Blockchain(it, it.derivationPath(derivationStyle)?.rawPath) } +
+            tokens.map {
+                Currency.Token(
+                    token = it.token,
+                    blockchain = it.blockchain,
+                    derivationPath = it.blockchain.derivationPath(derivationStyle)?.rawPath,
+                )
+            }
     }
 
     private fun deriveMissingBlockchains(
@@ -123,7 +164,7 @@ object TokensMiddleware {
         val config = CardConfig.createConfig(scanResponse.card)
         val derivationDataList = currencyList.mapNotNull { currency ->
             val curve = config.primaryCurve(currency.blockchain)
-            curve?.let { getDerivations(curve, scanResponse, currency) }
+            curve?.let { getLegacyDerivations(curve, scanResponse, currency) }
         }
         val derivations = buildMap<ByteArrayKey, MutableList<DerivationPath>> {
             derivationDataList.forEach {
@@ -174,7 +215,69 @@ object TokensMiddleware {
         }
     }
 
-    private fun getDerivations(curve: EllipticCurve, scanResponse: ScanResponse, currency: Currency): DerivationData? {
+    private fun deriveMissingCoins(
+        scanResponse: ScanResponse,
+        currencyList: List<CryptoCurrency>,
+        onSuccess: (ScanResponse) -> Unit,
+    ) {
+        val config = CardConfig.createConfig(scanResponse.card)
+        val derivationDataList = currencyList.mapNotNull { currency ->
+            val curve = config.primaryCurve(blockchain = Blockchain.fromId(currency.network.id.value))
+            curve?.let { getNewDerivations(curve, scanResponse, currency) }
+        }
+        val derivations = buildMap<ByteArrayKey, MutableList<DerivationPath>> {
+            derivationDataList.forEach {
+                val current = this[it.derivations.first]
+                if (current != null) {
+                    current.addAll(it.derivations.second)
+                    current.distinct()
+                } else {
+                    this[it.derivations.first] = it.derivations.second.toMutableList()
+                }
+            }
+        }
+
+        if (derivations.isEmpty()) {
+            onSuccess(scanResponse)
+            return
+        }
+
+        scope.launch {
+            val result = tangemSdkManager.derivePublicKeys(
+                cardId = null,
+                derivations = derivations,
+            )
+            when (result) {
+                is CompletionResult.Success -> {
+                    val newDerivedKeys = result.data.entries
+                    val oldDerivedKeys = scanResponse.derivedKeys
+
+                    val walletKeys = (newDerivedKeys.keys + oldDerivedKeys.keys).toSet()
+
+                    val updatedDerivedKeys = walletKeys.associateWith { walletKey ->
+                        val oldDerivations = ExtendedPublicKeysMap(oldDerivedKeys[walletKey] ?: emptyMap())
+                        val newDerivations = newDerivedKeys[walletKey] ?: ExtendedPublicKeysMap(emptyMap())
+                        ExtendedPublicKeysMap(oldDerivations + newDerivations)
+                    }
+                    val updatedScanResponse = scanResponse.copy(derivedKeys = updatedDerivedKeys)
+
+                    store.dispatchOnMain(GlobalAction.SaveScanResponse(updatedScanResponse))
+                    delay(DELAY_SDK_DIALOG_CLOSE)
+
+                    onSuccess(updatedScanResponse)
+                }
+                is CompletionResult.Failure -> {
+                    store.dispatchDebugErrorNotification(TapError.CustomError("Error adding tokens"))
+                }
+            }
+        }
+    }
+
+    private fun getLegacyDerivations(
+        curve: EllipticCurve,
+        scanResponse: ScanResponse,
+        currency: Currency,
+    ): DerivationData? {
         val wallet = scanResponse.card.wallets.firstOrNull { it.curve == curve } ?: return null
 
         val supportedCurves = currency.blockchain.getSupportedCurves()
@@ -205,9 +308,45 @@ object TokensMiddleware {
         return DerivationData(derivations = mapKeyOfWalletPublicKey to toDerive)
     }
 
+    private fun getNewDerivations(
+        curve: EllipticCurve,
+        scanResponse: ScanResponse,
+        currency: CryptoCurrency,
+    ): DerivationData? {
+        val wallet = scanResponse.card.wallets.firstOrNull { it.curve == curve } ?: return null
+
+        val blockchain = Blockchain.fromId(currency.network.id.value)
+        val supportedCurves = blockchain.getSupportedCurves()
+        val path = blockchain.derivationPath(scanResponse.derivationStyleProvider.getDerivationStyle())
+            .takeIf { supportedCurves.contains(curve) }
+
+        val customPath = currency.network.derivationPath.value?.let {
+            DerivationPath(it)
+        }.takeIf { supportedCurves.contains(curve) }
+
+        val bothCandidates = listOfNotNull(path, customPath).distinct().toMutableList()
+        if (bothCandidates.isEmpty()) return null
+
+        if (currency is CryptoCurrency.Coin && blockchain == Blockchain.Cardano) {
+            currency.network.derivationPath.value?.let {
+                bothCandidates.add(CardanoUtils.extendedDerivationPath(DerivationPath(it)))
+            }
+        }
+
+        val mapKeyOfWalletPublicKey = wallet.publicKey.toMapKey()
+        val alreadyDerivedKeys: ExtendedPublicKeysMap =
+            scanResponse.derivedKeys[mapKeyOfWalletPublicKey] ?: ExtendedPublicKeysMap(emptyMap())
+        val alreadyDerivedPaths = alreadyDerivedKeys.keys.toList()
+
+        val toDerive = bothCandidates.filterNot { alreadyDerivedPaths.contains(it) }
+        if (toDerive.isEmpty()) return null
+
+        return DerivationData(derivations = mapKeyOfWalletPublicKey to toDerive)
+    }
+
     class DerivationData(val derivations: Pair<ByteArrayKey, List<DerivationPath>>)
 
-    private fun submitAdd(scanResponse: ScanResponse, currencyList: List<Currency>) {
+    private fun submitLegacyAdd(scanResponse: ScanResponse, currencyList: List<Currency>) {
         val selectedUserWallet = userWalletsListManager.selectedUserWalletSync.guard {
             Timber.e("Unable to add currencies, no user wallet selected")
             return
@@ -228,7 +367,31 @@ object TokensMiddleware {
         }
     }
 
-    private suspend fun removeCurrenciesIfNeeded(currencies: List<Currency>) {
+    private fun submitNewAdd(
+        userWalletId: UserWalletId,
+        updatedScanResponse: ScanResponse,
+        currencyList: List<CryptoCurrency>,
+    ) {
+        val currenciesRepository = store.state.daggerGraphState.get(DaggerGraphState::currenciesRepository)
+        val networksRepository = store.state.daggerGraphState.get(DaggerGraphState::networksRepository)
+
+        scope.launch {
+            userWalletsListManager.update(
+                userWalletId = userWalletId,
+                update = { it.copy(scanResponse = updatedScanResponse) },
+            )
+
+            currenciesRepository.addCurrencies(userWalletId = userWalletId, currencies = currencyList)
+
+            networksRepository.getNetworkStatusesSync(
+                userWalletId = userWalletId,
+                networks = currencyList.map(CryptoCurrency::network).toSet(),
+                refresh = true,
+            )
+        }
+    }
+
+    private suspend fun removeLegacyCurrenciesIfNeeded(currencies: List<Currency>) {
         if (currencies.isEmpty()) return
         val selectedUserWallet = userWalletsListManager.selectedUserWalletSync.guard {
             Timber.e("Unable to remove currencies, no user wallet selected")
@@ -237,55 +400,10 @@ object TokensMiddleware {
         walletCurrenciesManager.removeCurrencies(selectedUserWallet, currencies)
     }
 
-    private fun isNeedToDerive(scanResponse: ScanResponse, currency: Currency): Boolean {
-        return currency.derivationPath?.let {
-            !scanResponse.hasDerivation(currency.blockchain, it)
-        } ?: false
-    }
+    private suspend fun removeNewCurrenciesIfNeeded(userWalletId: UserWalletId, currencies: List<CryptoCurrency>) {
+        if (currencies.isEmpty()) return
+        val currenciesRepository = store.state.daggerGraphState.get(DaggerGraphState::currenciesRepository)
 
-    private fun handleAddingCustomToken() = scope.launch {
-        val onAddCustomToken = fun(customCurrency: CustomCurrency) {
-            val scanResponse = store.state.globalState.scanResponse ?: return
-
-            fun submitAndPopBack(scanResponse: ScanResponse, currencyList: List<Currency>) {
-                submitAdd(scanResponse, currencyList)
-                // pop from the AddCustomTokenScreen
-                store.dispatchOnMain(NavigationAction.PopBackTo())
-                store.dispatchOnMain(NavigationAction.PopBackTo())
-            }
-
-            Analytics.send(ManageTokens.CustomToken.TokenWasAdded(customCurrency))
-            val currency = Currency.fromCustomCurrency(customCurrency)
-            val isNeedToDerive = isNeedToDerive(scanResponse, currency)
-            val currencyList = listOf(currency)
-            if (isNeedToDerive) {
-                deriveMissingBlockchains(scanResponse, currencyList) {
-                    submitAndPopBack(it, currencyList)
-                }
-            } else {
-                submitAndPopBack(scanResponse, currencyList)
-            }
-        }
-
-        val addedCurrencies = store.state.walletState.walletsStores
-            .map { walletStore -> walletStore.walletsData.map(WalletDataModel::currency) }
-            .flatten()
-            .map { currency ->
-                when (currency) {
-                    is Currency.Blockchain -> DomainWrapped.Currency.Blockchain(
-                        currency.blockchain,
-                        currency.derivationPath,
-                    )
-
-                    is Currency.Token -> DomainWrapped.Currency.Token(
-                        currency.token,
-                        currency.blockchain,
-                        currency.derivationPath,
-                    )
-                }
-            }
-        domainStore.dispatch(AddCustomTokenAction.Init.SetAddedCurrencies(addedCurrencies))
-        domainStore.dispatch(AddCustomTokenAction.Init.SetOnAddTokenCallback(onAddCustomToken))
-        store.dispatch(NavigationAction.NavigateTo(AppScreen.AddCustomToken))
+        currenciesRepository.removeCurrencies(userWalletId = userWalletId, currencies = currencies)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensReducer.kt b/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensReducer.kt
index 8e33fdc8f4..389a02219a 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensReducer.kt
@@ -1,11 +1,7 @@
 package com.tangem.tap.features.tokens.legacy.redux
 
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.blockchain.common.derivation.DerivationStyle
+import com.tangem.domain.tokens.TokensAction
 import com.tangem.tap.common.redux.AppState
-import com.tangem.tap.domain.model.WalletDataModel
-import com.tangem.tap.features.wallet.models.Currency
-import com.tangem.tap.features.wallet.models.Currency.Token
 import org.rekotlin.Action
 
 object TokensReducer {
@@ -16,40 +12,8 @@ private fun internalReduce(action: Action, state: AppState): TokensState {
     if (action !is TokensAction) return state.tokensState
 
     return when (action) {
-        is TokensAction.SetArgs.ManageAccess -> {
-            state.tokensState.copy(
-                isManageAccess = true,
-                addedWallets = action.wallets,
-                addedBlockchains = action.wallets.toNonCustomBlockchains(action.derivationStyle),
-                addedTokens = action.wallets.toNonCustomTokensWithBlockchains(action.derivationStyle),
-            )
-        }
-
-        is TokensAction.SetArgs.ReadAccess -> {
-            state.tokensState.copy(isManageAccess = false)
-        }
-
+        is TokensAction.SetArgs.ManageAccess -> state.tokensState.copy(isManageAccess = true)
+        is TokensAction.SetArgs.ReadAccess -> state.tokensState.copy(isManageAccess = false)
         else -> state.tokensState
     }
-}
-
-private fun List<WalletDataModel>.toNonCustomBlockchains(derivationStyle: DerivationStyle?): List<Blockchain> {
-    return mapNotNull { walletDataModel ->
-        if (walletDataModel.currency.isCustomCurrency(derivationStyle)) {
-            null
-        } else {
-            (walletDataModel.currency as? Currency.Blockchain)?.blockchain
-        }
-    }.distinct()
-}
-
-private fun List<WalletDataModel>.toNonCustomTokensWithBlockchains(
-    derivationStyle: DerivationStyle?,
-): List<TokenWithBlockchain> {
-    return mapNotNull { walletDataModel ->
-        if (walletDataModel.currency !is Token) return@mapNotNull null
-        if (walletDataModel.currency.isCustomCurrency(derivationStyle)) return@mapNotNull null
-
-        TokenWithBlockchain(walletDataModel.currency.token, walletDataModel.currency.blockchain)
-    }.distinct()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensState.kt b/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensState.kt
index 156fd0c922..14c5d9d721 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensState.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensState.kt
@@ -1,16 +1,5 @@
 package com.tangem.tap.features.tokens.legacy.redux
 
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.blockchain.common.Token
-import com.tangem.tap.domain.model.WalletDataModel
 import org.rekotlin.StateType
 
-data class TokensState(
-    val isManageAccess: Boolean = false,
-    val addedWallets: List<WalletDataModel> = emptyList(),
-    val addedTokens: List<TokenWithBlockchain> = emptyList(),
-    val addedBlockchains: List<Blockchain> = emptyList(),
-) : StateType
-
-// TODO: [REDACTED_TASK_KEY] Remove this class
-data class TokenWithBlockchain(val token: Token, val blockchain: Blockchain)
\ No newline at end of file
+data class TokensState(val isManageAccess: Boolean = false) : StateType
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/converters/CryptoCurrencyConverter.kt b/app/src/main/java/com/tangem/tap/features/wallet/converters/CryptoCurrencyConverter.kt
index 8b22dd95e6..891841469c 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/converters/CryptoCurrencyConverter.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/converters/CryptoCurrencyConverter.kt
@@ -1,13 +1,15 @@
 package com.tangem.tap.features.wallet.converters
 
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchain.common.Token
 import com.tangem.data.tokens.utils.CryptoCurrencyFactory
 import com.tangem.domain.common.util.derivationStyleProvider
-import com.tangem.domain.tokens.models.CryptoCurrency
+import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.store
-import com.tangem.utils.converter.Converter
+import com.tangem.utils.converter.TwoWayConverter
 
-internal class CryptoCurrencyConverter : Converter<Currency, CryptoCurrency> {
+internal class CryptoCurrencyConverter : TwoWayConverter<Currency, CryptoCurrency> {
 
     private val cryptoCurrencyFactory by lazy { CryptoCurrencyFactory() }
 
@@ -16,6 +18,7 @@ internal class CryptoCurrencyConverter : Converter<Currency, CryptoCurrency> {
             is Currency.Blockchain -> requireNotNull(
                 cryptoCurrencyFactory.createCoin(
                     blockchain = value.blockchain,
+                    extraDerivationPath = value.derivationPath,
                     derivationStyleProvider = requireNotNull(
                         store.state.globalState
                             .userWalletsListManager
@@ -29,6 +32,7 @@ internal class CryptoCurrencyConverter : Converter<Currency, CryptoCurrency> {
                 cryptoCurrencyFactory.createToken(
                     sdkToken = value.token,
                     blockchain = value.blockchain,
+                    extraDerivationPath = value.derivationPath,
                     derivationStyleProvider = requireNotNull(
                         store.state.globalState
                             .userWalletsListManager
@@ -40,4 +44,26 @@ internal class CryptoCurrencyConverter : Converter<Currency, CryptoCurrency> {
             )
         }
     }
+
+    override fun convertBack(value: CryptoCurrency): Currency {
+        val blockchain = Blockchain.fromId(value.network.id.value)
+        if (blockchain == Blockchain.Unknown) error("CryptoCurrencyConverter convertBack Unknown blockchain")
+        return when (value) {
+            is CryptoCurrency.Coin -> Currency.Blockchain(
+                blockchain = blockchain,
+                derivationPath = value.network.derivationPath.value,
+            )
+            is CryptoCurrency.Token -> Currency.Token(
+                token = Token(
+                    name = value.name,
+                    symbol = value.symbol,
+                    contractAddress = value.contractAddress,
+                    decimals = value.decimals,
+                    id = value.id.value,
+                ),
+                blockchain = blockchain,
+                derivationPath = value.network.derivationPath.value,
+            )
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/data/WalletRepositoryImpl.kt b/app/src/main/java/com/tangem/tap/features/wallet/data/WalletRepositoryImpl.kt
index e610e03389..e0b6ce6972 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/data/WalletRepositoryImpl.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/data/WalletRepositoryImpl.kt
@@ -1,5 +1,6 @@
 package com.tangem.tap.features.wallet.data
 
+import com.tangem.datasource.api.common.response.getOrThrow
 import com.tangem.datasource.api.tangemTech.TangemTechApi
 import com.tangem.datasource.api.tangemTech.models.CurrenciesResponse
 import com.tangem.tap.features.wallet.domain.WalletRepository
@@ -18,6 +19,6 @@ class WalletRepositoryImpl(
 ) : WalletRepository {
 
     override suspend fun getCurrencyList(): CurrenciesResponse = withContext(dispatchers.io) {
-        tangemTechApi.getCurrencyList()
+        tangemTechApi.getCurrencyList().getOrThrow()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt
index adca4f96f4..30b0aaadce 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt
@@ -19,6 +19,7 @@ import com.tangem.tap.domain.model.WalletStoreModel
 import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.features.wallet.redux.models.WalletDialog
 import com.tangem.wallet.R
+import kotlinx.coroutines.CoroutineScope
 import org.rekotlin.Action
 
 sealed class WalletAction : Action {
@@ -76,7 +77,7 @@ sealed class WalletAction : Action {
 
     data class Scan(
         val onScanSuccessEvent: AnalyticsEvent?,
-        val lifecycleScope: LifecycleCoroutineScope,
+        val scope: CoroutineScope,
     ) : WalletAction()
 
     data class Send(val amount: Amount? = null) : WalletAction()
@@ -113,7 +114,7 @@ sealed class WalletAction : Action {
     data class ExploreAddress(val exploreUrl: String, val context: Context) : WalletAction()
 
     object CreateWallet : WalletAction()
-    data class ChangeWallet(val lifecycleScope: LifecycleCoroutineScope) : WalletAction()
+    data class ChangeWallet(val scope: LifecycleCoroutineScope) : WalletAction()
     object ShowSaveWalletIfNeeded : WalletAction()
 
     sealed class TradeCryptoAction : WalletAction() {
@@ -121,14 +122,6 @@ sealed class WalletAction : Action {
 
         data class Buy(val checkUserLocation: Boolean = true) : TradeCryptoAction()
 
-        data class FinishSelling(val transactionId: String) : TradeCryptoAction()
-        data class SendCrypto(
-            val currencyId: String,
-            val amount: String,
-            val destinationAddress: String,
-            val transactionId: String,
-        ) : TradeCryptoAction()
-
         object Swap : TradeCryptoAction()
     }
 
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/MultiWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/MultiWalletMiddleware.kt
index 91fa88858c..1b3426fda4 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/MultiWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/MultiWalletMiddleware.kt
@@ -1,6 +1,5 @@
 package com.tangem.tap.features.wallet.redux.middlewares
 
-import androidx.core.os.bundleOf
 import com.tangem.common.doOnSuccess
 import com.tangem.common.extensions.guard
 import com.tangem.common.flatMap
@@ -8,7 +7,6 @@ import com.tangem.core.analytics.Analytics
 import com.tangem.core.navigation.AppScreen
 import com.tangem.core.navigation.NavigationAction
 import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.features.tokendetails.navigation.TokenDetailsRouter
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.Token.ButtonRemoveToken
 import com.tangem.tap.common.extensions.addContext
@@ -17,7 +15,6 @@ import com.tangem.tap.common.extensions.dispatchErrorNotification
 import com.tangem.tap.common.extensions.dispatchWithMain
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.TapError
-import com.tangem.tap.features.wallet.converters.CryptoCurrencyConverter
 import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.features.wallet.redux.WalletState
 import com.tangem.tap.features.wallet.redux.models.WalletDialog
@@ -32,18 +29,12 @@ import timber.log.Timber
 
 class MultiWalletMiddleware {
 
-    private val cryptoCurrencyConverter by lazy { CryptoCurrencyConverter() }
-
     @Suppress("LongMethod", "ComplexMethod")
     fun handle(action: WalletAction.MultiWallet, walletState: WalletState?) {
         when (action) {
             is WalletAction.MultiWallet.SelectWallet -> {
                 if (action.currency != null) {
-                    val bundle = bundleOf(
-                        // TODO: [REDACTED_JIRA]
-                        TokenDetailsRouter.SELECTED_CURRENCY_KEY to cryptoCurrencyConverter.convert(action.currency),
-                    )
-                    store.dispatch(NavigationAction.NavigateTo(screen = AppScreen.WalletDetails, bundle = bundle))
+                    store.dispatch(NavigationAction.NavigateTo(screen = AppScreen.WalletDetails))
                 }
             }
             is WalletAction.MultiWallet.TryToRemoveWallet -> {
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt
index 2528753b4e..666f1ac84e 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt
@@ -11,16 +11,20 @@ import com.tangem.core.navigation.AppScreen
 import com.tangem.core.navigation.NavigationAction
 import com.tangem.domain.common.extensions.toCoinId
 import com.tangem.domain.common.extensions.toNetworkId
-import com.tangem.domain.common.util.derivationStyleProvider
 import com.tangem.domain.tokens.legacy.TradeCryptoAction
-import com.tangem.domain.tokens.models.CryptoCurrency
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.Network
 import com.tangem.feature.swap.presentation.SwapFragment
+import com.tangem.features.send.navigation.SendRouter
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.Token
+import com.tangem.tap.common.apptheme.MutableAppThemeModeHolder
 import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
+import com.tangem.tap.common.extensions.dispatchErrorNotification
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.dispatchOpenUrl
 import com.tangem.tap.common.redux.AppState
+import com.tangem.tap.domain.TapError
 import com.tangem.tap.domain.tokens.getIconUrl
 import com.tangem.tap.features.demo.DemoHelper
 import com.tangem.tap.features.home.RUSSIA_COUNTRY_CODE
@@ -29,6 +33,7 @@ import com.tangem.tap.features.send.redux.SendAction
 import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.features.wallet.redux.WalletState
+import com.tangem.tap.features.wallet.redux.models.WalletDialog
 import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager
 import com.tangem.tap.network.exchangeServices.buyErc20TestnetTokens
 import com.tangem.tap.proxy.redux.DaggerGraphState
@@ -39,7 +44,10 @@ import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import com.tangem.feature.swap.domain.models.domain.Currency as SwapCurrency
 
+@Suppress("LargeClass")
 class TradeCryptoMiddleware {
+
+    @Suppress("LongMethod", "CyclomaticComplexMethod")
     fun handle(state: () -> AppState?, action: TradeCryptoAction) {
         if (DemoHelper.tryHandle(state, action)) return
 
@@ -49,14 +57,20 @@ class TradeCryptoMiddleware {
             is TradeCryptoAction.SendCrypto -> preconfigureAndOpenSendScreen(action)
             is TradeCryptoAction.FinishSelling -> openReceiptUrl(action.transactionId)
             is TradeCryptoAction.Swap -> {
-                openSwap(currency = store.state.walletState.selectedWalletData?.currency?.toSwapCurrency())
+                openSwap(
+                    currency = store.state.walletState.selectedWalletData?.currency?.toSwapCurrency(),
+                    derivationPath = store.state.walletState.selectedWalletData?.currency?.derivationPath,
+                )
             }
             is TradeCryptoAction.New.Buy -> proceedNewBuyAction(state, action)
-            TradeCryptoAction.New.Send -> store.dispatch(WalletAction.Send())
             is TradeCryptoAction.New.Sell -> proceedNewSellAction(action)
-            is TradeCryptoAction.New.Swap -> {
-                openSwap(currency = action.cryptoCurrency.toSwapCurrency())
-            }
+            is TradeCryptoAction.New.Swap -> openSwap(
+                currency = action.cryptoCurrency.toSwapCurrency(),
+                derivationPath = action.cryptoCurrency.network.derivationPath.value,
+                network = action.cryptoCurrency.network,
+            )
+            is TradeCryptoAction.New.SendToken -> handleNewSendToken(action = action)
+            is TradeCryptoAction.New.SendCoin -> handleNewSendCoin(action = action)
         }
     }
 
@@ -100,6 +114,7 @@ class TradeCryptoMiddleware {
             cryptoCurrencyName = currency.currencySymbol,
             fiatCurrencyName = appCurrency.code,
             walletAddress = addresses[0].address,
+            isDarkTheme = MutableAppThemeModeHolder.isDarkThemeActive,
         )?.let {
             store.dispatchOpenUrl(it)
             Analytics.send(Token.Topup.ScreenOpened())
@@ -109,24 +124,41 @@ class TradeCryptoMiddleware {
     private fun proceedNewBuyAction(state: () -> AppState?, action: TradeCryptoAction.New.Buy) {
         val networkAddress = action.cryptoCurrencyStatus.value.networkAddress?.defaultAddress ?: return
 
-        if (action.checkUserLocation && state()?.globalState?.userCountryCode == RUSSIA_COUNTRY_CODE) {
-            store.dispatchOnMain(WalletAction.DialogAction.RussianCardholdersWarningDialog())
-            return
-        }
-
         val status = action.cryptoCurrencyStatus
         val currency = status.currency
         val blockchain = Blockchain.fromId(currency.network.id.value)
+        val exchangeManager = store.state.globalState.exchangeManager
+        val topUrl = exchangeManager.getUrl(
+            action = CurrencyExchangeManager.Action.Buy,
+            blockchain = blockchain,
+            cryptoCurrencyName = currency.symbol,
+            fiatCurrencyName = action.appCurrencyCode,
+            walletAddress = networkAddress,
+            isDarkTheme = MutableAppThemeModeHolder.isDarkThemeActive,
+        )
+
+        if (action.checkUserLocation && state()?.globalState?.userCountryCode == RUSSIA_COUNTRY_CODE) {
+            val dialogData = topUrl?.let {
+                WalletDialog.RussianCardholdersWarningDialog.Data(
+                    topUpUrl = it,
+                )
+            }
+            store.dispatchOnMain(
+                WalletAction.DialogAction.RussianCardholdersWarningDialog(
+                    dialogData = dialogData,
+                ),
+            )
+            return
+        }
+
         if (currency is CryptoCurrency.Token && currency.network.isTestnet) {
             scope.launch {
                 val walletManager = store.state.daggerGraphState
                     .get(DaggerGraphState::walletManagersFacade)
                     .getOrCreateWalletManager(
-                        userWallet = action.userWallet,
+                        userWalletId = action.userWallet.walletId,
                         blockchain = blockchain,
-                        derivationPath = blockchain.derivationPath(
-                            style = action.userWallet.scanResponse.derivationStyleProvider.getDerivationStyle(),
-                        ),
+                        derivationPath = currency.network.derivationPath.value,
                     )
 
                 if (walletManager !is EthereumWalletManager) {
@@ -143,14 +175,7 @@ class TradeCryptoMiddleware {
             return
         }
 
-        val exchangeManager = store.state.globalState.exchangeManager
-        exchangeManager.getUrl(
-            action = CurrencyExchangeManager.Action.Buy,
-            blockchain = blockchain,
-            cryptoCurrencyName = currency.symbol,
-            fiatCurrencyName = action.appCurrencyCode,
-            walletAddress = networkAddress,
-        )?.let {
+        topUrl?.let {
             store.dispatchOpenUrl(it)
             Analytics.send(Token.Topup.ScreenOpened())
         }
@@ -172,6 +197,7 @@ class TradeCryptoMiddleware {
             cryptoCurrencyName = currency.currencySymbol,
             fiatCurrencyName = appCurrency.code,
             walletAddress = addresses[0].address,
+            isDarkTheme = MutableAppThemeModeHolder.isDarkThemeActive,
         )?.let {
             store.dispatchOpenUrl(it)
             Analytics.send(Token.Withdraw.ScreenOpened())
@@ -188,6 +214,7 @@ class TradeCryptoMiddleware {
             cryptoCurrencyName = currency.symbol,
             fiatCurrencyName = action.appCurrencyCode,
             walletAddress = networkAddress,
+            isDarkTheme = MutableAppThemeModeHolder.isDarkThemeActive,
         )?.let {
             store.dispatchOpenUrl(it)
             Analytics.send(Token.Withdraw.ScreenOpened())
@@ -239,10 +266,11 @@ class TradeCryptoMiddleware {
         )?.let { store.dispatchOpenUrl(it) }
     }
 
-    private fun openSwap(currency: SwapCurrency?) {
+    private fun openSwap(currency: SwapCurrency?, derivationPath: String?, network: Network? = null) {
         val bundle = bundleOf(
             SwapFragment.CURRENCY_BUNDLE_KEY to Json.encodeToString(currency),
-            SwapFragment.DERIVATION_PATH to store.state.walletState.selectedWalletData?.currency?.derivationPath,
+            SwapFragment.DERIVATION_PATH to derivationPath,
+            SwapFragment.NETWORK to network,
         )
 
         store.dispatchOnMain(NavigationAction.NavigateTo(screen = AppScreen.Swap, bundle = bundle))
@@ -265,11 +293,11 @@ class TradeCryptoMiddleware {
             }
             is CryptoCurrency.Token -> {
                 SwapCurrency.NonNativeToken(
-                    id = id.value,
+                    id = id.rawCurrencyId ?: "",
                     name = name,
                     symbol = symbol,
                     networkId = blockchain.toNetworkId(),
-                    logoUrl = getIconUrl(id.value),
+                    logoUrl = getIconUrl(id.rawCurrencyId ?: ""),
                     contractAddress = contractAddress,
                     decimalCount = decimals,
                 )
@@ -301,4 +329,95 @@ class TradeCryptoMiddleware {
             )
         }
     }
+
+    private fun handleNewSendToken(action: TradeCryptoAction.New.SendToken) {
+        val cryptoStatus = action.tokenStatus
+        val currency = cryptoStatus.currency
+        val blockchain = Blockchain.fromId(currency.network.id.value)
+
+        scope.launch {
+            val walletManager = store.state.daggerGraphState
+                .get(DaggerGraphState::walletManagersFacade)
+                .getOrCreateWalletManager(
+                    userWalletId = action.userWallet.walletId,
+                    blockchain = blockchain,
+                    derivationPath = currency.network.derivationPath.value,
+                )
+
+            if (walletManager == null) {
+                val error = TapError.UnsupportedState(stateError = "WalletManager is null")
+                FirebaseCrashlytics.getInstance().recordException(IllegalStateException(error.stateError))
+                store.dispatchErrorNotification(error)
+                return@launch
+            }
+
+            val sendableAmounts = walletManager.wallet.amounts.values.filter { it.type is AmountType.Token }
+            when (currency) {
+                is CryptoCurrency.Coin -> error("Action.tokenStatus.currency is Coin")
+                is CryptoCurrency.Token -> {
+                    store.dispatchOnMain(
+                        action = PrepareSendScreen(
+                            walletManager = walletManager,
+                            coinAmount = walletManager.wallet.amounts[AmountType.Coin],
+                            coinRate = action.coinFiatRate,
+                            tokenAmount = sendableAmounts.first(),
+                            tokenRate = cryptoStatus.value.fiatRate,
+                        ),
+                    )
+                }
+            }
+            val bundle = bundleOf(SendRouter.CRYPTO_CURRENCY_KEY to currency)
+            store.dispatchOnMain(NavigationAction.NavigateTo(screen = AppScreen.Send, bundle = bundle))
+        }
+    }
+
+    private fun handleNewSendCoin(action: TradeCryptoAction.New.SendCoin) {
+        val cryptoStatus = action.coinStatus
+        val currency = cryptoStatus.currency
+        val blockchain = Blockchain.fromId(currency.network.id.value)
+
+        scope.launch {
+            val walletManager = store.state.daggerGraphState
+                .get(DaggerGraphState::walletManagersFacade)
+                .getOrCreateWalletManager(
+                    userWalletId = action.userWallet.walletId,
+                    blockchain = blockchain,
+                    derivationPath = currency.network.derivationPath.value,
+                )
+
+            if (walletManager == null) {
+                val error = TapError.UnsupportedState(stateError = "WalletManager is null")
+                FirebaseCrashlytics.getInstance().recordException(IllegalStateException(error.stateError))
+                store.dispatchErrorNotification(error)
+                return@launch
+            }
+
+            val sendableAmounts = walletManager.wallet.amounts.values.filter { it.type == AmountType.Coin }
+            when (currency) {
+                is CryptoCurrency.Coin -> {
+                    val amountToSend = sendableAmounts.find { it.currencySymbol == currency.symbol }
+
+                    if (amountToSend == null) {
+                        val error = TapError.UnsupportedState(stateError = "Amount to send is null")
+                        FirebaseCrashlytics.getInstance()
+                            .recordException(IllegalStateException(error.stateError))
+                        store.dispatchErrorNotification(error)
+                        return@launch
+                    }
+
+                    store.dispatchOnMain(
+                        action = PrepareSendScreen(
+                            walletManager = walletManager,
+                            coinAmount = amountToSend,
+                            coinRate = cryptoStatus.value.fiatRate,
+                        ),
+                    )
+                }
+                is CryptoCurrency.Token -> error("Action.tokenStatus.currency is Token")
+            }
+
+            val bundle = bundleOf(SendRouter.CRYPTO_CURRENCY_KEY to currency)
+            store.dispatchOnMain(NavigationAction.NavigateTo(screen = AppScreen.Send, bundle = bundle))
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
index b4f81bd001..ce93801220 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
@@ -116,9 +116,9 @@ class WalletMiddleware {
             }
             is WalletAction.Scan -> {
                 store.dispatch(NavigationAction.PopBackTo(AppScreen.Home))
-                action.lifecycleScope.launch {
+                action.scope.launch {
                     delay(timeMillis = 700)
-                    store.dispatchOnMain(HomeAction.ReadCard(action.onScanSuccessEvent, action.lifecycleScope))
+                    store.dispatchOnMain(HomeAction.ReadCard(action.onScanSuccessEvent, action.scope))
                 }
             }
             is WalletAction.LoadData,
@@ -227,7 +227,7 @@ class WalletMiddleware {
                 showSaveWalletIfNeeded()
             }
             is WalletAction.ChangeWallet -> {
-                changeWallet(walletState, action.lifecycleScope)
+                changeWallet(walletState, action.scope)
             }
             is WalletAction.UserWalletChanged -> Unit
             is WalletAction.WalletStoresChanged -> {
@@ -403,7 +403,7 @@ class WalletMiddleware {
                 store.dispatch(
                     WalletAction.Scan(
                         onScanSuccessEvent = Basic.CardWasScanned(AnalyticsParam.ScannedFrom.Main),
-                        lifecycleScope = lifecycleScope,
+                        scope = lifecycleScope,
                     ),
                 )
             }
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WarningsMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WarningsMiddleware.kt
index 44a7dd5341..39e905255e 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WarningsMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WarningsMiddleware.kt
@@ -19,11 +19,12 @@ import com.tangem.tap.preferencesStorage
 import com.tangem.tap.proxy.redux.DaggerGraphState
 import com.tangem.tap.scope
 import com.tangem.tap.store
-import com.tangem.wallet.R
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
+// TODO: Delete with WalletFeatureToggles
+@Deprecated(message = "Used only in old wallet screen")
 class WarningsMiddleware {
     fun handle(action: WalletAction.Warnings, globalState: GlobalState?) {
         when (action) {
@@ -49,7 +50,7 @@ class WarningsMiddleware {
                 if (action.remainingSignatures != null &&
                     action.remainingSignatures <= WarningMessagesManager.REMAINING_SIGNATURES_WARNING
                 ) {
-                    store.state.globalState.warningManager?.removeWarnings(R.string.warning_low_signatures_format)
+                    // store.state.globalState.warningManager?.removeWarnings(R.string.warning_low_signatures_format)
                     addWarningMessage(
                         warning = WarningMessagesManager.remainingSignaturesNotEnough(action.remainingSignatures),
                         autoUpdate = true,
@@ -154,9 +155,8 @@ class WarningsMiddleware {
                         store.dispatch(WalletAction.Warnings.CheckHashesCount.SaveCardId)
                     }
                     is SimpleResult.Failure ->
-                        if (result.error is BlockchainSdkError.SignatureCountNotMatched) {
-                            addWarningMessage(alreadySignedHashesWarning, true)
-                        } else if (signedHashes > 0) {
+                        if (signedHashes > 0 || result.error is BlockchainSdkError.SignatureCountNotMatched) {
+                            alreadySignedHashesWarning.isHidden = false
                             addWarningMessage(alreadySignedHashesWarning, true)
                         }
                     null -> Unit
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/BalanceWidget.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/BalanceWidget.kt
index 3cab6df274..eb7dfd7126 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/BalanceWidget.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/BalanceWidget.kt
@@ -10,6 +10,8 @@ import com.tangem.tap.store
 import com.tangem.wallet.R
 import com.tangem.wallet.databinding.CardBalanceBinding
 
+// TODO: Delete with WalletFeatureToggles
+@Deprecated(message = "Used only in old wallet screen")
 class BalanceWidget(
     private val binding: CardBalanceBinding,
     private val fragment: WalletFragment,
@@ -46,12 +48,11 @@ class BalanceWidget(
                 val statusView = if (blockchainWalletData.status is WalletDataModel.VerifiedOnline) {
                     R.id.tv_status_verified
                 } else {
-                    tvStatusError.text =
-                        fragment.getText(R.string.wallet_balance_tx_in_progress)
+                    // tvStatusError.text = fragment.getText(R.string.wallet_balance_tx_in_progress)
                     R.id.group_error
                 }
                 showStatus(statusView)
-                tvStatusErrorMessage.hide()
+                // tvStatusErrorMessage.hide()
 
                 if (tokenWalletData != null) {
                     showBalanceWithToken(blockchainWalletData, true)
@@ -70,12 +71,12 @@ class BalanceWidget(
                 tvCurrency.text = currency
                 tvAmount.text = ""
 
-                tvStatusErrorMessage.text = blockchainWalletData.status.errorMessage
-                tvStatusError.text =
-                    fragment.getString(R.string.wallet_balance_blockchain_unreachable)
+                // tvStatusErrorMessage.text = blockchainWalletData.status.errorMessage
+                // TODO: Delete with WalletFeatureToggles
+                // tvStatusError.text = fragment.getString(R.string.wallet_balance_blockchain_unreachable)
 
                 showStatus(R.id.group_error)
-                tvStatusErrorMessage.show(!blockchainWalletData.status.errorMessage.isNullOrBlank())
+                // tvStatusErrorMessage.show(!blockchainWalletData.status.errorMessage.isNullOrBlank())
             }
             is WalletDataModel.NoAccount -> with(binding.lBalanceError) {
                 binding.lBalance.root.hide()
@@ -93,7 +94,7 @@ class BalanceWidget(
     }
 
     private fun showStatus(@IdRes viewRes: Int) = with(binding.lBalance) {
-        groupError.show(viewRes == R.id.group_error)
+        // groupError.show(viewRes == R.id.group_error)
         tvStatusLoading.show(viewRes == R.id.tv_status_loading)
         tvStatusVerified.show(viewRes == R.id.tv_status_verified)
     }
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt
index fe767bafda..de08710457 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt
@@ -10,7 +10,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.transition.TransitionInflater
 import by.kirich1409.viewbindingdelegate.viewBinding
 import com.badoo.mvicore.DiffStrategy
 import com.badoo.mvicore.ModelWatcher
@@ -63,7 +62,9 @@ import javax.inject.Inject
 /**
  * Wallet details fragment - use only for MultiWallet
  */
+// TODO: Delete with WalletFeatureToggles
 @Suppress("LargeClass", "MagicNumber")
+@Deprecated(message = "Used only in old wallet screen")
 @AndroidEntryPoint
 class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details), SafeStoreSubscriber<WalletState> {
 
@@ -152,9 +153,6 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details), SafeSt
                 }
             },
         )
-        val inflater = TransitionInflater.from(requireContext())
-        enterTransition = inflater.inflateTransition(R.transition.slide_right)
-        exitTransition = inflater.inflateTransition(R.transition.fade)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -440,10 +438,11 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details), SafeSt
                 lBalance.root.show()
                 lBalance.groupBalance.hide()
                 lBalance.tvError.show()
-                lBalance.tvError.setWarningStatus(
-                    R.string.wallet_balance_blockchain_unreachable,
-                    status.errorMessage,
-                )
+                // TODO: Delete with WalletFeatureToggles
+                // lBalance.tvError.setWarningStatus(
+                //     R.string.wallet_balance_blockchain_unreachable,
+                //     status.errorMessage,
+                // )
             }
             is WalletDataModel.NoAccount -> {
                 lBalance.root.hide()
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
index cbb33a7dcd..a02a218d62 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
@@ -37,7 +37,6 @@ import com.tangem.tap.common.utils.SafeStoreSubscriber
 import com.tangem.tap.domain.configurable.warningMessage.WarningMessage
 import com.tangem.tap.domain.statePrinter.printScanResponseState
 import com.tangem.tap.domain.statePrinter.printWalletState
-import com.tangem.tap.features.details.redux.DetailsAction
 import com.tangem.tap.features.wallet.redux.ErrorType
 import com.tangem.tap.features.wallet.redux.ProgressState
 import com.tangem.tap.features.wallet.redux.WalletAction
@@ -73,7 +72,6 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), SafeStoreSubscriber<W
 
     private var walletView: WalletView = MultiWalletView()
 
-    // private val learn2earnViewModel by activityViewModels<Learn2earnViewModel>()
     private val viewModel by viewModels<WalletViewModel>()
 
     private val totalBalanceWatcher = modelWatcher {
@@ -101,9 +99,8 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), SafeStoreSubscriber<W
             },
         )
         val inflater = TransitionInflater.from(requireContext())
-        enterTransition = inflater.inflateTransition(R.transition.slide_right)
+        enterTransition = inflater.inflateTransition(R.transition.fade)
         exitTransition = inflater.inflateTransition(R.transition.fade)
-        // learn2earnViewModel.onMainScreenCreated()
     }
 
     override fun onStart() {
@@ -136,9 +133,7 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), SafeStoreSubscriber<W
 
         binding.toolbar.setNavigationOnClickListener(
             OneTouchClickListener {
-                lifecycleScope.launch {
-                    store.dispatch(WalletAction.ChangeWallet(lifecycleScope))
-                }
+                store.dispatch(WalletAction.ChangeWallet(scope = requireActivity().lifecycleScope))
             },
         )
         setupWarningsRecyclerView()
@@ -309,17 +304,9 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), SafeStoreSubscriber<W
         return when (item.itemId) {
             R.id.details_menu -> {
                 store.dispatch(GlobalAction.UpdateFeedbackInfo(store.state.walletState.walletManagers))
-                store.state.globalState.scanResponse?.let { scanResponse ->
-                    store.dispatch(
-                        DetailsAction.PrepareScreen(
-                            scanResponse = scanResponse,
-                            wallets = store.state.walletState.walletManagers.map { it.wallet },
-                        ),
-                    )
-                    store.dispatch(NavigationAction.NavigateTo(AppScreen.Details))
-                    true
-                }
-                false
+                store.dispatch(NavigationAction.NavigateTo(AppScreen.Details))
+
+                true
             }
             else -> super.onOptionsItemSelected(item)
         }
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletViewModel.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletViewModel.kt
index b94cc9de26..271bc8aaae 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletViewModel.kt
@@ -64,6 +64,7 @@ internal class WalletViewModel @Inject constructor(
                         batch = scanResponse.card.batchId,
                         signInType = signInType,
                         walletsCount = store.state.globalState.userWalletsListManager?.walletsCount.toString(),
+                        hasBackup = scanResponse.card.backupStatus?.isActive,
                     ),
                 )
             }
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletWarningConverter.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletWarningConverter.kt
index afbf3bff5a..5f98692fca 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletWarningConverter.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletWarningConverter.kt
@@ -9,43 +9,45 @@ import com.tangem.wallet.R
 /**
 [REDACTED_AUTHOR]
  */
+// TODO: Delete with WalletFeatureToggles
+@Deprecated(message = "Used only in old wallet screen")
 class WalletWarningConverter(
     private val context: Context,
 ) : ModuleMessageConverter<WalletWarning, WalletWarningDescription> {
 
     override fun convert(message: WalletWarning): WalletWarningDescription {
-        val warningMessage = when (message) {
-            is WalletWarning.ExistentialDeposit -> {
-                context.getString(
-                    R.string.warning_existential_deposit_message,
-                    message.currencyName,
-                    message.edStringValueWithSymbol,
-                )
-            }
-            is WalletWarning.BalanceNotEnoughForFee -> {
-                context.getString(
-                    R.string.token_details_send_blocked_fee_format,
-                    message.currencyName,
-                    message.blockchainFullName,
-                    message.currencyName,
-                    message.blockchainFullName,
-                    message.blockchainSymbol,
-                )
-            }
-            is WalletWarning.TransactionInProgress -> {
-                context.getString(
-                    R.string.token_details_send_blocked_tx_format,
-                    message.currencyName,
-                )
-            }
-            is WalletWarning.Rent -> {
-                context.getString(
-                    R.string.solana_rent_warning,
-                    message.walletRent.rent,
-                    message.walletRent.exemptionAmount,
-                )
-            }
-        }
-        return WalletWarningDescription(context.getString(R.string.common_warning), warningMessage)
+        // val warningMessage = when (message) {
+        //     is WalletWarning.ExistentialDeposit -> {
+        //         context.getString(
+        //             R.string.warning_existential_deposit_message,
+        //             message.currencyName,
+        //             message.edStringValueWithSymbol,
+        //         )
+        //     }
+        //     is WalletWarning.BalanceNotEnoughForFee -> {
+        //         context.getString(
+        //             R.string.token_details_send_blocked_fee_format,
+        //             message.currencyName,
+        //             message.blockchainFullName,
+        //             message.currencyName,
+        //             message.blockchainFullName,
+        //             message.blockchainSymbol,
+        //         )
+        //     }
+        //     is WalletWarning.TransactionInProgress -> {
+        //         context.getString(
+        //             R.string.token_details_send_blocked_tx_format,
+        //             message.currencyName,
+        //         )
+        //     }
+        //     is WalletWarning.Rent -> {
+        //         context.getString(
+        //             R.string.solana_rent_warning,
+        //             message.walletRent.rent,
+        //             message.walletRent.exemptionAmount,
+        //         )
+        //     }
+        // }
+        return WalletWarningDescription(context.getString(R.string.common_warning), "")
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletAdapter.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletAdapter.kt
index 3f511f7b65..0b1e671dab 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletAdapter.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletAdapter.kt
@@ -22,6 +22,8 @@ import com.tangem.tap.store
 import com.tangem.wallet.R
 import com.tangem.wallet.databinding.ItemCurrencyWalletBinding
 
+// TODO: Delete with WalletFeatureToggles
+@Deprecated(message = "Used only in old wallet screen")
 class WalletAdapter : ListAdapter<WalletDataModel, WalletAdapter.WalletsViewHolder>(DiffUtilCallback) {
 
     override fun getItemId(position: Int): Long {
@@ -59,7 +61,8 @@ class WalletAdapter : ListAdapter<WalletDataModel, WalletAdapter.WalletsViewHold
                     root.getString(R.string.wallet_balance_tx_in_progress)
                 }
                 is WalletDataModel.Unreachable -> {
-                    root.getString(R.string.wallet_balance_blockchain_unreachable)
+                    // TODO: Delete with WalletFeatureToggles
+                    // root.getString(R.string.wallet_balance_blockchain_unreachable)
                 }
                 is WalletDataModel.MissedDerivation -> {
                     root.getString(R.string.wallet_balance_missing_derivation)
@@ -86,7 +89,7 @@ class WalletAdapter : ListAdapter<WalletDataModel, WalletAdapter.WalletsViewHold
             lContent.tvAmount.text = wallet.getFormattedCryptoAmount()
 
             lContent.tvStatus.isVisible = statusMessage != null
-            lContent.tvStatus.text = statusMessage
+            // lContent.tvStatus.text = statusMessage
 
             lContent.tvExchangeRate.isVisible = statusMessage == null
             lContent.tvExchangeRate.text = wallet.getFormattedFiatRate(
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WarningMessagesAdapter.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WarningMessagesAdapter.kt
index 762d6e818e..1534ef1d17 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WarningMessagesAdapter.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WarningMessagesAdapter.kt
@@ -10,12 +10,7 @@ import com.google.android.play.core.review.ReviewManagerFactory
 import com.tangem.core.analytics.Analytics
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.MainScreen
-import com.tangem.tap.common.extensions.getActivity
-import com.tangem.tap.common.extensions.getColor
-import com.tangem.tap.common.extensions.getString
-import com.tangem.tap.common.extensions.hide
-import com.tangem.tap.common.extensions.show
-import com.tangem.tap.common.feedback.RateCanBeBetterEmail
+import com.tangem.tap.common.extensions.*
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.configurable.warningMessage.WarningMessage
 import com.tangem.tap.features.wallet.redux.WalletAction
@@ -24,6 +19,8 @@ import com.tangem.wallet.R
 import com.tangem.wallet.databinding.LayoutWarningCardActionBinding
 import timber.log.Timber
 
+// TODO: Delete with WalletFeatureToggles
+@Deprecated(message = "Used only in old wallet screen")
 class WarningMessagesAdapter : ListAdapter<WarningMessage, WarningMessageVH>(DiffUtilCallback) {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): WarningMessageVH {
@@ -94,11 +91,11 @@ class WarningMessageVH(val binding: LayoutWarningCardActionBinding) : RecyclerVi
 
             val buttonAction =
                 when (warning.titleResId) {
-                    R.string.warning_important_security_info -> {
-                        View.OnClickListener {
-                            store.dispatch(WalletAction.DialogAction.SignedHashesMultiWalletDialog)
-                        }
-                    }
+                    // R.string.warning_important_security_info -> {
+                    //     View.OnClickListener {
+                    //         store.dispatch(WalletAction.DialogAction.SignedHashesMultiWalletDialog)
+                    //     }
+                    // }
                     else -> {
                         View.OnClickListener {
                             store.dispatch(GlobalAction.HideWarningMessage(warning))
@@ -120,12 +117,12 @@ class WarningMessageVH(val binding: LayoutWarningCardActionBinding) : RecyclerVi
                 store.dispatch(GlobalAction.HideWarningMessage(warning))
                 store.dispatch(WalletAction.Warnings.AppRating.RemindLater)
             }
-            binding.btnCanBeBetter.setOnClickListener {
-                Analytics.send(MainScreen.NoticeRateAppButton(AnalyticsParam.RateApp.Disliked))
-                store.dispatch(WalletAction.Warnings.AppRating.SetNeverToShow)
-                store.dispatch(GlobalAction.HideWarningMessage(warning))
-                store.dispatch(GlobalAction.SendEmail(RateCanBeBetterEmail()))
-            }
+            // binding.btnCanBeBetter.setOnClickListener {
+            //     Analytics.send(MainScreen.NoticeRateAppButton(AnalyticsParam.RateApp.Disliked))
+            //     store.dispatch(WalletAction.Warnings.AppRating.SetNeverToShow)
+            //     store.dispatch(GlobalAction.HideWarningMessage(warning))
+            //     store.dispatch(GlobalAction.SendEmail(RateCanBeBetterEmail()))
+            // }
             binding.btnReallyCool.setOnClickListener {
                 val activity = binding.root.context.getActivity() ?: return@setOnClickListener
 
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ScanFailsDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ScanFailsDialog.kt
index f1081006c2..30d7d0b8e4 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ScanFailsDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ScanFailsDialog.kt
@@ -2,6 +2,7 @@ package com.tangem.tap.features.wallet.ui.dialogs
 
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.tangem.core.analytics.Analytics
 import com.tangem.tap.common.analytics.events.IntroductionProcess
 import com.tangem.tap.common.extensions.dispatchDialogHide
@@ -15,7 +16,7 @@ import com.tangem.wallet.R
  */
 object ScanFailsDialog {
     fun create(context: Context): AlertDialog {
-        return AlertDialog.Builder(context).apply {
+        return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog).apply {
             setTitle(context.getString(R.string.common_warning))
             setMessage(R.string.alert_troubleshooting_scan_card_title)
             setPositiveButton(R.string.alert_button_request_support) { _, _ ->
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SignedHashesWarningDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SignedHashesWarningDialog.kt
index c44801d9c8..8ebbffeb54 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SignedHashesWarningDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SignedHashesWarningDialog.kt
@@ -2,17 +2,20 @@ package com.tangem.tap.features.wallet.ui.dialogs
 
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.configurable.warningMessage.WarningMessagesManager
 import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.store
 import com.tangem.wallet.R
 
+// TODO: Delete with WalletFeatureToggles
+@Deprecated(message = "Used only in old wallet screen")
 object SignedHashesWarningDialog {
     fun create(context: Context): AlertDialog {
-        return AlertDialog.Builder(context).apply {
-            setTitle(context.getString(R.string.warning_important_security_info, "\u26A0"))
-            setMessage(R.string.alert_signed_hashes_message)
+        return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog).apply {
+            // setTitle(context.getString(R.string.warning_important_security_info, "\u26A0"))
+            // setMessage(R.string.alert_signed_hashes_message)
             setPositiveButton(R.string.common_understand) { _, _ ->
                 store.dispatch(WalletAction.Warnings.CheckHashesCount.SaveCardId)
                 store.dispatch(
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SimpleOkDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SimpleOkDialog.kt
index 8f3a42060f..9abf465eb0 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SimpleOkDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SimpleOkDialog.kt
@@ -2,6 +2,7 @@ package com.tangem.tap.features.wallet.ui.dialogs
 
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.tangem.tap.common.extensions.dispatchDialogHide
 import com.tangem.tap.common.redux.AppDialog
 import com.tangem.tap.store
@@ -13,7 +14,7 @@ import com.tangem.wallet.R
 object SimpleOkDialog {
 
     fun create(dialog: AppDialog.SimpleOkDialog, context: Context): AlertDialog {
-        return AlertDialog.Builder(context).apply {
+        return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog).apply {
             setTitle(dialog.header)
             setMessage(dialog.message)
             setPositiveButton(R.string.common_ok) { _, _ -> }
@@ -60,7 +61,7 @@ object SimpleOkDialog {
     )
 
     fun create(dialog: AppDialog.OkCancelDialogRes, context: Context): AlertDialog {
-        return AlertDialog.Builder(context).apply {
+        return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog).apply {
             setTitle(context.getString(dialog.headerId))
             setMessage(dialog.messageId)
             setPositiveButton(dialog.okButton.title) { _, _ -> dialog.okButton.action?.invoke() }
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/view/TotalBalanceCard.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/view/TotalBalanceCard.kt
index fdfadc43e1..d39bf43e05 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/view/TotalBalanceCard.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/view/TotalBalanceCard.kt
@@ -134,7 +134,7 @@ private fun TotalBalanceCardContent(state: TotalBalanceCardState, modifier: Modi
                 Text(
                     modifier = Modifier.fillMaxWidth(),
                     text = stringResource(id = R.string.main_processing_full_amount),
-                    style = TangemTheme.typography.caption,
+                    style = TangemTheme.typography.caption2,
                     color = TangemTheme.colors.text.attention,
                 )
             }
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/CurrencySelectionDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/CurrencySelectionDialog.kt
index 835b547e6d..51a29dfdba 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/CurrencySelectionDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/CurrencySelectionDialog.kt
@@ -2,6 +2,7 @@ package com.tangem.tap.features.wallet.ui.wallet
 
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.features.wallet.redux.models.WalletDialog
 import com.tangem.tap.store
@@ -15,7 +16,7 @@ object CurrencySelectionDialog {
         val currentSelection = dialog.currenciesList
             .indexOfFirst { it.code == dialog.currentAppCurrency.code }
 
-        return AlertDialog.Builder(context)
+        return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog)
             .setTitle(context.getString(R.string.details_row_title_currency))
             .setNegativeButton(context.getString(R.string.common_cancel)) { _, _ -> /* no-op */ }
             .setOnDismissListener {
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/MultiWalletView.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/MultiWalletView.kt
index 8f17e52682..290bd68881 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/MultiWalletView.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/MultiWalletView.kt
@@ -6,7 +6,7 @@ import com.badoo.mvicore.modelWatcher
 import com.tangem.core.analytics.Analytics
 import com.tangem.core.navigation.AppScreen
 import com.tangem.core.navigation.NavigationAction
-import com.tangem.domain.common.util.derivationStyleProvider
+import com.tangem.domain.tokens.TokensAction
 import com.tangem.tap.common.analytics.events.MainScreen
 import com.tangem.tap.common.analytics.events.Portfolio
 import com.tangem.tap.common.entities.FiatCurrency
@@ -14,7 +14,6 @@ import com.tangem.tap.common.extensions.getQuantityString
 import com.tangem.tap.common.extensions.hide
 import com.tangem.tap.common.extensions.show
 import com.tangem.tap.domain.model.TotalFiatBalance
-import com.tangem.tap.features.tokens.legacy.redux.TokensAction
 import com.tangem.tap.features.wallet.redux.ErrorType
 import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.features.wallet.redux.WalletState
@@ -106,14 +105,8 @@ class MultiWalletView : WalletView() {
         binding.btnAddToken.setOnClickListener {
             Analytics.send(Portfolio.ButtonManageTokens())
 
-            store.dispatch(
-                TokensAction.SetArgs.ManageAccess(
-                    wallets = state.walletsDataFromStores,
-                    derivationStyle = store.state.globalState.scanResponse
-                        ?.derivationStyleProvider?.getDerivationStyle(),
-                ),
-            )
-            store.dispatch(NavigationAction.NavigateTo(AppScreen.AddTokens))
+            store.dispatch(action = TokensAction.SetArgs.ManageAccess)
+            store.dispatch(action = NavigationAction.NavigateTo(screen = AppScreen.AddTokens))
         }
         handleErrorStates(state = state, binding = binding, fragment = fragment)
     }
diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorMiddleware.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorMiddleware.kt
index 3ee7ad011b..1593e811f9 100644
--- a/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorMiddleware.kt
@@ -288,6 +288,9 @@ internal class WalletSelectorMiddleware {
     }
 
     private fun refreshUserWalletsAmounts() {
+        val featureToggles = store.state.daggerGraphState.get(DaggerGraphState::walletFeatureToggles)
+        if (featureToggles.isRedesignedScreenEnabled) return
+
         scope.launch {
             walletStoresManager.updateAmounts(
                 userWallets = userWalletsListManager.userWallets.firstOrNull().orEmpty(),
diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/WallectSelectorScreenContent.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/WallectSelectorScreenContent.kt
index 472a4322ec..0993a1c9ea 100644
--- a/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/WallectSelectorScreenContent.kt
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/WallectSelectorScreenContent.kt
@@ -177,7 +177,7 @@ private fun Footer(
             PrimaryButton(
                 modifier = Modifier.fillMaxWidth(),
                 text = stringResource(
-                    id = R.string.user_wallet_list_unlock_all,
+                    id = R.string.user_wallet_list_unlock_all_with,
                     stringResource(id = R.string.common_biometrics),
                 ),
                 showProgress = showUnlockProgress,
diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/WalletItem.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/WalletItem.kt
index 62ef2c0468..0224ee04fc 100644
--- a/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/WalletItem.kt
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/WalletItem.kt
@@ -151,7 +151,7 @@ private fun RowScope.WalletInfo(wallet: UserWalletItem, isSelected: Boolean) {
             },
             color = TangemTheme.colors.text.tertiary,
             maxLines = 1,
-            style = TangemTheme.typography.caption,
+            style = TangemTheme.typography.caption2,
         )
     }
 }
@@ -255,7 +255,7 @@ private fun LoadedTokensInfo(
                     count = tokensCount,
                     tokensCount,
                 ),
-                style = TangemTheme.typography.caption,
+                style = TangemTheme.typography.caption2,
                 color = TangemTheme.colors.text.tertiary,
                 textAlign = TextAlign.End,
             )
diff --git a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeAction.kt b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeAction.kt
index 338743a569..97138375c6 100644
--- a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeAction.kt
@@ -1,22 +1,27 @@
 package com.tangem.tap.features.welcome.redux
 
 import android.content.Intent
-import androidx.lifecycle.LifecycleCoroutineScope
 import com.tangem.common.core.TangemError
+import kotlinx.coroutines.CoroutineScope
 import org.rekotlin.Action
 
 internal sealed interface WelcomeAction : Action {
-    object ProceedWithBiometrics : WelcomeAction {
+
+    data class SetCoroutineScope(val scope: CoroutineScope) : WelcomeAction
+
+    object ClearCoroutineScope : WelcomeAction
+
+    data class ProceedWithBiometrics(val afterUnlockIntent: Intent? = null) : WelcomeAction {
         object Success : WelcomeAction
         data class Error(val error: TangemError) : WelcomeAction
     }
 
-    data class ProceedWithCard(val lifecycleCoroutineScope: LifecycleCoroutineScope) : WelcomeAction {
+    object ProceedWithCard : WelcomeAction {
         object Success : WelcomeAction
         data class Error(val error: TangemError) : WelcomeAction
     }
 
-    data class SetInitialIntent(val intent: Intent?) : WelcomeAction
+    data class ProceedWithIntent(val intent: Intent) : WelcomeAction
 
     object CloseError : WelcomeAction
 
diff --git a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
index 1ab1cee43d..482671ce51 100644
--- a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
@@ -1,26 +1,31 @@
 package com.tangem.tap.features.welcome.redux
 
-import androidx.lifecycle.LifecycleCoroutineScope
+import android.content.Intent
 import com.tangem.common.core.TangemSdkError
 import com.tangem.common.doOnFailure
 import com.tangem.common.doOnResult
 import com.tangem.common.doOnSuccess
 import com.tangem.common.flatMap
+import com.tangem.core.analytics.Analytics
 import com.tangem.core.navigation.AppScreen
 import com.tangem.core.navigation.NavigationAction
+import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.userwallets.UserWalletBuilder
 import com.tangem.domain.wallets.legacy.unlockIfLockable
 import com.tangem.tap.*
+import com.tangem.tap.common.analytics.converters.ParamCardCurrencyConverter
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.Basic
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.dispatchWithMain
 import com.tangem.tap.common.extensions.onUserWalletSelected
 import com.tangem.tap.common.redux.AppState
+import com.tangem.tap.features.intentHandler.handlers.BackgroundScanIntentHandler
 import com.tangem.tap.features.intentHandler.handlers.WalletConnectLinkIntentHandler
 import com.tangem.tap.features.signin.redux.SignInAction
 import com.tangem.tap.proxy.redux.DaggerGraphState
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import org.rekotlin.Middleware
 import timber.log.Timber
@@ -39,15 +44,119 @@ internal class WelcomeMiddleware {
     }
 
     private fun handleAction(action: WelcomeAction, state: WelcomeState) {
-        when (action) {
-            is WelcomeAction.ProceedWithBiometrics -> proceedWithBiometrics(state)
-            is WelcomeAction.ProceedWithCard -> proceedWithCard(state, action.lifecycleCoroutineScope)
-            is WelcomeAction.ClearUserWallets -> disableUserWalletsSaving()
-            else -> Unit
+        state.scope?.launch {
+            when (action) {
+                is WelcomeAction.ProceedWithIntent -> proceedWithIntent(action.intent, scope = this)
+                is WelcomeAction.ProceedWithBiometrics -> proceedWithBiometrics(
+                    afterUnlockIntent = action.afterUnlockIntent ?: state.intent,
+                )
+                is WelcomeAction.ProceedWithCard -> proceedWithCard(afterScanIntent = state.intent)
+                is WelcomeAction.ClearUserWallets -> disableUserWalletsSaving()
+                else -> Unit
+            }
         }
     }
 
-    private fun disableUserWalletsSaving() = scope.launch {
+    private suspend fun proceedWithIntent(initialIntent: Intent, scope: CoroutineScope) {
+        Timber.d(
+            """
+                Proceeding with intent
+                |- Intent: $initialIntent
+            """.trimIndent(),
+        )
+
+        val handler = BackgroundScanIntentHandler(
+            scope = scope,
+            hasSavedUserWalletsProvider = { true },
+        )
+        val isBackgroundScanHandled = handler.handleIntent(initialIntent)
+        val hasUncompletedBackup = backupService.hasIncompletedBackup
+
+        if (!isBackgroundScanHandled && !hasUncompletedBackup) {
+            store.dispatchWithMain(WelcomeAction.ProceedWithBiometrics(initialIntent))
+        }
+    }
+
+    private suspend fun proceedWithBiometrics(afterUnlockIntent: Intent?) {
+        Timber.d(
+            """
+                Proceeding with biometry
+                |- Intent: $afterUnlockIntent
+            """.trimIndent(),
+        )
+
+        userWalletsListManager.unlockIfLockable()
+            .doOnFailure { error ->
+                Timber.e(error, "Unable to unlock user wallets with biometrics")
+                store.dispatchWithMain(WelcomeAction.ProceedWithBiometrics.Error(error))
+            }
+            .doOnSuccess { selectedUserWallet ->
+                sendSignedInAnalyticsEvent(
+                    scanResponse = selectedUserWallet.scanResponse,
+                    signInType = Basic.SignedIn.SignInType.Biometric,
+                )
+
+                store.dispatchWithMain(SignInAction.SetSignInType(Basic.SignedIn.SignInType.Biometric))
+                store.dispatchWithMain(NavigationAction.NavigateTo(AppScreen.Wallet))
+                store.dispatchWithMain(WelcomeAction.ProceedWithBiometrics.Success)
+                store.onUserWalletSelected(userWallet = selectedUserWallet)
+
+                afterUnlockIntent?.let {
+                    WalletConnectLinkIntentHandler().handleIntent(it)
+                }
+            }
+    }
+
+    private suspend fun proceedWithCard(afterScanIntent: Intent?) {
+        Timber.d(
+            """
+                Proceeding with card
+                |- Intent: $afterScanIntent
+            """.trimIndent(),
+        )
+
+        scanCardInternal { scanResponse ->
+            val userWallet = UserWalletBuilder(scanResponse).build() ?: return@scanCardInternal
+
+            userWalletsListManager.save(userWallet, canOverride = true)
+                .doOnFailure { error ->
+                    Timber.e(error, "Unable to save user wallet")
+                    store.dispatchWithMain(WelcomeAction.ProceedWithCard.Error(error))
+                }
+                .doOnSuccess {
+                    sendSignedInAnalyticsEvent(scanResponse = scanResponse, signInType = Basic.SignedIn.SignInType.Card)
+
+                    store.dispatchWithMain(SignInAction.SetSignInType(Basic.SignedIn.SignInType.Card))
+                    store.dispatchWithMain(NavigationAction.NavigateTo(AppScreen.Wallet))
+                    store.dispatchWithMain(WelcomeAction.ProceedWithCard.Success)
+                    store.onUserWalletSelected(userWallet = userWallet)
+
+                    afterScanIntent?.let {
+                        WalletConnectLinkIntentHandler().handleIntent(it)
+                    }
+                }
+        }
+    }
+
+    private fun sendSignedInAnalyticsEvent(scanResponse: ScanResponse, signInType: Basic.SignedIn.SignInType) {
+        val currency = ParamCardCurrencyConverter().convert(
+            value = scanResponse.cardTypesResolver,
+        )
+
+        if (currency != null) {
+            Analytics.send(
+                event = Basic.SignedIn(
+                    currency = currency,
+                    batch = scanResponse.card.batchId,
+                    signInType = signInType,
+                    walletsCount = store.state.globalState.userWalletsListManager?.walletsCount.toString(),
+                    hasBackup = scanResponse.card.backupStatus?.isActive,
+                ),
+            )
+        }
+    }
+
+    private suspend fun disableUserWalletsSaving() {
         userWalletsListManager.clear()
             .flatMap { walletStoresManager.clear() }
             .flatMap { tangemSdkManager.clearSavedUserCodes() }
@@ -60,48 +169,6 @@ internal class WelcomeMiddleware {
             }
     }
 
-    private fun proceedWithBiometrics(state: WelcomeState) = scope.launch {
-        userWalletsListManager.unlockIfLockable()
-            .doOnFailure { error ->
-                Timber.e(error, "Unable to unlock user wallets with biometrics")
-                store.dispatchOnMain(WelcomeAction.ProceedWithBiometrics.Error(error))
-            }
-            .doOnSuccess { selectedUserWallet ->
-                store.dispatchOnMain(SignInAction.SetSignInType(Basic.SignedIn.SignInType.Biometric))
-                store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.Wallet))
-                store.dispatchOnMain(WelcomeAction.ProceedWithBiometrics.Success)
-                store.onUserWalletSelected(userWallet = selectedUserWallet)
-
-                state.intent?.let {
-                    WalletConnectLinkIntentHandler().handleIntent(it)
-                }
-            }
-    }
-
-    private fun proceedWithCard(state: WelcomeState, lifecycleCoroutineScope: LifecycleCoroutineScope) {
-        lifecycleCoroutineScope.launch {
-            scanCardInternal { scanResponse ->
-                val userWallet = UserWalletBuilder(scanResponse).build() ?: return@scanCardInternal
-
-                userWalletsListManager.save(userWallet, canOverride = true)
-                    .doOnFailure { error ->
-                        Timber.e(error, "Unable to save user wallet")
-                        store.dispatchOnMain(WelcomeAction.ProceedWithCard.Error(error))
-                    }
-                    .doOnSuccess {
-                        store.dispatchOnMain(SignInAction.SetSignInType(Basic.SignedIn.SignInType.Card))
-                        store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.Wallet))
-                        store.dispatchOnMain(WelcomeAction.ProceedWithCard.Success)
-                        store.onUserWalletSelected(userWallet = userWallet)
-
-                        state.intent?.let {
-                            WalletConnectLinkIntentHandler().handleIntent(it)
-                        }
-                    }
-            }
-        }
-    }
-
     private suspend inline fun scanCardInternal(crossinline onCardScanned: suspend (ScanResponse) -> Unit) {
         store.state.daggerGraphState.get(DaggerGraphState::cardSdkConfigRepository).setAccessCodeRequestPolicy(
             isBiometricsRequestPolicy = preferencesStorage.shouldSaveAccessCodes,
diff --git a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeReducer.kt b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeReducer.kt
index 11bfb0ea4a..85db06dc63 100644
--- a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeReducer.kt
@@ -14,7 +14,9 @@ internal object WelcomeReducer {
 
     private fun internalReduce(action: WelcomeAction, state: WelcomeState): WelcomeState {
         return when (action) {
-            is WelcomeAction.SetInitialIntent -> state.copy(intent = action.intent)
+            is WelcomeAction.SetCoroutineScope -> state.copy(scope = action.scope)
+            is WelcomeAction.ClearCoroutineScope -> state.copy(scope = null)
+            is WelcomeAction.ProceedWithIntent -> state.copy(intent = action.intent)
             is WelcomeAction.ProceedWithBiometrics -> state.copy(isUnlockWithBiometricsInProgress = true)
             is WelcomeAction.ProceedWithCard -> state.copy(isUnlockWithCardInProgress = true)
             is WelcomeAction.ProceedWithBiometrics.Error -> state.copy(
diff --git a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeState.kt b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeState.kt
index a8a55d3984..951fa1e673 100644
--- a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeState.kt
+++ b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeState.kt
@@ -2,9 +2,11 @@ package com.tangem.tap.features.welcome.redux
 
 import android.content.Intent
 import com.tangem.common.core.TangemError
+import kotlinx.coroutines.CoroutineScope
 import org.rekotlin.StateType
 
 data class WelcomeState(
+    val scope: CoroutineScope? = null,
     val isUnlockWithBiometricsInProgress: Boolean = false,
     val isUnlockWithCardInProgress: Boolean = false,
     val intent: Intent? = null,
diff --git a/app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeFragment.kt b/app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeFragment.kt
index f3d9cd27f1..c3197818c0 100644
--- a/app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeFragment.kt
@@ -11,9 +11,9 @@ import androidx.compose.material.SnackbarHostState
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.fragment.app.viewModels
+import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.lifecycle.lifecycleScope
 import com.tangem.core.analytics.Analytics
 import com.tangem.core.ui.components.SystemBarsEffect
 import com.tangem.core.ui.res.TangemTheme
@@ -33,8 +33,6 @@ internal class WelcomeFragment : ComposeFragment() {
     @Inject
     override lateinit var appThemeModeHolder: AppThemeModeHolder
 
-    private val viewModel by viewModels<WelcomeViewModel>()
-
     override fun onStart() {
         super.onStart()
         Analytics.eraseContext()
@@ -43,6 +41,9 @@ internal class WelcomeFragment : ComposeFragment() {
 
     @Composable
     override fun ScreenContent(modifier: Modifier) {
+        val viewModel = hiltViewModel<WelcomeViewModel>()
+        LocalLifecycleOwner.current.lifecycle.addObserver(viewModel)
+
         val state by viewModel.state.collectAsStateWithLifecycle()
         val snackbarHostState = remember { SnackbarHostState() }
         val errorMessage by rememberUpdatedState(newValue = state.error?.resolveReference())
@@ -66,7 +67,7 @@ internal class WelcomeFragment : ComposeFragment() {
                 showUnlockProgress = state.showUnlockWithBiometricsProgress,
                 showScanCardProgress = state.showUnlockWithCardProgress,
                 onUnlockClick = viewModel::unlockWallets,
-                onScanCardClick = { viewModel.scanCard(lifecycleCoroutineScope = lifecycleScope) },
+                onScanCardClick = viewModel::scanCard,
             )
 
             SnackbarHost(
@@ -87,4 +88,8 @@ internal class WelcomeFragment : ComposeFragment() {
             }
         }
     }
+
+    internal companion object {
+        const val INITIAL_INTENT_KEY = "intent"
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeViewModel.kt b/app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeViewModel.kt
index 4f7587289d..fbd107685e 100644
--- a/app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeViewModel.kt
@@ -1,7 +1,7 @@
 package com.tangem.tap.features.welcome.ui
 
-import androidx.lifecycle.LifecycleCoroutineScope
-import androidx.lifecycle.ViewModel
+import android.content.Intent
+import androidx.lifecycle.*
 import com.tangem.common.core.TangemError
 import com.tangem.core.analytics.Analytics
 import com.tangem.domain.wallets.legacy.UserWalletsListError
@@ -12,28 +12,50 @@ import com.tangem.tap.features.welcome.redux.WelcomeAction
 import com.tangem.tap.features.welcome.redux.WelcomeState
 import com.tangem.tap.features.welcome.ui.model.WarningModel
 import com.tangem.tap.store
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
 import org.rekotlin.StoreSubscriber
+import javax.inject.Inject
+
+@HiltViewModel
+internal class WelcomeViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle,
+) : ViewModel(),
+    StoreSubscriber<WelcomeState>,
+    DefaultLifecycleObserver {
+
+    private val initialIntent: Intent? = savedStateHandle[WelcomeFragment.INITIAL_INTENT_KEY]
 
-internal class WelcomeViewModel : ViewModel(), StoreSubscriber<WelcomeState> {
     private val stateInternal = MutableStateFlow(WelcomeScreenState())
     val state: StateFlow<WelcomeScreenState> = stateInternal
 
     init {
+        store.dispatch(WelcomeAction.SetCoroutineScope(viewModelScope))
+
         subscribeToStoreChanges()
         initGlobalState()
     }
 
-    fun unlockWallets() {
-        Analytics.send(SignIn.ButtonBiometricSignIn())
-        store.dispatch(WelcomeAction.ProceedWithBiometrics)
+    override fun onCreate(owner: LifecycleOwner) {
+        val welcomeAction = if (initialIntent != null) {
+            WelcomeAction.ProceedWithIntent(initialIntent)
+        } else {
+            WelcomeAction.ProceedWithBiometrics()
+        }
+
+        store.dispatch(welcomeAction)
     }
 
-    fun scanCard(lifecycleCoroutineScope: LifecycleCoroutineScope) {
+    fun unlockWallets() {
+        Analytics.send(SignIn.ButtonBiometricSignIn())
+        store.dispatch(WelcomeAction.ProceedWithBiometrics())
+    }
+
+    fun scanCard() {
         Analytics.send(SignIn.ButtonCardSignIn())
-        store.dispatch(WelcomeAction.ProceedWithCard(lifecycleCoroutineScope))
+        store.dispatch(WelcomeAction.ProceedWithCard)
     }
 
     fun closeError() {
@@ -60,6 +82,7 @@ internal class WelcomeViewModel : ViewModel(), StoreSubscriber<WelcomeState> {
     }
 
     override fun onCleared() {
+        store.dispatch(WelcomeAction.ClearCoroutineScope)
         store.unsubscribe(this)
     }
 
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/BuyExchangeService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/BuyExchangeService.kt
index 07804272ed..f9d2d16492 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/BuyExchangeService.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/BuyExchangeService.kt
@@ -42,8 +42,16 @@ internal class BuyExchangeService(
         cryptoCurrencyName: String,
         fiatCurrencyName: String,
         walletAddress: String,
+        isDarkTheme: Boolean,
     ): String? {
-        return currentService.getUrl(action, blockchain, cryptoCurrencyName, fiatCurrencyName, walletAddress)
+        return currentService.getUrl(
+            action,
+            blockchain,
+            cryptoCurrencyName,
+            fiatCurrencyName,
+            walletAddress,
+            isDarkTheme,
+        )
     }
 
     override fun getSellCryptoReceiptUrl(action: CurrencyExchangeManager.Action, transactionId: String): String? {
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt
index ad03f2c04a..037b139a49 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt
@@ -50,6 +50,7 @@ class CurrencyExchangeManager(
         cryptoCurrencyName: CryptoCurrencyName,
         fiatCurrencyName: String,
         walletAddress: String,
+        isDarkTheme: Boolean,
     ): String? {
         if (blockchain.isTestnet()) return blockchain.getTestnetTopUpUrl()
 
@@ -60,6 +61,7 @@ class CurrencyExchangeManager(
             cryptoCurrencyName,
             fiatCurrencyName,
             walletAddress,
+            isDarkTheme,
         )
     }
 
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/DefaultRampManager.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/DefaultRampManager.kt
new file mode 100644
index 0000000000..b8a3e32d55
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/DefaultRampManager.kt
@@ -0,0 +1,21 @@
+package com.tangem.tap.network.exchangeServices
+
+import com.tangem.domain.exchange.RampStateManager
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.tap.features.wallet.converters.CryptoCurrencyConverter
+
+class DefaultRampManager(private val exchangeService: ExchangeService?) : RampStateManager {
+
+    private val cryptoCurrencyConverter = CryptoCurrencyConverter()
+    override fun availableForBuy(cryptoCurrency: CryptoCurrency): Boolean {
+        return exchangeService?.availableForBuy(
+            currency = cryptoCurrencyConverter.convertBack(cryptoCurrency),
+        ) ?: false
+    }
+
+    override fun availableForSell(cryptoCurrency: CryptoCurrency): Boolean {
+        return exchangeService?.availableForSell(
+            currency = cryptoCurrencyConverter.convertBack(cryptoCurrency),
+        ) ?: false
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt
index f38a8c64a1..442a0a6db0 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt
@@ -28,6 +28,7 @@ interface ExchangeService : Feature, Exchanger, ExchangeUrlBuilder {
                 cryptoCurrencyName: String,
                 fiatCurrencyName: String,
                 walletAddress: String,
+                isDarkTheme: Boolean,
             ): String? = null
 
             override fun getSellCryptoReceiptUrl(
@@ -52,12 +53,14 @@ interface ExchangeRules : Feature, Exchanger {
 }
 
 interface ExchangeUrlBuilder {
+    @Suppress("LongParameterList")
     fun getUrl(
         action: CurrencyExchangeManager.Action,
         blockchain: Blockchain,
         cryptoCurrencyName: String,
         fiatCurrencyName: String,
         walletAddress: String,
+        isDarkTheme: Boolean,
     ): String?
 
     fun getSellCryptoReceiptUrl(action: CurrencyExchangeManager.Action, transactionId: String): String?
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt
index 39d09fb0dc..6ded86b438 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt
@@ -79,6 +79,7 @@ internal class MercuryoService(private val environment: MercuryoEnvironment) : E
         cryptoCurrencyName: CryptoCurrencyName,
         fiatCurrencyName: String,
         walletAddress: String,
+        isDarkTheme: Boolean,
     ): String {
         if (action == CurrencyExchangeManager.Action.Sell) throw UnsupportedOperationException()
 
@@ -92,6 +93,7 @@ internal class MercuryoService(private val environment: MercuryoEnvironment) : E
             .appendQueryParameter("signature", signature(walletAddress))
             .appendQueryParameter("fix_currency", "true")
             .appendQueryParameter("return_url", ExchangeUrlBuilder.SUCCESS_URL)
+        if (isDarkTheme) builder.appendQueryParameter("theme", "1inch")
 
         return builder.build().toString()
     }
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt
index 472fd9e6a5..2d4694c975 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt
@@ -102,6 +102,7 @@ class MoonPayService(
         cryptoCurrencyName: CryptoCurrencyName,
         fatCurrency: String,
         walletAddress: String,
+        isDarkTheme: Boolean,
     ): String {
         if (action == CurrencyExchangeManager.Action.Buy) throw UnsupportedOperationException()
 
@@ -112,6 +113,7 @@ class MoonPayService(
             .appendQueryParameter("baseCurrencyCode", cryptoCurrencyName)
             .appendQueryParameter("refundWalletAddress", walletAddress)
             .appendQueryParameter("redirectURL", "tangem://sell-request.tangem.com")
+        if (isDarkTheme) uri.appendQueryParameter("theme", "dark")
 
         val originalQuery = uri.build().encodedQuery ?: uri.build().toString()
         val signature = createSignature(originalQuery)
diff --git a/app/src/main/java/com/tangem/tap/proxy/AppStateHolder.kt b/app/src/main/java/com/tangem/tap/proxy/AppStateHolder.kt
index cdcbc7fd9a..7b669beb49 100644
--- a/app/src/main/java/com/tangem/tap/proxy/AppStateHolder.kt
+++ b/app/src/main/java/com/tangem/tap/proxy/AppStateHolder.kt
@@ -9,11 +9,13 @@ import com.tangem.domain.redux.ReduxStateHolder
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.legacy.WalletsStateHolder
 import com.tangem.tap.common.entities.FiatCurrency
+import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.domain.TangemSdkManager
 import com.tangem.tap.domain.tokens.UserTokensRepository
 import com.tangem.tap.domain.walletStores.WalletStoresManager
 import com.tangem.tap.features.wallet.redux.WalletState
+import com.tangem.tap.network.exchangeServices.ExchangeService
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import org.rekotlin.Action
@@ -45,17 +47,22 @@ class AppStateHolder @Inject constructor() : WalletsStateHolder, ReduxNavControl
     var tangemSdkManager: TangemSdkManager? = null
     var walletStoresManager: WalletStoresManager? = null
     var appFiatCurrency: FiatCurrency = FiatCurrency.Default
+    var exchangeService: ExchangeService? = null
 
     fun getActualCard(): CardDTO? {
         return scanResponse?.card
     }
 
     override fun navigate(action: NavigationAction) {
-        mainStore?.dispatch(action)
+        mainStore?.dispatchOnMain(action)
     }
 
     override fun getBackStack(): List<AppScreen> = mainStore?.state?.navigationState?.backStack.orEmpty()
 
+    override fun popBackStack(screen: AppScreen?) {
+        mainStore?.dispatchOnMain(NavigationAction.PopBackTo(screen))
+    }
+
     override fun dispatch(action: Action) {
         mainStore?.dispatch(action)
     }
diff --git a/app/src/main/java/com/tangem/tap/proxy/DerivationManagerImpl.kt b/app/src/main/java/com/tangem/tap/proxy/DerivationManagerImpl.kt
index d03a7956e9..6a82e6bbb4 100644
--- a/app/src/main/java/com/tangem/tap/proxy/DerivationManagerImpl.kt
+++ b/app/src/main/java/com/tangem/tap/proxy/DerivationManagerImpl.kt
@@ -10,24 +10,31 @@ import com.tangem.common.core.TangemSdkError
 import com.tangem.common.extensions.ByteArrayKey
 import com.tangem.common.extensions.toMapKey
 import com.tangem.crypto.hdWallet.DerivationPath
+import com.tangem.data.tokens.utils.CryptoCurrencyFactory
 import com.tangem.domain.common.BlockchainNetwork
+import com.tangem.domain.common.DerivationStyleProvider
 import com.tangem.domain.common.configs.CardConfig
 import com.tangem.domain.common.extensions.fromNetworkId
 import com.tangem.domain.common.util.derivationStyleProvider
 import com.tangem.domain.common.util.hasDerivation
 import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.repository.CurrenciesRepository
+import com.tangem.domain.tokens.repository.NetworksRepository
+import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.lib.crypto.DerivationManager
 import com.tangem.lib.crypto.models.Currency
 import com.tangem.lib.crypto.models.Currency.NonNativeToken
 import com.tangem.lib.crypto.models.errors.UserCancelledException
 import com.tangem.operations.derivation.ExtendedPublicKeysMap
-import com.tangem.tap.DELAY_SDK_DIALOG_CLOSE
 import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.TapError
 import com.tangem.tap.features.tokens.legacy.redux.TokensMiddleware
 import com.tangem.tap.scope
+import com.tangem.tap.userWalletsListManager
+import com.tangem.utils.extensions.DELAY_SDK_DIALOG_CLOSE
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlin.coroutines.suspendCoroutine
@@ -35,21 +42,15 @@ import com.tangem.tap.features.wallet.models.Currency as WalletModelCurrency
 
 class DerivationManagerImpl(
     private val appStateHolder: AppStateHolder,
+    private val currenciesRepository: CurrenciesRepository,
+    private val networksRepository: NetworksRepository,
 ) : DerivationManager {
 
     override suspend fun deriveMissingBlockchains(currency: Currency) = suspendCoroutine { continuation ->
         val blockchain = Blockchain.fromNetworkId(currency.networkId)
         val card = appStateHolder.getActualCard()
         if (blockchain != null && card != null) {
-            val appToken = if (currency is NonNativeToken) {
-                Token(
-                    symbol = currency.symbol,
-                    contractAddress = currency.contractAddress,
-                    decimals = currency.decimalCount,
-                )
-            } else {
-                null
-            }
+            val appToken = getAppToken(currency)
             val scanResponse = appStateHolder.scanResponse
             if (scanResponse != null) {
                 val blockchainNetwork = BlockchainNetwork(blockchain, scanResponse.derivationStyleProvider)
@@ -70,6 +71,65 @@ class DerivationManagerImpl(
         }
     }
 
+    override suspend fun deriveAndAddTokens(currency: Currency) = suspendCoroutine { continuation ->
+        val selectedUserWallet = requireNotNull(
+            userWalletsListManager.selectedUserWalletSync,
+        ) { "selectedUserWallet shouldn't be null" }
+        val scanResponse = selectedUserWallet.scanResponse
+        val blockchain = requireNotNull(
+            Blockchain.fromNetworkId(currency.networkId),
+        ) { "unsupported blockchain" }
+        val derivationStyleProvider = scanResponse.derivationStyleProvider
+        val derivationPath = requireNotNull(
+            blockchain.derivationPath(derivationStyleProvider.getDerivationStyle())?.rawPath,
+        ) { "derivationPath shouldn't be null" }
+        val hasDerivation = scanResponse.hasDerivation(
+            blockchain,
+            derivationPath,
+        )
+        if (hasDerivation) {
+            scope.launch {
+                addToken(
+                    userWalletId = selectedUserWallet.walletId,
+                    blockchain = blockchain,
+                    currency = currency,
+                    derivationPath = derivationPath,
+                    derivationStyleProvider = derivationStyleProvider,
+                )
+                continuation.resumeWith(Result.success(derivationPath))
+            }
+        } else {
+            val blockchainNetwork = BlockchainNetwork(blockchain, scanResponse.derivationStyleProvider)
+            val appCurrency = WalletModelCurrency.fromBlockchainNetwork(
+                blockchainNetwork,
+                getAppToken(currency),
+            )
+            deriveMissingBlockchains(
+                scanResponse = scanResponse,
+                currencyList = listOf(appCurrency),
+                onSuccess = { updatedScanResponse ->
+                    scope.launch {
+                        userWalletsListManager.update(
+                            userWalletId = selectedUserWallet.walletId,
+                            update = { it.copy(scanResponse = updatedScanResponse) },
+                        )
+                        addToken(
+                            userWalletId = selectedUserWallet.walletId,
+                            blockchain = blockchain,
+                            currency = currency,
+                            derivationPath = derivationPath,
+                            derivationStyleProvider = derivationStyleProvider,
+                        )
+                        continuation.resumeWith(Result.success(derivationPath))
+                    }
+                },
+                onFailure = {
+                    continuation.resumeWith(Result.failure(it))
+                },
+            )
+        }
+    }
+
     override fun getDerivationPathForBlockchain(networkId: String): String? {
         val scanResponse = appStateHolder.scanResponse
         val blockchain = Blockchain.fromNetworkId(networkId)
@@ -91,6 +151,63 @@ class DerivationManagerImpl(
         return false
     }
 
+    private suspend fun addToken(
+        userWalletId: UserWalletId,
+        blockchain: Blockchain,
+        currency: Currency,
+        derivationPath: String,
+        derivationStyleProvider: DerivationStyleProvider,
+    ) {
+        val cryptoCurrency = convertCurrency(
+            blockchain = blockchain,
+            currency = currency,
+            derivationPath = derivationPath,
+            derivationStyleProvider = derivationStyleProvider,
+        )
+        currenciesRepository.addCurrencies(
+            userWalletId,
+            listOf(cryptoCurrency),
+        )
+        networksRepository.getNetworkStatusesSync(
+            userWalletId = userWalletId,
+            networks = setOf(cryptoCurrency.network),
+            refresh = true,
+        )
+    }
+
+    private fun convertCurrency(
+        blockchain: Blockchain,
+        currency: Currency,
+        derivationPath: String,
+        derivationStyleProvider: DerivationStyleProvider,
+    ): CryptoCurrency {
+        val cryptoCurrencyFactory = CryptoCurrencyFactory()
+        return when (currency) {
+            is Currency.NativeToken -> {
+                cryptoCurrencyFactory.createCoin(
+                    blockchain = blockchain,
+                    extraDerivationPath = derivationPath,
+                    derivationStyleProvider = derivationStyleProvider,
+                )
+            }
+            is NonNativeToken -> {
+                val sdkToken = Token(
+                    name = currency.name,
+                    symbol = currency.symbol,
+                    contractAddress = currency.contractAddress,
+                    decimals = currency.decimalCount,
+                    id = currency.id,
+                )
+                cryptoCurrencyFactory.createToken(
+                    sdkToken = sdkToken,
+                    blockchain = blockchain,
+                    extraDerivationPath = derivationPath,
+                    derivationStyleProvider = derivationStyleProvider,
+                )
+            }
+        } as CryptoCurrency
+    }
+
     private fun deriveMissingBlockchains(
         scanResponse: ScanResponse,
         currencyList: List<WalletModelCurrency>,
@@ -119,7 +236,7 @@ class DerivationManagerImpl(
         }
 
         scope.launch {
-            val selectedUserWallet = appStateHolder.userWalletsListManager?.selectedUserWalletSync
+            val selectedUserWallet = userWalletsListManager.selectedUserWalletSync
 
             val result = appStateHolder.tangemSdkManager?.derivePublicKeys(
                 cardId = null, // always ignore cardId in derive task
@@ -141,12 +258,10 @@ class DerivationManagerImpl(
                         derivedKeys = updatedDerivedKeys,
                     )
                     if (selectedUserWallet != null) {
-                        val userWallet = selectedUserWallet.copy(
-                            scanResponse = updatedScanResponse,
+                        userWalletsListManager.update(
+                            userWalletId = selectedUserWallet.walletId,
+                            update = { it.copy(scanResponse = updatedScanResponse) },
                         )
-
-                        appStateHolder.userWalletsListManager?.save(userWallet, canOverride = true)
-                        appStateHolder.walletStoresManager?.fetch(userWallet, true)
                     }
                     appStateHolder.mainStore?.dispatchOnMain(GlobalAction.SaveScanResponse(updatedScanResponse))
                     delay(DELAY_SDK_DIALOG_CLOSE)
@@ -204,6 +319,17 @@ class DerivationManagerImpl(
         return TokensMiddleware.DerivationData(derivations = mapKeyOfWalletPublicKey to toDerive)
     }
 
+    private fun getAppToken(currency: Currency): Token? {
+        return if (currency is NonNativeToken) {
+            Token(
+                symbol = currency.symbol,
+                contractAddress = currency.contractAddress,
+                decimals = currency.decimalCount,
+            )
+        } else {
+            null
+        }
+    }
     /**
      * Simple error handler
      * for now specifically handle only UserCancelled
diff --git a/app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt b/app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt
index 57afd33a26..b05033931a 100644
--- a/app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt
+++ b/app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt
@@ -17,6 +17,8 @@ import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.domain.card.repository.CardSdkConfigRepository
 import com.tangem.domain.common.BlockchainNetwork
 import com.tangem.domain.common.extensions.fromNetworkId
+import com.tangem.domain.walletmanager.WalletManagersFacade
+import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles
 import com.tangem.lib.crypto.TransactionManager
 import com.tangem.lib.crypto.models.*
 import com.tangem.lib.crypto.models.transactions.SendTxResult
@@ -25,6 +27,7 @@ import com.tangem.tap.common.analytics.events.Basic
 import com.tangem.tap.common.analytics.events.Basic.TransactionSent.MemoType
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.TangemSigner
+import com.tangem.tap.userWalletsListManager
 import java.math.BigDecimal
 import java.math.BigInteger
 import java.math.MathContext
@@ -35,6 +38,8 @@ class TransactionManagerImpl(
     private val appStateHolder: AppStateHolder,
     private val analytics: AnalyticsEventHandler,
     private val cardSdkConfigRepository: CardSdkConfigRepository,
+    private val walletManagersFacade: WalletManagersFacade,
+    private val walletFeatureToggles: WalletFeatureToggles,
 ) : TransactionManager {
 
     override suspend fun sendApproveTransaction(
@@ -409,9 +414,20 @@ class TransactionManagerImpl(
         }
     }
 
-    private fun getActualWalletManager(blockchain: Blockchain, derivationPath: String?): WalletManager {
-        val blockchainNetwork = BlockchainNetwork(blockchain, derivationPath, emptyList())
-        val walletManager = appStateHolder.walletState?.getWalletManager(blockchainNetwork)
+    private suspend fun getActualWalletManager(blockchain: Blockchain, derivationPath: String?): WalletManager {
+        val walletManager = if (walletFeatureToggles.isRedesignedScreenEnabled) {
+            val selectedUserWallet = requireNotNull(
+                userWalletsListManager.selectedUserWalletSync,
+            ) { "userWallet or userWalletsListManager is null" }
+            walletManagersFacade.getOrCreateWalletManager(
+                selectedUserWallet.walletId,
+                blockchain,
+                derivationPath,
+            )
+        } else {
+            val blockchainNetwork = BlockchainNetwork(blockchain, derivationPath, emptyList())
+            appStateHolder.walletState?.getWalletManager(blockchainNetwork)
+        }
         return requireNotNull(walletManager) { "no wallet manager found" }
     }
 
diff --git a/app/src/main/java/com/tangem/tap/proxy/UserWalletManagerImpl.kt b/app/src/main/java/com/tangem/tap/proxy/UserWalletManagerImpl.kt
index 0403ad4383..6a9a2abf90 100644
--- a/app/src/main/java/com/tangem/tap/proxy/UserWalletManagerImpl.kt
+++ b/app/src/main/java/com/tangem/tap/proxy/UserWalletManagerImpl.kt
@@ -10,7 +10,8 @@ import com.tangem.domain.common.BlockchainNetwork
 import com.tangem.domain.common.extensions.fromNetworkId
 import com.tangem.domain.common.extensions.toCoinId
 import com.tangem.domain.common.extensions.toNetworkId
-import com.tangem.domain.userwallets.UserWalletIdBuilder
+import com.tangem.domain.walletmanager.WalletManagersFacade
+import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles
 import com.tangem.lib.crypto.UserWalletManager
 import com.tangem.lib.crypto.models.Currency
 import com.tangem.lib.crypto.models.Currency.NativeToken
@@ -29,6 +30,8 @@ import com.tangem.tap.features.wallet.models.Currency as WalletCurrency
 
 class UserWalletManagerImpl(
     private val appStateHolder: AppStateHolder,
+    private val walletManagersFacade: WalletManagersFacade,
+    private val walletFeatureToggles: WalletFeatureToggles,
 ) : UserWalletManager {
 
     override suspend fun getUserTokens(
@@ -86,12 +89,10 @@ class UserWalletManagerImpl(
     }
 
     override fun getWalletId(): String {
-        return appStateHolder.getActualCard()?.let {
-            UserWalletIdBuilder.card(it)
-                .build()
-                ?.stringValue
-        }
-            ?: ""
+        val selectedUserWallet = requireNotNull(
+            userWalletsListManager.selectedUserWalletSync,
+        ) { "selectedUserWallet shouldn't be null" }
+        return selectedUserWallet.walletId.stringValue
     }
 
     override suspend fun isTokenAdded(currency: Currency, derivationPath: String?): Boolean {
@@ -142,13 +143,13 @@ class UserWalletManagerImpl(
             }
     }
 
-    override fun getWalletAddress(networkId: String, derivationPath: String?): String {
+    override suspend fun getWalletAddress(networkId: String, derivationPath: String?): String {
         val blockchain = requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
         val walletManager = getActualWalletManager(blockchain, derivationPath)
         return walletManager.wallet.address
     }
 
-    override fun getLastTransactionHash(networkId: String, derivationPath: String?): String? {
+    override suspend fun getLastTransactionHash(networkId: String, derivationPath: String?): String? {
         val blockchain = requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
         val walletManager = getActualWalletManager(blockchain, derivationPath)
         return walletManager.wallet.recentTransactions
@@ -187,7 +188,7 @@ class UserWalletManagerImpl(
         return balances
     }
 
-    override fun getNativeTokenBalance(networkId: String, derivationPath: String?): ProxyAmount? {
+    override suspend fun getNativeTokenBalance(networkId: String, derivationPath: String?): ProxyAmount? {
         val blockchain = requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
         val walletManager = getActualWalletManager(blockchain, derivationPath)
         return walletManager.wallet.amounts.firstNotNullOfOrNull {
@@ -220,10 +221,24 @@ class UserWalletManagerImpl(
         appStateHolder.mainStore?.dispatchOnMain(WalletAction.LoadData.Refresh)
     }
 
-    @kotlin.jvm.Throws(IllegalArgumentException::class)
-    private fun getActualWalletManager(blockchain: Blockchain, derivationPath: String?): WalletManager {
-        val blockchainNetwork = BlockchainNetwork(blockchain, derivationPath, emptyList())
-        return requireNotNull(appStateHolder.walletState?.getWalletManager(blockchainNetwork)) {
+    @Throws(IllegalArgumentException::class)
+    private suspend fun getActualWalletManager(blockchain: Blockchain, derivationPath: String?): WalletManager {
+        val walletManager = if (walletFeatureToggles.isRedesignedScreenEnabled) {
+            val selectedUserWallet = requireNotNull(
+                userWalletsListManager.selectedUserWalletSync,
+            ) { "userWallet or userWalletsListManager is null" }
+            walletManagersFacade.getOrCreateWalletManager(
+                selectedUserWallet.walletId,
+                blockchain,
+                derivationPath,
+            )
+        } else {
+            val blockchainNetwork = BlockchainNetwork(blockchain, derivationPath, emptyList())
+            return requireNotNull(appStateHolder.walletState?.getWalletManager(blockchainNetwork)) {
+                "No wallet manager found"
+            }
+        }
+        return requireNotNull(walletManager) {
             "No wallet manager found"
         }
     }
diff --git a/app/src/main/java/com/tangem/tap/proxy/di/ProxyModule.kt b/app/src/main/java/com/tangem/tap/proxy/di/ProxyModule.kt
index 19474ce5cc..b64680c54c 100644
--- a/app/src/main/java/com/tangem/tap/proxy/di/ProxyModule.kt
+++ b/app/src/main/java/com/tangem/tap/proxy/di/ProxyModule.kt
@@ -2,13 +2,19 @@ package com.tangem.tap.proxy.di
 
 import com.tangem.common.Provider
 import com.tangem.core.analytics.api.AnalyticsEventHandler
+import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
 import com.tangem.domain.card.repository.CardSdkConfigRepository
 import com.tangem.domain.common.CardTypesResolver
 import com.tangem.domain.common.util.cardTypesResolver
+import com.tangem.domain.tokens.repository.CurrenciesRepository
+import com.tangem.domain.tokens.repository.NetworksRepository
+import com.tangem.domain.walletmanager.WalletManagersFacade
 import com.tangem.feature.learn2earn.domain.api.Learn2earnDependencyProvider
+import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles
 import com.tangem.lib.crypto.DerivationManager
 import com.tangem.lib.crypto.TransactionManager
 import com.tangem.lib.crypto.UserWalletManager
+import com.tangem.tap.features.details.DarkThemeFeatureToggle
 import com.tangem.tap.proxy.*
 import dagger.Module
 import dagger.Provides
@@ -30,9 +36,15 @@ class ProxyModule {
 
     @Provides
     @Singleton
-    fun provideUserWalletManager(appStateHolder: AppStateHolder): UserWalletManager {
+    fun provideUserWalletManager(
+        appStateHolder: AppStateHolder,
+        walletManagersFacade: WalletManagersFacade,
+        walletFeatureToggles: WalletFeatureToggles,
+    ): UserWalletManager {
         return UserWalletManagerImpl(
             appStateHolder = appStateHolder,
+            walletManagersFacade = walletManagersFacade,
+            walletFeatureToggles = walletFeatureToggles,
         )
     }
 
@@ -42,22 +54,38 @@ class ProxyModule {
         appStateHolder: AppStateHolder,
         analytics: AnalyticsEventHandler,
         cardSdkConfigRepository: CardSdkConfigRepository,
+        walletManagersFacade: WalletManagersFacade,
+        walletFeatureToggles: WalletFeatureToggles,
     ): TransactionManager {
         return TransactionManagerImpl(
             appStateHolder = appStateHolder,
             analytics = analytics,
             cardSdkConfigRepository = cardSdkConfigRepository,
+            walletManagersFacade = walletManagersFacade,
+            walletFeatureToggles = walletFeatureToggles,
         )
     }
 
     @Provides
     @Singleton
-    fun provideDerivationManager(appStateHolder: AppStateHolder): DerivationManager {
+    fun provideDerivationManager(
+        appStateHolder: AppStateHolder,
+        currenciesRepository: CurrenciesRepository,
+        networksRepository: NetworksRepository,
+    ): DerivationManager {
         return DerivationManagerImpl(
             appStateHolder = appStateHolder,
+            currenciesRepository = currenciesRepository,
+            networksRepository = networksRepository,
         )
     }
 
+    @Provides
+    @Singleton
+    fun provideDarkThemeFeatureToggle(featureTogglesManager: FeatureTogglesManager): DarkThemeFeatureToggle {
+        return DarkThemeFeatureToggle(featureTogglesManager)
+    }
+
     // regions FeatureConsumers
     @Provides
     @Singleton
diff --git a/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt b/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt
index c677f70300..08f259fa70 100644
--- a/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt
+++ b/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt
@@ -3,12 +3,16 @@ package com.tangem.tap.proxy.redux
 import com.tangem.datasource.asset.AssetReader
 import com.tangem.datasource.connection.NetworkConnectionManager
 import com.tangem.domain.appcurrency.repository.AppCurrencyRepository
+import com.tangem.domain.apptheme.repository.AppThemeModeRepository
+import com.tangem.domain.balancehiding.repositories.BalanceHidingRepository
 import com.tangem.domain.card.ScanCardProcessor
 import com.tangem.domain.card.ScanCardUseCase
 import com.tangem.domain.card.repository.CardSdkConfigRepository
+import com.tangem.domain.tokens.repository.CurrenciesRepository
+import com.tangem.domain.tokens.repository.NetworksRepository
 import com.tangem.domain.walletmanager.WalletManagersFacade
+import com.tangem.domain.wallets.repository.WalletsRepository
 import com.tangem.features.tester.api.TesterRouter
-import com.tangem.features.tokendetails.featuretoggles.TokenDetailsFeatureToggles
 import com.tangem.features.tokendetails.navigation.TokenDetailsRouter
 import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles
 import com.tangem.features.wallet.navigation.WalletRouter
@@ -16,6 +20,8 @@ import com.tangem.tap.domain.walletconnect2.domain.WalletConnectInteractor
 import com.tangem.tap.domain.walletconnect2.domain.WalletConnectRepository
 import com.tangem.tap.domain.walletconnect2.domain.WalletConnectSessionsRepository
 import com.tangem.tap.features.customtoken.api.featuretoggles.CustomTokenFeatureToggles
+import com.tangem.tap.features.details.featuretoggles.DetailsFeatureToggles
+import com.tangem.tap.proxy.AppStateHolder
 import org.rekotlin.StateType
 
 data class DaggerGraphState(
@@ -29,12 +35,20 @@ data class DaggerGraphState(
     val walletConnectRepository: WalletConnectRepository? = null,
     val walletConnectSessionsRepository: WalletConnectSessionsRepository? = null,
     val walletConnectInteractor: WalletConnectInteractor? = null,
-    val tokenDetailsFeatureToggles: TokenDetailsFeatureToggles? = null,
     val tokenDetailsRouter: TokenDetailsRouter? = null,
     val scanCardProcessor: ScanCardProcessor? = null,
     val cardSdkConfigRepository: CardSdkConfigRepository? = null,
     val appCurrencyRepository: AppCurrencyRepository? = null,
     val walletManagersFacade: WalletManagersFacade? = null,
+    val appStateHolder: AppStateHolder? = null,
+    val appThemeModeRepository: AppThemeModeRepository? = null,
+    val balanceHidingRepository: BalanceHidingRepository? = null,
+    val detailsFeatureToggles: DetailsFeatureToggles? = null,
+    val walletsRepository: WalletsRepository? = null,
+    val networksRepository: NetworksRepository? = null,
+
+    // FIXME: It is used only for TokensList screen. Remove after refactoring of TokensList
+    val currenciesRepository: CurrenciesRepository? = null,
 ) : StateType {
 
     inline fun <reified T> get(getDependency: DaggerGraphState.() -> T?): T {
diff --git a/app/src/main/res/color/selector_chip_background.xml b/app/src/main/res/color/selector_chip_background.xml
index e0b0431767..16be87b913 100644
--- a/app/src/main/res/color/selector_chip_background.xml
+++ b/app/src/main/res/color/selector_chip_background.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-<!-- 24% opacity -->
-<item android:alpha="0.1" android:color="?attr/colorSecondary" android:state_enabled="true" android:state_selected="true" />
-<item android:alpha="0.1" android:color="?attr/colorSecondary" android:state_checked="true" android:state_enabled="true" />
+    <!-- 24% opacity -->
+    <item android:alpha="0.1" android:color="?attr/colorSecondary" android:state_enabled="true" android:state_selected="true" />
+    <item android:alpha="0.1" android:color="?attr/colorSecondary" android:state_checked="true" android:state_enabled="true" />
 
-<item android:color="@color/backgroundLightGray" android:state_enabled="true" />
-<item android:color="@color/backgroundLightGray" />
+    <item android:color="@color/background_secondary" android:state_enabled="true" />
+    <item android:color="@color/background_secondary" />
 
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/selector_chip_stroke.xml b/app/src/main/res/color/selector_chip_stroke.xml
index e4a5d64acc..c2827e783e 100644
--- a/app/src/main/res/color/selector_chip_stroke.xml
+++ b/app/src/main/res/color/selector_chip_stroke.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorSecondary" android:state_enabled="true" android:state_selected="true" />
-    <item android:color="?attr/colorSecondary" android:state_checked="true" android:state_enabled="true" />
-    <!-- 12% of 87% opacity -->
-    <item android:alpha="0.10" android:color="?attr/colorOnSurface" android:state_enabled="true" />
-    <item android:alpha="0.12" android:color="?attr/colorOnSurface" />
+    <item android:color="@color/accent" android:state_enabled="true" android:state_selected="true" />
+    <item android:color="@color/accent" android:state_checked="true" android:state_enabled="true" />
+
+    <item android:color="@color/text_secondary" android:state_enabled="true" />
+    <item android:color="@color/text_secondary" />
 
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/selector_chip_text.xml b/app/src/main/res/color/selector_chip_text.xml
new file mode 100644
index 0000000000..e205f4e82d
--- /dev/null
+++ b/app/src/main/res/color/selector_chip_text.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/accent" android:state_enabled="true" android:state_selected="true" />
+    <item android:color="@color/accent" android:state_checked="true" android:state_enabled="true" />
+
+    <item android:color="@color/text_primary_1" android:state_enabled="true" />
+    <item android:color="@color/text_primary_1" />
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/selector_edit_text.xml b/app/src/main/res/color/selector_edit_text.xml
index b6c0697011..192514f802 100644
--- a/app/src/main/res/color/selector_edit_text.xml
+++ b/app/src/main/res/color/selector_edit_text.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item  android:color="#1ACE80" android:state_focused="true"/>
-    <item  android:color="#1ACE80" android:state_hovered="true"/>
-    <item  android:color="#E0E0E0" android:state_enabled="false"/>
-    <item android:color="#E0E0E0"/>  <!-- unfocused -->
+    <item android:color="@color/accent" android:state_focused="true" />
+    <item android:color="@color/accent" android:state_hovered="true" />
+    <item android:color="@color/icon_primary_1" android:state_enabled="false" />
+    <item android:color="@color/icon_primary_1" />  <!-- unfocused -->
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/selector_edit_text_secondary.xml b/app/src/main/res/color/selector_edit_text_secondary.xml
new file mode 100644
index 0000000000..df06469793
--- /dev/null
+++ b/app/src/main/res/color/selector_edit_text_secondary.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/accent" android:state_focused="true" />
+    <item android:color="@color/text_secondary" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/img_meet_tangem.webp b/app/src/main/res/drawable-hdpi/img_meet_tangem.webp
index e9b4ef6b19..a7c8c0b3f6 100644
Binary files a/app/src/main/res/drawable-hdpi/img_meet_tangem.webp and b/app/src/main/res/drawable-hdpi/img_meet_tangem.webp differ
diff --git a/app/src/main/res/drawable-hdpi/img_revolutionary_wallet.webp b/app/src/main/res/drawable-hdpi/img_revolutionary_wallet.webp
new file mode 100644
index 0000000000..64c528cb66
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_revolutionary_wallet.webp differ
diff --git a/app/src/main/res/drawable-hdpi/img_meet_tangem2.webp b/app/src/main/res/drawable-hdpi/img_tangem_for_everyone.webp
similarity index 100%
rename from app/src/main/res/drawable-hdpi/img_meet_tangem2.webp
rename to app/src/main/res/drawable-hdpi/img_tangem_for_everyone.webp
diff --git a/app/src/main/res/drawable-hdpi/revolutionary_wallet.webp b/app/src/main/res/drawable-hdpi/revolutionary_wallet.webp
deleted file mode 100644
index 7e0f631f9c..0000000000
Binary files a/app/src/main/res/drawable-hdpi/revolutionary_wallet.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/img_meet_tangem.webp b/app/src/main/res/drawable-mdpi/img_meet_tangem.webp
index 7bd5ec80c5..26a4bd6a9d 100644
Binary files a/app/src/main/res/drawable-mdpi/img_meet_tangem.webp and b/app/src/main/res/drawable-mdpi/img_meet_tangem.webp differ
diff --git a/app/src/main/res/drawable-mdpi/img_revolutionary_wallet.webp b/app/src/main/res/drawable-mdpi/img_revolutionary_wallet.webp
new file mode 100644
index 0000000000..67573e0e1c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_revolutionary_wallet.webp differ
diff --git a/app/src/main/res/drawable-mdpi/img_meet_tangem2.webp b/app/src/main/res/drawable-mdpi/img_tangem_for_everyone.webp
similarity index 100%
rename from app/src/main/res/drawable-mdpi/img_meet_tangem2.webp
rename to app/src/main/res/drawable-mdpi/img_tangem_for_everyone.webp
diff --git a/app/src/main/res/drawable-mdpi/revolutionary_wallet.webp b/app/src/main/res/drawable-mdpi/revolutionary_wallet.webp
deleted file mode 100644
index dfc7b106a9..0000000000
Binary files a/app/src/main/res/drawable-mdpi/revolutionary_wallet.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/img_meet_tangem.webp b/app/src/main/res/drawable-xhdpi/img_meet_tangem.webp
index 9bc7cba662..179125d14b 100644
Binary files a/app/src/main/res/drawable-xhdpi/img_meet_tangem.webp and b/app/src/main/res/drawable-xhdpi/img_meet_tangem.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/img_revolutionary_wallet.webp b/app/src/main/res/drawable-xhdpi/img_revolutionary_wallet.webp
new file mode 100644
index 0000000000..020651af9b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_revolutionary_wallet.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/img_meet_tangem2.webp b/app/src/main/res/drawable-xhdpi/img_tangem_for_everyone.webp
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/img_meet_tangem2.webp
rename to app/src/main/res/drawable-xhdpi/img_tangem_for_everyone.webp
diff --git a/app/src/main/res/drawable-xhdpi/revolutionary_wallet.webp b/app/src/main/res/drawable-xhdpi/revolutionary_wallet.webp
deleted file mode 100644
index ee0435caf1..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/revolutionary_wallet.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_meet_tangem.webp b/app/src/main/res/drawable-xxhdpi/img_meet_tangem.webp
index 941a671afb..f34b981aab 100644
Binary files a/app/src/main/res/drawable-xxhdpi/img_meet_tangem.webp and b/app/src/main/res/drawable-xxhdpi/img_meet_tangem.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_revolutionary_wallet.webp b/app/src/main/res/drawable-xxhdpi/img_revolutionary_wallet.webp
new file mode 100644
index 0000000000..f49cff2ff7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_revolutionary_wallet.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_meet_tangem2.webp b/app/src/main/res/drawable-xxhdpi/img_tangem_for_everyone.webp
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/img_meet_tangem2.webp
rename to app/src/main/res/drawable-xxhdpi/img_tangem_for_everyone.webp
diff --git a/app/src/main/res/drawable-xxhdpi/revolutionary_wallet.webp b/app/src/main/res/drawable-xxhdpi/revolutionary_wallet.webp
deleted file mode 100644
index 360f004149..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/revolutionary_wallet.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/img_meet_tangem.webp b/app/src/main/res/drawable-xxxhdpi/img_meet_tangem.webp
new file mode 100644
index 0000000000..bf14c572fb
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_meet_tangem.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/img_revolutionary_wallet.webp b/app/src/main/res/drawable-xxxhdpi/img_revolutionary_wallet.webp
new file mode 100644
index 0000000000..c7030ebcd2
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_revolutionary_wallet.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/img_meet_tangem2.webp b/app/src/main/res/drawable-xxxhdpi/img_tangem_for_everyone.webp
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/img_meet_tangem2.webp
rename to app/src/main/res/drawable-xxxhdpi/img_tangem_for_everyone.webp
diff --git a/app/src/main/res/drawable-xxxhdpi/meet_tangem.webp b/app/src/main/res/drawable-xxxhdpi/meet_tangem.webp
deleted file mode 100644
index 8ca89394bc..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/meet_tangem.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/revolutionary_wallet.webp b/app/src/main/res/drawable-xxxhdpi/revolutionary_wallet.webp
deleted file mode 100644
index 9568833439..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/revolutionary_wallet.webp and /dev/null differ
diff --git a/app/src/main/res/drawable/bg_half_transparent_overlay.xml b/app/src/main/res/drawable/bg_half_transparent_overlay.xml
index 4b5937d793..1e819d64aa 100644
--- a/app/src/main/res/drawable/bg_half_transparent_overlay.xml
+++ b/app/src/main/res/drawable/bg_half_transparent_overlay.xml
@@ -2,8 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
         android:angle="90"
-        android:startColor="#FFFFFF"
-        android:centerColor="#F0FFFFFF"
-        android:endColor="#19FFFFFF"
+        android:centerColor="@color/gradient_center_color"
+        android:endColor="@color/gradient_end_color"
+        android:startColor="@color/gradient_start_color"
         android:type="linear" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/card_placeholder_black.xml b/app/src/main/res/drawable/card_placeholder_black.xml
deleted file mode 100644
index 83fab8e0f7..0000000000
--- a/app/src/main/res/drawable/card_placeholder_black.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="214dp"
-    android:height="130dp"
-    android:viewportWidth="214"
-    android:viewportHeight="130">
-    <path
-        android:fillColor="#1B1D1C"
-        android:pathData="M1.043,8.273C1.019,4.256 4.265,1 8.294,1H205.706C209.735,1 213.019,4.256 213.043,8.273L213.709,121.725C213.733,125.742 210.487,128.998 206.459,128.998H9.046C5.018,128.998 1.733,125.742 1.709,121.725L1.043,8.273Z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M1.043,8.273C1.019,4.256 4.265,1 8.294,1H205.706C209.735,1 213.019,4.256 213.043,8.273L213.709,121.725C213.733,125.742 210.487,128.998 206.459,128.998H9.046C5.018,128.998 1.733,125.742 1.709,121.725L1.043,8.273Z"
-        android:strokeWidth="0.5" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M25.274,26.4L25.274,32.64L28.079,32.64C28.188,32.639 28.292,32.596 28.369,32.522C28.446,32.447 28.49,32.346 28.491,32.241L28.491,26.4L25.274,26.4Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M19,32.241C19.001,32.346 19.045,32.447 19.122,32.522C19.199,32.596 19.303,32.639 19.412,32.64L22.217,32.64L22.217,26.4L19,26.4L19,32.241Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M28.491,23.2L28.491,20.409C28.491,20.301 28.448,20.197 28.372,20.12C28.296,20.043 28.194,20 28.086,20L19.405,20C19.297,20 19.195,20.043 19.119,20.12C19.043,20.197 19,20.301 19,20.409L19,23.2L28.491,23.2Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M43.503,24.163C42.922,23.921 42.292,23.812 41.661,23.846C40.827,23.844 39.996,23.934 39.183,24.113L39.183,25.532C39.832,25.455 40.483,25.412 41.136,25.4C41.486,25.385 41.836,25.418 42.177,25.5C42.286,25.532 42.385,25.59 42.465,25.669C42.546,25.748 42.605,25.846 42.637,25.953C42.74,26.334 42.783,26.728 42.766,27.122L42.766,27.539C41.997,27.498 41.385,27.476 40.965,27.476C40.519,27.454 40.073,27.539 39.667,27.725C39.347,27.903 39.109,28.195 38.999,28.54C38.847,29.044 38.779,29.569 38.796,30.094C38.74,30.771 38.901,31.448 39.257,32.029C39.445,32.243 39.683,32.409 39.95,32.513C40.216,32.618 40.505,32.659 40.791,32.632C41.127,32.632 42.172,32.605 42.633,32.007C42.709,31.912 42.774,31.808 42.826,31.698L42.877,32.496L44.572,32.496L44.572,27.222C44.596,26.539 44.52,25.857 44.346,25.196C44.284,24.977 44.178,24.772 44.033,24.594C43.888,24.417 43.708,24.27 43.503,24.163ZM42.748,29.256C42.796,29.736 42.713,30.219 42.508,30.656C42.409,30.782 42.272,30.876 42.117,30.924C41.942,30.972 41.76,30.995 41.578,30.992C41.294,31.028 41.006,30.953 40.777,30.783C40.623,30.523 40.558,30.221 40.592,29.922C40.582,29.681 40.607,29.44 40.666,29.206C40.684,29.139 40.716,29.075 40.761,29.021C40.805,28.966 40.861,28.921 40.924,28.889C41.098,28.821 41.285,28.791 41.472,28.803L42.748,28.803L42.748,29.256Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M58.169,24.645C58.133,24.584 58.095,24.526 58.053,24.471C57.494,23.736 56.162,23.846 56.162,23.846C55.722,23.831 55.29,23.964 54.929,24.222C54.564,24.573 54.329,25.042 54.263,25.55C54.001,27.328 54.001,29.136 54.263,30.914C54.326,31.417 54.555,31.882 54.911,32.233C55.299,32.52 55.774,32.659 56.251,32.623C56.251,32.623 56.278,32.623 56.296,32.623C56.296,32.623 57.498,32.72 58.084,32.104C58.095,32.607 58.062,33.11 57.985,33.606C57.966,33.738 57.915,33.864 57.837,33.971C57.759,34.078 57.656,34.164 57.539,34.222C57.166,34.351 56.773,34.406 56.381,34.382L54.535,34.35L54.535,35.788C54.876,35.853 55.219,35.9 55.563,35.93C55.988,35.972 56.39,35.99 56.774,35.99C57.49,36.044 58.205,35.884 58.834,35.53C59.055,35.374 59.242,35.174 59.386,34.943C59.529,34.71 59.626,34.451 59.67,34.18C59.813,33.297 59.875,32.402 59.853,31.507L59.853,23.979L58.209,23.979L58.169,24.645ZM57.963,30.221C57.936,30.452 57.824,30.664 57.65,30.813C57.447,30.94 57.212,30.999 56.975,30.983C56.711,31.006 56.446,30.95 56.211,30.823C56.028,30.636 55.923,30.385 55.916,30.12C55.815,28.876 55.815,27.625 55.916,26.381C55.923,26.125 56.025,25.882 56.202,25.701C56.442,25.579 56.709,25.526 56.975,25.55C57.227,25.529 57.479,25.599 57.686,25.747C57.87,25.947 57.981,26.207 57.999,26.482C58.066,27.072 58.093,27.666 58.079,28.26C58.101,28.916 58.062,29.573 57.963,30.221Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M66.713,24.124C66.131,23.787 65.461,23.636 64.793,23.691C64.098,23.642 63.404,23.802 62.799,24.152C62.358,24.473 62.062,24.959 61.975,25.502C61.831,26.388 61.77,27.286 61.793,28.184C61.769,29.083 61.833,29.983 61.984,30.87C62.031,31.139 62.131,31.395 62.278,31.623C62.425,31.851 62.616,32.046 62.84,32.197C63.478,32.531 64.194,32.681 64.911,32.631C65.367,32.63 65.823,32.603 66.276,32.552C66.653,32.517 67.025,32.453 67.392,32.359L67.392,30.916C66.554,31.004 65.867,31.05 65.33,31.05C64.933,31.074 64.535,31.025 64.155,30.907C64.038,30.857 63.936,30.778 63.856,30.677C63.777,30.577 63.723,30.458 63.7,30.331C63.618,29.823 63.585,29.307 63.6,28.792L67.574,28.792L67.574,28.165C67.596,27.241 67.548,26.317 67.433,25.4C67.368,24.896 67.109,24.438 66.713,24.124ZM65.849,27.428L63.6,27.428C63.6,26.95 63.632,26.473 63.696,26C63.704,25.887 63.736,25.777 63.79,25.678C63.843,25.579 63.917,25.492 64.005,25.424C64.473,25.233 64.994,25.233 65.462,25.424C65.548,25.494 65.619,25.583 65.671,25.683C65.723,25.782 65.754,25.892 65.762,26.004C65.833,26.475 65.862,26.952 65.849,27.428Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M78.824,25.12C78.747,24.744 78.542,24.406 78.243,24.161C77.886,23.928 77.46,23.817 77.032,23.844C77.032,23.844 76.991,23.844 76.963,23.844C76.963,23.844 75.581,23.767 75.01,24.464C74.948,24.542 74.892,24.625 74.844,24.712C74.752,24.478 74.592,24.275 74.383,24.129C74.024,23.923 73.61,23.826 73.195,23.848C73.195,23.848 71.813,23.767 71.242,24.468C71.178,24.545 71.122,24.629 71.076,24.717L71.03,23.984L69.349,23.984L69.349,32.48L71.191,32.48L71.191,28.051C71.182,27.52 71.201,26.988 71.251,26.459C71.263,26.198 71.362,25.949 71.532,25.749C71.736,25.584 71.997,25.506 72.26,25.531C72.493,25.513 72.727,25.557 72.937,25.658C73.015,25.731 73.076,25.819 73.119,25.916C73.162,26.013 73.185,26.118 73.186,26.223C73.234,26.747 73.254,27.272 73.245,27.798L73.245,32.48L75.088,32.48L75.088,28.051C75.088,27.314 75.088,26.785 75.143,26.459C75.156,26.197 75.258,25.946 75.434,25.749C75.642,25.586 75.906,25.508 76.171,25.531C76.405,25.513 76.641,25.557 76.852,25.658C76.929,25.732 76.99,25.82 77.032,25.917C77.074,26.014 77.096,26.118 77.096,26.223C77.147,26.747 77.167,27.272 77.156,27.798L77.156,32.48L78.999,32.48L78.999,26.884C79.009,26.291 78.951,25.699 78.824,25.12Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M51.691,24.171C51.307,23.928 50.851,23.814 50.394,23.845C50.394,23.845 50.356,23.845 50.338,23.845C50.338,23.845 48.938,23.773 48.364,24.465C48.323,24.514 48.286,24.565 48.252,24.619L48.21,23.981L46.507,23.981L46.507,32.48L48.373,32.48L48.373,28.049C48.363,27.521 48.384,26.992 48.434,26.465C48.448,26.203 48.553,25.952 48.733,25.755C48.958,25.584 49.242,25.503 49.526,25.528C49.774,25.511 50.023,25.555 50.249,25.655C50.333,25.728 50.401,25.816 50.448,25.915C50.496,26.014 50.521,26.121 50.524,26.23C50.578,26.75 50.6,27.273 50.59,27.796L50.59,32.48L52.456,32.48L52.456,26.963C52.471,26.356 52.419,25.749 52.302,25.153C52.226,24.765 52.009,24.417 51.691,24.171Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M36.543,21.44L34.653,21.44L34.653,23.877L33.477,23.877L33.477,25.434L34.653,25.434L34.653,32.48L36.543,32.48L36.543,25.434L37.981,25.434L37.981,23.877L36.543,23.877L36.543,21.44Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M23.463,105.118L21.826,104.112L21.904,106H21.024L21.087,104.112L19.441,105.125L19.02,104.335L20.707,103.493L19.016,102.645L19.428,101.882L21.08,102.875L21.001,101H21.874L21.818,102.882L23.451,101.882L23.885,102.645L22.184,103.5L23.895,104.342L23.463,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M32.161,105.118L30.524,104.112L30.602,106H29.722L29.785,104.112L28.139,105.125L27.718,104.335L29.405,103.493L27.715,102.645L28.126,101.882L29.778,102.875L29.699,101H30.573L30.517,102.882L32.149,101.882L32.583,102.645L30.883,103.5L32.593,104.342L32.161,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M40.86,105.118L39.222,104.112L39.3,106H38.42L38.483,104.112L36.837,105.125L36.416,104.335L38.104,103.493L36.413,102.645L36.825,101.882L38.476,102.875L38.398,101H39.271L39.215,102.882L40.847,101.882L41.282,102.645L39.581,103.5L41.292,104.342L40.86,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M49.558,105.118L47.92,104.112L47.998,106H47.119L47.181,104.112L45.535,105.125L45.114,104.335L46.802,103.493L45.111,102.645L45.523,101.882L47.174,102.875L47.096,101H47.969L47.913,102.882L49.546,101.882L49.98,102.645L48.279,103.5L49.99,104.342L49.558,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M63.14,105.118L61.502,104.112L61.58,106H60.701L60.763,104.112L59.117,105.125L58.696,104.335L60.384,103.493L58.693,102.645L59.105,101.882L60.756,102.875L60.678,101H61.551L61.495,102.882L63.128,101.882L63.562,102.645L61.861,103.5L63.572,104.342L63.14,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M71.838,105.118L70.2,104.112L70.279,106H69.399L69.462,104.112L67.815,105.125L67.394,104.335L69.082,103.493L67.391,102.645L67.803,101.882L69.454,102.875L69.376,101H70.249L70.193,102.882L71.826,101.882L72.26,102.645L70.559,103.5L72.27,104.342L71.838,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M80.536,105.118L78.898,104.112L78.977,106H78.097L78.16,104.112L76.514,105.125L76.093,104.335L77.78,103.493L76.089,102.645L76.501,101.882L78.152,102.875L78.074,101H78.947L78.891,102.882L80.524,101.882L80.958,102.645L79.257,103.5L80.968,104.342L80.536,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M89.234,105.118L87.597,104.112L87.675,106H86.795L86.858,104.112L85.212,105.125L84.791,104.335L86.478,103.493L84.788,102.645L85.2,101.882L86.851,102.875L86.772,101H87.646L87.59,102.882L89.222,101.882L89.657,102.645L87.956,103.5L89.666,104.342L89.234,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M102.816,105.118L101.179,104.112L101.257,106H100.377L100.44,104.112L98.794,105.125L98.373,104.335L100.06,103.493L98.369,102.645L98.781,101.882L100.433,102.875L100.354,101H101.227L101.171,102.882L102.804,101.882L103.238,102.645L101.538,103.5L103.248,104.342L102.816,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M111.515,105.118L109.877,104.112L109.955,106H109.075L109.138,104.112L107.492,105.125L107.071,104.335L108.758,103.493L107.068,102.645L107.48,101.882L109.131,102.875L109.053,101H109.926L109.87,102.882L111.502,101.882L111.937,102.645L110.236,103.5L111.947,104.342L111.515,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M120.213,105.118L118.575,104.112L118.653,106H117.774L117.836,104.112L116.19,105.125L115.769,104.335L117.457,103.493L115.766,102.645L116.178,101.882L117.829,102.875L117.751,101H118.624L118.568,102.882L120.201,101.882L120.635,102.645L118.934,103.5L120.645,104.342L120.213,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M128.911,105.118L127.273,104.112L127.352,106H126.472L126.535,104.112L124.888,105.125L124.467,104.335L126.155,103.493L124.464,102.645L124.876,101.882L126.527,102.875L126.449,101H127.322L127.266,102.882L128.899,101.882L129.333,102.645L127.632,103.5L129.343,104.342L128.911,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M142.493,105.118L140.855,104.112L140.933,106H140.054L140.116,104.112L138.47,105.125L138.049,104.335L139.737,103.493L138.046,102.645L138.458,101.882L140.109,102.875L140.031,101H140.904L140.848,102.882L142.481,101.882L142.915,102.645L141.214,103.5L142.925,104.342L142.493,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M151.191,105.118L149.553,104.112L149.632,106H148.752L148.815,104.112L147.169,105.125L146.748,104.335L148.435,103.493L146.744,102.645L147.156,101.882L148.807,102.875L148.729,101H149.602L149.546,102.882L151.179,101.882L151.613,102.645L149.912,103.5L151.623,104.342L151.191,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M159.889,105.118L158.252,104.112L158.33,106H157.45L157.513,104.112L155.867,105.125L155.446,104.335L157.133,103.493L155.443,102.645L155.854,101.882L157.506,102.875L157.427,101H158.3L158.244,102.882L159.877,101.882L160.311,102.645L158.611,103.5L160.321,104.342L159.889,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M168.588,105.118L166.95,104.112L167.028,106H166.148L166.211,104.112L164.565,105.125L164.144,104.335L165.831,103.493L164.141,102.645L164.553,101.882L166.204,102.875L166.126,101H166.999L166.943,102.882L168.575,101.882L169.01,102.645L167.309,103.5L169.02,104.342L168.588,105.118Z" />
-</vector>
diff --git a/app/src/main/res/drawable/currency0.webp b/app/src/main/res/drawable/currency0.webp
index a55afc36fe..7bc5ca5605 100644
Binary files a/app/src/main/res/drawable/currency0.webp and b/app/src/main/res/drawable/currency0.webp differ
diff --git a/app/src/main/res/drawable/currency1.webp b/app/src/main/res/drawable/currency1.webp
index b24e1009ff..4818bdf156 100644
Binary files a/app/src/main/res/drawable/currency1.webp and b/app/src/main/res/drawable/currency1.webp differ
diff --git a/app/src/main/res/drawable/currency2.webp b/app/src/main/res/drawable/currency2.webp
index 86dfb0f2d4..9f726cd395 100644
Binary files a/app/src/main/res/drawable/currency2.webp and b/app/src/main/res/drawable/currency2.webp differ
diff --git a/app/src/main/res/drawable/currency3.webp b/app/src/main/res/drawable/currency3.webp
index a6a5da8499..4a5a827545 100644
Binary files a/app/src/main/res/drawable/currency3.webp and b/app/src/main/res/drawable/currency3.webp differ
diff --git a/app/src/main/res/drawable/currency4.webp b/app/src/main/res/drawable/currency4.webp
index 517c55c0f7..2f5bd64aae 100644
Binary files a/app/src/main/res/drawable/currency4.webp and b/app/src/main/res/drawable/currency4.webp differ
diff --git a/app/src/main/res/drawable/dapps0.webp b/app/src/main/res/drawable/dapps0.webp
index 65809f5fe4..5a5ddd3913 100644
Binary files a/app/src/main/res/drawable/dapps0.webp and b/app/src/main/res/drawable/dapps0.webp differ
diff --git a/app/src/main/res/drawable/dapps1.webp b/app/src/main/res/drawable/dapps1.webp
index 833c952010..d4895fdfbf 100644
Binary files a/app/src/main/res/drawable/dapps1.webp and b/app/src/main/res/drawable/dapps1.webp differ
diff --git a/app/src/main/res/drawable/dapps2.webp b/app/src/main/res/drawable/dapps2.webp
index a13cb38ba8..7411af18e6 100644
Binary files a/app/src/main/res/drawable/dapps2.webp and b/app/src/main/res/drawable/dapps2.webp differ
diff --git a/app/src/main/res/drawable/dapps3.webp b/app/src/main/res/drawable/dapps3.webp
index 99f594fd3d..4fe8d18fa1 100644
Binary files a/app/src/main/res/drawable/dapps3.webp and b/app/src/main/res/drawable/dapps3.webp differ
diff --git a/app/src/main/res/drawable/dapps4.webp b/app/src/main/res/drawable/dapps4.webp
index 15704d6a6e..57507b303c 100644
Binary files a/app/src/main/res/drawable/dapps4.webp and b/app/src/main/res/drawable/dapps4.webp differ
diff --git a/app/src/main/res/drawable/dapps5.webp b/app/src/main/res/drawable/dapps5.webp
index 5d6370f05a..94405e826b 100644
Binary files a/app/src/main/res/drawable/dapps5.webp and b/app/src/main/res/drawable/dapps5.webp differ
diff --git a/app/src/main/res/drawable/ic_activation_success.xml b/app/src/main/res/drawable/ic_activation_success.xml
deleted file mode 100644
index 7957c82493..0000000000
--- a/app/src/main/res/drawable/ic_activation_success.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="60dp"
-    android:height="60dp"
-    android:viewportWidth="60"
-    android:viewportHeight="60">
-  <path
-      android:strokeWidth="1"
-      android:pathData="M30,0.5L30,0.5A29.5,29.5 0,0 1,59.5 30L59.5,30A29.5,29.5 0,0 1,30 59.5L30,59.5A29.5,29.5 0,0 1,0.5 30L0.5,30A29.5,29.5 0,0 1,30 0.5z"
-      android:fillColor="#ffffff"
-      android:strokeColor="#1ACE80"/>
-  <path
-      android:pathData="M30,60C46.5685,60 60,46.5685 60,30C60,13.4315 46.5685,0 30,0C13.4315,0 0,13.4315 0,30C0,46.5685 13.4315,60 30,60Z"
-      android:strokeAlpha="0.2"
-      android:fillColor="#1ACE80"
-      android:fillType="evenOdd"
-      android:fillAlpha="0.2"/>
-  <path
-      android:pathData="M30,50C41.0457,50 50,41.0457 50,30C50,18.9543 41.0457,10 30,10C18.9543,10 10,18.9543 10,30C10,41.0457 18.9543,50 30,50Z"
-      android:fillColor="#1ACE80"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M35.3137,24.3607L28.0752,32.731L24.7481,29.5455C24.616,29.4145 24.4579,29.31 24.2832,29.2382C24.1084,29.1663 23.9205,29.1285 23.7303,29.1269C23.5402,29.1253 23.3516,29.16 23.1755,29.229C22.9995,29.2979 22.8396,29.3997 22.7051,29.5285C22.5707,29.6572 22.4643,29.8103 22.3923,29.9789C22.3203,30.1474 22.284,30.328 22.2857,30.51C22.2874,30.6921 22.3269,30.8721 22.4019,31.0394C22.477,31.2067 22.5861,31.358 22.7229,31.4845L27.0196,35.5983C27.2806,35.8482 27.6323,35.992 28.0014,35.9997C28.3704,36.0074 28.7283,35.8783 29.0004,35.6394L37.2501,26.382C37.53,26.1362 37.6965,25.7939 37.7129,25.4305C37.7293,25.0672 37.5942,24.7124 37.3374,24.4444C37.0806,24.1764 36.7232,24.017 36.3436,24.0013C35.9641,23.9856 35.5936,24.1149 35.3137,24.3607Z"
-      android:fillColor="#ffffff"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_arbitrum_no_color.xml b/app/src/main/res/drawable/ic_arbitrum_no_color.xml
index 02164f7121..e7c20e844b 100644
--- a/app/src/main/res/drawable/ic_arbitrum_no_color.xml
+++ b/app/src/main/res/drawable/ic_arbitrum_no_color.xml
@@ -3,7 +3,6 @@
     android:width="22dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <group>
         <clip-path android:pathData="M0,0h22v22h-22z"/>
-        <path android:fillColor="#F1F1F1" android:pathData="M11,22C17.1327,22 22,17.0354 22,11C22,4.8673 17.0354,0 11,0C4.8673,0 0,4.9646 0,11C0,17.0354 4.9646,22 11,22Z"/>
         <path android:fillColor="#A1A1A4" android:pathData="M16.5486,12.9469L13.6283,8.469L12.5575,10.2212L15.3805,14.7964L16.646,14.2124L16.5486,12.9469Z"/>
         <path android:fillColor="#A1A1A4" android:pathData="M15.186,15.3805L12.2656,10.9026L11.0001,12.8495L13.3364,16.5486L14.7966,15.9645L15.186,15.3805Z"/>
         <path android:fillColor="#A1A1A4" android:fillType="evenOdd" android:pathData="M5.6461,7.8851L11.0001,4.7701L16.3541,7.8851V14.1152L11.0001,17.2303L7.0089,14.9913L7,16L10.9028,18.3984C11.0001,18.4958 11.0974,18.4958 11.1948,18.3984L17.3275,14.894C17.4249,14.7966 17.5222,14.6993 17.5222,14.602V7.5931C17.5222,7.4958 17.4249,7.3984 17.3275,7.3011L11.1948,3.7966C11.0974,3.6993 11.0001,3.6993 10.9028,3.7966L4.77,7.2037C4.6727,7.3011 4.5753,7.3984 4.5753,7.4958V14.5046C4.5753,14.602 4.6727,14.6993 4.77,14.7966L6,15.5L6.5,14.5L5.7435,14.1152V7.8851H5.6461Z"/>
diff --git a/app/src/main/res/drawable/ic_arrows_up_down.xml b/app/src/main/res/drawable/ic_arrows_up_down.xml
index 6e7d34d5e6..96faa98e71 100644
--- a/app/src/main/res/drawable/ic_arrows_up_down.xml
+++ b/app/src/main/res/drawable/ic_arrows_up_down.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="14"
     android:viewportHeight="19">
     <path
-        android:fillColor="@color/blue"
+        android:fillColor="@color/accent"
         android:pathData="M11,14.51V7.5H9V14.51H6L10,18.5L14,14.51H11ZM4,0.5L0,4.49H3V11.5H5V4.49H8L4,0.5Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_avalanche_no_color.xml b/app/src/main/res/drawable/ic_avalanche_no_color.xml
index 72317338ab..032533db9d 100644
--- a/app/src/main/res/drawable/ic_avalanche_no_color.xml
+++ b/app/src/main/res/drawable/ic_avalanche_no_color.xml
@@ -1,6 +1,11 @@
-<vector android:autoMirrored="true" android:height="16dp"
-    android:viewportHeight="16" android:viewportWidth="16"
-    android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#A1A1A4" android:pathData="M8,8m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"/>
-    <path android:fillColor="#F1F1F1" android:fillType="evenOdd" android:pathData="M16,8C16,12.4183 12.4183,16 8,16C3.5817,16 0,12.4183 0,8C0,3.5817 3.5817,0 8,0C12.4183,0 16,3.5817 16,8ZM5.733,11.1836H4.1804C3.8542,11.1836 3.6931,11.1836 3.5948,11.1207C3.4887,11.0519 3.4238,10.9379 3.416,10.8121C3.4101,10.6962 3.4906,10.5547 3.6518,10.2717L7.4853,3.5146C7.6484,3.2277 7.7309,3.0842 7.8351,3.0312C7.9471,2.9742 8.0808,2.9742 8.1928,3.0312C8.297,3.0842 8.3795,3.2277 8.5426,3.5146L9.3307,4.8903L9.3347,4.8973C9.5109,5.2052 9.6002,5.3613 9.6392,5.5251C9.6825,5.7039 9.6825,5.8926 9.6392,6.0715C9.5999,6.2365 9.5115,6.3938 9.3327,6.7063L7.319,10.2658L7.3138,10.2749C7.1365,10.5853 7.0466,10.7426 6.922,10.8613C6.7864,10.991 6.6233,11.0853 6.4445,11.1384C6.2813,11.1836 6.0986,11.1836 5.733,11.1836ZM9.6538,11.1836H11.8785C12.2067,11.1836 12.3718,11.1836 12.4701,11.1188C12.5762,11.05 12.643,10.934 12.6489,10.8083C12.6546,10.6961 12.5758,10.5601 12.4213,10.2935C12.416,10.2845 12.4107,10.2752 12.4052,10.2658L11.2909,8.3595L11.2782,8.3381C11.1216,8.0733 11.0426,7.9395 10.941,7.8878C10.8291,7.8309 10.6973,7.8309 10.5853,7.8878C10.4831,7.9409 10.4006,8.0805 10.2375,8.3615L9.1271,10.2678L9.1233,10.2744C8.9607,10.555 8.8795,10.6952 8.8854,10.8102C8.8932,10.936 8.9581,11.0519 9.0642,11.1207C9.1605,11.1836 9.3256,11.1836 9.6538,11.1836Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#909090"
+        android:fillType="evenOdd"
+        android:pathData="M7.763,15.538H5.577C5.117,15.538 4.891,15.538 4.752,15.45C4.603,15.353 4.511,15.192 4.5,15.015C4.492,14.852 4.606,14.653 4.832,14.254L10.23,4.741C10.459,4.337 10.575,4.135 10.722,4.06C10.88,3.98 11.068,3.98 11.226,4.06C11.372,4.135 11.489,4.337 11.718,4.741L12.828,6.678L12.833,6.688C13.082,7.121 13.207,7.341 13.262,7.571C13.323,7.823 13.323,8.089 13.262,8.341C13.207,8.573 13.082,8.794 12.831,9.234L9.996,14.246L9.988,14.259C9.739,14.696 9.612,14.917 9.437,15.084C9.246,15.267 9.016,15.4 8.764,15.474C8.535,15.538 8.277,15.538 7.763,15.538ZM13.283,15.538H16.415C16.877,15.538 17.109,15.538 17.248,15.447C17.397,15.35 17.491,15.187 17.5,15.01C17.508,14.852 17.397,14.66 17.179,14.285C17.172,14.272 17.164,14.259 17.156,14.246L15.588,11.562L15.57,11.532C15.349,11.159 15.238,10.971 15.095,10.898C14.937,10.818 14.752,10.818 14.594,10.898C14.45,10.973 14.334,11.169 14.104,11.565L12.541,14.249L12.536,14.258C12.307,14.653 12.193,14.85 12.201,15.012C12.212,15.189 12.303,15.353 12.453,15.45C12.588,15.538 12.821,15.538 13.283,15.538Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_azero_no_color.xml b/app/src/main/res/drawable/ic_azero_no_color.xml
index da712895b3..612a316f3f 100644
--- a/app/src/main/res/drawable/ic_azero_no_color.xml
+++ b/app/src/main/res/drawable/ic_azero_no_color.xml
@@ -3,9 +3,6 @@
     android:height="22dp"
     android:viewportWidth="22"
     android:viewportHeight="22">
-  <path
-      android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"
-      android:fillColor="#EBEBEB"/>
   <path
       android:pathData="M14.927,11.319H16.829C16.874,11.319 16.918,11.302 16.95,11.271C16.982,11.24 17,11.198 17,11.154V9.834C17,9.79 16.982,9.748 16.95,9.717C16.918,9.686 16.874,9.669 16.829,9.669H14.164L12.064,5.131C12.046,5.092 12.017,5.059 11.98,5.035C11.943,5.012 11.9,5 11.856,5H10.144C10.1,5 10.057,5.012 10.02,5.035C9.983,5.059 9.954,5.092 9.936,5.131L7.836,9.669H5.171C5.126,9.669 5.082,9.686 5.05,9.717C5.018,9.748 5,9.79 5,9.834V11.154C5,11.198 5.018,11.24 5.05,11.271C5.082,11.302 5.126,11.319 5.171,11.319H7.073L5.015,15.768C5.003,15.793 4.998,15.821 5.001,15.848C5.003,15.875 5.012,15.902 5.028,15.925C5.043,15.948 5.065,15.967 5.09,15.98C5.115,15.993 5.143,16 5.172,16H6.702C6.746,16 6.79,15.988 6.827,15.965C6.864,15.941 6.893,15.908 6.911,15.87L11,7.03L15.089,15.87C15.107,15.908 15.136,15.941 15.173,15.965C15.21,15.988 15.254,16 15.298,16H16.828C16.857,16 16.885,15.993 16.91,15.98C16.935,15.967 16.957,15.948 16.972,15.925C16.988,15.902 16.997,15.875 16.999,15.848C17.001,15.821 16.997,15.793 16.985,15.768L14.927,11.319Z"
       android:fillColor="#B0B0B0"/>
diff --git a/app/src/main/res/drawable/ic_bitcoin_cash_no_color.xml b/app/src/main/res/drawable/ic_bitcoin_cash_no_color.xml
index 8ca8b29ddb..f9a1276588 100644
--- a/app/src/main/res/drawable/ic_bitcoin_cash_no_color.xml
+++ b/app/src/main/res/drawable/ic_bitcoin_cash_no_color.xml
@@ -1,6 +1,5 @@
 <vector android:autoMirrored="true" android:height="16dp"
     android:viewportHeight="16" android:viewportWidth="16"
     android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#F1F1F1" android:pathData="M8,16C12.4183,16 16,12.4183 16,8C16,3.5817 12.4183,0 8,0C3.5817,0 0,3.5817 0,8C0,12.4183 3.5817,16 8,16Z"/>
     <path android:fillColor="#A1A1A4" android:pathData="M10.6797,5.3445C10.272,4.4259 9.3351,4.2295 8.1882,4.4198L7.8196,3L6.9507,3.223L7.3131,4.6387C7.0845,4.696 6.8498,4.7451 6.6171,4.8106L6.2547,3.403L5.3858,3.626L5.7543,5.0458C5.567,5.099 4,5.498 4,5.498L4.2389,6.4227C4.2389,6.4227 4.8772,6.2447 4.871,6.259C5.2252,6.1669 5.3919,6.3429 5.4702,6.5086L6.4833,10.3998C6.4956,10.5123 6.475,10.7046 6.232,10.77C6.2465,10.7782 5.5999,10.9317 5.5999,10.9317L5.6946,12.0098C5.6946,12.0098 7.2472,11.615 7.451,11.5638L7.8237,13L8.6927,12.777L8.32,11.3306C8.5588,11.2754 8.7915,11.2181 9.018,11.1588L9.3886,12.597L10.2576,12.374L9.8849,10.9399C11.2233,10.6166 12.1684,9.7778 11.9748,8.4951C11.8513,7.7218 11.0009,7.0876 10.2946,7.016C10.7291,6.6334 10.9494,6.0749 10.6797,5.3445ZM10.2617,8.7304C10.4346,10.0008 8.6577,10.1563 8.0708,10.3097L7.5602,8.4092C8.1491,8.2557 9.9693,7.6113 10.2617,8.7304ZM9.191,6.1424C9.3742,7.2717 7.8546,7.4026 7.3646,7.5274L6.8992,5.8028C7.3913,5.6821 8.8183,5.097 9.191,6.1424Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_bitcoin_no_color.xml b/app/src/main/res/drawable/ic_bitcoin_no_color.xml
index 9b8aef2452..b18c3c9cce 100644
--- a/app/src/main/res/drawable/ic_bitcoin_no_color.xml
+++ b/app/src/main/res/drawable/ic_bitcoin_no_color.xml
@@ -1,6 +1,5 @@
 <vector android:autoMirrored="true" android:height="16dp"
     android:viewportHeight="16" android:viewportWidth="16"
     android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#F1F1F1" android:pathData="M15.7605,9.9353C14.6919,14.221 10.3507,16.8292 6.064,15.7605C1.7791,14.692 -0.8295,10.351 0.2396,6.0656C1.3077,1.7794 5.649,-0.8291 9.9344,0.2394C14.2209,1.3079 16.8292,5.6493 15.7605,9.9353Z"/>
     <path android:fillColor="#A1A1A4" android:pathData="M11.5275,6.8603C11.6868,5.7958 10.8762,5.2236 9.7678,4.8418L10.1273,3.3998L9.2495,3.1811L8.8995,4.5851C8.6687,4.5276 8.4317,4.4733 8.1961,4.4196L8.5487,3.0064L7.6713,2.7876L7.3116,4.2291C7.1205,4.1856 6.933,4.1426 6.751,4.0973L6.752,4.0928L5.5414,3.7906L5.3078,4.7281C5.3078,4.7281 5.9592,4.8773 5.9454,4.8866C6.301,4.9753 6.3652,5.2106 6.3545,5.3971L5.9449,7.0398C5.9694,7.0461 6.0012,7.0551 6.0362,7.0691C6.0069,7.0618 5.9757,7.0538 5.9434,7.0461L5.3693,9.3473C5.3258,9.4553 5.2156,9.6173 4.9671,9.5558C4.9758,9.5685 4.329,9.3965 4.329,9.3965L3.8932,10.4013L5.0356,10.686C5.2481,10.7393 5.4563,10.795 5.6614,10.8475L5.2981,12.306L6.1749,12.5248L6.5347,11.0818C6.7742,11.1468 7.0068,11.2068 7.2343,11.2633L6.8758,12.6995L7.7536,12.9182L8.1169,11.4625C9.6138,11.7458 10.7394,11.6315 11.2132,10.2778C11.595,9.1878 11.1942,8.559 10.4066,8.149C10.9802,8.0168 11.4122,7.6396 11.5275,6.8603ZM9.5218,9.6725C9.2505,10.7625 7.4151,10.1733 6.82,10.0255L7.3021,8.0933C7.8971,8.2418 9.8053,8.5358 9.5218,9.6725ZM9.7933,6.8446C9.5458,7.8361 8.0181,7.3323 7.5226,7.2088L7.9596,5.4563C8.4552,5.5798 10.0511,5.8103 9.7933,6.8446Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_bsc_no_color.xml b/app/src/main/res/drawable/ic_bsc_no_color.xml
index 1fb72febdf..a7062f73c1 100644
--- a/app/src/main/res/drawable/ic_bsc_no_color.xml
+++ b/app/src/main/res/drawable/ic_bsc_no_color.xml
@@ -1,7 +1,6 @@
 <vector android:autoMirrored="true" android:height="16dp"
     android:viewportHeight="16" android:viewportWidth="16"
     android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#F1F1F1" android:fillType="evenOdd" android:pathData="M8,0C12.4186,0 16,3.5814 16,8C16,12.4186 12.4186,16 8,16C3.5814,16 0,12.4186 0,8C0,3.5814 3.5814,0 8,0Z"/>
     <path android:fillColor="#A1A1A4" android:pathData="M4.3968,8.0001L4.4025,10.1154L6.2,11.1731V12.4116L3.3506,10.7404V7.3815L4.3968,8.0001ZM4.3968,5.8847V7.1174L3.35,6.4981V5.2655L4.3968,4.6462L5.4487,5.2655L4.3968,5.8847ZM6.9506,5.2655L7.9974,4.6462L9.0493,5.2655L7.9974,5.8847L6.9506,5.2655Z"/>
     <path android:fillColor="#A1A1A4" android:pathData="M5.1532,9.677V8.4385L6.2,9.0577V10.2904L5.1532,9.677ZM6.9506,11.6167L7.9974,12.2359L9.0493,11.6167V12.8494L7.9974,13.4686L6.9506,12.8494V11.6167ZM10.5505,5.2655L11.5973,4.6462L12.6492,5.2655V6.4981L11.5973,7.1174V5.8847L10.5505,5.2655ZM11.5973,10.1154L11.6031,8.0001L12.6499,7.3808V10.7398L9.8006,12.4109V11.1725L11.5973,10.1154Z"/>
     <path android:fillColor="#A1A1A4" android:pathData="M10.8468,9.6769L9.8,10.2903V9.0577L10.8468,8.4385V9.6769Z"/>
diff --git a/app/src/main/res/drawable/ic_cardano_no_color.xml b/app/src/main/res/drawable/ic_cardano_no_color.xml
index ea706040d3..46a9df7709 100644
--- a/app/src/main/res/drawable/ic_cardano_no_color.xml
+++ b/app/src/main/res/drawable/ic_cardano_no_color.xml
@@ -1,6 +1,5 @@
 <vector android:autoMirrored="true" android:height="16dp"
     android:viewportHeight="16" android:viewportWidth="16"
     android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#F1F1F1" android:pathData="M8,8m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"/>
     <path android:fillColor="#A1A1A4" android:pathData="M7.8738,3.2662C8.098,3.1493 8.3717,3.4204 8.2526,3.6444C8.1834,3.827 7.9211,3.8755 7.7871,3.7364C7.6452,3.6028 7.6915,3.3388 7.8738,3.2662ZM5.4626,3.5261C5.5988,3.47 5.7712,3.5948 5.7573,3.7432C5.7718,3.9043 5.5747,4.0229 5.4359,3.9464C5.252,3.8751 5.273,3.5766 5.4626,3.5261ZM10.4011,3.9509C10.1883,3.9252 10.1546,3.5906 10.3595,3.5232C10.5184,3.4457 10.6642,3.591 10.6875,3.7417C10.6541,3.8703 10.5465,3.9881 10.4011,3.9509ZM6.0113,4.5523C6.2389,4.4083 6.5638,4.6228 6.5288,4.8872C6.517,5.1543 6.1623,5.309 5.9622,5.1284C5.7687,4.9867 5.798,4.6614 6.0113,4.5523ZM9.4869,4.7051C9.5884,4.4434 10,4.4354 10.1156,4.6903C10.2299,4.8886 10.0894,5.1342 9.8857,5.2016C9.616,5.2519 9.3599,4.9604 9.4869,4.7051ZM7.5835,5.1867C7.5813,4.9617 7.7862,4.7941 8.0001,4.7787C8.1419,4.8072 8.2965,4.8676 8.3573,5.0107C8.4707,5.2082 8.37,5.48 8.1651,5.5706C8.0714,5.6231 7.9607,5.6034 7.8586,5.5973C7.7027,5.5208 7.5713,5.3706 7.5835,5.1867ZM3.9976,5.5146C4.2056,5.3867 4.4862,5.62 4.4075,5.846C4.3641,6.0414 4.1014,6.1209 3.9512,5.9962C3.7909,5.8793 3.8163,5.5982 3.9976,5.5146ZM11.6978,5.5142C11.8742,5.3772 12.1654,5.5343 12.1444,5.7571C12.1562,5.9603 11.9045,6.1135 11.7293,6.0089C11.5364,5.9222 11.5167,5.6253 11.6978,5.5142ZM8.5919,5.9187C8.8831,5.814 9.2289,5.9392 9.3949,6.1988C9.6138,6.5162 9.4974,6.9995 9.1576,7.1816C8.8056,7.397 8.2916,7.2144 8.1615,6.8213C8.014,6.4694 8.229,6.029 8.5919,5.9187ZM6.8834,5.9533C7.2062,5.8009 7.6405,5.9287 7.7964,6.2589C7.9798,6.5802 7.838,7.0276 7.51,7.1935C7.1816,7.38 6.7183,7.2386 6.5594,6.8936C6.3812,6.56 6.5395,6.1069 6.8834,5.9533ZM5.1728,6.5381C5.1973,6.3302 5.3934,6.1949 5.5913,6.1809C5.8046,6.2066 5.9749,6.3722 5.9981,6.588C5.9841,6.8016 5.819,7.0104 5.5926,7.0091C5.3436,7.0306 5.1252,6.7828 5.1728,6.5381ZM10.2255,6.2261C10.4812,6.0773 10.8363,6.2939 10.8249,6.5877C10.8425,6.8989 10.4495,7.1183 10.1949,6.9357C9.9304,6.7837 9.951,6.3555 10.2255,6.2261ZM6.1882,7.3231C6.4872,7.2408 6.8292,7.3818 6.9759,7.6566C7.1365,7.9333 7.0708,8.3177 6.8213,8.5206C6.5013,8.8183 5.911,8.6988 5.7407,8.2926C5.545,7.9201 5.7827,7.4211 6.1882,7.3231ZM9.4286,7.3215C9.7194,7.2384 10.0609,7.3504 10.2172,7.6153C10.4238,7.9182 10.3252,8.37 10.0176,8.5653C9.6953,8.792 9.1961,8.673 9.0188,8.3184C8.8038,7.9517 9.0202,7.4334 9.4286,7.3215ZM4.2647,7.6671C4.523,7.5694 4.8094,7.8545 4.7047,8.1106C4.6408,8.3439 4.312,8.4302 4.1421,8.2581C3.9433,8.0966 4.0169,7.7372 4.2647,7.6671ZM11.2667,8.0388C11.2593,7.8247 11.4159,7.6352 11.6354,7.6234C11.8123,7.6514 11.9843,7.7941 11.9703,7.9867C11.9865,8.2411 11.68,8.414 11.4633,8.2944C11.3617,8.2428 11.3096,8.1386 11.2667,8.0388ZM2.9945,7.7928C3.1499,7.7249 3.3422,7.8596 3.3067,8.0322C3.2983,8.2276 3.0098,8.3028 2.9038,8.1395C2.8102,8.0261 2.8662,7.8512 2.9945,7.7928ZM12.7939,7.7889C12.9033,7.7109 13.0789,7.767 13.1223,7.8948C13.1958,8.0344 13.061,8.2257 12.9038,8.2021C12.6832,8.2222 12.6118,7.886 12.7939,7.7889ZM7.0323,8.727C7.4413,8.6206 7.8809,8.9616 7.8835,9.3827C7.9102,9.8083 7.4772,10.1856 7.0585,10.0873C6.735,10.0352 6.4811,9.7235 6.4915,9.3965C6.4907,9.0838 6.7267,8.7931 7.0323,8.727ZM8.6519,8.7261C9.067,8.6101 9.5197,8.9572 9.5131,9.388C9.5351,9.8057 9.1156,10.1703 8.7057,10.0875C8.32,10.0376 8.0354,9.6138 8.1431,9.2395C8.1974,8.9901 8.4058,8.7872 8.6519,8.7261ZM5.5292,8.9853C5.8165,8.9363 6.0857,9.2567 5.9692,9.5295C5.8843,9.8201 5.4613,9.8989 5.2743,9.6615C5.055,9.4335 5.2187,9.0168 5.5292,8.9853ZM10.2789,8.9981C10.535,8.8908 10.8494,9.1124 10.8297,9.3904C10.84,9.6964 10.4519,9.9074 10.2014,9.7288C9.9177,9.5684 9.9694,9.0965 10.2789,8.9981ZM11.6065,10.3297C11.5062,10.1427 11.6884,9.895 11.8959,9.9296C11.9993,9.9278 12.0715,10.0092 12.1377,10.0775C12.1512,10.1883 12.174,10.3205 12.0821,10.4059C11.9572,10.5639 11.6743,10.5188 11.6065,10.3297ZM3.9968,9.9816C4.1907,9.8525 4.4699,10.0451 4.4263,10.2719C4.4031,10.4725 4.1504,10.5871 3.984,10.4733C3.8054,10.37 3.812,10.0758 3.9968,9.9816ZM7.8292,10.4015C8.0832,10.2894 8.4067,10.5105 8.3826,10.7902C8.4015,11.0993 8.0013,11.3134 7.753,11.1278C7.4772,10.9684 7.5232,10.4995 7.8292,10.4015ZM6.0542,10.8156C6.2705,10.7018 6.5607,10.8983 6.541,11.1404C6.5476,11.3392 6.3536,11.5086 6.1575,11.4792C5.995,11.4757 5.8891,11.3301 5.837,11.1916C5.8396,11.0406 5.9018,10.8725 6.0542,10.8156ZM9.6497,10.8191C9.8722,10.6816 10.1883,10.8791 10.1673,11.1379C10.173,11.4085 9.8157,11.5818 9.6086,11.4041C9.4081,11.2648 9.4326,10.9299 9.6497,10.8191ZM10.275,12.3649C10.1761,12.2152 10.2925,12.0348 10.4532,12.0007C10.5824,12.0269 10.719,12.1241 10.6918,12.2739C10.673,12.4765 10.3766,12.5387 10.275,12.3649ZM5.3116,12.2349C5.351,12.1162 5.4464,11.9983 5.5861,12.0292C5.7897,12.0436 5.8501,12.3505 5.6719,12.4451C5.5117,12.5531 5.3258,12.4051 5.3116,12.2349ZM7.7062,12.371C7.7451,12.1955 7.9723,12.1101 8.1221,12.2033C8.2211,12.2458 8.25,12.3565 8.2754,12.4507C8.2618,12.4997 8.2496,12.5487 8.2377,12.5978C8.1764,12.6704 8.0976,12.7431 7.9956,12.7405C7.806,12.7627 7.6349,12.5483 7.7062,12.371Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_chia_no_color.xml b/app/src/main/res/drawable/ic_chia_no_color.xml
index 9119f89479..4ed5d9574b 100644
--- a/app/src/main/res/drawable/ic_chia_no_color.xml
+++ b/app/src/main/res/drawable/ic_chia_no_color.xml
@@ -3,9 +3,6 @@
     android:height="22dp"
     android:viewportWidth="22"
     android:viewportHeight="22">
-  <path
-      android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"
-      android:fillColor="#EBEBEB"/>
   <path
       android:pathData="M11.415,6.503C11.372,6.507 11.212,6.521 11.061,6.534C10.799,6.555 10.406,6.603 10.342,6.624C10.325,6.629 10.255,6.642 10.185,6.654C9.672,6.737 9.036,6.949 8.678,7.157C8.613,7.195 8.543,7.233 8.521,7.241C8.44,7.273 7.903,7.658 7.704,7.825C6.237,9.061 5.459,10.99 5.785,12.584C5.825,12.778 5.83,12.78 5.964,12.678C6.179,12.514 6.368,12.389 6.631,12.235C6.785,12.144 7.451,11.811 7.478,11.811C7.482,11.811 7.533,11.789 7.591,11.763C8.174,11.487 9.873,10.889 10.726,10.658C10.758,10.649 10.905,10.608 11.05,10.568C11.86,10.341 11.995,10.311 11.995,10.35C11.995,10.358 11.949,10.383 11.892,10.403C11.613,10.502 10.855,10.816 10.824,10.843C10.814,10.852 10.795,10.86 10.781,10.86C10.768,10.86 10.699,10.888 10.629,10.921C10.559,10.953 10.496,10.981 10.488,10.981C10.482,10.981 10.409,11.012 10.329,11.052C10.248,11.091 10.178,11.123 10.173,11.123C10.168,11.123 10.089,11.159 9.996,11.204C9.903,11.248 9.822,11.285 9.817,11.285C9.734,11.285 7.837,12.304 7.238,12.67C7.102,12.754 6.987,12.822 6.983,12.822C6.977,12.822 6.791,12.942 6.197,13.328C5.534,13.759 4.427,14.564 3.745,15.113C3.664,15.179 3.567,15.256 3.53,15.287C2.939,15.759 2.863,15.845 3.199,15.664C3.954,15.259 4.795,14.854 5.4,14.607C5.77,14.455 6.161,14.342 6.425,14.309L6.535,14.296L6.809,14.578C7.526,15.314 8.297,15.688 9.432,15.849C9.702,15.887 10.568,15.882 10.774,15.841C10.835,15.83 10.967,15.805 11.069,15.788C11.173,15.769 11.283,15.747 11.316,15.738C11.349,15.729 11.432,15.705 11.502,15.687C12.809,15.338 13.928,14.506 14.918,13.144C14.94,13.113 15.028,12.995 15.115,12.88C15.202,12.765 15.291,12.643 15.313,12.61C15.336,12.577 15.391,12.494 15.437,12.427C15.953,11.68 16.683,10.45 17.154,9.536C17.205,9.436 17.288,9.276 17.338,9.182C17.387,9.087 17.547,8.759 17.695,8.454C17.842,8.148 17.971,7.882 17.981,7.862C18.023,7.782 18.007,7.764 17.813,7.684C17.791,7.675 17.645,7.625 17.488,7.572C17.331,7.52 17.154,7.461 17.095,7.44C16.837,7.351 16.408,7.223 15.885,7.081C15.432,6.957 15.308,6.924 15.137,6.886C15.05,6.867 14.957,6.843 14.93,6.834C14.903,6.825 14.828,6.806 14.763,6.795C14.58,6.759 14.5,6.742 14.33,6.704C13.697,6.564 13.148,6.513 12.213,6.503C11.818,6.498 11.459,6.5 11.415,6.503Z"
       android:fillColor="#909090"
diff --git a/app/src/main/res/drawable/ic_cosmos_no_color.xml b/app/src/main/res/drawable/ic_cosmos_no_color.xml
index 2b45162689..fbcaaabdd2 100644
--- a/app/src/main/res/drawable/ic_cosmos_no_color.xml
+++ b/app/src/main/res/drawable/ic_cosmos_no_color.xml
@@ -3,9 +3,6 @@
     android:height="22dp"
     android:viewportWidth="22"
     android:viewportHeight="22">
-  <path
-      android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"
-      android:fillColor="#EBEBEB"/>
   <path
       android:pathData="M11.173,1.882C11.085,1.801 11.04,1.8 11.033,1.8C11.025,1.8 10.98,1.801 10.893,1.882C10.803,1.964 10.696,2.106 10.58,2.326C10.35,2.765 10.129,3.428 9.939,4.283C9.725,5.245 9.556,6.421 9.449,7.738C9.964,7.987 10.494,8.258 11.033,8.549C11.571,8.258 12.101,7.987 12.616,7.737C12.51,6.421 12.341,5.245 12.127,4.283C11.936,3.428 11.716,2.765 11.485,2.326C11.37,2.106 11.262,1.964 11.173,1.882ZM10.582,8.795C10.186,8.585 9.796,8.386 9.415,8.2C9.386,8.623 9.363,9.06 9.348,9.508C9.549,9.387 9.754,9.266 9.962,9.147C10.169,9.027 10.376,8.91 10.582,8.795ZM9.034,7.54C9.343,3.93 10.121,1.369 11.033,1.369C11.944,1.369 12.723,3.93 13.032,7.54C16.314,6.002 18.923,5.396 19.378,6.185C19.834,6.973 18.004,8.928 15.031,11C18.004,13.072 19.834,15.027 19.378,15.816C18.923,16.604 16.314,15.998 13.032,14.46C12.723,18.07 11.944,20.631 11.033,20.631C10.121,20.631 9.343,18.07 9.034,14.46C5.751,15.998 3.143,16.604 2.687,15.816C2.231,15.027 4.061,13.072 7.034,11C4.061,8.928 2.231,6.973 2.687,6.185C3.143,5.396 5.751,6.002 9.034,7.54ZM7.414,10.739C6.326,9.989 5.392,9.254 4.665,8.588C4.019,7.996 3.555,7.473 3.29,7.054C3.157,6.845 3.087,6.681 3.061,6.562C3.035,6.446 3.056,6.406 3.06,6.4C3.063,6.394 3.087,6.355 3.2,6.32C3.317,6.283 3.494,6.262 3.742,6.272C4.238,6.291 4.923,6.432 5.759,6.695C6.7,6.991 7.803,7.433 8.997,7.998C8.956,8.569 8.926,9.163 8.908,9.774C8.387,10.095 7.887,10.418 7.414,10.739ZM7.414,11.261C6.326,12.011 5.392,12.746 4.665,13.412C4.019,14.004 3.555,14.527 3.29,14.946C3.157,15.156 3.087,15.319 3.061,15.438C3.035,15.554 3.056,15.594 3.06,15.6C3.063,15.606 3.087,15.645 3.2,15.68C3.317,15.717 3.494,15.738 3.742,15.728C4.238,15.709 4.923,15.568 5.759,15.305C6.7,15.009 7.803,14.567 8.997,14.002C8.956,13.431 8.926,12.837 8.908,12.226C8.387,11.905 7.887,11.582 7.414,11.261ZM8.897,11.712C8.517,11.475 8.15,11.237 7.797,11C8.15,10.763 8.517,10.525 8.897,10.288C8.893,10.523 8.891,10.76 8.891,11C8.891,11.24 8.893,11.477 8.897,11.712ZM9.333,11.981C9.326,11.658 9.322,11.331 9.322,11C9.322,10.669 9.326,10.342 9.333,10.019C9.608,9.852 9.89,9.685 10.177,9.519C10.464,9.354 10.75,9.193 11.033,9.039C11.316,9.193 11.601,9.354 11.888,9.519C12.175,9.685 12.457,9.852 12.733,10.019C12.74,10.342 12.744,10.669 12.744,11C12.744,11.331 12.74,11.658 12.733,11.981C12.457,12.148 12.175,12.315 11.888,12.481C11.601,12.646 11.316,12.807 11.033,12.962C10.75,12.807 10.464,12.646 10.177,12.481C9.89,12.315 9.608,12.148 9.333,11.981ZM9.348,12.492C9.363,12.94 9.386,13.377 9.415,13.8C9.796,13.614 10.186,13.415 10.582,13.205C10.376,13.09 10.169,12.973 9.962,12.854C9.754,12.734 9.549,12.613 9.348,12.492ZM11.033,13.451C10.494,13.742 9.964,14.013 9.449,14.262C9.556,15.579 9.725,16.755 9.939,17.717C10.129,18.572 10.35,19.235 10.58,19.674C10.696,19.894 10.803,20.036 10.893,20.118C10.98,20.199 11.025,20.201 11.033,20.201C11.04,20.201 11.085,20.199 11.173,20.118C11.262,20.036 11.37,19.894 11.485,19.674C11.716,19.235 11.936,18.572 12.127,17.717C12.341,16.755 12.51,15.579 12.616,14.263C12.101,14.013 11.571,13.742 11.033,13.451ZM13.068,14.002C14.262,14.568 15.366,15.009 16.306,15.305C17.142,15.568 17.827,15.709 18.323,15.728C18.571,15.738 18.748,15.717 18.865,15.68C18.978,15.645 19.002,15.606 19.006,15.6C19.009,15.594 19.031,15.554 19.005,15.438C18.978,15.319 18.908,15.156 18.775,14.946C18.511,14.527 18.046,14.004 17.4,13.412C16.674,12.746 15.739,12.011 14.651,11.261C14.178,11.582 13.679,11.905 13.157,12.226C13.14,12.837 13.11,13.431 13.068,14.002ZM14.651,10.739C15.739,9.989 16.674,9.254 17.4,8.588C18.046,7.996 18.511,7.473 18.775,7.054C18.908,6.845 18.978,6.681 19.005,6.562C19.031,6.446 19.009,6.406 19.006,6.4C19.002,6.394 18.978,6.355 18.865,6.32C18.748,6.283 18.571,6.262 18.323,6.272C17.827,6.291 17.142,6.432 16.306,6.695C15.366,6.991 14.262,7.433 13.068,7.998C13.11,8.569 13.14,9.163 13.157,9.774C13.679,10.095 14.178,10.418 14.651,10.739ZM13.168,10.288C13.549,10.525 13.916,10.763 14.268,11C13.916,11.237 13.549,11.475 13.168,11.712C13.172,11.477 13.174,11.24 13.174,11C13.174,10.76 13.172,10.523 13.168,10.288ZM12.718,9.508C12.702,9.06 12.68,8.623 12.651,8.199C12.269,8.386 11.879,8.585 11.483,8.795C11.689,8.91 11.896,9.027 12.103,9.147C12.311,9.266 12.516,9.387 12.718,9.508ZM12.651,13.801C12.269,13.614 11.879,13.415 11.483,13.205C11.689,13.09 11.896,12.973 12.103,12.854C12.311,12.734 12.516,12.613 12.718,12.492C12.702,12.94 12.68,13.377 12.651,13.801Z"
       android:strokeWidth="0.3"
diff --git a/app/src/main/res/drawable/ic_cronos_no_color.xml b/app/src/main/res/drawable/ic_cronos_no_color.xml
index 090ea95326..3764710b20 100644
--- a/app/src/main/res/drawable/ic_cronos_no_color.xml
+++ b/app/src/main/res/drawable/ic_cronos_no_color.xml
@@ -3,9 +3,6 @@
     android:height="22dp"
     android:viewportWidth="22"
     android:viewportHeight="22">
-  <path
-      android:fillColor="#EBEBEB"
-      android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
   <path
       android:fillColor="#B0B0B0"
       android:pathData="M11.005,3.5L4.5,7.25V14.75L11.005,18.5L17.5,14.75V7.25L11.005,3.5ZM15.573,13.637L10.995,16.274L6.427,13.637V8.363L11.005,5.726L15.573,8.363V13.637Z" />
diff --git a/app/src/main/res/drawable/ic_dash_no_color.xml b/app/src/main/res/drawable/ic_dash_no_color.xml
index be475ecf51..0e7c3f29b6 100644
--- a/app/src/main/res/drawable/ic_dash_no_color.xml
+++ b/app/src/main/res/drawable/ic_dash_no_color.xml
@@ -6,9 +6,6 @@
   <group>
     <clip-path
         android:pathData="M0,0h22v22h-22z"/>
-    <path
-        android:pathData="M11,21.988C17.069,21.988 21.988,17.069 21.988,11C21.988,4.931 17.069,0.012 11,0.012C4.931,0.012 0.012,4.931 0.012,11C0.012,17.069 4.931,21.988 11,21.988Z"
-        android:fillColor="#F1F1F1"/>
     <path
         android:pathData="M12.97,4.846H7.66L7.22,7.304L12.012,7.311C14.372,7.311 15.07,8.168 15.05,9.588C15.038,10.317 14.724,11.549 14.588,11.948C14.224,13.012 13.477,14.227 10.677,14.223L6.02,14.221L5.578,16.682H10.875C12.743,16.682 13.538,16.464 14.379,16.076C16.246,15.215 17.356,13.373 17.8,10.97C18.462,7.392 17.636,4.846 12.97,4.846"
         android:fillColor="#A1A1A4"/>
diff --git a/app/src/main/res/drawable/ic_discord.xml b/app/src/main/res/drawable/ic_discord.xml
index 88444ddf14..6502165e77 100644
--- a/app/src/main/res/drawable/ic_discord.xml
+++ b/app/src/main/res/drawable/ic_discord.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="22dp"
-    android:height="18dp"
-    android:viewportWidth="22"
-    android:viewportHeight="18">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
   <path
-      android:pathData="M18.636,1.924C17.212,1.259 15.689,0.775 14.097,0.5C13.902,0.853 13.673,1.327 13.516,1.705C11.824,1.451 10.147,1.451 8.486,1.705C8.328,1.327 8.095,0.853 7.897,0.5C6.304,0.775 4.779,1.26 3.355,1.927C0.483,6.26 -0.296,10.486 0.093,14.651C1.999,16.071 3.845,16.934 5.66,17.498C6.108,16.882 6.508,16.228 6.852,15.538C6.196,15.29 5.568,14.983 4.975,14.626C5.132,14.51 5.286,14.388 5.435,14.263C9.055,15.953 12.988,15.953 16.565,14.263C16.715,14.388 16.869,14.51 17.025,14.626C16.43,14.984 15.8,15.291 15.144,15.54C15.488,16.228 15.887,16.884 16.336,17.5C18.153,16.935 20.001,16.073 21.906,14.651C22.363,9.822 21.126,5.636 18.636,1.924ZM7.345,12.089C6.259,12.089 5.368,11.076 5.368,9.843C5.368,8.61 6.24,7.596 7.345,7.596C8.451,7.596 9.342,8.608 9.323,9.843C9.325,11.076 8.451,12.089 7.345,12.089ZM14.655,12.089C13.568,12.089 12.677,11.076 12.677,9.843C12.677,8.61 13.549,7.596 14.655,7.596C15.76,7.596 16.651,8.608 16.632,9.843C16.632,11.076 15.76,12.089 14.655,12.089Z"
-      android:fillColor="#B0B0B0"/>
+      android:pathData="M19.636,4.924C18.212,4.259 16.689,3.775 15.097,3.5C14.902,3.853 14.673,4.327 14.516,4.705C12.824,4.451 11.147,4.451 9.486,4.705C9.328,4.327 9.095,3.853 8.897,3.5C7.304,3.775 5.779,4.26 4.355,4.927C1.483,9.26 0.704,13.486 1.093,17.651C2.999,19.071 4.845,19.934 6.66,20.498C7.108,19.882 7.508,19.228 7.852,18.538C7.196,18.289 6.568,17.983 5.975,17.626C6.132,17.51 6.286,17.388 6.435,17.263C10.055,18.953 13.988,18.953 17.565,17.263C17.715,17.388 17.869,17.51 18.025,17.626C17.43,17.984 16.8,18.291 16.144,18.54C16.489,19.228 16.886,19.884 17.336,20.5C19.153,19.935 21.001,19.073 22.906,17.651C23.363,12.822 22.126,8.636 19.636,4.924ZM8.345,15.089C7.259,15.089 6.368,14.076 6.368,12.843C6.368,11.61 7.24,10.596 8.345,10.596C9.451,10.596 10.342,11.608 10.323,12.843C10.325,14.076 9.451,15.089 8.345,15.089ZM15.655,15.089C14.568,15.089 13.677,14.076 13.677,12.843C13.677,11.61 14.549,10.596 15.655,10.596C16.76,10.596 17.651,11.608 17.632,12.843C17.632,14.076 16.76,15.089 15.655,15.089Z"
+      android:fillColor="#909090"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_dogecoin_no_color.xml b/app/src/main/res/drawable/ic_dogecoin_no_color.xml
index 8ca48b696e..9d52af3530 100644
--- a/app/src/main/res/drawable/ic_dogecoin_no_color.xml
+++ b/app/src/main/res/drawable/ic_dogecoin_no_color.xml
@@ -1,6 +1,5 @@
 <vector android:autoMirrored="true" android:height="16dp"
     android:viewportHeight="16" android:viewportWidth="16"
     android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#F1F1F1" android:pathData="M8,8m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"/>
     <path android:fillColor="#A1A1A4" android:fillType="evenOdd" android:pathData="M5.3545,12.185H8.1164H8.1165C8.1165,12.185 11.9999,12.5157 11.9999,8.0674C11.9999,3.7917 8.4536,3.8068 7.7682,3.8098C7.7521,3.8098 7.7376,3.8099 7.7248,3.8099H5.3544V7.5406H4.3809V8.4545H5.3545V12.185ZM6.9101,5.3579H7.9998C8.4074,5.3579 10.4578,5.5245 10.4611,8.0975C10.4643,10.6399 8.397,10.6373 8.0645,10.6368C8.0604,10.6368 8.0567,10.6368 8.0532,10.6368H6.9101V8.4544H8.6245V7.5405H6.9101V5.3579Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_dot.xml b/app/src/main/res/drawable/ic_dot.xml
index 321894f58a..bef54d1532 100644
--- a/app/src/main/res/drawable/ic_dot.xml
+++ b/app/src/main/res/drawable/ic_dot.xml
@@ -7,7 +7,7 @@
         android:thickness="4.5dp"
         android:useLevel="false">
       <solid
-          android:color="#80686868"
+          android:color="@color/icon_informative"
           android:fillAlpha="0.5"
           />
     </shape>
diff --git a/app/src/main/res/drawable/ic_eth_no_color.xml b/app/src/main/res/drawable/ic_eth_no_color.xml
index 95066b1560..41071ba559 100644
--- a/app/src/main/res/drawable/ic_eth_no_color.xml
+++ b/app/src/main/res/drawable/ic_eth_no_color.xml
@@ -1,7 +1,6 @@
 <vector android:autoMirrored="true" android:height="16dp"
     android:viewportHeight="16" android:viewportWidth="16"
     android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#F1F1F1" android:pathData="M8,16C12.4183,16 16,12.4183 16,8C16,3.5817 12.4183,0 8,0C3.5817,0 0,3.5817 0,8C0,12.4183 3.5817,16 8,16Z"/>
     <group>
         <clip-path android:pathData="M8.0002,2.8001L8.0002,2.8001A3.2001,3.2001 0,0 1,11.2003 6.0001L11.2003,10.0003A3.2001,3.2001 0,0 1,8.0002 13.2003L8.0002,13.2003A3.2001,3.2001 0,0 1,4.8002 10.0003L4.8002,6.0001A3.2001,3.2001 0,0 1,8.0002 2.8001z"/>
         <path android:fillColor="#A1A1A4" android:pathData="M7.9994,2.8001L7.9296,3.037V9.9123L7.9994,9.9819L11.1986,8.0955L7.9994,2.8001Z"/>
diff --git a/app/src/main/res/drawable/ic_ethereumfair_no_color.xml b/app/src/main/res/drawable/ic_ethereumfair_no_color.xml
index dd68efa83e..1379276e0d 100644
--- a/app/src/main/res/drawable/ic_ethereumfair_no_color.xml
+++ b/app/src/main/res/drawable/ic_ethereumfair_no_color.xml
@@ -6,9 +6,6 @@
     android:viewportHeight="22">
     <group>
         <clip-path android:pathData="M0,0h22v22h-22z" />
-        <path
-            android:fillColor="#F1F1F1"
-            android:pathData="M11,22C17.075,22 22,17.075 22,11C22,4.925 17.075,0 11,0C4.925,0 0,4.925 0,11C0,17.075 4.925,22 11,22Z" />
         <path
             android:fillColor="#A1A1A4"
             android:pathData="M10.75,3.737L10.75,5.243L7.014,10.538L6.243,10.081L10.75,3.737Z" />
diff --git a/app/src/main/res/drawable/ic_ethereumpow_no_color.xml b/app/src/main/res/drawable/ic_ethereumpow_no_color.xml
index aa369fd0ab..40a0651a32 100644
--- a/app/src/main/res/drawable/ic_ethereumpow_no_color.xml
+++ b/app/src/main/res/drawable/ic_ethereumpow_no_color.xml
@@ -6,9 +6,6 @@
     android:viewportHeight="22">
     <group>
         <clip-path android:pathData="M0,0h22v22h-22z" />
-        <path
-            android:fillColor="#F1F1F1"
-            android:pathData="M11,22C17.075,22 22,17.075 22,11C22,4.925 17.075,0 11,0C4.925,0 0,4.925 0,11C0,17.075 4.925,22 11,22Z" />
         <group>
             <clip-path android:pathData="M11,3.85L11,3.85A4.4,4.4 0,0 1,15.4 8.25L15.4,13.75A4.4,4.4 0,0 1,11 18.15L11,18.15A4.4,4.4 0,0 1,6.6 13.75L6.6,8.25A4.4,4.4 0,0 1,11 3.85z" />
             <path
diff --git a/app/src/main/res/drawable/ic_facebook.xml b/app/src/main/res/drawable/ic_facebook.xml
index 9343c46fe7..1db025e42c 100644
--- a/app/src/main/res/drawable/ic_facebook.xml
+++ b/app/src/main/res/drawable/ic_facebook.xml
@@ -1,5 +1,9 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B0B0B0" android:pathData="M12,1.935C6.442,1.935 1.935,6.465 1.935,12.052C1.935,17.124 5.653,21.312 10.495,22.043V14.733H8.005V12.074H10.495V10.304C10.495,7.375 11.915,6.089 14.337,6.089C15.497,6.089 16.111,6.176 16.402,6.215V8.536H14.749C13.721,8.536 13.362,9.516 13.362,10.62V12.074H16.375L15.967,14.733H13.362V22.065C18.274,21.395 22.065,17.173 22.065,12.052C22.065,6.465 17.558,1.935 12,1.935Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,1.935C6.442,1.935 1.935,6.465 1.935,12.052C1.935,17.124 5.653,21.312 10.495,22.043V14.733H8.005V12.074H10.495V10.304C10.495,7.375 11.915,6.089 14.337,6.089C15.497,6.089 16.111,6.176 16.402,6.215V8.536H14.749C13.721,8.536 13.362,9.516 13.362,10.62V12.074H16.375L15.967,14.733H13.362V22.065C18.274,21.395 22.065,17.173 22.065,12.052C22.065,6.465 17.558,1.935 12,1.935Z"
+      android:fillColor="#909090"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_fantom_no_color.xml b/app/src/main/res/drawable/ic_fantom_no_color.xml
index 4b873b7e55..f7498b5230 100644
--- a/app/src/main/res/drawable/ic_fantom_no_color.xml
+++ b/app/src/main/res/drawable/ic_fantom_no_color.xml
@@ -1,6 +1,5 @@
 <vector android:autoMirrored="true" android:height="22dp"
     android:viewportHeight="22" android:viewportWidth="22"
     android:width="22dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#F1F1F1" android:pathData="M11,22C17.0751,22 22,17.0751 22,11C22,4.9249 17.0751,0 11,0C4.9249,0 0,4.9249 0,11C0,17.0751 4.9249,22 11,22Z"/>
     <path android:fillColor="#A1A1A4" android:fillType="evenOdd" android:pathData="M11.825,8.8687L14.3,7.425V10.3125L11.825,8.8687ZM14.3,15.0562L11,16.9813L7.7,15.0562V11.6875L11,13.6125L14.3,11.6875V15.0562ZM7.7,7.425L10.175,8.8687L7.7,10.3125V7.425ZM11.4125,9.5562L13.8875,11L11.4125,12.4438V9.5562ZM10.5875,12.4438L8.1125,11L10.5875,9.5562V12.4438ZM13.8875,6.7375L11,8.3875L8.1125,6.7375L11,5.0188L13.8875,6.7375ZM6.875,6.4625V15.4688L11,17.8062L15.125,15.4688V6.4625L11,4.125L6.875,6.4625Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_github.xml b/app/src/main/res/drawable/ic_github.xml
index 57bbd79618..daa1de7021 100644
--- a/app/src/main/res/drawable/ic_github.xml
+++ b/app/src/main/res/drawable/ic_github.xml
@@ -1,5 +1,9 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B0B0B0" android:pathData="M12,2.4C6.698,2.4 2.4,6.698 2.4,12C2.4,16.498 5.498,20.262 9.674,21.304C9.629,21.174 9.6,21.024 9.6,20.838V19.197C9.21,19.197 8.558,19.197 8.394,19.197C7.737,19.197 7.153,18.914 6.87,18.39C6.555,17.806 6.501,16.914 5.722,16.369C5.49,16.187 5.666,15.98 5.933,16.008C6.425,16.147 6.833,16.485 7.217,16.986C7.599,17.487 7.779,17.601 8.494,17.601C8.84,17.601 9.358,17.581 9.846,17.504C10.109,16.838 10.562,16.224 11.117,15.934C7.92,15.606 6.394,14.015 6.394,11.856C6.394,10.926 6.79,10.027 7.463,9.27C7.242,8.518 6.965,6.984 7.548,6.4C8.986,6.4 9.856,7.333 10.065,7.585C10.782,7.339 11.569,7.2 12.396,7.2C13.225,7.2 14.015,7.339 14.734,7.586C14.94,7.336 15.81,6.4 17.252,6.4C17.838,6.985 17.557,8.525 17.334,9.275C18.002,10.031 18.396,10.928 18.396,11.856C18.396,14.014 16.873,15.603 13.681,15.934C14.559,16.392 15.2,17.68 15.2,18.65V20.838C15.2,20.921 15.182,20.981 15.172,21.052C18.913,19.741 21.6,16.189 21.6,12C21.6,6.698 17.302,2.4 12,2.4Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,2.4C6.698,2.4 2.4,6.698 2.4,12C2.4,16.498 5.497,20.262 9.674,21.304C9.629,21.174 9.6,21.024 9.6,20.838V19.197C9.21,19.197 8.557,19.197 8.394,19.197C7.737,19.197 7.153,18.914 6.87,18.39C6.555,17.806 6.501,16.914 5.721,16.369C5.49,16.187 5.666,15.98 5.933,16.008C6.425,16.147 6.833,16.485 7.217,16.986C7.599,17.487 7.779,17.601 8.493,17.601C8.84,17.601 9.358,17.581 9.846,17.504C10.109,16.838 10.562,16.224 11.117,15.934C7.92,15.606 6.394,14.015 6.394,11.856C6.394,10.926 6.79,10.027 7.463,9.27C7.242,8.518 6.965,6.984 7.548,6.4C8.986,6.4 9.856,7.333 10.065,7.585C10.781,7.339 11.569,7.2 12.396,7.2C13.225,7.2 14.015,7.339 14.733,7.586C14.94,7.336 15.81,6.4 17.252,6.4C17.837,6.985 17.557,8.525 17.333,9.275C18.002,10.031 18.396,10.928 18.396,11.856C18.396,14.014 16.873,15.603 13.681,15.934C14.559,16.392 15.2,17.68 15.2,18.65V20.838C15.2,20.921 15.182,20.981 15.172,21.052C18.913,19.741 21.6,16.189 21.6,12C21.6,6.698 17.302,2.4 12,2.4Z"
+      android:fillColor="#909090"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_gnosis_no_color.xml b/app/src/main/res/drawable/ic_gnosis_no_color.xml
index a8d4069093..271d24efd6 100644
--- a/app/src/main/res/drawable/ic_gnosis_no_color.xml
+++ b/app/src/main/res/drawable/ic_gnosis_no_color.xml
@@ -3,9 +3,6 @@
     android:height="22dp"
     android:viewportWidth="22"
     android:viewportHeight="22">
-  <path
-      android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"
-      android:fillColor="#F1F1F1" />
   <path
       android:pathData="M7.703,12.11C8.163,12.11 8.612,11.957 8.974,11.677L6.058,8.761C5.356,9.669 5.524,10.978 6.432,11.68C6.799,11.957 7.243,12.11 7.703,12.11Z"
       android:fillColor="#A1A1A4" />
diff --git a/app/src/main/res/drawable/ic_instagram.xml b/app/src/main/res/drawable/ic_instagram.xml
index 844639d9e3..76744cf7f5 100644
--- a/app/src/main/res/drawable/ic_instagram.xml
+++ b/app/src/main/res/drawable/ic_instagram.xml
@@ -1,10 +1,19 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <group>
-        <clip-path android:pathData="M2.4,2.4h19.2v19.2h-19.2z"/>
-        <path android:fillColor="#B0B0B0" android:pathData="M21.581,8.045C21.536,7.025 21.371,6.323 21.135,5.716C20.891,5.07 20.516,4.493 20.025,4.013C19.545,3.525 18.963,3.146 18.326,2.906C17.714,2.67 17.017,2.505 15.997,2.46C14.969,2.411 14.642,2.4 12.036,2.4C9.429,2.4 9.103,2.411 8.079,2.456C7.058,2.501 6.357,2.666 5.749,2.903C5.104,3.146 4.527,3.521 4.047,4.013C3.559,4.493 3.18,5.074 2.94,5.712C2.704,6.323 2.539,7.021 2.494,8.041C2.445,9.069 2.434,9.395 2.434,12.002C2.434,14.609 2.445,14.935 2.49,15.959C2.535,16.979 2.7,17.68 2.936,18.288C3.18,18.933 3.559,19.511 4.047,19.991C4.527,20.479 5.108,20.857 5.746,21.097C6.357,21.334 7.055,21.499 8.075,21.544C9.099,21.589 9.425,21.6 12.032,21.6C14.639,21.6 14.965,21.589 15.989,21.544C17.009,21.499 17.711,21.334 18.318,21.097C19.608,20.598 20.629,19.578 21.128,18.288C21.364,17.677 21.529,16.979 21.574,15.959C21.619,14.935 21.63,14.609 21.63,12.002C21.63,9.395 21.626,9.069 21.581,8.045ZM19.852,15.884C19.811,16.822 19.653,17.328 19.522,17.666C19.199,18.502 18.536,19.166 17.699,19.488C17.362,19.62 16.852,19.777 15.918,19.818C14.905,19.864 14.601,19.875 12.039,19.875C9.478,19.875 9.17,19.864 8.161,19.818C7.223,19.777 6.717,19.62 6.38,19.488C5.963,19.334 5.584,19.091 5.277,18.772C4.958,18.461 4.714,18.086 4.56,17.669C4.429,17.332 4.272,16.822 4.23,15.888C4.185,14.875 4.174,14.571 4.174,12.009C4.174,9.448 4.185,9.14 4.23,8.131C4.272,7.193 4.429,6.687 4.56,6.35C4.714,5.933 4.958,5.554 5.281,5.247C5.592,4.928 5.967,4.684 6.383,4.53C6.721,4.399 7.231,4.242 8.165,4.2C9.178,4.155 9.481,4.144 12.043,4.144C14.609,4.144 14.912,4.155 15.922,4.2C16.859,4.242 17.365,4.399 17.703,4.53C18.119,4.684 18.498,4.928 18.806,5.247C19.125,5.558 19.368,5.933 19.522,6.35C19.653,6.687 19.811,7.197 19.852,8.131C19.897,9.144 19.909,9.448 19.909,12.009C19.909,14.571 19.897,14.871 19.852,15.884Z"/>
-        <path android:fillColor="#B0B0B0" android:pathData="M12.036,7.07C9.313,7.07 7.103,9.279 7.103,12.002C7.103,14.725 9.313,16.934 12.036,16.934C14.759,16.934 16.968,14.725 16.968,12.002C16.968,9.279 14.759,7.07 12.036,7.07ZM12.036,15.201C10.269,15.201 8.836,13.768 8.836,12.002C8.836,10.235 10.269,8.802 12.036,8.802C13.802,8.802 15.235,10.235 15.235,12.002C15.235,13.768 13.802,15.201 12.036,15.201Z"/>
-        <path android:fillColor="#B0B0B0" android:pathData="M18.315,6.875C18.315,7.511 17.799,8.026 17.163,8.026C16.527,8.026 16.011,7.511 16.011,6.875C16.011,6.239 16.527,5.723 17.163,5.723C17.799,5.723 18.315,6.239 18.315,6.875Z"/>
-    </group>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M2.4,2.4h19.2v19.2h-19.2z"/>
+    <path
+        android:pathData="M21.581,8.045C21.536,7.025 21.371,6.323 21.135,5.716C20.891,5.07 20.516,4.493 20.025,4.013C19.545,3.525 18.963,3.146 18.326,2.906C17.714,2.67 17.017,2.505 15.997,2.46C14.969,2.411 14.642,2.4 12.036,2.4C9.429,2.4 9.103,2.411 8.079,2.456C7.058,2.501 6.357,2.666 5.749,2.903C5.104,3.146 4.527,3.521 4.047,4.013C3.559,4.493 3.18,5.074 2.94,5.712C2.704,6.323 2.539,7.021 2.494,8.041C2.445,9.069 2.434,9.395 2.434,12.002C2.434,14.609 2.445,14.935 2.49,15.959C2.535,16.979 2.7,17.68 2.936,18.288C3.18,18.933 3.559,19.511 4.047,19.991C4.527,20.479 5.108,20.857 5.746,21.097C6.357,21.334 7.055,21.499 8.075,21.544C9.099,21.589 9.425,21.6 12.032,21.6C14.639,21.6 14.965,21.589 15.989,21.544C17.009,21.499 17.711,21.334 18.318,21.097C19.608,20.598 20.629,19.578 21.128,18.288C21.364,17.677 21.529,16.979 21.574,15.959C21.619,14.935 21.63,14.609 21.63,12.002C21.63,9.395 21.626,9.069 21.581,8.045ZM19.852,15.884C19.811,16.822 19.653,17.328 19.522,17.666C19.199,18.502 18.536,19.166 17.699,19.488C17.362,19.62 16.852,19.777 15.918,19.818C14.905,19.864 14.601,19.875 12.039,19.875C9.478,19.875 9.17,19.864 8.161,19.818C7.223,19.777 6.717,19.62 6.38,19.488C5.963,19.334 5.584,19.091 5.277,18.772C4.958,18.461 4.714,18.086 4.56,17.669C4.429,17.332 4.272,16.822 4.23,15.888C4.185,14.875 4.174,14.571 4.174,12.009C4.174,9.448 4.185,9.14 4.23,8.131C4.272,7.193 4.429,6.687 4.56,6.35C4.714,5.933 4.958,5.554 5.281,5.247C5.592,4.928 5.967,4.684 6.383,4.53C6.721,4.399 7.231,4.242 8.165,4.2C9.178,4.155 9.481,4.144 12.043,4.144C14.609,4.144 14.912,4.155 15.922,4.2C16.859,4.242 17.365,4.399 17.703,4.53C18.119,4.684 18.498,4.928 18.806,5.247C19.125,5.558 19.368,5.933 19.522,6.35C19.653,6.687 19.811,7.197 19.852,8.131C19.897,9.144 19.909,9.448 19.909,12.009C19.909,14.571 19.897,14.871 19.852,15.884Z"
+        android:fillColor="#909090"/>
+    <path
+        android:pathData="M12.036,7.07C9.313,7.07 7.103,9.279 7.103,12.002C7.103,14.725 9.313,16.934 12.036,16.934C14.759,16.934 16.968,14.725 16.968,12.002C16.968,9.279 14.759,7.07 12.036,7.07ZM12.036,15.201C10.269,15.201 8.836,13.768 8.836,12.002C8.836,10.235 10.269,8.802 12.036,8.802C13.802,8.802 15.235,10.235 15.235,12.002C15.235,13.768 13.802,15.201 12.036,15.201Z"
+        android:fillColor="#909090"/>
+    <path
+        android:pathData="M18.315,6.875C18.315,7.511 17.799,8.026 17.163,8.026C16.527,8.026 16.011,7.511 16.011,6.875C16.011,6.239 16.527,5.723 17.163,5.723C17.799,5.723 18.315,6.239 18.315,6.875Z"
+        android:fillColor="#909090"/>
+  </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_kaspa_no_color.xml b/app/src/main/res/drawable/ic_kaspa_no_color.xml
index cae1a10de8..55b68fd581 100644
--- a/app/src/main/res/drawable/ic_kaspa_no_color.xml
+++ b/app/src/main/res/drawable/ic_kaspa_no_color.xml
@@ -3,9 +3,6 @@
     android:height="22dp"
     android:viewportWidth="22"
     android:viewportHeight="22">
-    <path
-        android:fillColor="#EBEBEB"
-        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
     <path
         android:fillColor="#C9C9C9"
         android:pathData="M13.659,5.35L11.564,5.663L12.174,9.721L7.787,6.34L6.5,8.022L10.343,10.975L6.5,13.944L7.787,15.626L12.174,12.245L11.564,16.303L13.659,16.616L14.5,10.975L13.659,5.35Z" />
diff --git a/app/src/main/res/drawable/ic_kava_no_color.xml b/app/src/main/res/drawable/ic_kava_no_color.xml
index d48b77cede..49e4647c33 100644
--- a/app/src/main/res/drawable/ic_kava_no_color.xml
+++ b/app/src/main/res/drawable/ic_kava_no_color.xml
@@ -3,9 +3,6 @@
     android:height="22dp"
     android:viewportWidth="22"
     android:viewportHeight="22">
-  <path
-      android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"
-      android:fillColor="#EBEBEB"/>
   <path
       android:pathData="M7.052,6.009H8.795V16H7.052V6.009ZM9.741,11.001L13.565,15.993H15.747L11.984,11.001L15.747,6.009H13.565L9.741,11.001Z"
       android:fillColor="#C9C9C9"
diff --git a/app/src/main/res/drawable/ic_kusama_no_color.xml b/app/src/main/res/drawable/ic_kusama_no_color.xml
index 8cf194e177..be4ff99b2e 100644
--- a/app/src/main/res/drawable/ic_kusama_no_color.xml
+++ b/app/src/main/res/drawable/ic_kusama_no_color.xml
@@ -1,6 +1,5 @@
 <vector android:autoMirrored="true" android:height="16dp"
     android:viewportHeight="16" android:viewportWidth="16"
     android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#F1F1F1" android:pathData="M8,8m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"/>
     <path android:fillColor="#A1A1A4" android:pathData="M12.4155,5.3206C12.265,5.2041 12.0856,5.0449 11.7587,5.0051C11.452,4.9653 11.1395,5.1671 10.9282,5.3007C10.717,5.4343 10.3177,5.8266 10.1528,5.946C9.9879,6.0654 9.5654,6.1762 8.8854,6.577C8.2054,6.9778 5.5376,8.6606 5.5376,8.6606L6.2321,8.6691L3.136,10.2354H3.4456L3,10.5679C3,10.5679 3.3935,10.6703 3.7234,10.4656V10.5594C3.7234,10.5594 7.4097,9.1325 8.1215,9.502L7.6875,9.6271C7.7251,9.6271 8.4254,9.6725 8.4254,9.6725C8.4423,9.815 8.4911,9.952 8.5681,10.0738C8.6451,10.1957 8.7485,10.2994 8.8709,10.3775C9.2934,10.6504 9.3021,10.801 9.3021,10.801C9.3021,10.801 9.0822,10.8891 9.0822,11C9.0822,11 9.4063,10.9034 9.7072,10.9119C9.8982,10.919 10.0876,10.9486 10.2714,11C10.2714,11 10.2483,10.8806 9.956,10.801C9.6638,10.7214 9.3744,10.4088 9.2326,10.2382C9.1458,10.1296 9.0892,10.0008 9.0684,9.8642C9.0476,9.7276 9.0633,9.5881 9.114,9.4593C9.2153,9.2007 9.5683,9.0585 10.2975,8.689C11.1568,8.2513 11.3536,7.9272 11.4751,7.6742C11.5966,7.4212 11.776,6.9181 11.8773,6.6822C12.0046,6.378 12.1609,6.216 12.2911,6.1194C12.4213,6.0227 13,5.8095 13,5.8095C13,5.8095 12.5573,5.4315 12.4155,5.3206Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_linkedin.xml b/app/src/main/res/drawable/ic_linkedin.xml
index 36600f605d..2df3cb834a 100644
--- a/app/src/main/res/drawable/ic_linkedin.xml
+++ b/app/src/main/res/drawable/ic_linkedin.xml
@@ -1,5 +1,9 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B0B0B0" android:pathData="M19.2,3.2H4.8C3.916,3.2 3.2,3.916 3.2,4.8V19.2C3.2,20.084 3.916,20.8 4.8,20.8H19.2C20.084,20.8 20.8,20.084 20.8,19.2V4.8C20.8,3.916 20.084,3.2 19.2,3.2ZM8.763,17.6H6.403V10.006H8.763V17.6ZM7.559,8.921C6.798,8.921 6.183,8.304 6.183,7.545C6.183,6.785 6.799,6.169 7.559,6.169C8.318,6.169 8.934,6.786 8.934,7.545C8.934,8.304 8.318,8.921 7.559,8.921ZM17.603,17.6H15.245V13.907C15.245,13.026 15.229,11.894 14.018,11.894C12.79,11.894 12.602,12.853 12.602,13.843V17.6H10.243V10.006H12.507V11.044H12.539C12.854,10.447 13.624,9.817 14.772,9.817C17.162,9.817 17.603,11.39 17.603,13.435V17.6Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19.2,3.2H4.8C3.916,3.2 3.2,3.916 3.2,4.8V19.2C3.2,20.084 3.916,20.8 4.8,20.8H19.2C20.084,20.8 20.8,20.084 20.8,19.2V4.8C20.8,3.916 20.084,3.2 19.2,3.2ZM8.763,17.6H6.403V10.006H8.763V17.6ZM7.559,8.921C6.798,8.921 6.183,8.304 6.183,7.545C6.183,6.785 6.799,6.169 7.559,6.169C8.318,6.169 8.934,6.786 8.934,7.545C8.934,8.304 8.318,8.921 7.559,8.921ZM17.603,17.6H15.245V13.907C15.245,13.026 15.229,11.894 14.018,11.894C12.79,11.894 12.602,12.853 12.602,13.843V17.6H10.243V10.006H12.507V11.044H12.539C12.854,10.447 13.624,9.817 14.772,9.817C17.162,9.817 17.603,11.39 17.603,13.435V17.6Z"
+      android:fillColor="#909090"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_litecoin_no_color.xml b/app/src/main/res/drawable/ic_litecoin_no_color.xml
index 5758f1ab6e..5b3acc91e8 100644
--- a/app/src/main/res/drawable/ic_litecoin_no_color.xml
+++ b/app/src/main/res/drawable/ic_litecoin_no_color.xml
@@ -1,9 +1,10 @@
-<vector android:autoMirrored="true" android:height="16dp"
-    android:viewportHeight="16" android:viewportWidth="16"
-    android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <group>
-        <clip-path android:pathData="M0,0h16v16h-16z"/>
-        <path android:fillColor="#A1A1A4" android:pathData="M8,16C12.4183,16 16,12.4183 16,8C16,3.5817 12.4183,0 8,0C3.5817,0 0,3.5817 0,8C0,12.4183 3.5817,16 8,16Z"/>
-        <path android:fillColor="#F1F1F1" android:pathData="M8,0C6.4177,0 4.871,0.4692 3.5554,1.3482C2.2399,2.2273 1.2145,3.4767 0.609,4.9385C0.0035,6.4003 -0.155,8.0089 0.1537,9.5607C0.4624,11.1126 1.2243,12.538 2.3431,13.6569C3.462,14.7757 4.8874,15.5376 6.4393,15.8463C7.9911,16.155 9.5997,15.9965 11.0615,15.391C12.5233,14.7855 13.7727,13.7602 14.6518,12.4446C15.5308,11.129 16,9.5822 16,8C16.0031,6.9525 15.7998,5.9146 15.4017,4.9457C15.0037,3.9767 14.4187,3.0956 13.6801,2.3528C12.9416,1.6099 12.0639,1.0198 11.0973,0.6161C10.1307,0.2124 9.094,0.003 8.0465,0H8ZM8.1356,8.2712L7.3027,11.0799H11.7579C11.7874,11.0789 11.8168,11.0837 11.8445,11.094C11.8721,11.1044 11.8975,11.12 11.9191,11.1402C11.9407,11.1603 11.9581,11.1846 11.9703,11.2114C11.9825,11.2383 11.9893,11.2673 11.9903,11.2969V11.3705L11.6029,12.707C11.5858,12.7702 11.5478,12.8257 11.495,12.8645C11.4422,12.9032 11.3778,12.9228 11.3124,12.9201H4.4939L5.6368,9.0266L4.3584,9.414L4.6489,8.523L5.9274,8.1356L7.5351,2.6731C7.5528,2.6103 7.591,2.5552 7.6437,2.5165C7.6963,2.4779 7.7604,2.458 7.8257,2.4601H9.5496C9.5792,2.459 9.6086,2.4638 9.6362,2.4741C9.6639,2.4845 9.6892,2.5002 9.7108,2.5203C9.7324,2.5405 9.7498,2.5647 9.762,2.5916C9.7743,2.6185 9.7811,2.6475 9.7821,2.677V2.7506L8.4262,7.3608L9.7046,6.9734L9.4334,7.9032L8.1356,8.2712Z"/>
-    </group>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#909090"
+        android:pathData="M11.186,11.373L10.041,15.235H16.167C16.208,15.233 16.248,15.24 16.286,15.254C16.324,15.269 16.359,15.29 16.389,15.318C16.418,15.345 16.442,15.379 16.459,15.416C16.476,15.453 16.485,15.493 16.487,15.533V15.634L15.954,17.472C15.931,17.559 15.878,17.635 15.806,17.689C15.733,17.742 15.644,17.769 15.554,17.765H6.179L7.751,12.412L5.993,12.944L6.392,11.719L8.15,11.186L10.361,3.676C10.385,3.589 10.438,3.513 10.51,3.46C10.583,3.407 10.671,3.38 10.76,3.383H13.131C13.171,3.381 13.212,3.388 13.25,3.402C13.288,3.416 13.323,3.438 13.352,3.465C13.382,3.493 13.406,3.526 13.423,3.563C13.44,3.6 13.449,3.64 13.45,3.681V3.782L11.586,10.121L13.344,9.588L12.971,10.867L11.186,11.373Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_near_no_color.xml b/app/src/main/res/drawable/ic_near_no_color.xml
new file mode 100644
index 0000000000..573a4ef9be
--- /dev/null
+++ b/app/src/main/res/drawable/ic_near_no_color.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M15.721,5C15.277,5 14.864,5.23 14.632,5.609L12.123,9.333C12.042,9.456 12.075,9.622 12.197,9.703C12.297,9.77 12.429,9.761 12.519,9.683L14.988,7.542C15.029,7.505 15.092,7.509 15.129,7.55C15.146,7.569 15.155,7.593 15.155,7.618V14.323C15.155,14.378 15.11,14.423 15.055,14.423C15.025,14.423 14.997,14.41 14.978,14.387L7.515,5.453C7.272,5.166 6.915,5 6.539,5H6.278C5.572,5 5,5.572 5,6.278V15.722C5,16.428 5.572,17 6.278,17C6.723,17 7.135,16.77 7.368,16.391L9.876,12.667C9.958,12.544 9.925,12.378 9.802,12.297C9.703,12.23 9.571,12.239 9.481,12.317L7.012,14.458C6.971,14.495 6.907,14.491 6.87,14.45C6.854,14.432 6.845,14.407 6.845,14.382V7.676C6.845,7.62 6.89,7.576 6.945,7.576C6.975,7.576 7.003,7.589 7.022,7.612L14.484,16.547C14.727,16.834 15.084,17 15.46,17H15.721C16.427,17 16.999,16.428 17,15.722V6.278C17,5.572 16.428,5 15.722,5H15.721Z"
+      android:fillColor="#909090"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_octaspace_no_color.xml b/app/src/main/res/drawable/ic_octaspace_no_color.xml
index 36751027a3..c61e79358f 100644
--- a/app/src/main/res/drawable/ic_octaspace_no_color.xml
+++ b/app/src/main/res/drawable/ic_octaspace_no_color.xml
@@ -4,9 +4,6 @@
     android:autoMirrored="true"
     android:viewportWidth="22"
     android:viewportHeight="22">
-    <path
-        android:fillColor="#EBEBEB"
-        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
     <path
         android:fillColor="#B0B0B0"
         android:pathData="M3.385,7.404L4.654,6.558V15.442L3.385,14.596V7.404Z" />
diff --git a/app/src/main/res/drawable/ic_optimism_no_color.xml b/app/src/main/res/drawable/ic_optimism_no_color.xml
index 3a9d21620b..7091ff4c7d 100644
--- a/app/src/main/res/drawable/ic_optimism_no_color.xml
+++ b/app/src/main/res/drawable/ic_optimism_no_color.xml
@@ -5,9 +5,6 @@
     android:viewportHeight="22">
     <group>
         <clip-path android:pathData="M0,0h22v22h-22z" />
-        <path
-            android:fillColor="#F1F1F1"
-            android:pathData="M11,22C17.075,22 22,17.075 22,11C22,4.925 17.075,0 11,0C4.925,0 0,4.925 0,11C0,17.075 4.925,22 11,22Z" />
         <path
             android:fillColor="#A1A1A4"
             android:fillType="evenOdd"
diff --git a/app/src/main/res/drawable/ic_paste.xml b/app/src/main/res/drawable/ic_paste.xml
index c49d12dc4b..b971249451 100644
--- a/app/src/main/res/drawable/ic_paste.xml
+++ b/app/src/main/res/drawable/ic_paste.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="16"
     android:viewportHeight="19">
     <path
-        android:fillColor="#1C1C1E"
+        android:fillColor="@color/text_primary_1"
         android:pathData="M13.8333,1.6667H10.35C10,0.7 9.0833,0 8,0C6.9167,0 6,0.7 5.65,1.6667H2.1667C1.25,1.6667 0.5,2.4167 0.5,3.3333V16.6667C0.5,17.5833 1.25,18.3333 2.1667,18.3333H13.8333C14.75,18.3333 15.5,17.5833 15.5,16.6667V3.3333C15.5,2.4167 14.75,1.6667 13.8333,1.6667ZM8,1.6667C8.4583,1.6667 8.8333,2.0417 8.8333,2.5C8.8333,2.9583 8.4583,3.3333 8,3.3333C7.5417,3.3333 7.1667,2.9583 7.1667,2.5C7.1667,2.0417 7.5417,1.6667 8,1.6667ZM13.8333,16.6667H2.1667V3.3333H3.8333V5.8333H12.1667V3.3333H13.8333V16.6667Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_paste_disabled.xml b/app/src/main/res/drawable/ic_paste_disabled.xml
index 7666c5a52d..156ddafc4b 100644
--- a/app/src/main/res/drawable/ic_paste_disabled.xml
+++ b/app/src/main/res/drawable/ic_paste_disabled.xml
@@ -6,6 +6,6 @@
     android:viewportHeight="19">
 
     <path
-        android:fillColor="#99838383"
+        android:fillColor="@color/text_disabled"
         android:pathData="M13.8333 1.66667H10.35C10 0.7 9.08333 0 8 0C6.91667 0 6 0.7 5.65 1.66667H2.16667C1.25 1.66667 0.5 2.41667 0.5 3.33333V16.6667C0.5 17.5833 1.25 18.3333 2.16667 18.3333H13.8333C14.75 18.3333 15.5 17.5833 15.5 16.6667V3.33333C15.5 2.41667 14.75 1.66667 13.8333 1.66667ZM8 1.66667C8.45833 1.66667 8.83333 2.04167 8.83333 2.5C8.83333 2.95833 8.45833 3.33333 8 3.33333C7.54167 3.33333 7.16667 2.95833 7.16667 2.5C7.16667 2.04167 7.54167 1.66667 8 1.66667ZM13.8333 16.6667H2.16667V3.33333H3.83333V5.83333H12.1667V3.33333H13.8333V16.6667Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_polkadot_no_color.xml b/app/src/main/res/drawable/ic_polkadot_no_color.xml
index 705c2e1a4b..6e8ee64a05 100644
--- a/app/src/main/res/drawable/ic_polkadot_no_color.xml
+++ b/app/src/main/res/drawable/ic_polkadot_no_color.xml
@@ -1,7 +1,6 @@
 <vector android:autoMirrored="true" android:height="16dp"
     android:viewportHeight="16" android:viewportWidth="16"
     android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#F1F1F1" android:pathData="M8,8m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"/>
     <path android:fillColor="#A1A1A4" android:pathData="M7.9994,4.5169C9.2703,4.5169 10.3006,3.9535 10.3006,3.2585C10.3006,2.5634 9.2703,2 7.9994,2C6.7285,2 5.6982,2.5634 5.6982,3.2585C5.6982,3.9535 6.7285,4.5169 7.9994,4.5169Z"/>
     <path android:fillColor="#A1A1A4" android:pathData="M7.9994,13.9991C9.2703,13.9991 10.3006,13.4357 10.3006,12.7406C10.3006,12.0456 9.2703,11.4822 7.9994,11.4822C6.7285,11.4822 5.6982,12.0456 5.6982,12.7406C5.6982,13.4357 6.7285,13.9991 7.9994,13.9991Z"/>
     <path android:fillColor="#A1A1A4" android:pathData="M4.7927,6.259C5.4282,5.2241 5.424,4.1032 4.7835,3.7555C4.1429,3.4077 3.1086,3.9648 2.4731,4.9997C1.8376,6.0346 1.8418,7.1554 2.4823,7.5032C3.1228,7.8509 4.1572,7.2939 4.7927,6.259Z"/>
diff --git a/app/src/main/res/drawable/ic_polygon_no_color.xml b/app/src/main/res/drawable/ic_polygon_no_color.xml
index 665486d682..eafe18126e 100644
--- a/app/src/main/res/drawable/ic_polygon_no_color.xml
+++ b/app/src/main/res/drawable/ic_polygon_no_color.xml
@@ -1,6 +1,5 @@
 <vector android:autoMirrored="true" android:height="16dp"
     android:viewportHeight="16" android:viewportWidth="16"
     android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#F1F1F1" android:pathData="M8,16C12.4183,16 16,12.4183 16,8C16,3.5817 12.4183,0 8,0C3.5817,0 0,3.5817 0,8C0,12.4183 3.5817,16 8,16Z"/>
     <path android:fillColor="#A1A1A4" android:pathData="M10.6283,6.3937C10.4378,6.2889 10.1902,6.2889 9.9808,6.3937L8.4952,7.1968L7.4858,7.7205L6.0003,8.5237C5.8098,8.6284 5.5622,8.6284 5.3527,8.5237L4.1719,7.8951C3.9815,7.7904 3.8482,7.5983 3.8482,7.3888V6.1492C3.8482,5.9397 3.9624,5.7477 4.1719,5.6429L5.3337,5.0319C5.5241,4.9271 5.7717,4.9271 5.9812,5.0319L7.143,5.6429C7.3335,5.7477 7.4668,5.9397 7.4668,6.1492V6.9524L8.4762,6.4111V5.608C8.4762,5.3985 8.3619,5.2064 8.1524,5.1017L6.0003,3.9494C5.8098,3.8447 5.5622,3.8447 5.3527,3.9494L3.1625,5.1017C2.953,5.2064 2.8387,5.3985 2.8387,5.608V7.93C2.8387,8.1395 2.953,8.3316 3.1625,8.4363L5.3527,9.5886C5.5432,9.6934 5.7908,9.6934 6.0003,9.5886L7.4858,8.803L8.4952,8.2618L9.9808,7.4761C10.1712,7.3714 10.4188,7.3714 10.6283,7.4761L11.7901,8.0872C11.9805,8.1919 12.1138,8.384 12.1138,8.5935V9.8331C12.1138,10.0426 11.9996,10.2346 11.7901,10.3394L10.6283,10.9679C10.4378,11.0727 10.1902,11.0727 9.9808,10.9679L8.819,10.3568C8.6285,10.2521 8.4952,10.06 8.4952,9.8505V9.0474L7.4858,9.5886V10.3917C7.4858,10.6013 7.6001,10.7933 7.8096,10.8981L9.9998,12.0504C10.1902,12.1551 10.4378,12.1551 10.6473,12.0504L12.8376,10.8981C13.028,10.7933 13.1613,10.6013 13.1613,10.3917V8.0697C13.1613,7.8602 13.0471,7.6682 12.8376,7.5634L10.6283,6.3937Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_qr_code_scan.xml b/app/src/main/res/drawable/ic_qr_code_scan.xml
index 34a2bf62a8..5ec455e546 100644
--- a/app/src/main/res/drawable/ic_qr_code_scan.xml
+++ b/app/src/main/res/drawable/ic_qr_code_scan.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="18">
   <path
       android:pathData="M1.0712,6.8139C1.5571,6.8139 1.8138,6.5481 1.8138,6.0622V3.8986C1.8138,2.9451 2.318,2.4593 3.2348,2.4593H5.4534C5.9392,2.4593 6.2051,2.1934 6.2051,1.7167C6.2051,1.2491 5.9392,0.9833 5.4534,0.9833H3.2164C1.3004,0.9833 0.3378,1.9275 0.3378,3.8161V6.0622C0.3378,6.5481 0.6036,6.8139 1.0712,6.8139ZM16.4271,6.8139C16.913,6.8139 17.1697,6.5481 17.1697,6.0622V3.8161C17.1697,1.9275 16.2071,0.9833 14.2911,0.9833H12.045C11.5682,0.9833 11.3024,1.2491 11.3024,1.7167C11.3024,2.1934 11.5682,2.4593 12.045,2.4593H14.2636C15.1712,2.4593 15.6937,2.9451 15.6937,3.8986V6.0622C15.6937,6.5481 15.9596,6.8139 16.4271,6.8139ZM8.3595,8.6016V5.4021C8.3595,5.1821 8.1854,4.9987 7.9562,4.9987H4.7566C4.5366,4.9987 4.3624,5.1821 4.3624,5.4021V8.6016C4.3624,8.8217 4.5366,8.9958 4.7566,8.9958H7.9562C8.1854,8.9958 8.3595,8.8217 8.3595,8.6016ZM9.9455,5.7963H12.3475V8.1983H9.9455V5.7963ZM11.6507,7.5015V6.5022H10.6423V7.5015H11.6507ZM6.856,7.5015V6.5022H5.8567V7.5015H6.856ZM5.1508,10.591H7.5619V12.993H5.1508V10.591ZM13.0259,10.9027V9.9035H12.0266V10.9027H13.0259ZM10.2664,10.9027V9.9035H9.2671V10.9027H10.2664ZM6.856,12.2871V11.2878H5.8567V12.2871H6.856ZM11.6416,12.2871V11.2878H10.6423V12.2871H11.6416ZM12.045,17.806H14.2911C16.2071,17.806 17.1697,16.8526 17.1697,14.964V12.7271C17.1697,12.2412 16.9039,11.9754 16.4271,11.9754C15.9504,11.9754 15.6937,12.2412 15.6937,12.7271V14.8907C15.6937,15.8441 15.1712,16.33 14.2636,16.33H12.045C11.5682,16.33 11.3024,16.5959 11.3024,17.0726C11.3024,17.5402 11.5682,17.806 12.045,17.806ZM3.2164,17.806H5.4534C5.9392,17.806 6.2051,17.5402 6.2051,17.0726C6.2051,16.5959 5.9392,16.33 5.4534,16.33H3.2348C2.318,16.33 1.8138,15.8441 1.8138,14.8907V12.7271C1.8138,12.2412 1.5479,11.9754 1.0712,11.9754C0.5945,11.9754 0.3378,12.2412 0.3378,12.7271V14.964C0.3378,16.8618 1.3004,17.806 3.2164,17.806ZM10.2664,13.6714V12.6721H9.2671V13.6714H10.2664ZM13.0259,13.6714V12.6721H12.0266V13.6714H13.0259ZM13.1451,8.6016V5.4021C13.1451,5.1821 12.9709,4.9987 12.7417,4.9987H9.5513C9.3222,4.9987 9.148,5.1821 9.148,5.4021V8.6016C9.148,8.8217 9.3222,8.9958 9.5513,8.9958H12.7417C12.9709,8.9958 13.1451,8.8217 13.1451,8.6016ZM5.1508,5.7963H7.5619V8.1983H5.1508V5.7963ZM8.3595,13.3872V10.1877C8.3595,9.9676 8.1854,9.7935 7.9562,9.7935H4.7566C4.5366,9.7935 4.3624,9.9676 4.3624,10.1877V13.3872C4.3624,13.6072 4.5366,13.7906 4.7566,13.7906H7.9562C8.1854,13.7906 8.3595,13.6072 8.3595,13.3872Z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/text_primary_1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_ravencoin_no_color.xml b/app/src/main/res/drawable/ic_ravencoin_no_color.xml
index 5bc49c57cf..7599b5c971 100644
--- a/app/src/main/res/drawable/ic_ravencoin_no_color.xml
+++ b/app/src/main/res/drawable/ic_ravencoin_no_color.xml
@@ -3,9 +3,6 @@
     android:height="22dp"
     android:viewportWidth="22"
     android:viewportHeight="22">
-  <path
-      android:fillColor="#EBEBEB"
-      android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
   <group>
     <clip-path android:pathData="M7,4h8.483v14h-8.483z" />
     <path
diff --git a/app/src/main/res/drawable/ic_reddit.xml b/app/src/main/res/drawable/ic_reddit.xml
new file mode 100644
index 0000000000..2a1e04a004
--- /dev/null
+++ b/app/src/main/res/drawable/ic_reddit.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,12C22,17.523 17.523,22 12,22C6.477,22 2,17.523 2,12C2,6.477 6.477,2 12,2C17.523,2 22,6.477 22,12ZM17.161,10.594C17.969,10.566 18.645,11.195 18.674,12C18.684,12.562 18.369,13.079 17.867,13.33C17.876,13.477 17.876,13.624 17.867,13.77C17.867,16.012 15.257,17.832 12.038,17.832C8.819,17.832 6.209,16.01 6.209,13.77C6.199,13.624 6.199,13.477 6.209,13.33C6.062,13.266 5.931,13.174 5.816,13.067C5.227,12.515 5.2,11.59 5.751,11.004C6.303,10.415 7.228,10.387 7.814,10.939C8.968,10.159 10.323,9.731 11.715,9.709L12.453,6.239V6.234C12.49,6.065 12.657,5.96 12.823,5.998L15.274,6.487C15.431,6.214 15.714,6.03 16.03,5.998C16.579,5.938 17.071,6.336 17.131,6.885C17.191,7.434 16.793,7.926 16.243,7.986C15.694,8.046 15.202,7.648 15.142,7.099L13.002,6.649L12.353,9.768C13.728,9.798 15.065,10.223 16.204,10.999C16.462,10.753 16.803,10.606 17.161,10.594ZM9.676,12C9.125,12 8.675,12.45 8.675,13.002C8.675,13.554 9.122,13.999 9.676,14.004C10.228,14.004 10.678,13.554 10.678,13.002C10.678,12.45 10.228,12 9.676,12ZM14.484,15.751V15.791C14.593,15.684 14.595,15.505 14.488,15.396C14.381,15.287 14.203,15.284 14.093,15.391C13.484,15.826 12.748,16.04 12.003,16C11.257,16.035 10.524,15.811 9.922,15.371C9.82,15.289 9.679,15.289 9.579,15.371C9.465,15.465 9.447,15.637 9.542,15.751C10.253,16.286 11.123,16.559 12.013,16.522C12.903,16.559 13.773,16.286 14.484,15.751ZM14.297,14.076H14.347C14.899,14.054 15.329,13.589 15.307,13.037C15.307,12.485 14.856,12.035 14.305,12.035C13.753,12.035 13.303,12.485 13.303,13.037C13.303,13.589 13.753,14.039 14.305,14.039L14.297,14.076Z"
+      android:fillColor="#909090"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_rsk_no_color.xml b/app/src/main/res/drawable/ic_rsk_no_color.xml
index e2bdadb7ac..f09adebd5c 100644
--- a/app/src/main/res/drawable/ic_rsk_no_color.xml
+++ b/app/src/main/res/drawable/ic_rsk_no_color.xml
@@ -1,6 +1,5 @@
 <vector android:autoMirrored="true" android:height="16dp"
     android:viewportHeight="16" android:viewportWidth="16"
     android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#F1F1F1" android:pathData="M8,16C12.4183,16 16,12.4183 16,8C16,3.5817 12.4183,0 8,0C3.5817,0 0,3.5817 0,8C0,12.4183 3.5817,16 8,16Z"/>
     <path android:fillColor="#A1A1A4" android:pathData="M12.9332,7.4093C12.9029,7.3959 12.1254,6.9819 11.469,7.3588C10.9473,7.6617 10.8363,8.271 10.8228,8.52L10.5805,8.6614C10.4627,8.5436 10.2944,8.4695 10.1093,8.4695C9.9242,8.4695 9.7626,8.5436 9.6448,8.6614L8.5341,8.0219C8.5475,7.9714 8.5576,7.9176 8.5576,7.8603C8.5576,7.5507 8.3523,7.2949 8.073,7.2141V6.8169C8.3961,6.6116 9.426,5.8543 9.426,4.646C9.426,3.2627 8.0427,2.3943 7.9854,2.3573L7.8912,2.3001L7.7869,2.3573C7.7297,2.3943 6.3531,3.2627 6.3531,4.6527C6.3531,5.8577 7.383,6.6083 7.7061,6.8237V7.2141C7.4267,7.2949 7.2214,7.554 7.2214,7.8603C7.2214,7.9176 7.2281,7.9714 7.245,8.0219L6.1343,8.6614C6.0165,8.5436 5.8482,8.4695 5.6698,8.4695C5.3029,8.4695 5,8.7725 5,9.1393C5,9.4423 5.2053,9.7048 5.4847,9.7856V11.1184C5.2053,11.1992 5,11.4584 5,11.7646C5,12.1315 5.3029,12.4344 5.6698,12.4344C5.8684,12.4344 6.0434,12.3537 6.1612,12.2123L7.2416,12.8383C7.2281,12.8888 7.2181,12.9427 7.2181,12.9999C7.2181,13.3668 7.521,13.6697 7.8878,13.6697C8.2547,13.6697 8.5576,13.3668 8.5576,12.9999C8.5576,12.9427 8.5509,12.8888 8.5341,12.8383L9.6145,12.2123C9.739,12.3436 9.9174,12.4344 10.1059,12.4344C10.4728,12.4344 10.7757,12.1315 10.7757,11.7646C10.7757,11.4617 10.5704,11.1992 10.291,11.1184V9.7856C10.5704,9.7048 10.7757,9.4456 10.7757,9.1393C10.7757,9.0888 10.769,9.0283 10.7622,8.9845L11.0046,8.8431C11.1459,8.9105 11.4253,9.0182 11.7417,9.0182C11.9335,9.0182 12.1388,8.9744 12.3441,8.8633C13.0005,8.4897 13.0341,7.6045 13.0341,7.5742V7.4598L12.9332,7.4093ZM10.2977,9.3783C10.2473,9.4221 10.1799,9.4456 10.1126,9.4456C10.0756,9.4456 10.0386,9.4389 10.0083,9.4221C9.978,9.4153 9.9511,9.3985 9.9275,9.3783C9.8703,9.3345 9.8232,9.2605 9.8164,9.1865C9.8164,9.173 9.8164,9.1562 9.8164,9.1427C9.8164,9.1292 9.8164,9.1191 9.8164,9.1057C9.8299,8.9946 9.9039,8.9071 10.0016,8.8633C10.0386,8.8499 10.0756,8.8398 10.1126,8.8398C10.1564,8.8398 10.1934,8.8465 10.2304,8.8633C10.3415,8.9071 10.4156,9.0182 10.4156,9.1427C10.4156,9.1562 10.4156,9.173 10.4088,9.1932C10.3954,9.2706 10.3516,9.3345 10.2977,9.3783ZM10.4088,11.7613C10.4088,11.9228 10.2776,12.0642 10.1059,12.0642C10.0487,12.0642 9.9948,12.0507 9.9511,12.0204C9.8636,11.97 9.8097,11.8723 9.8097,11.7613V11.7545C9.8097,11.7243 9.8164,11.6872 9.8232,11.667C9.8467,11.6165 9.8737,11.5627 9.9174,11.5358C9.9544,11.5055 9.9982,11.4853 10.0487,11.4786C10.0621,11.4786 10.0857,11.4718 10.0992,11.4718C10.1732,11.4718 10.2304,11.4954 10.2843,11.5391C10.3651,11.5863 10.4088,11.667 10.4088,11.7613ZM9.9242,11.1218C9.8366,11.1521 9.7491,11.1958 9.6818,11.253L8.5408,10.59C8.5475,10.5462 8.5543,10.5025 8.5543,10.4587C8.5543,10.3914 8.5475,10.3342 8.524,10.2736L9.6414,9.6274C9.7155,9.7014 9.8097,9.7586 9.9208,9.7889V11.1218H9.9242ZM7.8878,13.2994C7.7397,13.2994 7.6152,13.1884 7.595,13.0403C7.595,13.0268 7.595,13.01 7.595,12.9965C7.595,12.872 7.6758,12.7609 7.7801,12.7172C7.8172,12.7037 7.8542,12.6936 7.8912,12.6936C7.9282,12.6936 7.972,12.7003 8.0023,12.7172C8.1133,12.7609 8.1874,12.872 8.1874,12.9965C8.1874,13.01 8.1874,13.0268 8.1874,13.0403C8.1571,13.1917 8.0326,13.2994 7.8878,13.2994ZM7.2248,10.5933L6.0838,11.2497C6.0097,11.1925 5.929,11.1453 5.8415,11.1184V9.7856C5.9525,9.7553 6.04,9.698 6.1208,9.624L7.2382,10.2702C7.2248,10.3275 7.208,10.3948 7.208,10.4621C7.208,10.5058 7.2181,10.5496 7.2248,10.5933ZM5.9592,11.7613C5.9592,11.8723 5.902,11.9666 5.8179,12.0204C5.7741,12.0507 5.7236,12.0642 5.6631,12.0642C5.5015,12.0642 5.3601,11.9329 5.3601,11.7613C5.3601,11.667 5.4039,11.5762 5.4712,11.5257C5.5217,11.4819 5.589,11.4584 5.6563,11.4584C5.6698,11.4584 5.6933,11.4584 5.7068,11.4651C5.7573,11.4718 5.8011,11.4954 5.8381,11.5223C5.8818,11.5593 5.9189,11.6031 5.9323,11.6536C5.9391,11.6839 5.9458,11.7108 5.9458,11.7478C5.9592,11.7545 5.9592,11.7613 5.9592,11.7613ZM5.3568,9.1427C5.3568,8.9811 5.488,8.8398 5.6597,8.8398C5.6967,8.8398 5.7337,8.8465 5.7708,8.8633C5.865,8.9004 5.9391,8.9879 5.9559,9.0989C5.9559,9.1124 5.9559,9.1292 5.9559,9.1427C5.9559,9.1562 5.9559,9.173 5.9559,9.1865C5.9492,9.2672 5.9054,9.3345 5.8448,9.3783C5.8212,9.3918 5.8011,9.4086 5.7708,9.4221C5.7337,9.4355 5.6967,9.4456 5.6597,9.4456C5.5856,9.4456 5.5284,9.4221 5.4746,9.3783C5.4005,9.3211 5.3568,9.2403 5.3568,9.1427ZM7.696,7.6214C7.7465,7.5843 7.8138,7.554 7.8811,7.554C7.9484,7.554 8.0124,7.5776 8.0662,7.6214C8.1235,7.6651 8.1605,7.7392 8.1773,7.8132C8.1773,7.8267 8.1773,7.8435 8.1773,7.857C8.1773,7.9512 8.1335,8.0421 8.0595,8.0926C8.0359,8.106 8.009,8.1229 7.9854,8.1363C7.9484,8.1498 7.9114,8.1599 7.8744,8.1599C7.8374,8.1599 7.8003,8.1531 7.7633,8.1363C7.733,8.1296 7.7128,8.1128 7.6893,8.0926C7.622,8.0421 7.5715,7.9512 7.5715,7.857C7.5715,7.8435 7.5715,7.8267 7.5715,7.8132C7.5984,7.7324 7.6354,7.6651 7.696,7.6214ZM8.1807,10.4755C8.1807,10.5631 8.1369,10.6438 8.0696,10.6977C8.0561,10.7044 8.0393,10.7212 8.0258,10.728C7.9821,10.7515 7.9383,10.765 7.8845,10.765C7.834,10.765 7.7902,10.7515 7.7431,10.728C7.7297,10.7212 7.7128,10.7145 7.6994,10.6977C7.632,10.6472 7.5883,10.5664 7.5883,10.4688V10.4621C7.5883,10.4318 7.5883,10.4116 7.595,10.3813C7.6085,10.314 7.6455,10.2635 7.6994,10.2265C7.7297,10.2029 7.7734,10.1827 7.8104,10.176C7.834,10.1693 7.8609,10.1693 7.8845,10.1693C7.9148,10.1693 7.935,10.1693 7.9653,10.176C8.0023,10.1827 8.0393,10.2063 8.0763,10.2265C8.1268,10.2635 8.1638,10.3207 8.1807,10.3813C8.1874,10.4049 8.1941,10.4318 8.1941,10.4621C8.1807,10.4688 8.1807,10.4688 8.1807,10.4755ZM9.4597,8.9811C9.4462,9.0316 9.4361,9.0855 9.4361,9.1427C9.4361,9.1999 9.4428,9.2538 9.4597,9.311L8.3254,9.9673C8.2514,9.9 8.1638,9.8495 8.0662,9.8192V8.5032C8.1773,8.4729 8.2648,8.4157 8.3456,8.3416L9.4597,8.9811ZM6.7165,4.6494C6.7165,3.6632 7.5849,2.9497 7.8878,2.7376C8.1807,2.9497 9.0591,3.6632 9.0591,4.6494C9.0591,5.474 8.4499,6.0765 8.0797,6.3558V4.8042C8.0797,4.6999 7.9989,4.6191 7.8946,4.6191C7.7902,4.6191 7.7095,4.6999 7.7095,4.8042V6.3625C7.3258,6.0765 6.7165,5.4807 6.7165,4.6494ZM7.4166,8.3416C7.4974,8.4157 7.5849,8.4729 7.696,8.5032V9.8192C7.6017,9.8495 7.5109,9.8933 7.4368,9.9606L6.3026,9.3042C6.316,9.2538 6.3261,9.1999 6.3261,9.1427C6.3261,9.0855 6.3194,9.0316 6.3026,8.9811L7.4166,8.3416ZM6.3194,11.8791C6.3261,11.8421 6.3261,11.7983 6.3261,11.7613C6.3261,11.6872 6.3127,11.6199 6.2958,11.556L7.3998,10.9232C7.4806,11.004 7.5849,11.0713 7.7027,11.1083V12.3604C7.5917,12.3907 7.4974,12.4479 7.4234,12.5219L6.3194,11.8791ZM8.349,12.5219C8.2682,12.4479 8.1739,12.3907 8.0696,12.3604V11.1083C8.1874,11.078 8.2917,11.0141 8.3725,10.9232L9.4765,11.556C9.4529,11.6233 9.4462,11.6872 9.4462,11.7613C9.4462,11.7983 9.4462,11.8421 9.4529,11.8791L8.349,12.5219ZM12.159,8.547C11.91,8.6883 11.6373,8.6648 11.4219,8.6042L11.7888,8.3921C11.8763,8.3416 11.9066,8.2306 11.8561,8.1431C11.8056,8.0555 11.6945,8.0253 11.5969,8.0757L11.2301,8.2878C11.2873,8.0825 11.4051,7.8233 11.6508,7.6853C12.0042,7.48 12.4451,7.6113 12.6437,7.692C12.6168,7.9007 12.5124,8.3416 12.159,8.547Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_selected_dot.xml b/app/src/main/res/drawable/ic_selected_dot.xml
index e847725fc2..f747ab54ba 100644
--- a/app/src/main/res/drawable/ic_selected_dot.xml
+++ b/app/src/main/res/drawable/ic_selected_dot.xml
@@ -6,7 +6,7 @@
         android:shape="ring"
         android:thickness="4.5dp"
         android:useLevel="false">
-      <solid android:color="#060606"/>
+      <solid android:color="@color/icon_primary_1" />
     </shape>
   </item>
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_solana_no_color.xml b/app/src/main/res/drawable/ic_solana_no_color.xml
index a49a56f643..31e6195232 100644
--- a/app/src/main/res/drawable/ic_solana_no_color.xml
+++ b/app/src/main/res/drawable/ic_solana_no_color.xml
@@ -1,6 +1,5 @@
 <vector android:autoMirrored="true" android:height="16dp"
     android:viewportHeight="16" android:viewportWidth="16"
     android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#F1F1F1" android:pathData="M8,0L8,0A8,8 0,0 1,16 8L16,8A8,8 0,0 1,8 16L8,16A8,8 0,0 1,0 8L0,8A8,8 0,0 1,8 0z"/>
     <path android:fillColor="#A1A1A4" android:pathData="M12.3419,10.4366L10.8935,12.0202C10.862,12.0546 10.8239,12.082 10.7816,12.1008C10.7392,12.1195 10.6936,12.1292 10.6474,12.1292H3.7811C3.7483,12.1292 3.7163,12.1194 3.6889,12.1011C3.6615,12.0828 3.6399,12.0567 3.6268,12.0261C3.6138,11.9954 3.6098,11.9616 3.6154,11.9287C3.6209,11.8957 3.6358,11.8652 3.6581,11.8408L5.1077,10.2572C5.1391,10.2228 5.177,10.1955 5.2192,10.1767C5.2614,10.158 5.307,10.1483 5.353,10.1482H12.219C12.2517,10.1482 12.2838,10.158 12.3112,10.1763C12.3385,10.1946 12.3601,10.2207 12.3732,10.2513C12.3862,10.2819 12.3902,10.3158 12.3847,10.3487C12.3791,10.3816 12.3643,10.4122 12.3419,10.4366ZM10.8935,7.2476C10.862,7.2132 10.8239,7.1858 10.7816,7.167C10.7392,7.1483 10.6936,7.1386 10.6474,7.1387H3.7811C3.7483,7.1387 3.7163,7.1484 3.6889,7.1667C3.6615,7.1851 3.6399,7.2111 3.6268,7.2418C3.6138,7.2724 3.6098,7.3063 3.6154,7.3392C3.6209,7.3721 3.6358,7.4026 3.6581,7.4271L5.1077,9.0107C5.1391,9.045 5.177,9.0723 5.2192,9.0911C5.2614,9.1098 5.307,9.1195 5.353,9.1196H12.219C12.2517,9.1196 12.2838,9.1099 12.3112,9.0915C12.3385,9.0732 12.3601,9.0472 12.3732,9.0165C12.3862,8.9859 12.3902,8.952 12.3847,8.9191C12.3791,8.8862 12.3643,8.8557 12.3419,8.8312L10.8935,7.2476ZM3.7811,6.1101H10.6474C10.6936,6.1101 10.7392,6.1005 10.7816,6.0817C10.8239,6.063 10.862,6.0356 10.8935,6.0012L12.3419,4.4175C12.3643,4.3931 12.3791,4.3626 12.3847,4.3296C12.3902,4.2967 12.3862,4.2629 12.3732,4.2323C12.3601,4.2016 12.3385,4.1755 12.3112,4.1572C12.2838,4.1389 12.2517,4.1291 12.219,4.1291H5.353C5.307,4.1292 5.2614,4.1389 5.2192,4.1577C5.177,4.1764 5.1391,4.2038 5.1077,4.2381L3.6585,5.8217C3.6362,5.8461 3.6213,5.8766 3.6157,5.9095C3.6102,5.9424 3.6141,5.9762 3.6272,6.0068C3.6402,6.0374 3.6617,6.0635 3.689,6.0819C3.7163,6.1002 3.7483,6.11 3.7811,6.1101Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_stellar_no_color.xml b/app/src/main/res/drawable/ic_stellar_no_color.xml
index 27a497f3fb..61e3683e6f 100644
--- a/app/src/main/res/drawable/ic_stellar_no_color.xml
+++ b/app/src/main/res/drawable/ic_stellar_no_color.xml
@@ -3,7 +3,6 @@
     android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <group>
         <clip-path android:pathData="M0,0h16v16h-16z"/>
-        <path android:fillColor="#F1F1F1" android:pathData="M8,0L8,0A8,8 0,0 1,16 8L16,8A8,8 0,0 1,8 16L8,16A8,8 0,0 1,0 8L0,8A8,8 0,0 1,8 0z"/>
         <group>
             <clip-path android:pathData="M7.871,2.8386L7.871,2.8386A5.0322,5.0322 0,0 1,12.9032 7.8709L12.9032,7.8709A5.0322,5.0322 0,0 1,7.871 12.9031L7.871,12.9031A5.0322,5.0322 0,0 1,2.8387 7.8709L2.8387,7.8709A5.0322,5.0322 0,0 1,7.871 2.8386z"/>
             <path android:fillColor="#A1A1A4" android:pathData="M7.9897,3.6149C7.4207,3.5991 6.8543,3.6974 6.324,3.9042C5.7937,4.111 5.3102,4.4221 4.9022,4.8189C4.4941,5.2158 4.1698,5.6904 3.9483,6.2148C3.7269,6.7392 3.6128,7.3026 3.6129,7.8718C3.6129,7.9804 3.6171,8.0882 3.6254,8.196C3.637,8.3484 3.6031,8.5007 3.5282,8.6339C3.4533,8.7671 3.3406,8.8752 3.2044,8.9445L2.8387,9.1311V10.0009L3.9156,9.4519L4.2646,9.2741L4.6084,9.0993L10.7771,5.9558L11.4703,5.6027L12.9033,4.8726V4.0028L11.4829,4.7275L10.271,5.3452L4.4189,8.326C4.3992,8.175 4.3894,8.0228 4.3895,7.8706C4.3903,7.2632 4.5498,6.6667 4.8521,6.1399C5.1544,5.6132 5.589,5.1746 6.113,4.8675C6.637,4.5605 7.2321,4.3956 7.8393,4.3893C8.4466,4.3829 9.045,4.5354 9.5753,4.8315L10.2689,4.478L10.3725,4.4251C9.678,3.9211 8.8474,3.6388 7.9897,3.6149ZM12.9033,5.7427L4.9586,9.7878L4.2654,10.1418L2.8387,10.8694V11.7383L4.2553,11.0161L5.4673,10.3984L11.3256,7.4139C11.3453,7.5657 11.3551,7.7187 11.355,7.8718C11.3546,8.4798 11.1952,9.0771 10.8926,9.6045C10.59,10.1319 10.1548,10.5709 9.6301,10.8781C9.1054,11.1853 8.5094,11.3498 7.9015,11.3555C7.2935,11.3612 6.6946,11.2078 6.1642,10.9105L6.1219,10.9331L5.37,11.3164C6.0053,11.7776 6.7557,12.0541 7.5383,12.1155C8.3209,12.177 9.1053,12.0208 9.8048,11.6644C10.5042,11.308 11.0915,10.7651 11.5018,10.0958C11.912,9.4265 12.1293,8.6568 12.1296,7.8718C12.1296,7.7628 12.1254,7.6529 12.117,7.5447C12.1055,7.3924 12.1393,7.24 12.2141,7.1069C12.289,6.9737 12.4015,6.8656 12.5376,6.7962L12.9033,6.6095V5.7427Z"/>
diff --git a/app/src/main/res/drawable/ic_telegram.xml b/app/src/main/res/drawable/ic_telegram.xml
index 5d2351d73e..020ee3bc71 100644
--- a/app/src/main/res/drawable/ic_telegram.xml
+++ b/app/src/main/res/drawable/ic_telegram.xml
@@ -1,5 +1,9 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B0B0B0" android:pathData="M20.239,19.288C20.597,18.212 22.282,7.49 22.489,5.377C22.552,4.736 22.344,4.312 21.94,4.122C21.449,3.892 20.721,4.006 19.878,4.304C18.721,4.711 3.932,10.838 3.077,11.193C2.268,11.53 1.5,11.895 1.5,12.427C1.5,12.8 1.728,13.01 2.353,13.228C3.003,13.454 4.642,13.939 5.61,14.199C6.542,14.45 7.602,14.232 8.196,13.871C8.826,13.489 16.101,8.74 16.622,8.324C17.144,7.908 17.56,8.44 17.134,8.858C16.707,9.274 11.715,14.002 11.056,14.657C10.256,15.453 10.823,16.276 11.36,16.606C11.973,16.983 16.376,19.865 17.041,20.328C17.705,20.79 18.376,21 18.993,21C19.609,20.999 19.932,20.206 20.239,19.288Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20.239,19.288C20.597,18.212 22.282,7.49 22.489,5.377C22.552,4.736 22.344,4.312 21.94,4.122C21.449,3.892 20.721,4.006 19.878,4.304C18.721,4.711 3.932,10.838 3.077,11.193C2.268,11.53 1.5,11.895 1.5,12.427C1.5,12.8 1.728,13.01 2.353,13.228C3.003,13.454 4.642,13.939 5.61,14.199C6.542,14.45 7.602,14.232 8.196,13.871C8.826,13.489 16.101,8.74 16.622,8.324C17.144,7.908 17.56,8.44 17.134,8.858C16.707,9.274 11.715,14.002 11.056,14.657C10.256,15.453 10.823,16.276 11.36,16.606C11.973,16.983 16.376,19.865 17.041,20.328C17.705,20.79 18.376,21 18.993,21C19.609,20.999 19.932,20.206 20.239,19.288Z"
+      android:fillColor="#909090"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_telos_no_color.xml b/app/src/main/res/drawable/ic_telos_no_color.xml
index 01aca1d2b2..bdd073cd40 100644
--- a/app/src/main/res/drawable/ic_telos_no_color.xml
+++ b/app/src/main/res/drawable/ic_telos_no_color.xml
@@ -3,9 +3,6 @@
     android:height="22dp"
     android:viewportWidth="22"
     android:viewportHeight="22">
-  <path
-      android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"
-      android:fillColor="#EBEBEB"/>
   <path
       android:strokeWidth="1"
       android:pathData="M14.862,5.607C14.909,5.486 14.825,5.354 14.695,5.346L12.507,5.2C12.44,5.196 12.375,5.227 12.336,5.283L11.756,6.118C11.72,6.17 11.66,6.201 11.597,6.201L7.745,6.178C7.556,6.177 7.373,6.245 7.231,6.37L6.163,7.308C5.925,7.517 5.839,7.849 5.945,8.147L6.454,9.575C6.457,9.583 6.455,9.591 6.451,9.597C6.165,9.977 5.998,10.434 5.973,10.909L5.964,11.071C5.91,12.08 6.029,13.091 6.316,14.061C6.552,14.859 6.823,15.775 6.989,16.336C7.076,16.632 7.379,16.807 7.679,16.735C8.325,16.58 9.435,16.313 10.309,16.102C11.078,15.917 11.809,15.602 12.472,15.17L12.886,14.901C13.285,14.641 13.597,14.269 13.784,13.831C13.787,13.824 13.793,13.818 13.801,13.817L15.292,13.544C15.603,13.487 15.848,13.246 15.91,12.936L16.188,11.541C16.225,11.356 16.193,11.163 16.097,11L14.288,7.909C14.17,7.706 14.15,7.461 14.234,7.242L14.862,5.607Z"
diff --git a/app/src/main/res/drawable/ic_terra2_no_color.xml b/app/src/main/res/drawable/ic_terra2_no_color.xml
index 0a71065d0e..990d30d7b5 100644
--- a/app/src/main/res/drawable/ic_terra2_no_color.xml
+++ b/app/src/main/res/drawable/ic_terra2_no_color.xml
@@ -3,9 +3,6 @@
     android:height="22dp"
     android:viewportWidth="22"
     android:viewportHeight="22">
-    <path
-        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"
-        android:fillColor="#EBEBEB"/>
     <path
         android:pathData="M8.943,5.501C8.059,6.832 5.114,7.771 4.628,7.624L4.688,7.502C4.853,7.174 5.042,6.86 5.255,6.561C5.686,5.981 6.203,5.469 6.787,5.043C6.967,4.906 7.154,4.78 7.348,4.663C7.645,4.493 7.98,4.4 8.322,4.392C9.634,4.416 8.948,5.476 8.943,5.476"
         android:fillColor="#B0B0B0"/>
diff --git a/app/src/main/res/drawable/ic_terra_no_color.xml b/app/src/main/res/drawable/ic_terra_no_color.xml
index 0ba5bf40f7..f25adb981e 100644
--- a/app/src/main/res/drawable/ic_terra_no_color.xml
+++ b/app/src/main/res/drawable/ic_terra_no_color.xml
@@ -3,9 +3,6 @@
     android:height="22dp"
     android:viewportWidth="22"
     android:viewportHeight="22">
-    <path
-        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"
-        android:fillColor="#EBEBEB"/>
     <path
         android:pathData="M8.654,4.407C10.063,3.882 11.648,3.881 13.084,4.312C14.952,4.889 16.529,6.293 17.353,8.055C17.581,8.557 17.798,9.081 17.82,9.639C16.77,9.033 15.618,8.64 14.465,8.282C12.619,7.619 10.687,7.159 8.94,6.249C8.534,6.007 8.015,5.759 7.905,5.255C7.86,4.819 8.323,4.576 8.654,4.407Z"
         android:fillColor="#B0B0B0"/>
diff --git a/app/src/main/res/drawable/ic_tezos_no_color.xml b/app/src/main/res/drawable/ic_tezos_no_color.xml
index c023c94fa3..a929bead46 100644
--- a/app/src/main/res/drawable/ic_tezos_no_color.xml
+++ b/app/src/main/res/drawable/ic_tezos_no_color.xml
@@ -1,6 +1,5 @@
 <vector android:autoMirrored="true" android:height="16dp"
     android:viewportHeight="16" android:viewportWidth="16"
     android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#F1F1F1" android:pathData="M8,8m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"/>
     <path android:fillColor="#A1A1A4" android:pathData="M8.5216,13C7.8414,13 7.345,12.8281 7.0322,12.4844C6.7425,12.1934 6.5744,11.7939 6.5646,11.3732C6.5611,11.2455 6.5893,11.1189 6.6465,11.006C6.6999,10.9085 6.777,10.8275 6.8699,10.7715C6.9779,10.715 7.097,10.6856 7.2177,10.6856C7.3384,10.6856 7.4574,10.715 7.5654,10.7715C7.6582,10.8273 7.7349,10.9083 7.7875,11.006C7.8464,11.1184 7.8757,11.2451 7.8724,11.3732C7.8784,11.5263 7.8366,11.6772 7.7532,11.8029C7.6838,11.9056 7.5844,11.9818 7.4702,12.0203C7.5819,12.1695 7.74,12.2729 7.917,12.3125C8.1149,12.3728 8.3199,12.4038 8.5261,12.4046C8.799,12.4071 9.0663,12.3233 9.2931,12.164C9.5284,11.9896 9.7038,11.7403 9.7935,11.4531C9.9071,11.1112 9.9626,10.7511 9.9573,10.3891C9.9665,10.0117 9.9058,9.636 9.7786,9.2828C9.6829,9.0003 9.5013,8.7587 9.2618,8.5953C9.0392,8.4475 8.7807,8.3699 8.5173,8.3719C8.2877,8.3923 8.0663,8.4711 7.8724,8.6016L7.3942,8.8531V8.6016L9.5433,5.5769H6.5646V8.7156C6.5562,8.9421 6.6133,9.166 6.7284,9.3578C6.7842,9.4414 6.8595,9.5085 6.9472,9.5525C7.0348,9.5966 7.1319,9.6162 7.2288,9.6093C7.4081,9.6055 7.5814,9.5415 7.7233,9.4265C7.8841,9.3029 8.0241,9.1518 8.1373,8.9796C8.1475,8.9495 8.1663,8.9233 8.1912,8.9047C8.2111,8.8866 8.2366,8.8766 8.263,8.8766C8.3147,8.8815 8.3637,8.9034 8.403,8.939C8.4528,8.9974 8.4798,9.0732 8.4789,9.1515C8.4732,9.2042 8.4642,9.2563 8.4521,9.3078C8.3463,9.5765 8.1689,9.8075 7.9412,9.9732C7.7298,10.1233 7.48,10.2029 7.2247,10.2016C6.5798,10.2016 6.133,10.0682 5.8844,9.8016C5.7566,9.6542 5.6581,9.4815 5.5947,9.2937C5.5312,9.1059 5.5042,8.9067 5.515,8.7078V5.5769H4V4.9937H5.5221V3.664L5.1736,3.2982V3H6.1848L6.5646,3.2063V4.9937L10.4993,4.9812L10.8911,5.3937L8.4784,7.9372C8.6241,7.8757 8.7776,7.8368 8.9341,7.8216C9.2437,7.8358 9.5458,7.9263 9.8159,8.0857C10.1287,8.2417 10.3923,8.4885 10.5755,8.7969C10.7396,9.0579 10.8558,9.3488 10.9181,9.6547C10.9692,9.8959 10.9967,10.142 11,10.3891C11.0016,10.8607 10.8997,11.3264 10.7021,11.75C10.5148,12.1602 10.1995,12.491 9.8085,12.6876C9.4082,12.8945 8.9678,13.0014 8.5216,13Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_ton_no_color.xml b/app/src/main/res/drawable/ic_ton_no_color.xml
index c3d5d856db..e9ecd65434 100644
--- a/app/src/main/res/drawable/ic_ton_no_color.xml
+++ b/app/src/main/res/drawable/ic_ton_no_color.xml
@@ -3,9 +3,6 @@
     android:height="22dp"
     android:viewportWidth="22"
     android:viewportHeight="22">
-  <path
-      android:fillColor="#EBEBEB"
-      android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
   <path
       android:fillColor="#C9C9C9"
       android:fillType="evenOdd"
diff --git a/app/src/main/res/drawable/ic_tron_no_color.xml b/app/src/main/res/drawable/ic_tron_no_color.xml
index 6494f87e60..1281613a40 100644
--- a/app/src/main/res/drawable/ic_tron_no_color.xml
+++ b/app/src/main/res/drawable/ic_tron_no_color.xml
@@ -1,7 +1,6 @@
 <vector android:autoMirrored="true" android:height="22dp"
     android:viewportHeight="22" android:viewportWidth="22"
     android:width="22dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#F1F1F1" android:pathData="M11,11m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"/>
     <group>
         <clip-path android:pathData="M5,6h12v12h-12z"/>
         <path android:fillColor="#A1A1A4" android:pathData="M16.5405,9.6149C15.978,9.0955 15.1999,8.3024 14.5662,7.7399L14.5287,7.7137C14.4663,7.6636 14.3959,7.6243 14.3205,7.5974C12.7924,7.3124 5.6805,5.983 5.5418,5.9999C5.5029,6.0054 5.4657,6.0195 5.433,6.0412L5.3974,6.0693C5.3535,6.1138 5.3202,6.1677 5.2999,6.2268L5.2905,6.2512V6.3843V6.4049C6.0911,8.6343 9.2524,15.9374 9.8749,17.6512C9.9124,17.7674 9.9837,17.9887 10.1168,17.9999H10.1468C10.218,17.9999 10.5218,17.5987 10.5218,17.5987C10.5218,17.5987 15.9518,11.0137 16.5012,10.3124C16.5723,10.226 16.635,10.1331 16.6887,10.0349C16.7023,9.9581 16.6959,9.879 16.6699,9.8054C16.644,9.7318 16.5994,9.6662 16.5405,9.6149ZM11.9149,10.3818L14.2324,8.4599L15.5918,9.7124L11.9149,10.3818ZM11.0149,10.2562L7.0249,6.9862L13.4805,8.1768L11.0149,10.2562ZM11.3749,11.113L15.4587,10.4549L10.7899,16.0799L11.3749,11.113ZM6.483,7.3124L10.6812,10.8749L10.0737,16.0837L6.483,7.3124Z"/>
diff --git a/app/src/main/res/drawable/ic_twitter.xml b/app/src/main/res/drawable/ic_twitter.xml
index de09724525..1c3cb6cfef 100644
--- a/app/src/main/res/drawable/ic_twitter.xml
+++ b/app/src/main/res/drawable/ic_twitter.xml
@@ -1,5 +1,9 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B0B0B0" android:pathData="M22.4,5.55C21.634,5.89 20.812,6.118 19.949,6.222C20.83,5.694 21.506,4.858 21.825,3.861C21.001,4.35 20.087,4.705 19.114,4.897C18.336,4.067 17.227,3.549 16,3.549C13.643,3.549 11.733,5.46 11.733,7.816C11.733,8.15 11.771,8.477 11.843,8.788C8.297,8.61 5.153,6.911 3.047,4.329C2.681,4.959 2.47,5.692 2.47,6.475C2.47,7.955 3.223,9.262 4.368,10.026C3.669,10.004 3.01,9.812 2.435,9.493C2.435,9.511 2.435,9.528 2.435,9.546C2.435,11.614 3.906,13.339 5.858,13.73C5.501,13.828 5.123,13.88 4.734,13.88C4.459,13.88 4.191,13.853 3.931,13.804C4.474,15.499 6.05,16.733 7.918,16.768C6.458,17.913 4.618,18.595 2.618,18.595C2.274,18.595 1.934,18.575 1.599,18.535C3.488,19.746 5.73,20.452 8.141,20.452C15.99,20.452 20.282,13.95 20.282,8.31C20.282,8.126 20.278,7.942 20.27,7.758C21.104,7.156 21.828,6.405 22.4,5.55Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13.712,10.622L20.413,3H18.825L13.007,9.618L8.36,3H3L10.027,13.007L3,21H4.588L10.732,14.011L15.64,21H21L13.712,10.622H13.712ZM11.538,13.096L10.825,12.099L5.16,4.17H7.599L12.171,10.569L12.883,11.566L18.826,19.883H16.387L11.538,13.096V13.096Z"
+      android:fillColor="#909090"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_walletconnect.xml b/app/src/main/res/drawable/ic_walletconnect.xml
index 925a858a8a..d4b4c99942 100644
--- a/app/src/main/res/drawable/ic_walletconnect.xml
+++ b/app/src/main/res/drawable/ic_walletconnect.xml
@@ -1,5 +1,7 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#007AFF" android:pathData="M4.915,7.735C8.827,4.088 15.173,4.088 19.085,7.735L19.555,8.171C19.753,8.353 19.753,8.648 19.555,8.831L17.946,10.333C17.847,10.421 17.692,10.421 17.593,10.333L16.943,9.726C14.213,7.181 9.787,7.181 7.057,9.726L6.364,10.374C6.265,10.462 6.11,10.462 6.011,10.374L4.395,8.878C4.197,8.695 4.197,8.401 4.395,8.218L4.915,7.735ZM22.415,10.84L23.851,12.177C24.049,12.359 24.049,12.654 23.851,12.837L17.382,18.863C17.184,19.046 16.869,19.046 16.677,18.863L12.09,14.586C12.04,14.539 11.96,14.539 11.91,14.586L7.323,18.863C7.125,19.046 6.809,19.046 6.617,18.863L0.149,12.837C-0.05,12.654 -0.05,12.359 0.149,12.177L1.585,10.84C1.783,10.657 2.099,10.657 2.29,10.84L6.877,15.116C6.927,15.163 7.007,15.163 7.057,15.116L11.644,10.84C11.842,10.657 12.158,10.657 12.35,10.84L16.937,15.116C16.986,15.163 17.067,15.163 17.116,15.116L21.703,10.84C21.902,10.657 22.217,10.657 22.415,10.84Z"/>
+    <path
+        android:fillColor="@color/accent"
+        android:pathData="M4.915,7.735C8.827,4.088 15.173,4.088 19.085,7.735L19.555,8.171C19.753,8.353 19.753,8.648 19.555,8.831L17.946,10.333C17.847,10.421 17.692,10.421 17.593,10.333L16.943,9.726C14.213,7.181 9.787,7.181 7.057,9.726L6.364,10.374C6.265,10.462 6.11,10.462 6.011,10.374L4.395,8.878C4.197,8.695 4.197,8.401 4.395,8.218L4.915,7.735ZM22.415,10.84L23.851,12.177C24.049,12.359 24.049,12.654 23.851,12.837L17.382,18.863C17.184,19.046 16.869,19.046 16.677,18.863L12.09,14.586C12.04,14.539 11.96,14.539 11.91,14.586L7.323,18.863C7.125,19.046 6.809,19.046 6.617,18.863L0.149,12.837C-0.05,12.654 -0.05,12.359 0.149,12.177L1.585,10.84C1.783,10.657 2.099,10.657 2.29,10.84L6.877,15.116C6.927,15.163 7.007,15.163 7.057,15.116L11.644,10.84C11.842,10.657 12.158,10.657 12.35,10.84L16.937,15.116C16.986,15.163 17.067,15.163 17.116,15.116L21.703,10.84C21.902,10.657 22.217,10.657 22.415,10.84Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_xrp_no_color.xml b/app/src/main/res/drawable/ic_xrp_no_color.xml
index 67185b115a..47a43000ca 100644
--- a/app/src/main/res/drawable/ic_xrp_no_color.xml
+++ b/app/src/main/res/drawable/ic_xrp_no_color.xml
@@ -1,6 +1,10 @@
-<vector android:autoMirrored="true" android:height="16dp"
-    android:viewportHeight="16" android:viewportWidth="16"
-    android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#A1A1A4" android:pathData="M8,8m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"/>
-    <path android:fillColor="#F1F1F1" android:pathData="M8,16C3.5815,16 0,12.4185 0,8C0,3.5815 3.5815,0 8,0C12.4185,0 16,3.5815 16,8C16,12.4185 12.4185,16 8,16ZM11.5355,4C11.5352,4 11.5349,4.0001 11.5346,4.0003L9.248,6.2615C8.9152,6.5899 8.4665,6.7741 7.999,6.7741C7.5315,6.7741 7.0827,6.5899 6.75,6.2615L4.6138,4.1472C4.5185,4.0529 4.3898,4 4.2557,4C3.8009,4 3.5743,4.551 3.8976,4.8709L6.0275,6.9785C6.5533,7.4966 7.2618,7.787 8,7.787C8.7382,7.787 9.4467,7.4966 9.9725,6.9785L11.9537,5.0167C12.331,4.6431 12.0664,4 11.5355,4ZM4.4475,12.2811C4.4475,12.2813 4.4477,12.2813 4.4478,12.2813L6.752,10C7.0848,9.6716 7.5335,9.4874 8.001,9.4874C8.4685,9.4874 8.9172,9.6716 9.25,10L11.4037,12.134C11.499,12.2285 11.6278,12.2815 11.762,12.2815C12.2168,12.2815 12.4433,11.7305 12.1201,11.4106L9.9725,9.285C9.4467,8.7669 8.7382,8.4765 8,8.4765C7.2618,8.4765 6.5533,8.7669 6.0275,9.285L3.7291,11.5595C3.4613,11.8245 3.649,12.281 4.0258,12.281H4.4474C4.4474,12.281 4.4475,12.2811 4.4475,12.2811Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:autoMirrored="true"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:fillColor="#909090"
+        android:pathData="M16.148,5.5C15.964,5.5 15.787,5.573 15.656,5.702L12.716,8.61C12.259,9.061 11.642,9.314 10.999,9.314C10.356,9.314 9.739,9.061 9.281,8.61L6.344,5.702C6.213,5.573 6.036,5.5 5.852,5.5C5.226,5.5 4.915,6.258 5.359,6.698L8.288,9.595C9.011,10.308 9.985,10.707 11,10.707C12.015,10.707 12.989,10.308 13.712,9.595L16.64,6.696C17.084,6.257 16.773,5.5 16.148,5.5ZM5.827,16.887C6.012,16.887 6.189,16.814 6.32,16.684L9.284,13.75C9.742,13.298 10.358,13.045 11.001,13.045C11.644,13.045 12.261,13.298 12.719,13.75L15.68,16.684C15.811,16.814 15.988,16.887 16.173,16.887C16.798,16.887 17.11,16.129 16.665,15.69L13.712,12.767C12.989,12.054 12.015,11.655 11,11.655C9.985,11.655 9.011,12.054 8.288,12.767L5.335,15.689C4.89,16.129 5.202,16.887 5.827,16.887Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_youtube.xml b/app/src/main/res/drawable/ic_youtube.xml
index 81eb8d7e8c..6d5ade9d08 100644
--- a/app/src/main/res/drawable/ic_youtube.xml
+++ b/app/src/main/res/drawable/ic_youtube.xml
@@ -1,5 +1,9 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B0B0B0" android:pathData="M21.985,6.96C21.79,5.904 20.863,5.136 19.79,4.896C18.18,4.56 15.205,4.32 11.986,4.32C8.767,4.32 5.743,4.56 4.133,4.896C3.06,5.136 2.134,5.856 1.939,6.96C1.743,8.16 1.548,9.84 1.548,12C1.548,14.16 1.743,15.84 1.987,17.04C2.182,18.096 3.109,18.864 4.182,19.104C5.889,19.44 8.816,19.68 12.035,19.68C15.254,19.68 18.18,19.44 19.888,19.104C20.961,18.864 21.887,18.144 22.082,17.04C22.277,15.84 22.521,14.112 22.57,12C22.472,9.84 22.229,8.16 21.985,6.96ZM9.352,15.36V8.64L15.303,12L9.352,15.36Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21.985,6.96C21.79,5.904 20.863,5.136 19.79,4.896C18.18,4.56 15.205,4.32 11.986,4.32C8.767,4.32 5.743,4.56 4.133,4.896C3.06,5.136 2.134,5.856 1.939,6.96C1.743,8.16 1.548,9.84 1.548,12C1.548,14.16 1.743,15.84 1.987,17.04C2.182,18.096 3.109,18.864 4.182,19.104C5.889,19.44 8.816,19.68 12.035,19.68C15.254,19.68 18.18,19.44 19.888,19.104C20.961,18.864 21.887,18.144 22.082,17.04C22.277,15.84 22.521,14.112 22.57,12C22.472,9.84 22.229,8.16 21.985,6.96ZM9.352,15.36V8.64L15.303,12L9.352,15.36Z"
+      android:fillColor="#909090"/>
 </vector>
diff --git a/app/src/main/res/drawable/ill_reset_background.xml b/app/src/main/res/drawable/ill_reset_background.xml
deleted file mode 100644
index 8ce3137945..0000000000
--- a/app/src/main/res/drawable/ill_reset_background.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<vector android:autoMirrored="true" android:height="344dp"
-    android:viewportHeight="344" android:viewportWidth="233"
-    android:width="233dp" xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="0.3" android:pathData="M49,-262L49,-262A184,184 0,0 1,233 -78L233,160A184,184 0,0 1,49 344L49,344A184,184 0,0 1,-135 160L-135,-78A184,184 0,0 1,49 -262z">
-        <aapt:attr name="android:fillColor">
-            <gradient android:centerX="149.32" android:centerY="383.08"
-                android:gradientRadius="337.25" android:type="radial">
-                <item android:color="#FFFF9900" android:offset="0"/>
-                <item android:color="#00FF9900" android:offset="1"/>
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path android:fillAlpha="0.5" android:pathData="M49,-182L49,-182A150,150 0,0 1,199 -32L199,160A150,150 0,0 1,49 310L49,310A150,150 0,0 1,-101 160L-101,-32A150,150 0,0 1,49 -182z">
-        <aapt:attr name="android:fillColor">
-            <gradient android:centerX="73" android:centerY="498"
-                android:gradientRadius="371.06" android:type="radial">
-                <item android:color="#FFDA1717" android:offset="0"/>
-                <item android:color="#03DA1717" android:offset="1"/>
-                <item android:color="#00FF0000" android:offset="1"/>
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path android:fillColor="#DE1010" android:fillType="evenOdd" android:pathData="M72.88,249.79C72.88,253.27 70.53,255.96 66.66,255.96H31.34C27.47,255.96 25.12,253.27 25.12,249.79C25.12,248.71 25.39,247.62 26.01,246.6L43.69,215.79C44.85,213.71 46.9,212.67 49,212.67C51.1,212.67 53.12,213.71 54.31,215.79L71.99,246.6C72.56,247.6 72.88,248.71 72.88,249.79ZM49.02,240.74C47.84,240.74 47.18,240.06 47.15,238.85L46.86,226.45C46.84,225.24 47.72,224.38 49,224.38C50.23,224.38 51.19,225.27 51.16,226.48L50.82,238.85C50.8,240.08 50.14,240.74 49.02,240.74ZM49.02,248.37C47.66,248.37 46.47,247.28 46.47,245.93C46.47,244.57 47.63,243.47 49.02,243.47C50.39,243.47 51.55,244.54 51.55,245.93C51.55,247.3 50.37,248.37 49.02,248.37Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/img_alert.xml b/app/src/main/res/drawable/img_alert.xml
new file mode 100644
index 0000000000..42b087d91c
--- /dev/null
+++ b/app/src/main/res/drawable/img_alert.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="80dp"
+    android:height="80dp"
+    android:autoMirrored="true"
+    android:viewportWidth="80"
+    android:viewportHeight="80">
+    <group>
+        <clip-path android:pathData="M0,0h80v80h-80z" />
+        <path
+            android:fillAlpha="0.12"
+            android:fillColor="@color/icon_warning"
+            android:fillType="evenOdd"
+            android:pathData="M40,80C62.091,80 80,62.091 80,40C80,17.909 62.091,0 40,0C17.909,0 0,17.909 0,40C0,62.091 17.909,80 40,80ZM40,70C56.569,70 70,56.569 70,40C70,23.431 56.569,10 40,10C23.431,10 10,23.431 10,40C10,56.569 23.431,70 40,70Z"
+            android:strokeAlpha="0.12" />
+        <path
+            android:fillColor="@color/icon_warning"
+            android:pathData="M36.667,50H43.333V56.667H36.667V50ZM36.667,23.333H43.333V43.333H36.667V23.333ZM40,6.667C21.567,6.667 6.667,21.667 6.667,40C6.667,48.84 10.179,57.319 16.43,63.57C19.525,66.665 23.2,69.121 27.244,70.796C31.288,72.471 35.623,73.333 40,73.333C48.841,73.333 57.319,69.821 63.57,63.57C69.822,57.319 73.333,48.84 73.333,40C73.333,35.623 72.471,31.288 70.796,27.244C69.121,23.2 66.666,19.525 63.57,16.43C60.475,13.334 56.8,10.879 52.756,9.204C48.712,7.529 44.377,6.667 40,6.667ZM40,66.667C32.928,66.667 26.145,63.857 21.144,58.856C16.143,53.855 13.333,47.072 13.333,40C13.333,32.928 16.143,26.145 21.144,21.144C26.145,16.143 32.928,13.333 40,13.333C47.072,13.333 53.855,16.143 58.856,21.144C63.857,26.145 66.667,32.928 66.667,40C66.667,47.072 63.857,53.855 58.856,58.856C53.855,63.857 47.072,66.667 40,66.667Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/img_onboarding_success.xml b/app/src/main/res/drawable/img_onboarding_success.xml
new file mode 100644
index 0000000000..84574803ea
--- /dev/null
+++ b/app/src/main/res/drawable/img_onboarding_success.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="142dp"
+    android:height="142dp"
+    android:autoMirrored="true"
+    android:viewportWidth="142"
+    android:viewportHeight="142">
+    <path
+        android:fillColor="#0099FF"
+        android:fillType="evenOdd"
+        android:pathData="M71,117.66C96.77,117.66 117.66,96.77 117.66,71C117.66,45.23 96.77,24.34 71,24.34C45.23,24.34 24.34,45.23 24.34,71C24.34,96.77 45.23,117.66 71,117.66Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M83.58,57.65L66.44,77.46L58.57,69.92C58.26,69.61 57.88,69.37 57.47,69.2C57.06,69.03 56.61,68.94 56.16,68.93C55.71,68.93 55.27,69.01 54.85,69.18C54.43,69.34 54.05,69.58 53.74,69.88C53.42,70.19 53.17,70.55 53,70.95C52.82,71.35 52.74,71.78 52.74,72.21C52.75,72.64 52.84,73.06 53.02,73.46C53.2,73.86 53.45,74.21 53.78,74.51L63.95,84.25C64.56,84.84 65.4,85.18 66.27,85.2C67.14,85.22 67.99,84.91 68.63,84.35L88.16,62.44C88.82,61.86 89.22,61.05 89.25,60.19C89.29,59.33 88.97,58.49 88.37,57.85C87.76,57.22 86.91,56.84 86.01,56.8C85.12,56.77 84.24,57.07 83.58,57.65Z" />
+</vector>
diff --git a/app/src/main/res/drawable/shape_ellipse.xml b/app/src/main/res/drawable/shape_ellipse.xml
index b5f3fc7939..ca6cad24b5 100644
--- a/app/src/main/res/drawable/shape_ellipse.xml
+++ b/app/src/main/res/drawable/shape_ellipse.xml
@@ -10,7 +10,7 @@
         <clip-path android:pathData="M40 20C40 31.0457 31.0457 40 20 40C8.95431 40 0 31.0457 0 20C0 8.95431 8.95431 0 20 0C31.0457 0 40 8.95431 40 20Z" />
 
         <path
-            android:fillColor="#F4F5F6"
+            android:fillColor="@color/button_secondary"
             android:pathData="M0 0V40H40V0" />
 
     </group>
diff --git a/app/src/main/res/drawable/shape_refresh_button.xml b/app/src/main/res/drawable/shape_refresh_button.xml
index ac9508438d..cade7f63f3 100644
--- a/app/src/main/res/drawable/shape_refresh_button.xml
+++ b/app/src/main/res/drawable/shape_refresh_button.xml
@@ -2,11 +2,11 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/icon_primary_2" />
 
     <stroke
         android:width="1dp"
-        android:color="#E2E2E2" />
+        android:color="@color/button_secondary" />
 
     <size
         android:width="40dp"
diff --git a/app/src/main/res/drawable/shape_success_circle.xml b/app/src/main/res/drawable/shape_success_circle.xml
new file mode 100644
index 0000000000..d6c04dd519
--- /dev/null
+++ b/app/src/main/res/drawable/shape_success_circle.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/accent" />
+    <size
+        android:width="142dp"
+        android:height="142dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-h680dp/layout_onboarding_container_bottom.xml b/app/src/main/res/layout-h680dp/layout_onboarding_container_bottom.xml
index 32d2544981..131299d4d5 100644
--- a/app/src/main/res/layout-h680dp/layout_onboarding_container_bottom.xml
+++ b/app/src/main/res/layout-h680dp/layout_onboarding_container_bottom.xml
@@ -85,7 +85,7 @@
             android:layout_gravity="center"
             android:elevation="18dp"
             android:indeterminate="true"
-            android:indeterminateTint="@color/backgroundLightGray"
+            android:indeterminateTint="@color/background_secondary"
             android:visibility="invisible" />
 
     </FrameLayout>
@@ -93,6 +93,9 @@
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_alternative_action"
         style="@style/TapTextButton"
+        android:layout_width="match_parent"
+        android:layout_marginStart="@dimen/dimen16"
+        android:layout_marginEnd="@dimen/dimen16"
         android:layout_marginBottom="26dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/btn_expand_collapse.xml b/app/src/main/res/layout/btn_expand_collapse.xml
index 76f0338c98..8d9c220409 100644
--- a/app/src/main/res/layout/btn_expand_collapse.xml
+++ b/app/src/main/res/layout/btn_expand_collapse.xml
@@ -18,6 +18,7 @@
         android:layout_gravity="center"
         android:background="?selectableItemBackgroundBorderless"
         android:padding="5dp"
-        app:srcCompat="@drawable/ic_angle_bracket_up" />
+        app:srcCompat="@drawable/ic_angle_bracket_up"
+        app:tint="@color/icon_primary_1" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_onboarding_address_info.xml b/app/src/main/res/layout/dialog_onboarding_address_info.xml
index eadb8f7f36..b4a422e77b 100644
--- a/app/src/main/res/layout/dialog_onboarding_address_info.xml
+++ b/app/src/main/res/layout/dialog_onboarding_address_info.xml
@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="502dp">
+    android:layout_height="wrap_content"
+    android:background="@color/background_primary">
 
     <include
         android:id="@+id/pseudo_toolbar"
@@ -32,9 +33,10 @@
         android:layout_marginEnd="40dp"
         android:textAlignment="center"
         android:textAllCaps="false"
-        app:layout_constraintBottom_toTopOf="@+id/guideline3"
+        android:layout_marginTop="30dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        android:textColor="@color/text_secondary"
         app:layout_constraintTop_toBottomOf="@+id/imv_qr_code"
         tools:text="Send only Ethereum (ETH) from Ethereum network to this address. Using other tokens and networks may result in loss of funds." />
 
@@ -52,13 +54,14 @@
         android:layout_marginStart="32dp"
         android:layout_marginEnd="8dp"
         android:background="@drawable/shape_rectangle_rounded_100"
-        android:backgroundTint="@color/lightGray0"
+        android:layout_marginTop="30dp"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         app:layout_constraintEnd_toStartOf="@+id/btn_fl_share"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/guideline3">
+        android:backgroundTint="@color/button_secondary"
+        app:layout_constraintTop_toBottomOf="@id/tv_receive_message">
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
@@ -76,6 +79,7 @@
                 android:minWidth="120dp"
                 android:singleLine="true"
                 android:textSize="15sp"
+                android:textColor="@color/text_primary_1"
                 tools:text="addlkasLNXDLKNnkjkjhnjkjnljnnlsenn" />
 
             <View
@@ -85,6 +89,7 @@
             <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:tint="@color/accent"
                 android:background="?selectableItemBackgroundBorderless"
                 android:src="@drawable/ic_copy_green" />
 
@@ -98,13 +103,14 @@
         android:layout_height="40dp"
         android:layout_marginEnd="32dp"
         android:background="@drawable/shape_rectangle_rounded_100"
-        android:backgroundTint="@color/lightGray0"
+        android:layout_marginTop="30dp"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
+        android:backgroundTint="@color/background_primary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/btn_fl_copy_address"
-        app:layout_constraintTop_toTopOf="@+id/guideline3">
+        app:layout_constraintTop_toBottomOf="@+id/tv_receive_message">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="22dp"
@@ -116,4 +122,11 @@
 
     </FrameLayout>
 
+    <View
+        android:id="@+id/empty_view"
+        android:layout_width="match_parent"
+        android:layout_height="30dp"
+        app:layout_constraintBaseline_toBaselineOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/btn_fl_copy_address" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_russians_cardholders_warning.xml b/app/src/main/res/layout/dialog_russians_cardholders_warning.xml
index 29bf1c052b..a666076b95 100644
--- a/app/src/main/res/layout/dialog_russians_cardholders_warning.xml
+++ b/app/src/main/res/layout/dialog_russians_cardholders_warning.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/backgroundWhite"
+    android:background="@color/background_primary"
     android:minHeight="420dp"
     tools:layout_gravity="bottom">
 
@@ -25,7 +25,7 @@
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:background="@drawable/shape_circle"
-        android:backgroundTint="@color/backgroundWhite"
+        android:backgroundTint="@color/background_primary"
         app:layout_constraintBottom_toBottomOf="@id/iv_cross"
         app:layout_constraintEnd_toEndOf="@id/iv_cross"
         app:layout_constraintStart_toStartOf="@id/iv_cross"
@@ -55,7 +55,7 @@
         android:layout_marginEnd="38dp"
         android:text="@string/russian_bank_card_warning_title"
         android:textAlignment="center"
-        android:textColor="@color/textBlack"
+        android:textColor="@color/text_primary_1"
         android:textSize="20sp"
         app:layout_constraintBottom_toTopOf="@id/tv_description"
         app:layout_constraintEnd_toEndOf="parent"
@@ -72,7 +72,7 @@
         android:layout_marginBottom="38dp"
         android:text="@string/russian_bank_card_warning_subtitle"
         android:textAlignment="center"
-        android:textColor="@color/textBlack"
+        android:textColor="@color/text_primary_1"
         android:textSize="14sp"
         app:layout_constraintBottom_toTopOf="@id/btn_yes"
         app:layout_constraintEnd_toEndOf="parent"
@@ -87,9 +87,9 @@
         android:layout_marginStart="16dp"
         android:layout_marginEnd="6dp"
         android:layout_marginBottom="38dp"
-        android:backgroundTint="@color/tapButtonColorBlack"
+        android:backgroundTint="@color/button_primary"
         android:text="@string/common_yes"
-        android:textColor="@color/white"
+        android:textColor="@color/text_primary_2"
         app:cornerRadius="14dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/btn_no"
@@ -102,9 +102,9 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="6dp"
         android:layout_marginEnd="16dp"
-        android:backgroundTint="@color/buttonGray"
+        android:backgroundTint="@color/button_secondary"
         android:text="@string/common_no"
-        android:textColor="@color/textBlack"
+        android:textColor="@color/text_primary_1"
         app:cornerRadius="14dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/btn_yes"
diff --git a/app/src/main/res/layout/dialog_wallet_trade.xml b/app/src/main/res/layout/dialog_wallet_trade.xml
index dea867e05a..96dd6d34c1 100644
--- a/app/src/main/res/layout/dialog_wallet_trade.xml
+++ b/app/src/main/res/layout/dialog_wallet_trade.xml
@@ -11,7 +11,7 @@
         android:layout_height="56dp"
         android:padding="16dp"
         android:text="@string/wallet_choose_trade_action"
-        android:textColor="@color/darkGray2"
+        android:textColor="@color/text_secondary"
         android:textSize="14sp" />
 
     <TextView
@@ -24,7 +24,7 @@
         android:gravity="center_vertical"
         android:padding="16dp"
         android:text="@string/common_buy"
-        android:textColor="@color/darkGray3"
+        android:textColor="@color/text_primary_1"
         android:textSize="14sp"
         android:textStyle="bold"
         app:drawableStartCompat="@drawable/ic_arrow_up_24" />
@@ -39,7 +39,7 @@
         android:gravity="center_vertical"
         android:padding="16dp"
         android:text="@string/common_sell"
-        android:textColor="@color/darkGray3"
+        android:textColor="@color/text_primary_1"
         android:textSize="14sp"
         android:textStyle="bold"
         app:drawableStartCompat="@drawable/ic_arrow_down_24" />
@@ -54,7 +54,7 @@
         android:gravity="center_vertical"
         android:padding="16dp"
         android:text="@string/swapping_swap_action"
-        android:textColor="@color/darkGray3"
+        android:textColor="@color/text_primary_1"
         android:textSize="14sp"
         android:textStyle="bold"
         app:drawableStartCompat="@drawable/ic_exchange_vertical_24" />
diff --git a/app/src/main/res/layout/fragment_disclaimer.xml b/app/src/main/res/layout/fragment_disclaimer.xml
index 328a435e5c..1c237b7938 100644
--- a/app/src/main/res/layout/fragment_disclaimer.xml
+++ b/app/src/main/res/layout/fragment_disclaimer.xml
@@ -4,7 +4,7 @@
     android:id="@+id/coordinator_details_confirm"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/backgroundLightGray"
+    android:background="@color/background_secondary"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -12,7 +12,7 @@
         style="@style/Widget.MaterialComponents.Toolbar.Surface"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/backgroundLightGray"
+        android:background="@color/background_secondary"
         android:fitsSystemWindows="true"
         app:liftOnScroll="true">
 
@@ -21,6 +21,8 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:navigationIcon="@drawable/ic_baseline_arrow_back_24"
+            app:navigationIconTint="@color/icon_primary_1"
+            app:titleTextColor="@color/text_primary_1"
             app:title="@string/disclaimer_title" />
 
     </com.google.android.material.appbar.AppBarLayout>
@@ -29,7 +31,7 @@
         android:id="@+id/cl_details_confirm"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/white"
+        android:background="@color/background_secondary"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <WebView
diff --git a/app/src/main/res/layout/fragment_onboarding_main.xml b/app/src/main/res/layout/fragment_onboarding_main.xml
index c88f910dcb..b184df2cd2 100644
--- a/app/src/main/res/layout/fragment_onboarding_main.xml
+++ b/app/src/main/res/layout/fragment_onboarding_main.xml
@@ -4,7 +4,7 @@
     android:id="@+id/coordinator_onboarding"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/backgroundWhite"
+    android:background="@color/background_primary"
     android:clipChildren="false"
     android:clipToPadding="false"
     android:fitsSystemWindows="true"
@@ -22,6 +22,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
+            app:navigationIconTint="@color/icon_primary_1"
+            app:titleTextColor="@color/text_primary_1"
             android:layout_height="?attr/actionBarSize"
             app:navigationIcon="@drawable/ic_baseline_arrow_back_24" />
 
diff --git a/app/src/main/res/layout/fragment_onboarding_wallet.xml b/app/src/main/res/layout/fragment_onboarding_wallet.xml
index 821f0d3ef8..217d2db70e 100644
--- a/app/src/main/res/layout/fragment_onboarding_wallet.xml
+++ b/app/src/main/res/layout/fragment_onboarding_wallet.xml
@@ -5,7 +5,7 @@
     android:id="@+id/coordinator_details_confirm"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/backgroundLightGray"
+    android:background="@color/background_primary"
     android:clipChildren="false"
     android:clipToPadding="false"
     android:orientation="vertical">
@@ -21,8 +21,10 @@
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
+            app:navigationIconTint="@color/icon_primary_1"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
+            app:titleTextColor="@color/text_primary_1"
             app:navigationIcon="@drawable/ic_baseline_arrow_back_24"
             app:title="@string/onboarding_getting_started" />
 
@@ -59,7 +61,7 @@
                 android:layout_height="236dp"
                 android:adjustViewBounds="true"
                 android:background="@drawable/shape_circle"
-                android:backgroundTint="@color/lightGray0"
+                android:backgroundTint="@color/background_primary"
                 android:elevation="0dp"
                 android:scaleType="fitCenter"
                 app:layout_constraintBottom_toBottomOf="@id/fl_cards_container"
@@ -113,17 +115,35 @@
 
             </FrameLayout>
 
-            <androidx.appcompat.widget.AppCompatImageView
+            <FrameLayout
                 android:id="@+id/imv_success"
                 android:layout_width="142dp"
                 android:layout_height="142dp"
-                android:src="@drawable/ic_activation_success"
                 android:visibility="gone"
+                android:background="@android:color/transparent"
                 app:layout_constraintBottom_toTopOf="@id/guideline2"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.495"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/imv_success_middle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:background="@android:color/transparent"
+                    android:src="@drawable/img_onboarding_success" />
+
+                <View
+                    android:layout_width="142dp"
+                    android:layout_height="142dp"
+                    android:layout_gravity="center"
+                    android:alpha="0.2"
+                    android:background="@drawable/shape_success_circle"
+                    android:backgroundTint="@color/accent" />
+
+            </FrameLayout>
 
             <androidx.appcompat.widget.LinearLayoutCompat
                 android:id="@+id/ll_header_body_container"
@@ -146,7 +166,7 @@
                 android:layout_marginTop="12dp"
                 android:fontFamily="sans-serif-medium"
                 android:textAlignment="center"
-                android:textColor="#060606"
+                android:textColor="@color/text_primary_1"
                 android:textSize="24sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.504"
@@ -162,7 +182,7 @@
                 android:layout_marginTop="@dimen/home_bottom_tv_body_margin_top"
                 android:layout_marginEnd="@dimen/home_bottom_tv_body_margin_end"
                 android:textAlignment="center"
-                android:textColor="#686868"
+                android:textColor="@color/text_secondary"
                 android:textSize="16sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -183,7 +203,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="10dp"
                 android:layout_marginBottom="16dp"
-                android:background="@color/backgroundLightGray"
+                android:background="@color/background_primary"
                 android:visibility="gone"
                 app:layout_constraintBottom_toTopOf="@id/layout_buttons_common"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -200,7 +220,11 @@
                 layout="@layout/layout_onboarding_buttons_common"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintBottom_toBottomOf="parent" />
+                android:layout_marginStart="@dimen/dimen16"
+                android:layout_marginEnd="@dimen/dimen16"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
 
             <include
                 android:id="@+id/layout_buttons_add_cards"
@@ -208,7 +232,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent" />
+                android:layout_marginStart="@dimen/dimen16"
+                android:layout_marginEnd="@dimen/dimen16"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
 
             <androidx.constraintlayout.widget.Guideline
                 android:id="@+id/guideline2"
@@ -216,6 +244,8 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 app:layout_constraintBottom_toBottomOf="parent"
+                android:layout_marginStart="@dimen/dimen16"
+                android:layout_marginEnd="@dimen/dimen16"
                 app:layout_constraintGuide_percent="@dimen/onboarding_wallet_top_guide_line_weight"
                 app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/layout/fragment_send.xml b/app/src/main/res/layout/fragment_send.xml
index 20949f4932..a7f8c54c42 100644
--- a/app/src/main/res/layout/fragment_send.xml
+++ b/app/src/main/res/layout/fragment_send.xml
@@ -5,7 +5,7 @@
     android:id="@+id/coordinator_wallet"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/backgroundLightGray"
+    android:background="@color/background_secondary"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -13,7 +13,7 @@
         style="@style/Widget.MaterialComponents.Toolbar.Surface"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/backgroundLightGray"
+        android:background="@color/background_secondary"
         android:fitsSystemWindows="true"
         app:liftOnScroll="true">
 
@@ -22,7 +22,9 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:navigationIcon="@drawable/ic_baseline_arrow_back_24"
-            app:title="@string/common_send" />
+            app:navigationIconTint="@color/text_primary_1"
+            app:title="@string/common_send"
+            app:titleTextColor="@color/text_primary_1" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -125,7 +127,7 @@
                         android:layout_gravity="center"
                         android:elevation="18dp"
                         android:indeterminate="true"
-                        android:indeterminateTint="@color/backgroundLightGray" />
+                        android:indeterminateTint="@color/background_primary" />
 
                 </FrameLayout>
 
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 3d6e2f4020..48384d34c6 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -5,7 +5,7 @@
     android:id="@+id/coordinator_details_confirm"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/backgroundLightGray"
+    android:background="@color/background_secondary"
     android:clipChildren="false"
     android:clipToPadding="false"
     android:focusableInTouchMode="true"
@@ -16,7 +16,7 @@
         style="@style/ThemeOverlay.MyTheme.Toolbar.AccentColorMenu"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/backgroundLightGray"
+        android:background="@color/background_secondary"
         android:fitsSystemWindows="true"
         app:liftOnScroll="true">
 
diff --git a/app/src/main/res/layout/item_backup_info_adapter.xml b/app/src/main/res/layout/item_backup_info_adapter.xml
index ecbfdbdb1b..469434318b 100644
--- a/app/src/main/res/layout/item_backup_info_adapter.xml
+++ b/app/src/main/res/layout/item_backup_info_adapter.xml
@@ -2,7 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <TextView
         android:id="@+id/tv_header"
@@ -10,8 +11,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="12dp"
         android:fontFamily="sans-serif-medium"
-        android:text="Header"
-        android:textColor="#060606"
+        android:textColor="@color/text_primary_1"
+        tools:text="Header"
         android:textSize="24sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.504"
@@ -25,9 +26,9 @@
         android:layout_marginStart="64dp"
         android:layout_marginTop="10dp"
         android:layout_marginEnd="64dp"
-        android:text="Body"
+        android:textColor="@color/text_secondary"
         android:textAlignment="center"
-        android:textColor="#686868"
+        tools:text="Body"
         android:textSize="16sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/layout_backup_access_code.xml b/app/src/main/res/layout/layout_backup_access_code.xml
index d8c721b7f6..f402774903 100644
--- a/app/src/main/res/layout/layout_backup_access_code.xml
+++ b/app/src/main/res/layout/layout_backup_access_code.xml
@@ -2,7 +2,8 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/background_primary">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/layout_backup_access_code_info.xml b/app/src/main/res/layout/layout_backup_access_code_info.xml
index fe37f7cd96..c53bb8fc3d 100644
--- a/app/src/main/res/layout/layout_backup_access_code_info.xml
+++ b/app/src/main/res/layout/layout_backup_access_code_info.xml
@@ -12,7 +12,8 @@
         android:src="@drawable/ic_access_code"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="@color/icon_informative" />
 
     <TextView
         android:id="@+id/tv_feature_1_title"
@@ -32,6 +33,7 @@
         android:layout_marginStart="46dp"
         android:layout_marginTop="8dp"
         android:src="@drawable/ic_feature_1"
+        app:tint="@color/icon_primary_1"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_feature_1_title" />
 
@@ -65,6 +67,7 @@
         android:layout_marginStart="46dp"
         android:layout_marginTop="8dp"
         android:src="@drawable/ic_feature_2"
+        app:tint="@color/icon_primary_1"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_feature_2_title" />
 
@@ -98,6 +101,7 @@
         android:layout_marginStart="46dp"
         android:layout_marginTop="8dp"
         android:src="@drawable/ic_feature_3"
+        app:tint="@color/icon_primary_1"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_feature_3_title" />
 
@@ -117,10 +121,10 @@
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_access_code_create"
         style="@style/TapPrimaryButton"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/access_code_btn_continue_margin_start"
-        android:layout_marginEnd="@dimen/access_code_btn_continue_margin_start"
+        android:layout_marginStart="@dimen/dimen16"
+        android:layout_marginEnd="@dimen/dimen16"
         android:layout_marginBottom="@dimen/access_code_btn_continue_margin_bottom"
         android:text="@string/common_continue"
         android:textSize="16sp"
diff --git a/app/src/main/res/layout/layout_backup_access_code_submit.xml b/app/src/main/res/layout/layout_backup_access_code_submit.xml
index 23e95aae7e..fdf4387f56 100644
--- a/app/src/main/res/layout/layout_backup_access_code_submit.xml
+++ b/app/src/main/res/layout/layout_backup_access_code_submit.xml
@@ -14,6 +14,7 @@
         android:layout_marginTop="14dp"
         android:paddingStart="32dp"
         android:paddingEnd="32dp"
+        android:textColor="@color/text_secondary"
         android:text="@string/onboarding_access_code_hint"
         android:textAlignment="center"
         app:layout_constraintTop_toTopOf="parent" />
@@ -28,12 +29,17 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="40dp"
         android:hint="@string/onboarding_wallet_info_title_third"
+        android:textColorHint="@color/text_primary_1"
         android:theme="@style/EditTextThemeOverlay"
         app:boxStrokeColor="@color/selector_edit_text"
         app:boxStrokeWidth="1dp"
         app:endIconDrawable="@drawable/selector_password_toggle"
+        app:boxStrokeErrorColor="@color/icon_warning"
         app:endIconMode="password_toggle"
         app:hintTextColor="@color/accent"
+        app:endIconTint="@color/icon_primary_1"
+        app:errorIconTint="@color/icon_warning"
+        app:errorTextColor="@color/icon_warning"
         app:layout_constraintTop_toBottomOf="@id/tv_access_code_enter_description">
 
         <com.google.android.material.textfield.TextInputEditText
@@ -41,6 +47,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:inputType="textVisiblePassword"
+            android:textColor="@color/text_primary_1"
             android:textSize="16sp" />
 
     </com.google.android.material.textfield.TextInputLayout>
@@ -48,10 +55,10 @@
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_access_code_submit"
         style="@style/TapPrimaryButton"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
+        android:layout_marginStart="@dimen/dimen16"
+        android:layout_marginEnd="@dimen/dimen16"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/access_code_btn_continue_margin_start"
-        android:layout_marginEnd="@dimen/access_code_btn_continue_margin_end"
         android:layout_marginBottom="@dimen/access_code_btn_continue_margin_bottom"
         android:text="@string/common_create"
         android:textSize="16sp"
diff --git a/app/src/main/res/layout/layout_balance.xml b/app/src/main/res/layout/layout_balance.xml
index 6addd2be86..4141bd7302 100644
--- a/app/src/main/res/layout/layout_balance.xml
+++ b/app/src/main/res/layout/layout_balance.xml
@@ -38,41 +38,40 @@
         app:layout_constraintTop_toBottomOf="@id/tv_currency"
         tools:visibility="visible" />
 
-    <TextView
-        android:id="@+id/tv_status_error"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:drawablePadding="5dp"
-        android:paddingStart="16dp"
-        android:paddingTop="4dp"
-        android:paddingEnd="16dp"
-        android:text="@string/wallet_balance_blockchain_unreachable"
-        android:textColor="@color/warning"
-        android:textSize="14sp"
-        android:visibility="gone"
-        app:drawableStartCompat="@drawable/ic_warning_small"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_currency" />
-
-    <TextView
-        android:id="@+id/tv_status_error_message"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingStart="16dp"
-        android:paddingTop="4dp"
-        android:paddingEnd="16dp"
-        android:textColor="@color/darkGray2"
-        android:textSize="14sp"
-        android:visibility="gone"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_status_error" />
-
-    <androidx.constraintlayout.widget.Group
-        android:id="@+id/group_error"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:constraint_referenced_ids="tv_status_error, tv_status_error_message" />
+    <!-- TODO: Delete with WalletFeatureToggles -->
+    <!--<TextView-->
+    <!--    android:id="@+id/tv_status_error"-->
+    <!--    android:layout_width="wrap_content"-->
+    <!--    android:layout_height="wrap_content"-->
+    <!--    android:drawablePadding="5dp"-->
+    <!--    android:paddingStart="16dp"-->
+    <!--    android:paddingTop="4dp"-->
+    <!--    android:paddingEnd="16dp"-->
+    <!--    android:text="@string/wallet_balance_blockchain_unreachable"-->
+    <!--    android:textColor="@color/warning"-->
+    <!--    android:textSize="14sp"-->
+    <!--    android:visibility="gone"-->
+    <!--    app:drawableStartCompat="@drawable/ic_warning_small"-->
+    <!--    app:layout_constraintStart_toStartOf="parent"-->
+    <!--    app:layout_constraintTop_toBottomOf="@id/tv_currency" />-->
+    <!--<TextView-->
+    <!--    android:id="@+id/tv_status_error_message"-->
+    <!--    android:layout_width="wrap_content"-->
+    <!--    android:layout_height="wrap_content"-->
+    <!--    android:paddingStart="16dp"-->
+    <!--    android:paddingTop="4dp"-->
+    <!--    android:paddingEnd="16dp"-->
+    <!--    android:textColor="@color/darkGray2"-->
+    <!--    android:textSize="14sp"-->
+    <!--    android:visibility="gone"-->
+    <!--    app:layout_constraintStart_toStartOf="parent"-->
+    <!--    app:layout_constraintTop_toBottomOf="@id/tv_status_error" />-->
+    <!--<androidx.constraintlayout.widget.Group-->
+    <!--    android:id="@+id/group_error"-->
+    <!--    android:layout_width="wrap_content"-->
+    <!--    android:layout_height="wrap_content"-->
+    <!--    android:visibility="gone"-->
+    <!--    app:constraint_referenced_ids="tv_status_error, tv_status_error_message" />-->
 
     <TextView
         android:id="@+id/tv_status_loading"
diff --git a/app/src/main/res/layout/layout_onboarding_buttons_add_cards.xml b/app/src/main/res/layout/layout_onboarding_buttons_add_cards.xml
index 23821c5ce9..505d485b6f 100644
--- a/app/src/main/res/layout/layout_onboarding_buttons_add_cards.xml
+++ b/app/src/main/res/layout/layout_onboarding_buttons_add_cards.xml
@@ -8,7 +8,7 @@
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_add_card"
         style="@style/TapSecondaryIconButton"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="92dp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -19,6 +19,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_continue"
+        android:layout_width="match_parent"
         style="@style/TapPrimaryButton"
         android:layout_height="wrap_content"
         android:layout_marginBottom="32dp"
diff --git a/app/src/main/res/layout/layout_onboarding_buttons_common.xml b/app/src/main/res/layout/layout_onboarding_buttons_common.xml
index 1c756307dc..2e53801d0c 100644
--- a/app/src/main/res/layout/layout_onboarding_buttons_common.xml
+++ b/app/src/main/res/layout/layout_onboarding_buttons_common.xml
@@ -8,17 +8,20 @@
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_wallet_main_action"
         style="@style/TapPrimaryIconButton"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/home_bottom_fl_scan_card_container_margin_bottom"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         tools:icon="@drawable/ic_tangem_24"
+        app:iconSize="20dp"
         tools:text="Main Action" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_wallet_alternative_action"
         style="@style/TapTextButton"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/home_bottom_btn_alternative_action_margin_bottom"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/layout_onboarding_container_bottom.xml b/app/src/main/res/layout/layout_onboarding_container_bottom.xml
index 187018cab1..42668c1561 100644
--- a/app/src/main/res/layout/layout_onboarding_container_bottom.xml
+++ b/app/src/main/res/layout/layout_onboarding_container_bottom.xml
@@ -55,6 +55,7 @@
         android:textStyle="bold"
         android:visibility="gone"
         app:buttonTint="@color/accent"
+        android:textColor="@color/text_secondary"
         app:layout_constraintBottom_toTopOf="@+id/btn_container"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -63,11 +64,13 @@
 
     <FrameLayout
         android:id="@+id/btn_container"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/home_bottom_fl_scan_card_container_margin_bottom"
         android:clipChildren="false"
         android:clipToPadding="false"
+        android:layout_marginStart="@dimen/dimen16"
+        android:layout_marginEnd="@dimen/dimen16"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent">
@@ -75,7 +78,9 @@
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_main_action"
             style="@style/TapPrimaryIconButton"
+            android:layout_width="match_parent"
             tools:icon="@drawable/ic_tangem_24"
+            app:iconSize="20dp"
             tools:text="@string/welcome_unlock_card" />
 
         <ProgressBar
@@ -85,7 +90,7 @@
             android:layout_gravity="center"
             android:elevation="18dp"
             android:indeterminate="true"
-            android:indeterminateTint="@color/backgroundLightGray"
+            android:indeterminateTint="@color/background_secondary"
             android:visibility="invisible" />
 
     </FrameLayout>
@@ -93,6 +98,9 @@
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_alternative_action"
         style="@style/TapTextButton"
+        android:layout_width="match_parent"
+        android:layout_marginStart="@dimen/dimen16"
+        android:layout_marginEnd="@dimen/dimen16"
         android:layout_marginBottom="@dimen/home_bottom_btn_alternative_action_margin_bottom"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/layout_onboarding_container_top.xml b/app/src/main/res/layout/layout_onboarding_container_top.xml
index b68d4558c0..9c4e9abe83 100644
--- a/app/src/main/res/layout/layout_onboarding_container_top.xml
+++ b/app/src/main/res/layout/layout_onboarding_container_top.xml
@@ -31,7 +31,7 @@
         android:layout_height="236dp"
         android:adjustViewBounds="true"
         android:background="@drawable/shape_circle"
-        android:backgroundTint="@color/lightGray0"
+        android:backgroundTint="@color/onboarding_card_background"
         android:elevation="0dp"
         android:scaleType="fitCenter"
         app:layout_constraintBottom_toBottomOf="@+id/imv_front_card"
@@ -109,15 +109,40 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
 
-    <androidx.appcompat.widget.AppCompatImageView
+    <FrameLayout
         android:id="@+id/imv_activation_success"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_activation_success"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:background="@android:color/transparent"
         android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="@+id/imv_card_background"
         app:layout_constraintEnd_toEndOf="@+id/imv_card_background"
         app:layout_constraintStart_toStartOf="@+id/imv_card_background"
-        app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
+        app:layout_constraintTop_toBottomOf="@+id/imv_card_background">
+
+        <View
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center"
+            android:background="@drawable/shape_success_circle"
+            android:backgroundTint="@color/background_primary" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/imv_success_middle"
+            android:layout_width="55dp"
+            android:layout_height="55dp"
+            android:layout_gravity="center"
+            android:background="@android:color/transparent"
+            android:src="@drawable/img_onboarding_success" />
+
+        <View
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center"
+            android:alpha="0.2"
+            android:background="@drawable/shape_success_circle"
+            android:backgroundTint="@color/accent" />
+
+    </FrameLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_pseudo_toolbar.xml b/app/src/main/res/layout/layout_pseudo_toolbar.xml
index c1bc683d3a..361f8cbb40 100644
--- a/app/src/main/res/layout/layout_pseudo_toolbar.xml
+++ b/app/src/main/res/layout/layout_pseudo_toolbar.xml
@@ -4,7 +4,7 @@
     android:id="@+id/pseudo_toolbar"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
-    android:background="@color/backgroundLightGray"
+    android:background="@color/background_primary"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent">
@@ -18,6 +18,7 @@
         android:clickable="true"
         android:focusable="true"
         android:padding="16dp"
+        android:tint="@color/icon_primary_1"
         android:src="@drawable/ic_close_24" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/layout_receipt_total.xml b/app/src/main/res/layout/layout_receipt_total.xml
index 7cca4f9165..5ff5d3377c 100644
--- a/app/src/main/res/layout/layout_receipt_total.xml
+++ b/app/src/main/res/layout/layout_receipt_total.xml
@@ -47,7 +47,7 @@
             android:layout_gravity="end"
             android:layout_marginTop="4dp"
             android:gravity="end"
-            android:textColor="@color/darkGray1"
+            android:textColor="@color/text_tertiary"
             tools:text="123.29837729 ADA 39487593.109342039402938049 will be sent" />
 
     </LinearLayout>
@@ -64,7 +64,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="start"
             android:text="@string/send_total_label"
-            android:textColor="@color/darkGray1"
+            android:textColor="@color/text_tertiary"
             android:textSize="14sp"
             android:textStyle="bold" />
 
@@ -74,7 +74,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:textAllCaps="true"
-            android:textColor="@color/darkGray1"
+            android:textColor="@color/text_tertiary"
             android:textSize="14sp"
             android:textStyle="bold"
             tools:text="usd" />
diff --git a/app/src/main/res/layout/layout_send_address.xml b/app/src/main/res/layout/layout_send_address.xml
index c6dd2873c8..8367bf3524 100644
--- a/app/src/main/res/layout/layout_send_address.xml
+++ b/app/src/main/res/layout/layout_send_address.xml
@@ -21,23 +21,24 @@
             android:id="@+id/tilAddress"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            app:boxBackgroundColor="@color/backgroundLightGray"
             app:errorIconDrawable="@null"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
+            style="@style/SecondaryTextInputLayout"
             app:layout_constraintTop_toTopOf="parent">
 
             <com.tangem.tap.features.send.ui.EditTextCustomPaste
                 android:id="@+id/etAddress"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/backgroundLightGray"
                 android:ellipsize="middle"
                 android:inputType="textNoSuggestions"
                 android:paddingStart="0dp"
                 android:paddingEnd="98dp"
                 android:singleLine="true"
                 android:textSize="16sp"
+                android:background="@color/background_secondary"
+                android:textColor="@color/text_primary_1"
                 tools:text="139mrsJgyWnJ **** y9BV" />
 
         </com.google.android.material.textfield.TextInputLayout>
@@ -67,10 +68,10 @@
             android:id="@+id/flQrCode"
             android:layout_width="@dimen/btn_rounded_size"
             android:layout_height="@dimen/btn_rounded_size"
-            android:layout_marginTop="10dp"
             android:background="@drawable/shape_ellipse"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/tilAddress">
+            android:layout_marginTop="4dp"
+            app:layout_constraintTop_toTopOf="parent">
 
             <ImageView
                 android:id="@+id/imvQrCode"
@@ -108,14 +109,15 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/send_extras_hint_memo"
-                app:boxBackgroundColor="@color/backgroundLightGray"
+                style="@style/SecondaryTextInputLayout"
                 app:errorIconDrawable="@null">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/etXlmMemo"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/backgroundLightGray"
+                    android:background="@color/background_secondary"
+                    android:textColor="@color/text_primary_1"
                     android:ellipsize="middle"
                     android:inputType="text|textNoSuggestions"
                     android:paddingStart="0dp"
@@ -140,14 +142,15 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/send_extras_hint_memo"
-                app:boxBackgroundColor="@color/backgroundLightGray"
+                style="@style/SecondaryTextInputLayout"
                 app:errorIconDrawable="@null">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/etBinanceMemo"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/backgroundLightGray"
+                    android:background="@color/background_secondary"
+                    android:textColor="@color/text_primary_1"
                     android:ellipsize="end"
                     android:inputType="number"
                     android:paddingStart="0dp"
@@ -172,14 +175,15 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/send_extras_hint_destination_tag"
-                app:boxBackgroundColor="@color/backgroundLightGray"
+                style="@style/SecondaryTextInputLayout"
                 app:errorIconDrawable="@null">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/etDestinationTag"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/backgroundLightGray"
+                    android:background="@color/background_secondary"
+                    android:textColor="@color/text_primary_1"
                     android:ellipsize="end"
                     android:inputType="number"
                     android:paddingStart="0dp"
@@ -204,14 +208,15 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/send_extras_hint_memo"
-                app:boxBackgroundColor="@color/backgroundLightGray"
+                style="@style/SecondaryTextInputLayout"
                 app:errorIconDrawable="@null">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/etTonMemo"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/backgroundLightGray"
+                    android:background="@color/background_secondary"
+                    android:textColor="@color/text_primary_1"
                     android:ellipsize="end"
                     android:paddingStart="0dp"
                     android:paddingEnd="0dp"
@@ -235,14 +240,15 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/send_extras_hint_memo"
-                app:boxBackgroundColor="@color/backgroundLightGray"
+                style="@style/SecondaryTextInputLayout"
                 app:errorIconDrawable="@null">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/etCosmosMemo"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/backgroundLightGray"
+                    android:background="@color/background_secondary"
+                    android:textColor="@color/text_primary_1"
                     android:ellipsize="end"
                     android:paddingStart="0dp"
                     android:paddingEnd="0dp"
diff --git a/app/src/main/res/layout/layout_send_amount.xml b/app/src/main/res/layout/layout_send_amount.xml
index d53d8eed53..fb744b5755 100644
--- a/app/src/main/res/layout/layout_send_amount.xml
+++ b/app/src/main/res/layout/layout_send_amount.xml
@@ -44,20 +44,21 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
-            app:boxBackgroundColor="@color/backgroundLightGray"
+            style="@style/SecondaryTextInputLayout"
             app:errorIconDrawable="@null">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/etAmountToSend"
+                android:background="@color/background_secondary"
                 android:layout_width="match_parent"
                 android:layout_height="82dp"
-                android:background="@color/backgroundLightGray"
                 android:fontFamily="sans-serif-light"
                 android:imeOptions="actionDone"
                 android:inputType="numberDecimal"
                 android:paddingStart="0dp"
                 android:paddingEnd="96dp"
                 android:textSize="@dimen/text_size_amount_to_send"
+                android:textColor="@color/text_primary_1"
                 tools:text="139" />
 
         </com.google.android.material.textfield.TextInputLayout>
@@ -74,7 +75,7 @@
         android:drawablePadding="10dp"
         android:fontFamily="sans-serif-light"
         android:textAllCaps="true"
-        android:textColor="@color/blue"
+        android:textColor="@color/accent"
         android:textSize="32sp"
         app:drawableEndCompat="@drawable/ic_arrows_up_down"
         app:layout_constraintEnd_toEndOf="parent"
@@ -88,7 +89,7 @@
         android:layout_gravity="end"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
-        android:textColor="@color/darkGray1"
+        android:textColor="@color/text_tertiary"
         android:textSize="16sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/flAmountToSend" />
diff --git a/app/src/main/res/layout/layout_send_fee.xml b/app/src/main/res/layout/layout_send_fee.xml
index f54f8f8bfe..bba30587f9 100644
--- a/app/src/main/res/layout/layout_send_fee.xml
+++ b/app/src/main/res/layout/layout_send_fee.xml
@@ -85,6 +85,7 @@
             android:layout_marginStart="16dp"
             android:layout_marginEnd="8dp"
             android:text="@string/send_fee_include_description"
+            android:textColor="@color/text_primary_1"
             android:textSize="13sp" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/layout_send_receipt.xml b/app/src/main/res/layout/layout_send_receipt.xml
index 2cf18b1ed5..4a8fab6816 100644
--- a/app/src/main/res/layout/layout_send_receipt.xml
+++ b/app/src/main/res/layout/layout_send_receipt.xml
@@ -34,7 +34,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="@string/send_fee_label"
-        android:textColor="@color/darkGray1"
+        android:textColor="@color/text_tertiary"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvReceiptAmount" />
@@ -59,7 +59,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end"
         android:textAllCaps="true"
-        android:textColor="@color/darkGray1"
+        android:textColor="@color/text_tertiary"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/tvReceiptFee"
diff --git a/app/src/main/res/layout/layout_single_wallet_balance.xml b/app/src/main/res/layout/layout_single_wallet_balance.xml
index 984d73bf24..c3a75693bc 100644
--- a/app/src/main/res/layout/layout_single_wallet_balance.xml
+++ b/app/src/main/res/layout/layout_single_wallet_balance.xml
@@ -29,78 +29,73 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <com.skydoves.androidveil.VeilLayout
-            android:id="@+id/veil_balance"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            app:layout_constraintBottom_toTopOf="@id/tv_processing"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_title"
-            app:veilLayout_baseColor="@color/lightGray0"
-            app:veilLayout_highlightColor="@color/lightGray1"
-            app:veilLayout_layout="@layout/card_total_balance_shimmer"
-            app:veilLayout_radius="4dp"
-            app:veilLayout_shimmerEnable="true"
-            app:veilLayout_veiled="true"
-            tools:veilLayout_veiled="false">
-
-            <TextView
-                android:id="@+id/tv_balance"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxLines="1"
-                android:minWidth="152dp"
-                android:textColor="@color/text_primary_1"
-                android:textSize="24sp"
-                android:textStyle="bold"
-                tools:text="22 325.40 $" />
-
-        </com.skydoves.androidveil.VeilLayout>
-
-        <com.skydoves.androidveil.VeilLayout
-            android:id="@+id/veil_balance_crypto"
-            android:layout_width="wrap_content"
-            android:layout_height="18dp"
-            android:layout_marginTop="4dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/veil_balance"
-            app:veilLayout_baseColor="@color/lightGray0"
-            app:veilLayout_highlightColor="@color/lightGray1"
-            app:veilLayout_layout="@layout/card_total_balance_shimmer"
-            app:veilLayout_radius="4dp"
-            app:veilLayout_shimmerEnable="true"
-            app:veilLayout_veiled="true"
-            tools:veilLayout_veiled="false"
-            tools:visibility="visible">
-
-            <TextView
-                android:id="@+id/tv_balance_crypto"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:maxLines="1"
-                android:minWidth="152dp"
-                android:textColor="@color/text_tertiary"
-                android:textSize="12sp"
-                tools:text="5.13123123123 ETH"
-                tools:visibility="visible" />
-
-        </com.skydoves.androidveil.VeilLayout>
-
-        <TextView
-            android:id="@+id/tv_processing"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
-            android:text="@string/wallet_balance_blockchain_unreachable"
-            android:textColor="@color/warning"
-            android:textSize="12sp"
-            android:visibility="gone"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/veil_balance"
-            tools:visibility="visible" />
+        <!--TODO: Delete with WalletFeatureToggles-->
+        <!--<com.skydoves.androidveil.VeilLayout-->
+        <!--    android:id="@+id/veil_balance"-->
+        <!--    android:layout_width="0dp"-->
+        <!--    android:layout_height="wrap_content"-->
+        <!--    android:layout_marginTop="4dp"-->
+        <!--    app:layout_constraintBottom_toTopOf="@id/tv_processing"-->
+        <!--    app:layout_constraintEnd_toEndOf="parent"-->
+        <!--    app:layout_constraintStart_toStartOf="parent"-->
+        <!--    app:layout_constraintTop_toBottomOf="@id/tv_title"-->
+        <!--    app:veilLayout_baseColor="@color/lightGray0"-->
+        <!--    app:veilLayout_highlightColor="@color/lightGray1"-->
+        <!--    app:veilLayout_layout="@layout/card_total_balance_shimmer"-->
+        <!--    app:veilLayout_radius="4dp"-->
+        <!--    app:veilLayout_shimmerEnable="true"-->
+        <!--    app:veilLayout_veiled="true"-->
+        <!--    tools:veilLayout_veiled="false">-->
+        <!--    <TextView-->
+        <!--        android:id="@+id/tv_balance"-->
+        <!--        android:layout_width="wrap_content"-->
+        <!--        android:layout_height="wrap_content"-->
+        <!--        android:maxLines="1"-->
+        <!--        android:minWidth="152dp"-->
+        <!--        android:textColor="@color/text_primary_1"-->
+        <!--        android:textSize="24sp"-->
+        <!--        android:textStyle="bold"-->
+        <!--        tools:text="22 325.40 $" />-->
+        <!--</com.skydoves.androidveil.VeilLayout>-->
+        <!-- <com.skydoves.androidveil.VeilLayout
+             android:id="@+id/veil_balance_crypto"
+             android:layout_width="wrap_content"
+             android:layout_height="18dp"
+             android:layout_marginTop="4dp"
+             app:layout_constraintStart_toStartOf="parent"
+             app:layout_constraintTop_toBottomOf="@id/veil_balance"
+             app:veilLayout_baseColor="@color/lightGray0"
+             app:veilLayout_highlightColor="@color/lightGray1"
+             app:veilLayout_layout="@layout/card_total_balance_shimmer"
+             app:veilLayout_radius="4dp"
+             app:veilLayout_shimmerEnable="true"
+             app:veilLayout_veiled="true"
+             tools:veilLayout_veiled="false"
+             tools:visibility="visible">
+             <TextView
+                 android:id="@+id/tv_balance_crypto"
+                 android:layout_width="wrap_content"
+                 android:layout_height="wrap_content"
+                 android:layout_marginTop="2dp"
+                 android:maxLines="1"
+                 android:minWidth="152dp"
+                 android:textColor="@color/text_tertiary"
+                 android:textSize="12sp"
+                 tools:text="5.13123123123 ETH"
+                 tools:visibility="visible" />
+         </com.skydoves.androidveil.VeilLayout>-->
+        <!--<TextView-->
+        <!--    android:id="@+id/tv_processing"-->
+        <!--    android:layout_width="wrap_content"-->
+        <!--    android:layout_height="wrap_content"-->
+        <!--    android:layout_marginTop="2dp"-->
+        <!--    android:text="@string/wallet_balance_blockchain_unreachable"-->
+        <!--    android:textColor="@color/warning"-->
+        <!--    android:textSize="12sp"-->
+        <!--    android:visibility="gone"-->
+        <!--    app:layout_constraintStart_toStartOf="parent"-->
+        <!--    app:layout_constraintTop_toBottomOf="@id/veil_balance"-->
+        <!--    tools:visibility="visible" />-->
 
         <TextView
             android:id="@+id/tv_currency_name"
diff --git a/app/src/main/res/layout/layout_wallet_backup_warning.xml b/app/src/main/res/layout/layout_wallet_backup_warning.xml
index 119ab12734..4fb8f8360e 100644
--- a/app/src/main/res/layout/layout_wallet_backup_warning.xml
+++ b/app/src/main/res/layout/layout_wallet_backup_warning.xml
@@ -16,53 +16,53 @@
                 android:id="@+id/iv_warning_icon"
                 android:layout_width="42dp"
                 android:layout_height="42dp"
-                android:paddingBottom="4dp"
-                android:src="@drawable/img_warning_triangle_24"
-                android:scaleType="center"
-                android:background="@drawable/shape_ellipse"
-                android:backgroundTint="@color/buttonGray"
-                android:contentDescription="@null"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
+            android:paddingBottom="4dp"
+            android:src="@drawable/img_warning_triangle_24"
+            android:scaleType="center"
+            android:background="@drawable/shape_ellipse"
+            android:backgroundTint="@color/buttonGray"
+            android:contentDescription="@null"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
-        <TextView
-                android:id="@+id/tv_warning_title"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="16dp"
-                android:textSize="14sp"
-                android:textColor="@color/textBlack"
-                android:textStyle="bold"
-                android:text="@string/main_no_backup_warning_title"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintStart_toEndOf="@id/iv_warning_icon"
-                app:layout_constraintBottom_toTopOf="@id/tv_warning_subtitle"
-                app:layout_constraintEnd_toStartOf="@id/iv_warning_end_icon" />
-
-        <TextView
-                android:id="@+id/tv_warning_subtitle"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:textSize="12sp"
-                android:textColor="@color/iconGray"
-                android:text="@string/main_no_backup_warning_subtitle"
-                app:layout_constraintTop_toBottomOf="@id/tv_warning_title"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="@id/tv_warning_title"
-                app:layout_constraintEnd_toEndOf="@id/tv_warning_title" />
+        <!-- TODO: Delete with WalletFeatureToggles -->
+        <!--<TextView-->
+        <!--        android:id="@+id/tv_warning_title"-->
+        <!--        android:layout_width="0dp"-->
+        <!--        android:layout_height="wrap_content"-->
+        <!--        android:layout_marginStart="8dp"-->
+        <!--        android:layout_marginEnd="16dp"-->
+        <!--        android:textSize="14sp"-->
+        <!--        android:textColor="@color/textBlack"-->
+        <!--        android:textStyle="bold"-->
+        <!--        android:text="@string/main_no_backup_warning_title"-->
+        <!--        app:layout_constraintTop_toTopOf="parent"-->
+        <!--        app:layout_constraintStart_toEndOf="@id/iv_warning_icon"-->
+        <!--        app:layout_constraintBottom_toTopOf="@id/tv_warning_subtitle"-->
+        <!--        app:layout_constraintEnd_toStartOf="@id/iv_warning_end_icon" />-->
+        <!--<TextView-->
+        <!--        android:id="@+id/tv_warning_subtitle"-->
+        <!--        android:layout_width="0dp"-->
+        <!--        android:layout_height="wrap_content"-->
+        <!--        android:layout_marginTop="4dp"-->
+        <!--        android:textSize="12sp"-->
+        <!--        android:textColor="@color/iconGray"-->
+        <!--        android:text="@string/main_no_backup_warning_subtitle"-->
+        <!--        app:layout_constraintTop_toBottomOf="@id/tv_warning_title"-->
+        <!--        app:layout_constraintBottom_toBottomOf="parent"-->
+        <!--        app:layout_constraintStart_toStartOf="@id/tv_warning_title"-->
+        <!--        app:layout_constraintEnd_toEndOf="@id/tv_warning_title" />-->
 
         <ImageView
-                android:id="@+id/iv_warning_end_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_arrow_angle_right"
-                android:contentDescription="@null"
-                app:tint="@color/darkGray1"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
+            android:id="@+id/iv_warning_end_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_arrow_angle_right"
+            android:contentDescription="@null"
+            app:tint="@color/darkGray1"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" />
 
 
diff --git a/app/src/main/res/layout/layout_warning_card_action.xml b/app/src/main/res/layout/layout_warning_card_action.xml
index e85e77d3e5..bbb58fab01 100644
--- a/app/src/main/res/layout/layout_warning_card_action.xml
+++ b/app/src/main/res/layout/layout_warning_card_action.xml
@@ -45,17 +45,18 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/warning_content_container" />
 
-        <Button
-            android:id="@+id/btn_can_be_better"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="-16dp"
-            android:text="@string/warning_button_can_be_better"
-            android:textAllCaps="false"
-            android:textColor="@android:color/white"
-            app:layout_constraintEnd_toStartOf="@+id/btn_really_cool"
-            app:layout_constraintTop_toBottomOf="@+id/warning_content_container" />
+        <!--TODO: Delete with WalletFeatureToggles-->
+        <!--<Button-->
+        <!--    android:id="@+id/btn_can_be_better"-->
+        <!--    style="@style/Widget.AppCompat.Button.Borderless"-->
+        <!--    android:layout_width="wrap_content"-->
+        <!--    android:layout_height="wrap_content"-->
+        <!--    android:layout_marginTop="-16dp"-->
+        <!--    android:text="@string/warning_button_can_be_better"-->
+        <!--    android:textAllCaps="false"-->
+        <!--    android:textColor="@android:color/white"-->
+        <!--    app:layout_constraintEnd_toStartOf="@+id/btn_really_cool"-->
+        <!--    app:layout_constraintTop_toBottomOf="@+id/warning_content_container" />-->
 
         <Button
             android:id="@+id/btn_really_cool"
diff --git a/app/src/main/res/layout/lp_onboarding_create_wallet.xml b/app/src/main/res/layout/lp_onboarding_create_wallet.xml
index 68e87f3e61..85bf7d1c41 100644
--- a/app/src/main/res/layout/lp_onboarding_create_wallet.xml
+++ b/app/src/main/res/layout/lp_onboarding_create_wallet.xml
@@ -104,15 +104,39 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
 
-    <androidx.appcompat.widget.AppCompatImageView
+    <FrameLayout
         android:id="@+id/imv_activation_success"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_activation_success"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:background="@android:color/transparent"
         android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="@+id/imv_card_background"
         app:layout_constraintEnd_toEndOf="@+id/imv_card_background"
         app:layout_constraintStart_toStartOf="@+id/imv_card_background"
-        app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
+        app:layout_constraintTop_toBottomOf="@+id/imv_card_background">
+
+        <View
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center"
+            android:background="@drawable/shape_success_circle"
+            android:backgroundTint="@color/background_primary" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/imv_success_middle"
+            android:layout_width="55dp"
+            android:layout_height="55dp"
+            android:layout_gravity="center"
+            android:background="@android:color/transparent"
+            android:src="@drawable/img_onboarding_success" />
+
+        <View
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center"
+            android:alpha="0.2"
+            android:background="@drawable/shape_success_circle"
+            android:backgroundTint="@color/accent" />
+    </FrameLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/lp_onboarding_done.xml b/app/src/main/res/layout/lp_onboarding_done.xml
index 8f7be0c671..a5db6527a8 100644
--- a/app/src/main/res/layout/lp_onboarding_done.xml
+++ b/app/src/main/res/layout/lp_onboarding_done.xml
@@ -105,14 +105,33 @@
         app:layout_constraintStart_toStartOf="@+id/imv_card_background"
         app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
 
-    <androidx.appcompat.widget.AppCompatImageView
+    <FrameLayout
         android:id="@+id/imv_activation_success"
         android:layout_width="142dp"
         android:layout_height="142dp"
+        android:background="@android:color/transparent"
         android:layout_marginTop="@dimen/onboarding_card_margin_top"
-        android:src="@drawable/ic_activation_success"
+        android:src="@drawable/img_onboarding_success"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/pb_state" />
+        app:layout_constraintTop_toBottomOf="@+id/pb_state">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/imv_success_middle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="@android:color/transparent"
+            android:src="@drawable/img_onboarding_success" />
+
+        <View
+            android:layout_width="142dp"
+            android:layout_height="142dp"
+            android:layout_gravity="center"
+            android:alpha="0.2"
+            android:background="@drawable/shape_success_circle"
+            android:backgroundTint="@color/accent" />
+
+    </FrameLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/lp_onboarding_done_activation.xml b/app/src/main/res/layout/lp_onboarding_done_activation.xml
index 02512421c5..b1517de7c9 100644
--- a/app/src/main/res/layout/lp_onboarding_done_activation.xml
+++ b/app/src/main/res/layout/lp_onboarding_done_activation.xml
@@ -104,14 +104,39 @@
         app:layout_constraintStart_toStartOf="@+id/imv_card_background"
         app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
 
-    <androidx.appcompat.widget.AppCompatImageView
+    <FrameLayout
         android:id="@+id/imv_activation_success"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_activation_success"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:background="@android:color/transparent"
         app:layout_constraintBottom_toBottomOf="@+id/imv_card_background"
         app:layout_constraintEnd_toEndOf="@+id/imv_card_background"
         app:layout_constraintStart_toStartOf="@+id/imv_card_background"
-        app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
+        app:layout_constraintTop_toBottomOf="@+id/imv_card_background">
+
+        <View
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center"
+            android:background="@drawable/shape_success_circle"
+            android:backgroundTint="@color/background_primary" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/imv_success_middle"
+            android:layout_width="55dp"
+            android:layout_height="55dp"
+            android:layout_gravity="center"
+            android:background="@android:color/transparent"
+            android:src="@drawable/img_onboarding_success" />
+
+        <View
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center"
+            android:alpha="0.2"
+            android:background="@drawable/shape_success_circle"
+            android:backgroundTint="@color/accent" />
+
+    </FrameLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/lp_onboarding_done_activation_twins.xml b/app/src/main/res/layout/lp_onboarding_done_activation_twins.xml
index c465795c75..31a41e9321 100644
--- a/app/src/main/res/layout/lp_onboarding_done_activation_twins.xml
+++ b/app/src/main/res/layout/lp_onboarding_done_activation_twins.xml
@@ -103,14 +103,39 @@
         app:layout_constraintStart_toStartOf="@+id/imv_card_background"
         app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
 
-    <androidx.appcompat.widget.AppCompatImageView
+
+    <FrameLayout
         android:id="@+id/imv_activation_success"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_activation_success"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
         app:layout_constraintBottom_toBottomOf="@+id/imv_card_background"
         app:layout_constraintEnd_toEndOf="@+id/imv_card_background"
         app:layout_constraintStart_toStartOf="@+id/imv_card_background"
-        app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
+        app:layout_constraintTop_toBottomOf="@+id/imv_card_background">
+
+        <View
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center"
+            android:background="@drawable/shape_success_circle"
+            android:backgroundTint="@color/background_primary" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/imv_success_middle"
+            android:layout_width="55dp"
+            android:layout_height="55dp"
+            android:layout_gravity="center"
+            android:background="@android:color/transparent"
+            android:src="@drawable/img_onboarding_success" />
+
+        <View
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center"
+            android:alpha="0.2"
+            android:background="@drawable/shape_success_circle"
+            android:backgroundTint="@color/accent" />
+
+    </FrameLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/lp_onboarding_topup_wallet.xml b/app/src/main/res/layout/lp_onboarding_topup_wallet.xml
index e4e5587025..6d4f2d8ee5 100644
--- a/app/src/main/res/layout/lp_onboarding_topup_wallet.xml
+++ b/app/src/main/res/layout/lp_onboarding_topup_wallet.xml
@@ -30,7 +30,7 @@
         android:layout_marginTop="@dimen/onboarding_square_background_margin_top"
         android:layout_marginEnd="32dp"
         android:background="@drawable/shape_rectangle_rounded_8"
-        android:backgroundTint="@color/lightGray0"
+        android:backgroundTint="@color/onboarding_card_background"
         android:elevation="0dp"
         android:scaleType="fitCenter"
         app:layout_constraintEnd_toEndOf="parent"
@@ -102,15 +102,40 @@
         app:layout_constraintStart_toStartOf="@+id/imv_card_background"
         app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
 
-    <androidx.appcompat.widget.AppCompatImageView
+    <FrameLayout
         android:id="@+id/imv_activation_success"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_activation_success"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:background="@android:color/transparent"
         android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="@+id/imv_card_background"
         app:layout_constraintEnd_toEndOf="@+id/imv_card_background"
         app:layout_constraintStart_toStartOf="@+id/imv_card_background"
-        app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
+        app:layout_constraintTop_toBottomOf="@+id/imv_card_background">
+
+        <View
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center"
+            android:background="@drawable/shape_success_circle"
+            android:backgroundTint="@color/background_primary" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/imv_success_middle"
+            android:layout_width="55dp"
+            android:layout_height="55dp"
+            android:layout_gravity="center"
+            android:background="@android:color/transparent"
+            android:src="@drawable/img_onboarding_success" />
+
+        <View
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center"
+            android:alpha="0.2"
+            android:background="@drawable/shape_success_circle"
+            android:backgroundTint="@color/accent" />
+    </FrameLayout>
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/lp_onboarding_topup_wallet_twins.xml b/app/src/main/res/layout/lp_onboarding_topup_wallet_twins.xml
index 66351f4062..2a0c9ed3ba 100644
--- a/app/src/main/res/layout/lp_onboarding_topup_wallet_twins.xml
+++ b/app/src/main/res/layout/lp_onboarding_topup_wallet_twins.xml
@@ -30,7 +30,7 @@
         android:layout_marginTop="@dimen/onboarding_square_background_margin_top"
         android:layout_marginEnd="32dp"
         android:background="@drawable/shape_rectangle_rounded_8"
-        android:backgroundTint="@color/lightGray0"
+        android:backgroundTint="@color/onboarding_card_background"
         android:elevation="0dp"
         android:scaleType="fitCenter"
         app:layout_constraintEnd_toEndOf="parent"
@@ -102,15 +102,40 @@
         app:layout_constraintStart_toStartOf="@+id/imv_card_background"
         app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
 
-    <androidx.appcompat.widget.AppCompatImageView
+    <FrameLayout
         android:id="@+id/imv_activation_success"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_activation_success"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:background="@android:color/transparent"
         android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="@+id/imv_card_background"
         app:layout_constraintEnd_toEndOf="@+id/imv_card_background"
         app:layout_constraintStart_toStartOf="@+id/imv_card_background"
-        app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
+        app:layout_constraintTop_toBottomOf="@+id/imv_card_background">
+
+        <View
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center"
+            android:background="@drawable/shape_success_circle"
+            android:backgroundTint="@color/background_primary" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/imv_success_middle"
+            android:layout_width="55dp"
+            android:layout_height="55dp"
+            android:layout_gravity="center"
+            android:background="@android:color/transparent"
+            android:src="@drawable/img_onboarding_success" />
+
+        <View
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center"
+            android:alpha="0.2"
+            android:background="@drawable/shape_success_circle"
+            android:backgroundTint="@color/accent" />
+
+    </FrameLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/test_leapfrog_fragment.xml b/app/src/main/res/layout/test_leapfrog_fragment.xml
index 52b720ad27..9e0865e85a 100644
--- a/app/src/main/res/layout/test_leapfrog_fragment.xml
+++ b/app/src/main/res/layout/test_leapfrog_fragment.xml
@@ -4,7 +4,7 @@
     android:id="@+id/coordinator_onboarding"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/backgroundWhite"
+    android:background="@color/background_primary"
     android:clipChildren="false"
     android:fitsSystemWindows="true"
     android:orientation="vertical">
diff --git a/app/src/main/res/layout/view_bg_twins_welcome.xml b/app/src/main/res/layout/view_bg_twins_welcome.xml
index acfee09420..f9a713eab6 100644
--- a/app/src/main/res/layout/view_bg_twins_welcome.xml
+++ b/app/src/main/res/layout/view_bg_twins_welcome.xml
@@ -11,7 +11,7 @@
         android:alpha="0.4"
         android:scaleType="fitXY"
         android:src="@drawable/shape_circle"
-        android:tint="#DEDEE0"
+        android:tint="@color/onboarding_twin_wave_1"
         android:transitionName="bg_circle_large"
         android:translationX="-272dp"
         android:translationY="-200dp"
@@ -25,7 +25,7 @@
         android:alpha="0.4"
         android:scaleType="fitXY"
         android:src="@drawable/shape_circle"
-        android:tint="#DCDCDC"
+        android:tint="@color/onboarding_twin_wave_2"
         android:transitionName="bg_circle_medium"
         android:translationX="-254dp"
         android:translationY="-269dp"
@@ -39,7 +39,7 @@
         android:alpha="0.4"
         android:scaleType="fitXY"
         android:src="@drawable/shape_circle"
-        android:tint="#D9D9D9"
+        android:tint="@color/onboarding_twin_wave_3"
         android:transitionName="bg_circle_min"
         android:translationX="-394dp"
         android:translationY="-411dp"
diff --git a/app/src/main/res/layout/view_compose_fragment.xml b/app/src/main/res/layout/view_compose_fragment.xml
deleted file mode 100644
index af9273a84d..0000000000
--- a/app/src/main/res/layout/view_compose_fragment.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/coordinator_wallet"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/backgroundLightGray"
-    android:orientation="vertical">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/app_bar"
-        style="@style/Widget.MaterialComponents.Toolbar.Surface"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/backgroundLightGray"
-        android:fitsSystemWindows="true"
-        app:liftOnScroll="true">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            app:navigationIcon="@drawable/ic_baseline_arrow_back_24" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.compose.ui.platform.ComposeView
-        android:id="@+id/view_compose"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/view_currency_icon.xml b/app/src/main/res/layout/view_currency_icon.xml
index aa1330c398..7e76b227e7 100644
--- a/app/src/main/res/layout/view_currency_icon.xml
+++ b/app/src/main/res/layout/view_currency_icon.xml
@@ -45,7 +45,7 @@
         android:layout_width="18dp"
         android:layout_height="18dp"
         android:background="@drawable/shape_circle"
-        android:backgroundTint="@color/backgroundWhite"
+        android:backgroundTint="@color/background_primary"
         android:contentDescription="@null"
         android:padding="2dp"
         android:visibility="gone"
diff --git a/app/src/main/res/layout/view_onboarding_progress.xml b/app/src/main/res/layout/view_onboarding_progress.xml
index 1d840e7958..696a282eda 100644
--- a/app/src/main/res/layout/view_onboarding_progress.xml
+++ b/app/src/main/res/layout/view_onboarding_progress.xml
@@ -7,6 +7,6 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
-        android:progressBackgroundTint="#32000000"
-        android:progressTint="@color/background_action" />
+        android:progressBackgroundTint="@color/icon_informative"
+        android:progressTint="@color/icon_primary_1" />
 </merge>
diff --git a/app/src/main/res/layout/view_onboarding_refresh_balance.xml b/app/src/main/res/layout/view_onboarding_refresh_balance.xml
index 88daba2ce2..1bf18a57ac 100644
--- a/app/src/main/res/layout/view_onboarding_refresh_balance.xml
+++ b/app/src/main/res/layout/view_onboarding_refresh_balance.xml
@@ -11,6 +11,7 @@
         android:id="@+id/imv_bg_circle"
         android:layout_width="60dp"
         android:layout_height="60dp"
+        android:layout_gravity="center"
         android:src="@drawable/shape_refresh_button" />
 
     <ViewSwitcher
@@ -30,6 +31,7 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_gravity="center"
+                android:tint="@color/icon_primary_1"
                 android:src="@drawable/ic_arrow_refresh" />
         </FrameLayout>
 
@@ -39,23 +41,9 @@
             android:layout_height="24dp"
             android:layout_gravity="center"
             android:indeterminate="true"
-            app:indicatorColor="@android:color/black"
+            app:indicatorColor="@color/icon_primary_1"
             app:indicatorSize="23dp"
             app:trackThickness="1.8dp" />
 
-        <!--        <ProgressBar-->
-        <!--            android:id="@+id/imv_progress"-->
-        <!--            android:layout_width="30dp"-->
-        <!--            android:layout_height="30dp"-->
-        <!--            android:indeterminateTint="@android:color/black"-->
-        <!--            android:indeterminate="true" />-->
-
-        <!--        <androidx.appcompat.widget.AppCompatImageView-->
-        <!--            android:id="@+id/imv_progress"-->
-        <!--            android:layout_width="30dp"-->
-        <!--            android:layout_height="30dp"-->
-        <!--            android:layout_gravity="center"-->
-        <!--            android:src="@drawable/ic_progress_balance" />-->
-
     </ViewSwitcher>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_onboarding_tv_balance.xml b/app/src/main/res/layout/view_onboarding_tv_balance.xml
index 84aceb28fa..f421e4d992 100644
--- a/app/src/main/res/layout/view_onboarding_tv_balance.xml
+++ b/app/src/main/res/layout/view_onboarding_tv_balance.xml
@@ -14,7 +14,7 @@
         android:letterSpacing="0.036"
         android:text="@string/onboarding_balance_title"
         android:textAllCaps="true"
-        android:textColor="#ABABAB"
+        android:textColor="@color/text_secondary"
         android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -31,6 +31,7 @@
         android:maxLines="1"
         android:textSize="28sp"
         android:textStyle="bold"
+        android:textColor="@color/text_primary_1"
         app:layout_constraintEnd_toStartOf="@+id/tv_balance_currency"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintHorizontal_chainStyle="packed"
@@ -45,6 +46,7 @@
         android:letterSpacing="0.036"
         android:textSize="28sp"
         android:textStyle="bold"
+        android:textColor="@color/text_primary_1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/tv_balance_value"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 9be291c700..29535c674f 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -2,32 +2,37 @@
 <resources>
 
 
-    <!--<color name="background_action">#C9C9C9</color>-->
+    <color name="background_action">#303030</color>
     <!--<color name="background_plain">#000000</color>-->
-    <!--<color name="background_primary">#1E1E1E</color>-->
-    <!--<color name="background_secondary">#000000</color>-->
+    <color name="background_primary">#1E1E1E</color>
+    <color name="background_secondary">#000000</color>
 
-    <!--<color name="button_disabled">#1E1E1E</color>-->
+    <color name="button_disabled">#303030</color>
     <!--<color name="button_positive">#1ACE80</color>-->
     <!--<color name="button_positive_disabled">#06311F</color>-->
-    <!--<color name="button_primary">#F5F5F5</color>-->
-    <!--<color name="button_secondary">#303030</color>-->
+    <color name="button_primary">#F5F5F5</color>
+    <color name="button_secondary">#303030</color>
 
-    <!--<color name="control_checked">#1ACE80</color>-->
+    <color name="control_checked">#1ACE80</color>
     <!--<color name="control_key">#F5F5F5</color>-->
     <!--<color name="control_unchecked">#3B3B3B</color>-->
 
     <!--<color name="field_focused">#3B3B3B</color>-->
     <!--<color name="field_primary">#303030</color>-->
 
-    <!--<color name="icon_accent">#1ACE80</color>-->
-    <!--<color name="icon_attention">#FFB71B</color>-->
-    <!--<color name="icon_inactive">#3B3B3B</color>-->
-    <!--<color name="icon_informative">#656565</color>-->
-    <!--<color name="icon_primary_1">#FFFFFF</color>-->
-    <!--<color name="icon_primary_2">#1E1E1E</color>-->
-    <!--<color name="icon_secondary">#919191</color>-->
-    <!--<color name="icon_warning">#DE1010</color>-->
+    <color name="onboarding_card_background">#3B3B3B</color>
+    <color name="onboarding_twin_wave_1">#3E3E3E</color>
+    <color name="onboarding_twin_wave_2">#404040</color>
+    <color name="onboarding_twin_wave_3">#444444</color>
+
+    <color name="icon_accent">#1ACE80</color>
+    <color name="icon_attention">#FFB71B</color>
+    <color name="icon_inactive">#3B3B3B</color>
+    <color name="icon_informative">#656565</color>
+    <color name="icon_primary_1">#FFFFFF</color>
+    <color name="icon_primary_2">#1E1E1E</color>
+    <color name="icon_secondary">#919191</color>
+    <color name="icon_warning">#FF5B5B</color>
 
 
     <!--<color name="stroke_primary">#303030</color>-->
@@ -36,13 +41,18 @@
 
 
     <!--<color name="text_accent">#1ACE80</color>-->
-    <!--<color name="text_attention">#FFB71B</color>-->
+    <color name="text_attention">#FFB71B</color>
     <!--<color name="text_constant_white">#FFFFFF</color>-->
-    <!--<color name="text_disabled">#494949</color>-->
-    <!--<color name="text_primary_1">#FFFFFF</color>-->
-    <!--<color name="text_primary_2">#1E1E1E</color>-->
-    <!--<color name="text_secondary">#B0B0B0</color>-->
-    <!--<color name="text_tertiary">#919191</color>-->
+    <color name="text_disabled">#494949</color>
+    <color name="text_primary_1">#FFFFFF</color>
+    <color name="text_primary_2">#1E1E1E</color>
+    <color name="text_secondary">#B0B0B0</color>
+    <color name="text_tertiary">#919191</color>
     <!--<color name="text_warning">#DE1010</color>-->
 
+    <color name="card_background">#333333</color>
+
+    <color name="gradient_start_color">#000000</color>
+    <color name="gradient_center_color">#0F0000</color>
+    <color name="gradient_end_color">#19000000</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3509ec1ee5..7d26f9c9d0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,7 +3,7 @@
 
     <color name="colorPrimary">#0029FF</color>
     <color name="colorSecondary">#0022D4</color>
-    <color name="accent">#19C878</color>
+    <color name="accent">#0099FF</color>
 
     <color name="menu_accent_color">@color/accent</color>
 
@@ -11,7 +11,7 @@
 
     <color name="warning">#FFB71B</color>
 
-    <color name="toolbarColor">@color/backgroundLightGray</color>
+    <color name="toolbarColor">@color/background_secondary</color>
 
     <color name="white">#FFFFFF</color>
     <color name="lightGray0">#F3F3F3</color>
@@ -19,12 +19,10 @@
     <color name="lightGray5">#D1D1D6</color>
     <color name="darkGray1">#8E8E90</color>
     <color name="darkGray2">#666668</color>
-    <color name="darkGray3">#48484A</color>
+
     <color name="darkGray4">#3A3A3C</color>
     <color name="darkGray6">#1C1C1E</color>
 
-    <color name="backgroundWhite">#FFFFFF</color>
-    <color name="backgroundLightGray">#F9F9F9</color>
     <color name="buttonGray">#F4F5F6</color>
     <color name="textGray">#DE000000</color>
 
@@ -38,13 +36,19 @@
     <color name="blue">@color/colorSecondary</color>
     <color name="blue_pale">#E0E6FA</color>
 
+    <color name="onboarding_card_background">#F3F3F3</color>
+    <color name="onboarding_twin_wave_1">#DDDEE0</color>
+    <color name="onboarding_twin_wave_2">#DCDCDC</color>
+    <color name="onboarding_twin_wave_3">#D9D9D9</color>
+
+
     <color name="warning_info">#1C1C1E</color>
     <color name="warning_warning">#FFB71B</color>
     <color name="warning_critical">#CA0F03</color>
 
     <color name="all_colors_azure">#007AFF</color>
 
-    <color name="background_action">#000000</color>
+    <color name="background_action">#FFFFFF</color>
     <color name="background_primary">#FFFFFF</color>
     <color name="background_secondary">#F5F5F5</color>
 
@@ -61,9 +65,10 @@
     <color name="icon_attention">#FFB71B</color>
     <color name="icon_inactive">#C9C9C9</color>
     <color name="icon_informative">#B0B0B0</color>
+    <color name="icon_primary_1">#1E1E1E</color>
     <color name="icon_primary_2">#FFFFFF</color>
     <color name="icon_secondary">#656565</color>
-    <color name="icon_warning">#DE1010</color>
+    <color name="icon_warning">#FF3333</color>
 
 
     <color name="text_attention">#FFB71B</color>
@@ -74,6 +79,11 @@
     <color name="text_tertiary">#919191</color>
 
     <color name="background_splash">#000000</color>
+    <color name="transparent">#00000000</color>
+    d
+    <color name="card_background">#1B1D1C</color>
 
-
+    <color name="gradient_start_color">#FFFFFF</color>
+    <color name="gradient_center_color">#F0FFFF</color>
+    <color name="gradient_end_color">#19FFFFFF</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9b5f1ccfa6..85b9d8134c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,17 +1,20 @@
 <resources>
-    <!-- Base application theme. -->
-    <style name="BaseAppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorSecondary">@color/colorSecondary</item>
-        <item name="android:textColor">@color/darkGray6</item>
-        <item name="actionMenuTextColor">@color/menu_accent_color</item>
+
+    <style name="BaseAppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar" />
+
+    <style name="AppTheme" parent="BaseAppTheme">
+        <item name="colorPrimary">@color/menu_accent_color</item>
+        <item name="colorSecondary">@color/menu_accent_color</item>
+        <item name="android:textColor">@color/text_primary_1</item>
+        <item name="actionMenuTextColor">@color/icon_primary_1</item>
+
+        <item name="colorControlNormal">@color/text_secondary</item>
+        <item name="colorControlActivated">@color/accent</item>
+        <item name="colorControlHighlight">@color/accent</item>
 
         <item name="materialCardViewStyle">@style/Widget.AppTheme.CardView</item>
     </style>
 
-    <style name="AppTheme" parent="BaseAppTheme" />
-
     <style name="SplashTheme" parent="Theme.SplashScreen">
         <item name="windowSplashScreenBackground">@color/background_splash</item>
         <item name="windowSplashScreenAnimatedIcon">@drawable/inset_splash</item>
@@ -23,13 +26,19 @@
     <!-- Toolbar - overrides the menu text color to use a selector that responds to whether it's enabled or not -->
     <style name="ThemeOverlay.MyTheme.Toolbar" parent="ThemeOverlay.MaterialComponents.Toolbar.Surface">
         <!-- Color used in the icons of menu actions (i.e. non-overflow menu items). This is just convention, this will affect anything that uses ?attr/colorControlNormal) -->
-        <item name="colorControlNormal">@color/menu_item_color</item>
+        <item name="colorControlNormal">@color/text_secondary</item>
         <!-- Color used in the text of menu actions (i.e. non-overflow menu items) -->
-        <item name="actionMenuTextColor">@color/menu_item_color</item>
+        <item name="actionMenuTextColor">@color/text_secondary</item>
     </style>
 
     <style name="ThemeOverlay.MyTheme.Toolbar.AccentColorMenu" parent="ThemeOverlay.MaterialComponents.Toolbar.Surface">
-        <item name="actionMenuTextColor">@color/accent</item>
+        <item name="actionMenuTextColor">@color/icon_primary_1</item>
+    </style>
+
+
+    <style name="Widget.MaterialComponents.Toolbar.PrimarySurface" parent="Widget.MaterialComponents.Toolbar.Primary">
+        <item name="titleTextColor">@color/text_primary_1</item>
+        <item name="subtitleTextColor">@color/text_secondary</item>
     </style>
 
     <!-- EditText -->
@@ -39,6 +48,16 @@
         <item name="colorPrimary">@color/accent</item>
     </style>
 
+    <style name="SecondaryTextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
+        <item name="android:textColorHint">@color/text_secondary</item>
+        <item name="boxStrokeColor">@color/selector_edit_text_secondary</item>
+        <item name="helperTextTextColor">@color/text_secondary</item>
+        <item name="boxBackgroundColor">@color/background_secondary</item>
+        <item name="colorError">@color/icon_warning</item>
+        <item name="errorTextColor">@color/icon_warning</item>
+        <item name="boxStrokeErrorColor">@color/icon_warning</item>
+    </style>
+
     <style name="BaseTapButton" parent="Widget.Material3.Button">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
@@ -90,11 +109,12 @@
     </style>
 
     <style name="TapChip" parent="@style/Widget.MaterialComponents.Chip.Choice">
-        <item name="chipBackgroundColor">@color/selector_chip_background</item>
+        <item name="chipBackgroundColor">@color/icon_primary_2</item>
         <item name="chipStrokeColor">@color/selector_chip_stroke</item>
         <item name="chipStrokeWidth">1dp</item>
         <item name="android:minWidth">100dp</item>
         <item name="android:textAlignment">center</item>
+        <item name="android:textColor">@color/selector_chip_text</item>
     </style>
 
     <style name="TextViewOnboarding">
@@ -102,32 +122,32 @@
     </style>
 
     <style name="TextViewOnboarding.Header">
-        <item name="android:textColor">#060606</item>
+        <item name="android:textColor">@color/text_primary_1</item>
         <item name="android:textSize">24sp</item>
         <item name="android:lineSpacingExtra">4sp</item>
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
 
     <style name="TextViewOnboarding.Body">
-        <item name="android:textColor">#686868</item>
+        <item name="android:textColor">@color/text_secondary</item>
         <item name="android:textSize">16sp</item>
         <item name="android:lineSpacingExtra">4sp</item>
     </style>
 
     <style name="heading">
         <item name="android:textSize">24sp</item>
-        <item name="android:textColor">#060606</item>
+        <item name="android:textColor">@color/text_primary_1</item>
     </style>
 
     <style name="title">
         <item name="android:textSize">16sp</item>
-        <item name="android:textColor">#060606</item>
+        <item name="android:textColor">@color/text_primary_1</item>
         <item name="android:textStyle">bold</item>
     </style>
 
     <style name="description">
         <item name="android:textSize">14sp</item>
-        <item name="android:textColor">#686868</item>
+        <item name="android:textColor">@color/text_secondary</item>
     </style>
 
 
@@ -152,6 +172,29 @@
     <style name="TransparentBottomSheetDialog" parent="Widget.MaterialComponents.BottomSheet">
         <item name="backgroundTint">@android:color/transparent</item>
     </style>
+
+    <style name="CustomMaterialDialog" parent="@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog">
+        <item name="android:background">@color/background_primary</item>
+        <!-- Text Color for title and message -->
+        <item name="colorOnSurface">@color/text_primary_1</item>
+        <!-- Text Color for buttons -->
+        <item name="colorPrimary">@color/accent</item>
+        <item name="colorAccent">@color/accent</item>
+    </style>
+
+    <style name="AlertDialogTheme" parent="ThemeOverlay.MaterialComponents.Dialog.Alert">
+        <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
+        <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
+        <item name="colorAccent">@color/accent</item>
+    </style>
+
+    <style name="NegativeButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
+        <item name="android:textColor">@color/accent</item>
+    </style>
+
+    <style name="PositiveButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
+        <item name="android:textColor">@color/accent</item>
+    </style>
 </resources>
 
     <!--    android:fontFamily="sans-serif"           // roboto regular  -->
diff --git a/common/src/main/java/com/tangem/common/Filter.kt b/common/src/main/java/com/tangem/common/Filter.kt
deleted file mode 100644
index 6607f4080f..0000000000
--- a/common/src/main/java/com/tangem/common/Filter.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.tangem.common
-
-/**
-[REDACTED_AUTHOR]
- */
-interface Filter<T> {
-    fun filter(value: T): Boolean
-}
\ No newline at end of file
diff --git a/common/src/main/java/com/tangem/common/Strings.kt b/common/src/main/java/com/tangem/common/Strings.kt
new file mode 100644
index 0000000000..943b0de614
--- /dev/null
+++ b/common/src/main/java/com/tangem/common/Strings.kt
@@ -0,0 +1,6 @@
+package com.tangem.common
+
+object Strings {
+
+    const val STARS = "\u2217\u2217\u2217"
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/tangem/common/Validator.kt b/common/src/main/java/com/tangem/common/Validator.kt
deleted file mode 100644
index 8654e9d07e..0000000000
--- a/common/src/main/java/com/tangem/common/Validator.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.tangem.common
-
-/**
-[REDACTED_AUTHOR]
- */
-interface Validator<Data, Error> {
-    fun validate(data: Data? = null): Error?
-}
\ No newline at end of file
diff --git a/common/src/main/java/com/tangem/common/module/ModuleMessage.kt b/common/src/main/java/com/tangem/common/module/ModuleMessage.kt
index 511ffa8d99..1f8414a0ca 100644
--- a/common/src/main/java/com/tangem/common/module/ModuleMessage.kt
+++ b/common/src/main/java/com/tangem/common/module/ModuleMessage.kt
@@ -17,11 +17,6 @@ abstract class ModuleError : Throwable(), ModuleMessage {
     abstract val data: Any?
 }
 
-/**
- * An exception marked as FbConsumeException should be submitted to Firebase.Crashlytics as a non-fatal issue.
- */
-interface FbConsumeException
-
 interface ModuleMessageConverter<ModuleMessage, R> {
     fun convert(message: ModuleMessage): R
 }
\ No newline at end of file
diff --git a/core/analytics/models/src/main/java/com/tangem/core/analytics/models/AnalyticsParam.kt b/core/analytics/models/src/main/java/com/tangem/core/analytics/models/AnalyticsParam.kt
new file mode 100644
index 0000000000..feb88dfba6
--- /dev/null
+++ b/core/analytics/models/src/main/java/com/tangem/core/analytics/models/AnalyticsParam.kt
@@ -0,0 +1,138 @@
+package com.tangem.core.analytics.models
+
+sealed class AnalyticsParam {
+
+    sealed class CardBalanceState(val value: String) {
+        object Empty : CardBalanceState("Empty")
+        object Full : CardBalanceState("Full")
+        object CustomToken : CardBalanceState("Custom token")
+        object BlockchainError : CardBalanceState("Blockchain error")
+        companion object
+    }
+
+    sealed class RateApp(val value: String) {
+        object Liked : RateApp("Liked")
+        object Disliked : RateApp("Disliked")
+        object Closed : RateApp("Close")
+    }
+
+    sealed class OnOffState(val value: String) {
+        object On : OnOffState("On")
+        object Off : OnOffState("Off")
+    }
+
+    sealed class OrganizeSortType(val value: String) {
+        object ByBalance : OrganizeSortType("By Balance")
+        object Manually : OrganizeSortType("Manually")
+    }
+
+    sealed class UserCode(val value: String) {
+        object AccessCode : UserCode("Access Code")
+        object Passcode : UserCode("Passcode")
+    }
+
+    sealed class AccessCodeRecoveryStatus(val value: String) {
+
+        val key: String = "Status"
+
+        object Enabled : AccessCodeRecoveryStatus("Enabled")
+        object Disabled : AccessCodeRecoveryStatus("Disabled")
+
+        companion object {
+            fun from(enabled: Boolean): AccessCodeRecoveryStatus {
+                return if (enabled) Enabled else Disabled
+            }
+        }
+    }
+
+    sealed class Error(val value: String) {
+        object App : Error("App Error")
+        object CardSdk : Error("Card Sdk Error")
+        object BlockchainSdk : Error("Blockchain Sdk Error")
+    }
+
+    sealed class ScannedFrom(val value: String) {
+        object Introduction : ScannedFrom("Introduction")
+        object Main : ScannedFrom("Main")
+        object SignIn : ScannedFrom("Sign In")
+        object MyWallets : ScannedFrom("My Wallets")
+    }
+
+    sealed class TxSentFrom(val value: String) {
+        data class Send(
+            override val blockchain: String,
+            override val token: String,
+            override val feeType: FeeType,
+        ) : TxSentFrom("Send"), TxData
+
+        data class Swap(
+            override val blockchain: String,
+            override val token: String,
+            override val feeType: FeeType,
+        ) : TxSentFrom("Swap"), TxData
+
+        data class Approve(
+            override val blockchain: String,
+            override val token: String,
+            override val feeType: FeeType,
+            val permissionType: String,
+        ) : TxSentFrom("Approve"), TxData
+
+        object WalletConnect : TxSentFrom("WalletConnect")
+        object Sell : TxSentFrom("Sell")
+    }
+
+    sealed interface TxData {
+        val blockchain: String
+        val token: String
+        val feeType: FeeType
+    }
+
+    sealed class FeeType(val value: String) {
+        object Fixed : FeeType("Fixed")
+        object Min : FeeType("Min")
+        object Normal : FeeType("Normal")
+        object Max : FeeType("Max")
+
+        companion object {
+            fun fromString(feeType: String): FeeType {
+                return when (feeType) {
+                    Min.value -> Min
+                    Normal.value -> Normal
+                    Max.value -> Max
+                    Fixed.value -> Fixed
+                    else -> Fixed
+                }
+            }
+        }
+    }
+
+    sealed class WalletCreationType(val value: String) {
+        object PrivateKey : WalletCreationType("Private key")
+        object NewSeed : WalletCreationType("New seed")
+        object SeedImport : WalletCreationType("Seed import")
+    }
+
+    companion object Key {
+        const val BLOCKCHAIN = "blockchain"
+        const val TOKEN = "Token"
+        const val SOURCE = "Source"
+        const val BALANCE = "Balance"
+        const val BATCH = "Batch"
+        const val FEE_TYPE = "Fee Type"
+        const val PERMISSION_TYPE = "Permission Type"
+        const val PRODUCT_TYPE = "Product Type"
+        const val FIRMWARE = "Firmware"
+        const val CURRENCY = "Currency"
+        const val ERROR_DESCRIPTION = "Error Description"
+        const val ERROR_CODE = "Error Code"
+        const val ERROR_KEY = "Error Key"
+        const val CREATION_TYPE = "Creation type"
+        const val DAPP_NAME = "DApp Name"
+        const val DAPP_URL = "DApp Url"
+        const val METHOD_NAME = "Method Name"
+        const val VALIDATION = "Validation"
+        const val BLOCKCHAIN_EXCEPTION_HOST = "exception_host"
+        const val BLOCKCHAIN_SELECTED_HOST = "selected_host"
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/build.gradle.kts b/core/datasource/build.gradle.kts
index f304966f2a..6d7e66c87e 100644
--- a/core/datasource/build.gradle.kts
+++ b/core/datasource/build.gradle.kts
@@ -11,8 +11,11 @@ dependencies {
     /** Project */
     implementation(projects.core.utils)
     implementation(projects.libs.auth)
+    implementation(projects.domain.appTheme.models)
     implementation(projects.domain.tokens.models)
     implementation(projects.domain.wallets.models)
+    implementation(projects.domain.balanceHiding.models)
+    implementation(projects.domain.txhistory.models)
 
     /** Tangem libraries */
     implementation(deps.tangem.blockchain)
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/LocalDateAdapter.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/LocalDateAdapter.kt
new file mode 100644
index 0000000000..b11c76fccd
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/LocalDateAdapter.kt
@@ -0,0 +1,29 @@
+package com.tangem.datasource.api.common
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.JsonReader
+import com.squareup.moshi.JsonWriter
+import com.squareup.moshi.ToJson
+import org.joda.time.LocalDate
+import org.joda.time.format.DateTimeFormat
+
+class LocalDateAdapter : JsonAdapter<LocalDate>() {
+
+    private val formatter = DateTimeFormat.forPattern("yyyy-MM-dd")
+
+    @FromJson
+    override fun fromJson(reader: JsonReader): LocalDate? {
+        val dateString = reader.nextString()
+        return LocalDate.parse(dateString, formatter)
+    }
+
+    @ToJson
+    override fun toJson(writer: JsonWriter, value: LocalDate?) {
+        if (value != null) {
+            writer.value(formatter.print(value))
+        } else {
+            writer.nullValue()
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponse.kt
new file mode 100644
index 0000000000..0348dba0e3
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponse.kt
@@ -0,0 +1,40 @@
+package com.tangem.datasource.api.common.response
+
+/**
+ * Represents the possible responses from an API request.
+ *
+ * @param T The type of the data that is expected in a successful response.
+ */
+sealed class ApiResponse<T : Any> {
+
+    /**
+     * Represents a successful response from the API.
+     *
+     * @property data The data returned by the API.
+     */
+    data class Success<T : Any>(val data: T) : ApiResponse<T>()
+
+    /**
+     * Represents an error response or failure from the API.
+     *
+     * @property cause The cause of the error.
+     */
+    data class Error(val cause: ApiResponseError) : ApiResponse<Nothing>()
+}
+
+/**
+ * Wraps data in a [ApiResponse.Success] instance.
+ *
+ * @param data The data to wrap.
+ * @return A [ApiResponse.Success] instance containing the provided data.
+ */
+internal fun <T : Any> apiSuccess(data: T): ApiResponse<T> = ApiResponse.Success(data)
+
+/**
+ * Wraps an [ApiResponseError] in a [ApiResponse.Error] instance.
+ *
+ * @param cause The error to wrap.
+ * @return A [ApiResponse.Error] instance containing the provided error.
+ */
+@Suppress("UNCHECKED_CAST")
+internal fun <T : Any> apiError(cause: ApiResponseError): ApiResponse<T> = ApiResponse.Error(cause) as ApiResponse<T>
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponseCallAdapter.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponseCallAdapter.kt
new file mode 100644
index 0000000000..885b52ca28
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponseCallAdapter.kt
@@ -0,0 +1,16 @@
+package com.tangem.datasource.api.common.response
+
+import retrofit2.Call
+import retrofit2.CallAdapter
+import java.lang.reflect.Type
+
+internal class ApiResponseCallAdapter(
+    private val resultType: Type,
+) : CallAdapter<Type, Call<ApiResponse<Type>>> {
+
+    override fun responseType(): Type = resultType
+
+    override fun adapt(call: Call<Type>): Call<ApiResponse<Type>> {
+        return ApiResponseCallDelegate(call)
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponseCallAdapterFactory.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponseCallAdapterFactory.kt
new file mode 100644
index 0000000000..11eca2e0d6
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponseCallAdapterFactory.kt
@@ -0,0 +1,29 @@
+package com.tangem.datasource.api.common.response
+
+import retrofit2.Call
+import retrofit2.CallAdapter
+import retrofit2.Retrofit
+import java.lang.reflect.ParameterizedType
+import java.lang.reflect.Type
+
+internal class ApiResponseCallAdapterFactory private constructor() : CallAdapter.Factory() {
+
+    override fun get(returnType: Type, annotations: Array<out Annotation>, retrofit: Retrofit): CallAdapter<*, *>? {
+        if (getRawType(returnType) != Call::class.java) {
+            return null
+        }
+
+        val callType = getParameterUpperBound(0, returnType as ParameterizedType)
+        if (getRawType(callType) != ApiResponse::class.java) {
+            return null
+        }
+
+        val resultType = getParameterUpperBound(0, callType as ParameterizedType)
+        return ApiResponseCallAdapter(resultType)
+    }
+
+    companion object {
+
+        fun create() = ApiResponseCallAdapterFactory()
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponseCallDelegate.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponseCallDelegate.kt
new file mode 100644
index 0000000000..b69ef4e355
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponseCallDelegate.kt
@@ -0,0 +1,46 @@
+package com.tangem.datasource.api.common.response
+
+import okhttp3.Request
+import okio.Timeout
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+internal class ApiResponseCallDelegate<T : Any>(
+    private val wrappedCall: Call<T>,
+) : Call<ApiResponse<T>> {
+
+    override fun enqueue(callback: Callback<ApiResponse<T>>) {
+        wrappedCall.enqueue(ApiResponseCallback(callback))
+    }
+
+    override fun execute(): Response<ApiResponse<T>> = throw NotImplementedError()
+    override fun clone(): Call<ApiResponse<T>> = ApiResponseCallDelegate(wrappedCall.clone())
+    override fun request(): Request = wrappedCall.request()
+    override fun timeout(): Timeout = wrappedCall.timeout()
+    override fun isExecuted(): Boolean = wrappedCall.isExecuted
+    override fun isCanceled(): Boolean = wrappedCall.isCanceled
+    override fun cancel() { wrappedCall.cancel() }
+
+    private inner class ApiResponseCallback(
+        private val responseCallback: Callback<ApiResponse<T>>,
+    ) : Callback<T> {
+
+        override fun onResponse(call: Call<T>, response: Response<T>) {
+            val safeResponse = response.toSafeApiResponse()
+
+            responseCallback.onResponse(this@ApiResponseCallDelegate, Response.success(safeResponse))
+        }
+
+        override fun onFailure(call: Call<T>, t: Throwable) {
+            val e = if (t.isNetworkException()) {
+                ApiResponseError.NetworkException
+            } else {
+                ApiResponseError.UnknownException(t)
+            }
+            val safeResponse = apiError<T>(e)
+
+            responseCallback.onResponse(this@ApiResponseCallDelegate, Response.success(safeResponse))
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponseError.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponseError.kt
new file mode 100644
index 0000000000..5e88155058
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponseError.kt
@@ -0,0 +1,80 @@
+package com.tangem.datasource.api.common.response
+
+/**
+ * Represents the possible errors that can occur during an API request.
+ */
+sealed class ApiResponseError : Exception() {
+
+    /**
+     * Represents an HTTP exception, which typically occurs when the server responds
+     * with a non-2xx HTTP status code.
+     *
+     * @property code The HTTP status code.
+     * @property message A human-readable message describing the error.
+     */
+    data class HttpException(val code: Code, override val message: String?) : ApiResponseError() {
+
+        // region Error Codes
+        enum class Code(val code: Int) {
+            // 4xx Server Errors
+            BAD_REQUEST(code = 400),
+            UNAUTHORIZED(code = 401),
+            PAYMENT_REQUIRED(code = 402),
+            FORBIDDEN(code = 403),
+            NOT_FOUND(code = 404),
+            METHOD_NOT_ALLOWED(code = 405),
+            NOT_ACCEPTABLE(code = 406),
+            PROXY_AUTHENTICATION_REQUIRED(code = 407),
+            REQUEST_TIMEOUT(code = 408),
+            CONFLICT(code = 409),
+            GONE(code = 410),
+            LENGTH_REQUIRED(code = 411),
+            PRECONDITION_FAILED(code = 412),
+            PAYLOAD_TOO_LARGE(code = 413),
+            URI_TOO_LONG(code = 414),
+            UNSUPPORTED_MEDIA_TYPE(code = 415),
+            RANGE_NOT_SATISFIABLE(code = 416),
+            EXPECTATION_FAILED(code = 417),
+            IM_A_TEAPOT(code = 418), // Not an error, but an April Fools' joke from RFC 2324
+            UNPROCESSABLE_ENTITY(code = 422),
+            LOCKED(code = 423),
+            FAILED_DEPENDENCY(code = 424),
+            TOO_EARLY(code = 425),
+            UPGRADE_REQUIRED(code = 426),
+            PRECONDITION_REQUIRED(code = 428),
+            TOO_MANY_REQUESTS(code = 429),
+            REQUEST_HEADER_FIELDS_TOO_LARGE(code = 431),
+            UNAVAILABLE_FOR_LEGAL_REASONS(code = 451),
+            // 5xx Server Errors
+            INTERNAL_SERVER_ERROR(code = 500),
+            NOT_IMPLEMENTED(code = 501),
+            BAD_GATEWAY(code = 502),
+            SERVICE_UNAVAILABLE(code = 503),
+            GATEWAY_TIMEOUT(code = 504),
+            HTTP_VERSION_NOT_SUPPORTED(code = 505),
+            VARIANT_ALSO_NEGOTIATES(code = 506),
+            INSUFFICIENT_STORAGE(code = 507),
+            LOOP_DETECTED(code = 508),
+            NOT_EXTENDED(code = 510),
+            NETWORK_AUTHENTICATION_REQUIRED(code = 511),
+            ;
+
+            override fun toString(): String = "$code - $name"
+
+            companion object {
+                val values = values()
+            }
+        }
+        // endregion Error Codes
+    }
+
+    /** Represents a network error, typically when there's no connectivity. */
+    object NetworkException : ApiResponseError()
+
+    /**
+     * Represents an unexpected exception that doesn't fall into one of the other categories.
+     *
+     * @property cause The exception that caused this error.
+     */
+    data class UnknownException(override val cause: Throwable) : ApiResponseError()
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponseExt.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponseExt.kt
new file mode 100644
index 0000000000..256c45afe2
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponseExt.kt
@@ -0,0 +1,6 @@
+package com.tangem.datasource.api.common.response
+
+fun <T : Any> ApiResponse<T>.getOrThrow(): T = when (this) {
+    is ApiResponse.Error -> throw cause
+    is ApiResponse.Success -> data
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ResponseExt.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ResponseExt.kt
new file mode 100644
index 0000000000..0ddb0ffa36
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ResponseExt.kt
@@ -0,0 +1,32 @@
+package com.tangem.datasource.api.common.response
+
+import retrofit2.Response
+import java.net.ConnectException
+import java.net.UnknownHostException
+import javax.net.ssl.SSLHandshakeException
+
+internal fun <T : Any> Response<T>.toSafeApiResponse(): ApiResponse<T> {
+    val body = body()
+
+    return if (isSuccessful && body != null) {
+        apiSuccess(body)
+    } else {
+        val code = ApiResponseError.HttpException.Code.values
+            .firstOrNull { it.code == code() }
+        val e = if (code == null) {
+            ApiResponseError.UnknownException(IllegalArgumentException("Unknown error status code: ${code()}"))
+        } else {
+            ApiResponseError.HttpException(code, message())
+        }
+
+        apiError(e)
+    }
+}
+
+internal fun Throwable.isNetworkException(): Boolean = when (this) {
+    is ConnectException,
+    is UnknownHostException,
+    is SSLHandshakeException,
+    -> true
+    else -> false
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechApi.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechApi.kt
index 0a609246ac..be16a55885 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechApi.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechApi.kt
@@ -1,5 +1,6 @@
 package com.tangem.datasource.api.tangemTech
 
+import com.tangem.datasource.api.common.response.ApiResponse
 import com.tangem.datasource.api.tangemTech.models.*
 import retrofit2.http.*
 
@@ -25,13 +26,13 @@ interface TangemTechApi {
     suspend fun getRates(@Query("currencyId") currencyId: String, @Query("coinIds") coinIds: String): RatesResponse
 
     @GET("currencies")
-    suspend fun getCurrencyList(): CurrenciesResponse
+    suspend fun getCurrencyList(): ApiResponse<CurrenciesResponse>
 
     @GET("geo")
     suspend fun getUserCountryCode(): GeoResponse
 
     @GET("user-tokens/{user-id}")
-    suspend fun getUserTokens(@Path(value = "user-id") userId: String): UserTokensResponse
+    suspend fun getUserTokens(@Path(value = "user-id") userId: String): ApiResponse<UserTokensResponse>
 
     @PUT("user-tokens/{user-id}")
     suspend fun saveUserTokens(@Path(value = "user-id") userId: String, @Body userTokens: UserTokensResponse)
@@ -66,5 +67,5 @@ interface TangemTechApi {
         @Query("currencyId") currencyId: String,
         @Query("coinIds") coinIds: String,
         @Query("fields") fields: String = "price,priceChange24h,lastUpdatedAt",
-    ): QuotesResponse
+    ): ApiResponse<QuotesResponse>
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechService.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechService.kt
index 50f11aa961..cf51d43c58 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechService.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechService.kt
@@ -1,6 +1,7 @@
 package com.tangem.datasource.api.tangemTech
 
 import com.tangem.datasource.api.common.MoshiConverter
+import com.tangem.datasource.api.common.response.ApiResponseCallAdapterFactory
 import com.tangem.datasource.utils.RequestHeader
 import com.tangem.datasource.utils.RequestHeader.AuthenticationHeader
 import com.tangem.datasource.utils.RequestHeader.CacheControlHeader
@@ -29,6 +30,7 @@ object TangemTechService {
         val headers = mutableListOf<RequestHeader>(CacheControlHeader).apply { header?.let(::add) }
         return Retrofit.Builder()
             .addConverterFactory(MoshiConverter.networkMoshiConverter)
+            .addCallAdapterFactory(ApiResponseCallAdapterFactory.create())
             .baseUrl(TANGEM_TECH_BASE_URL)
             .client(
                 OkHttpClient.Builder()
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/QuotesResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/QuotesResponse.kt
index e3cd9723b9..2155d0bf77 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/QuotesResponse.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/QuotesResponse.kt
@@ -10,10 +10,8 @@ data class QuotesResponse(
 
     data class Quote(
         @Json(name = "price")
-        val price: BigDecimal,
+        val price: BigDecimal?,
         @Json(name = "priceChange24h")
-        val priceChange: BigDecimal,
-        @Json(name = "lastUpdatedAt")
-        val lastUpdated: String,
+        val priceChange: BigDecimal?,
     )
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/ReferralResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/ReferralResponse.kt
index 712c98c40a..2abb6e2a57 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/ReferralResponse.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/ReferralResponse.kt
@@ -1,14 +1,12 @@
 package com.tangem.datasource.api.tangemTech.models
 
 import com.squareup.moshi.Json
+import org.joda.time.LocalDate
 
-/**
- * Main response class for referral API
- * contains all necessary info about users program status
- */
 data class ReferralResponse(
     @Json(name = "conditions") val conditions: Conditions,
     @Json(name = "referral") val referral: Referral?,
+    @Json(name = "expectedAwards") val expectedAwards: ExpectedAwards?,
 ) {
 
     data class Conditions(
@@ -45,4 +43,16 @@ data class ReferralResponse(
         @Json(name = "walletsPurchased") val walletsPurchased: Int,
         @Json(name = "termsAcceptedAt") val termsAcceptedAt: String?,
     )
+
+    data class ExpectedAwards(
+        @Json(name = "numberOfWallets") val numberOfWallets: Int,
+        @Json(name = "list") val list: List<AwardItem>,
+    ) {
+
+        data class AwardItem(
+            @Json(name = "currency") val currency: String,
+            @Json(name = "paymentDate") val paymentDate: LocalDate,
+            @Json(name = "amount") val amount: Int,
+        )
+    }
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/AppCurrencyDataModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/AppCurrencyDataModule.kt
index b6d8832f86..e25e15471b 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/di/AppCurrencyDataModule.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/AppCurrencyDataModule.kt
@@ -7,8 +7,8 @@ import com.tangem.datasource.local.appcurrency.AvailableAppCurrenciesStore
 import com.tangem.datasource.local.appcurrency.SelectedAppCurrencyStore
 import com.tangem.datasource.local.appcurrency.implementation.DefaultAvailableAppCurrenciesStore
 import com.tangem.datasource.local.appcurrency.implementation.DefaultSelectedAppCurrencyStore
+import com.tangem.datasource.local.datastore.JsonSharedPreferencesDataStore
 import com.tangem.datasource.local.datastore.RuntimeDataStore
-import com.tangem.datasource.local.datastore.SharedPreferencesDataStore
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -35,7 +35,7 @@ internal object AppCurrencyDataModule {
         @NetworkMoshi moshi: Moshi,
     ): SelectedAppCurrencyStore {
         return DefaultSelectedAppCurrencyStore(
-            dataStore = SharedPreferencesDataStore(
+            dataStore = JsonSharedPreferencesDataStore(
                 preferencesName = "selected_app_currency",
                 context = context,
                 adapter = moshi.adapter(CurrenciesResponse.Currency::class.java),
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/AppThemeModeDataModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/AppThemeModeDataModule.kt
new file mode 100644
index 0000000000..a6e8020146
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/AppThemeModeDataModule.kt
@@ -0,0 +1,29 @@
+package com.tangem.datasource.di
+
+import android.content.Context
+import com.squareup.moshi.Moshi
+import com.tangem.datasource.local.apptheme.AppThemeModeStore
+import com.tangem.datasource.local.apptheme.DefaultAppThemeModeStore
+import com.tangem.datasource.local.datastore.JsonSharedPreferencesDataStore
+import com.tangem.domain.apptheme.model.AppThemeMode
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object AppThemeModeDataModule {
+
+    @Provides
+    fun provideAppThemeModeStore(@ApplicationContext context: Context, @NetworkMoshi moshi: Moshi): AppThemeModeStore {
+        return DefaultAppThemeModeStore(
+            dataStore = JsonSharedPreferencesDataStore(
+                preferencesName = "app_theme",
+                context = context,
+                adapter = moshi.adapter(AppThemeMode::class.java),
+            ),
+        )
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/CardDataModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/CardDataModule.kt
new file mode 100644
index 0000000000..f06e5ac8e5
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/CardDataModule.kt
@@ -0,0 +1,34 @@
+package com.tangem.datasource.di
+
+import android.content.Context
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.Types
+import com.tangem.datasource.local.card.DefaultUsedCardsStore
+import com.tangem.datasource.local.card.UsedCardInfo
+import com.tangem.datasource.local.card.UsedCardsStore
+import com.tangem.datasource.local.datastore.JsonSharedPreferencesDataStore
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object CardDataModule {
+
+    @Provides
+    @Singleton
+    fun provideUsedCardsStore(@ApplicationContext context: Context, @NetworkMoshi moshi: Moshi): UsedCardsStore {
+        return DefaultUsedCardsStore(
+            store = JsonSharedPreferencesDataStore(
+                preferencesName = "tapPrefs",
+                context = context,
+                adapter = moshi.adapter(
+                    Types.newParameterizedType(List::class.java, UsedCardInfo::class.java),
+                ),
+            ),
+        )
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/HiddenBalanceDataModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/HiddenBalanceDataModule.kt
new file mode 100644
index 0000000000..9b59f30477
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/HiddenBalanceDataModule.kt
@@ -0,0 +1,32 @@
+package com.tangem.datasource.di
+
+import android.content.Context
+import com.squareup.moshi.Moshi
+import com.tangem.datasource.local.appcurrency.BalanceHidingSettingsStore
+import com.tangem.datasource.local.appcurrency.implementation.BalanceStateHidingSettingsStore
+import com.tangem.datasource.local.datastore.JsonSharedPreferencesDataStore
+import com.tangem.domain.balancehiding.BalanceHidingSettings
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object HiddenBalanceDataModule {
+
+    @Provides
+    fun provideHiddenBalanceStateStore(
+        @ApplicationContext context: Context,
+        @NetworkMoshi moshi: Moshi,
+    ): BalanceHidingSettingsStore {
+        return BalanceStateHidingSettingsStore(
+            dataStore = JsonSharedPreferencesDataStore(
+                preferencesName = "balance_hiding_settings",
+                context = context,
+                adapter = moshi.adapter(BalanceHidingSettings::class.java),
+            ),
+        )
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/MarketCoinsStoreModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/MarketCoinsStoreModule.kt
new file mode 100644
index 0000000000..bd2098a670
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/MarketCoinsStoreModule.kt
@@ -0,0 +1,21 @@
+package com.tangem.datasource.di
+
+import com.tangem.datasource.local.datastore.RuntimeDataStore
+import com.tangem.datasource.local.token.DefaultUserMarketCoinsStore
+import com.tangem.datasource.local.token.UserMarketCoinsStore
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object MarketCoinsStoreModule {
+
+    @Provides
+    @Singleton
+    fun provideUserMarketCoinsStore(): UserMarketCoinsStore {
+        return DefaultUserMarketCoinsStore(dataStore = RuntimeDataStore())
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/MoshiModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/MoshiModule.kt
index 65668982d4..bf3d94095f 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/di/MoshiModule.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/MoshiModule.kt
@@ -4,6 +4,7 @@ import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import com.tangem.common.json.MoshiJsonConverter
 import com.tangem.datasource.api.common.BigDecimalAdapter
+import com.tangem.datasource.api.common.LocalDateAdapter
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -20,6 +21,7 @@ class MoshiModule {
     fun provideNetworkMoshi(): Moshi {
         return Moshi.Builder()
             .add(BigDecimalAdapter())
+            .add(LocalDateAdapter())
             .add(KotlinJsonAdapterFactory())
             .build()
     }
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt
index 9c11afc771..3a9580d2d0 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt
@@ -1,6 +1,7 @@
 package com.tangem.datasource.di
 
 import com.squareup.moshi.Moshi
+import com.tangem.datasource.api.common.response.ApiResponseCallAdapterFactory
 import com.tangem.datasource.api.paymentology.PaymentologyApi
 import com.tangem.datasource.api.promotion.PromotionApi
 import com.tangem.datasource.api.tangemTech.TangemTechApi
@@ -8,7 +9,6 @@ import com.tangem.datasource.utils.RequestHeader.*
 import com.tangem.datasource.utils.addHeaders
 import com.tangem.datasource.utils.allowLogging
 import com.tangem.lib.auth.AuthProvider
-import com.tangem.lib.auth.BuildConfig
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -28,6 +28,7 @@ class NetworkModule {
     fun provideTangemTechApi(@NetworkMoshi moshi: Moshi): TangemTechApi {
         return Retrofit.Builder()
             .addConverterFactory(MoshiConverterFactory.create(moshi))
+            .addCallAdapterFactory(ApiResponseCallAdapterFactory.create())
             .baseUrl(PROD_TANGEM_TECH_BASE_URL)
             .client(
                 OkHttpClient.Builder()
@@ -76,7 +77,7 @@ class NetworkModule {
     private fun createBasePromotionRetrofit(okHttpClient: OkHttpClient, moshi: Moshi): PromotionApi {
         return Retrofit.Builder()
             .addConverterFactory(MoshiConverterFactory.create(moshi))
-            .baseUrl(if (BuildConfig.DEBUG) DEV_TANGEM_TECH_BASE_URL else PROD_TANGEM_TECH_BASE_URL)
+            .baseUrl(PROD_TANGEM_TECH_BASE_URL)
             .client(okHttpClient)
             .build()
             .create(PromotionApi::class.java)
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/NetworksStatusesStoreModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/NetworksStatusesStoreModule.kt
new file mode 100644
index 0000000000..d9cb5b5946
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/NetworksStatusesStoreModule.kt
@@ -0,0 +1,21 @@
+package com.tangem.datasource.di
+
+import com.tangem.datasource.local.datastore.RuntimeDataStore
+import com.tangem.datasource.local.network.DefaultNetworksStatusesStore
+import com.tangem.datasource.local.network.NetworksStatusesStore
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object NetworksStatusesStoreModule {
+
+    @Provides
+    fun provideNetworksStatusesStore(): NetworksStatusesStore {
+        return DefaultNetworksStatusesStore(
+            dataStore = RuntimeDataStore(),
+        )
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/QuotesStoreModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/QuotesStoreModule.kt
index a62a3e4f31..ff605b0138 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/di/QuotesStoreModule.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/QuotesStoreModule.kt
@@ -1,15 +1,11 @@
 package com.tangem.datasource.di
 
-import android.content.Context
-import com.squareup.moshi.Moshi
-import com.tangem.datasource.local.datastore.SharedPreferencesDataStore
+import com.tangem.datasource.local.datastore.RuntimeDataStore
 import com.tangem.datasource.local.quote.DefaultQuotesStore
 import com.tangem.datasource.local.quote.QuotesStore
-import com.tangem.datasource.local.quote.model.StoredQuote
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
 
@@ -19,13 +15,9 @@ internal object QuotesStoreModule {
 
     @Provides
     @Singleton
-    fun provideQuotesStore(@ApplicationContext context: Context, @NetworkMoshi moshi: Moshi): QuotesStore {
+    fun provideQuotesStore(): QuotesStore {
         return DefaultQuotesStore(
-            dataStore = SharedPreferencesDataStore(
-                preferencesName = "quotes",
-                context = context,
-                adapter = moshi.adapter(StoredQuote::class.java),
-            ),
+            dataStore = RuntimeDataStore(),
         )
     }
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/SettingsDataModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/SettingsDataModule.kt
new file mode 100644
index 0000000000..ba757806d6
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/SettingsDataModule.kt
@@ -0,0 +1,50 @@
+package com.tangem.datasource.di
+
+import android.content.Context
+import com.tangem.datasource.local.datastore.BooleanSharedPreferencesDataStore
+import com.tangem.datasource.local.datastore.IntSharedPreferencesDataStore
+import com.tangem.datasource.local.datastore.LongSharedPreferencesDataStore
+import com.tangem.datasource.local.settings.*
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object SettingsDataModule {
+
+    @Provides
+    @Singleton
+    fun provideAppLaunchCountStore(@ApplicationContext context: Context): AppLaunchCountStore {
+        return DefaultAppLaunchCountStore(
+            store = IntSharedPreferencesDataStore(preferencesName = "tapPrefs", context = context),
+        )
+    }
+
+    @Provides
+    @Singleton
+    fun provideAppRatingShowingCountStore(@ApplicationContext context: Context): AppRatingShowingCountStore {
+        return DefaultAppRatingShowingCountStore(
+            store = IntSharedPreferencesDataStore(preferencesName = "tapPrefs", context = context),
+        )
+    }
+
+    @Provides
+    @Singleton
+    fun provideFundsFoundDateInMillisStore(@ApplicationContext context: Context): FundsFoundDateInMillisStore {
+        return DefaultFundsFoundDateInMillisStore(
+            store = LongSharedPreferencesDataStore(preferencesName = "tapPrefs", context = context),
+        )
+    }
+
+    @Provides
+    @Singleton
+    fun provideUserInteractingStatusStore(@ApplicationContext context: Context): UserInteractingStatusStore {
+        return DefaultUserInteractingStatusStore(
+            store = BooleanSharedPreferencesDataStore(preferencesName = "tapPrefs", context = context),
+        )
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/TxHistoryItemsStoreModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/TxHistoryItemsStoreModule.kt
new file mode 100644
index 0000000000..9a936f57f0
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/TxHistoryItemsStoreModule.kt
@@ -0,0 +1,21 @@
+package com.tangem.datasource.di
+
+import com.tangem.datasource.local.datastore.RuntimeDataStore
+import com.tangem.datasource.local.txhistory.DefaultTxHistoryItemsStore
+import com.tangem.datasource.local.txhistory.TxHistoryItemsStore
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object TxHistoryItemsStoreModule {
+
+    @Provides
+    fun provideTxHistoryItemsStore(): TxHistoryItemsStore {
+        return DefaultTxHistoryItemsStore(
+            dataStore = RuntimeDataStore(),
+        )
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/WalletsDataModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/WalletsDataModule.kt
new file mode 100644
index 0000000000..61cdcacad3
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/WalletsDataModule.kt
@@ -0,0 +1,26 @@
+package com.tangem.datasource.di
+
+import android.content.Context
+import com.tangem.datasource.local.datastore.BooleanSharedPreferencesDataStore
+import com.tangem.datasource.local.settings.*
+import com.tangem.datasource.local.userwallet.DefaultShouldSaveUserWalletStore
+import com.tangem.datasource.local.userwallet.ShouldSaveUserWalletStore
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object WalletsDataModule {
+
+    @Provides
+    @Singleton
+    fun provideShouldSaveUserWalletsStore(@ApplicationContext context: Context): ShouldSaveUserWalletStore {
+        return DefaultShouldSaveUserWalletStore(
+            store = BooleanSharedPreferencesDataStore(preferencesName = "tapPrefs", context = context),
+        )
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/appcurrency/BalanceHidingSettingsStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/appcurrency/BalanceHidingSettingsStore.kt
new file mode 100644
index 0000000000..a29714251b
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/appcurrency/BalanceHidingSettingsStore.kt
@@ -0,0 +1,13 @@
+package com.tangem.datasource.local.appcurrency
+
+import com.tangem.domain.balancehiding.BalanceHidingSettings
+import kotlinx.coroutines.flow.Flow
+
+interface BalanceHidingSettingsStore {
+
+    fun get(): Flow<BalanceHidingSettings>
+
+    suspend fun getSyncOrDefault(): BalanceHidingSettings
+
+    suspend fun store(settings: BalanceHidingSettings)
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/appcurrency/implementation/BalanceStateHidingSettingsStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/appcurrency/implementation/BalanceStateHidingSettingsStore.kt
new file mode 100644
index 0000000000..740005d56b
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/appcurrency/implementation/BalanceStateHidingSettingsStore.kt
@@ -0,0 +1,18 @@
+package com.tangem.datasource.local.appcurrency.implementation
+
+import com.tangem.datasource.local.appcurrency.BalanceHidingSettingsStore
+import com.tangem.datasource.local.datastore.core.KeylessDataStoreDecorator
+import com.tangem.datasource.local.datastore.core.StringKeyDataStore
+import com.tangem.domain.balancehiding.BalanceHidingSettings
+
+internal class BalanceStateHidingSettingsStore(
+    dataStore: StringKeyDataStore<BalanceHidingSettings>,
+) : BalanceHidingSettingsStore, KeylessDataStoreDecorator<BalanceHidingSettings>(dataStore) {
+
+    override suspend fun getSyncOrDefault(): BalanceHidingSettings {
+        return getSyncOrNull() ?: BalanceHidingSettings(
+            isHidingEnabledInSettings = false,
+            isBalanceHidden = false,
+        )
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/appcurrency/implementation/DefaultSelectedAppCurrencyStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/appcurrency/implementation/DefaultSelectedAppCurrencyStore.kt
index b6d8f61ade..c79bf3045b 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/appcurrency/implementation/DefaultSelectedAppCurrencyStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/appcurrency/implementation/DefaultSelectedAppCurrencyStore.kt
@@ -7,8 +7,4 @@ import com.tangem.datasource.local.datastore.core.StringKeyDataStore
 
 internal class DefaultSelectedAppCurrencyStore(
     dataStore: StringKeyDataStore<CurrenciesResponse.Currency>,
-) : SelectedAppCurrencyStore, KeylessDataStoreDecorator<CurrenciesResponse.Currency>(dataStore) {
-    override suspend fun isEmpty(): Boolean {
-        return getSyncOrNull() == null
-    }
-}
\ No newline at end of file
+) : SelectedAppCurrencyStore, KeylessDataStoreDecorator<CurrenciesResponse.Currency>(dataStore)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/apptheme/AppThemeModeStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/apptheme/AppThemeModeStore.kt
new file mode 100644
index 0000000000..78e1fd514c
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/apptheme/AppThemeModeStore.kt
@@ -0,0 +1,13 @@
+package com.tangem.datasource.local.apptheme
+
+import com.tangem.domain.apptheme.model.AppThemeMode
+import kotlinx.coroutines.flow.Flow
+
+interface AppThemeModeStore {
+
+    fun get(): Flow<AppThemeMode>
+
+    suspend fun store(item: AppThemeMode)
+
+    suspend fun isEmpty(): Boolean
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/apptheme/DefaultAppThemeModeStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/apptheme/DefaultAppThemeModeStore.kt
new file mode 100644
index 0000000000..483bf4b525
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/apptheme/DefaultAppThemeModeStore.kt
@@ -0,0 +1,9 @@
+package com.tangem.datasource.local.apptheme
+
+import com.tangem.datasource.local.datastore.core.KeylessDataStoreDecorator
+import com.tangem.datasource.local.datastore.core.StringKeyDataStore
+import com.tangem.domain.apptheme.model.AppThemeMode
+
+internal class DefaultAppThemeModeStore(
+    dataStore: StringKeyDataStore<AppThemeMode>,
+) : AppThemeModeStore, KeylessDataStoreDecorator<AppThemeMode>(dataStore)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/cache/CacheKeysStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/cache/CacheKeysStore.kt
index 962c09661a..20e96ef798 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/cache/CacheKeysStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/cache/CacheKeysStore.kt
@@ -10,5 +10,7 @@ interface CacheKeysStore {
 
     suspend fun remove(key: String)
 
+    suspend fun remove(keys: Collection<String>)
+
     suspend fun clear()
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/cache/DefaultCacheKeysStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/cache/DefaultCacheKeysStore.kt
index a2788d6a87..0dd225b6af 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/cache/DefaultCacheKeysStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/cache/DefaultCacheKeysStore.kt
@@ -2,15 +2,10 @@ package com.tangem.datasource.local.cache
 
 import com.tangem.datasource.local.cache.model.CacheKey
 import com.tangem.datasource.local.datastore.core.StringKeyDataStore
-import com.tangem.datasource.local.datastore.core.StringKeyDataStoreDecorator
 
 internal class DefaultCacheKeysStore(
     dataStore: StringKeyDataStore<CacheKey>,
-) : CacheKeysStore, StringKeyDataStoreDecorator<String, CacheKey>(dataStore) {
-
-    override fun provideStringKey(key: String): String {
-        return key
-    }
+) : CacheKeysStore, StringKeyDataStore<CacheKey> by dataStore {
 
     override suspend fun store(key: CacheKey) {
         store(key.id, key)
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/card/UsedCardInfo.kt b/core/datasource/src/main/java/com/tangem/datasource/local/card/UsedCardInfo.kt
new file mode 100644
index 0000000000..0f619b1eec
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/card/UsedCardInfo.kt
@@ -0,0 +1,8 @@
+package com.tangem.datasource.local.card
+
+data class UsedCardInfo(
+    val cardId: String,
+    val isScanned: Boolean = false,
+    val isActivationStarted: Boolean = false,
+    val isActivationFinished: Boolean = false,
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/card/UsedCardsStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/card/UsedCardsStore.kt
new file mode 100644
index 0000000000..0d54995dbb
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/card/UsedCardsStore.kt
@@ -0,0 +1,21 @@
+package com.tangem.datasource.local.card
+
+import com.tangem.datasource.local.datastore.SharedPreferencesDataStore
+import com.tangem.datasource.local.datastore.core.KeylessDataStoreDecorator
+import kotlinx.coroutines.flow.Flow
+
+interface UsedCardsStore {
+
+    fun get(): Flow<List<UsedCardInfo>>
+
+    suspend fun getSyncOrNull(): List<UsedCardInfo>?
+
+    suspend fun store(item: List<UsedCardInfo>)
+}
+
+internal class DefaultUsedCardsStore(
+    store: SharedPreferencesDataStore<List<UsedCardInfo>>,
+) : UsedCardsStore, KeylessDataStoreDecorator<List<UsedCardInfo>>(
+    wrappedDataStore = store,
+    key = "usedCardsInfo_v2",
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/datastore/BooleanSharedPreferencesDataStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/datastore/BooleanSharedPreferencesDataStore.kt
new file mode 100644
index 0000000000..36141207c0
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/datastore/BooleanSharedPreferencesDataStore.kt
@@ -0,0 +1,16 @@
+package com.tangem.datasource.local.datastore
+
+import android.content.Context
+import androidx.core.content.edit
+
+internal class BooleanSharedPreferencesDataStore(
+    preferencesName: String,
+    context: Context,
+) : SharedPreferencesDataStore<Boolean>(preferencesName, context) {
+
+    override fun getByKey(key: String): Boolean = sharedPreferences.getBoolean(key, false)
+
+    override fun storeByKey(key: String, value: Boolean) {
+        sharedPreferences.edit { putBoolean(key, value) }
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/datastore/FileDataStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/datastore/FileDataStore.kt
index cc65a7ff21..e9b2317f35 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/datastore/FileDataStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/datastore/FileDataStore.kt
@@ -4,7 +4,10 @@ import com.squareup.moshi.JsonAdapter
 import com.tangem.datasource.files.FileReader
 import com.tangem.datasource.local.datastore.core.StringKeyDataStore
 import com.tangem.datasource.local.datastore.utils.Trigger
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.map
 import timber.log.Timber
 
 @Deprecated("Use shared preferences data store instead")
@@ -14,6 +17,14 @@ internal class FileDataStore<Value : Any>(
 ) : StringKeyDataStore<Value> {
 
     private val writeTrigger = Trigger()
+    override suspend fun isEmpty(): Boolean {
+        val e = NotImplementedError("`isEmpty()` function not implemented for `FileDataStore`")
+        Timber.e(e)
+
+        throw e
+    }
+
+    override suspend fun contains(key: String): Boolean = getSyncOrNull(key) != null
 
     override fun get(key: String): Flow<Value> {
         return writeTrigger
@@ -33,16 +44,16 @@ internal class FileDataStore<Value : Any>(
         return getInternal(key)
     }
 
-    override suspend fun getAllSyncOrNull(): List<Value> {
+    override suspend fun getAllSyncOrNull(): List<Value>? {
         val e = NotImplementedError("`getAllSyncOrNull()` function not implemented for `FileDataStore`")
         Timber.e(e)
 
         throw e
     }
 
-    override suspend fun store(key: String, item: Value) {
+    override suspend fun store(key: String, value: Value) {
         try {
-            val json = adapter.toJson(item)
+            val json = adapter.toJson(value)
 
             fileReader.rewriteFile(json, key)
             writeTrigger.trigger()
@@ -51,8 +62,8 @@ internal class FileDataStore<Value : Any>(
         }
     }
 
-    override suspend fun store(items: Map<String, Value>) {
-        items.forEach { (key, item) ->
+    override suspend fun store(values: Map<String, Value>) {
+        values.forEach { (key, item) ->
             store(key, item)
         }
     }
@@ -62,6 +73,13 @@ internal class FileDataStore<Value : Any>(
         writeTrigger.trigger()
     }
 
+    override suspend fun remove(keys: Collection<String>) {
+        val e = NotImplementedError("`remove(keys)` function not implemented for `FileDataStore`")
+        Timber.e(e)
+
+        throw e
+    }
+
     override suspend fun clear() {
         val e = NotImplementedError("`clear()` function not implemented for `FileDataStore`")
         Timber.e(e)
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/datastore/IntSharedPreferencesDataStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/datastore/IntSharedPreferencesDataStore.kt
new file mode 100644
index 0000000000..7ef0f70fa6
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/datastore/IntSharedPreferencesDataStore.kt
@@ -0,0 +1,16 @@
+package com.tangem.datasource.local.datastore
+
+import android.content.Context
+import androidx.core.content.edit
+
+internal class IntSharedPreferencesDataStore(
+    preferencesName: String,
+    context: Context,
+) : SharedPreferencesDataStore<Int>(preferencesName, context) {
+
+    override fun getByKey(key: String): Int = sharedPreferences.getInt(key, 0)
+
+    override fun storeByKey(key: String, value: Int) {
+        sharedPreferences.edit { putInt(key, value) }
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/datastore/JsonSharedPreferencesDataStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/datastore/JsonSharedPreferencesDataStore.kt
new file mode 100644
index 0000000000..5e47ee8114
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/datastore/JsonSharedPreferencesDataStore.kt
@@ -0,0 +1,24 @@
+package com.tangem.datasource.local.datastore
+
+import android.content.Context
+import androidx.core.content.edit
+import com.squareup.moshi.JsonAdapter
+
+internal class JsonSharedPreferencesDataStore<Value : Any>(
+    preferencesName: String,
+    context: Context,
+    private val adapter: JsonAdapter<Value>,
+) : SharedPreferencesDataStore<Value>(preferencesName, context) {
+
+    override fun getByKey(key: String): Value? {
+        val json = sharedPreferences.getString(key, null) ?: return null
+
+        return adapter.fromJson(json)
+    }
+
+    override fun storeByKey(key: String, value: Value) {
+        val json = adapter.toJson(value)
+
+        sharedPreferences.edit { putString(key, json) }
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/datastore/LongSharedPreferencesDataStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/datastore/LongSharedPreferencesDataStore.kt
new file mode 100644
index 0000000000..b1bb00e4e1
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/datastore/LongSharedPreferencesDataStore.kt
@@ -0,0 +1,16 @@
+package com.tangem.datasource.local.datastore
+
+import android.content.Context
+import androidx.core.content.edit
+
+internal class LongSharedPreferencesDataStore(
+    preferencesName: String,
+    context: Context,
+) : SharedPreferencesDataStore<Long>(preferencesName, context) {
+
+    override fun getByKey(key: String): Long = sharedPreferences.getLong(key, 0)
+
+    override fun storeByKey(key: String, value: Long) {
+        sharedPreferences.edit { putLong(key, value) }
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/datastore/RuntimeDataStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/datastore/RuntimeDataStore.kt
index 2d4149648f..db39d064d3 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/datastore/RuntimeDataStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/datastore/RuntimeDataStore.kt
@@ -5,53 +5,74 @@ import kotlinx.coroutines.flow.*
 
 internal class RuntimeDataStore<Data : Any> : StringKeyDataStore<Data> {
 
-    private val store = MutableStateFlow<HashMap<String, Data>>(hashMapOf())
+    private val store: MutableSharedFlow<HashMap<String, Data>?> = MutableSharedFlow(replay = 1)
+
+    init {
+        store.tryEmit(value = null)
+    }
+
+    override suspend fun isEmpty(): Boolean = store.firstOrNull().isNullOrEmpty()
+
+    override suspend fun contains(key: String): Boolean = getSyncOrNull(key) != null
 
     override fun get(key: String): Flow<Data> {
-        return store
-            .map { value -> value[key] }
-            .filterNotNull()
-    }
-
-    override fun getAll(): Flow<List<Data>> {
-        return store.map { value -> value.values.toList() }
-    }
-
-    override suspend fun getSyncOrNull(key: String): Data? {
-        return store.value[key]
-    }
-
-    override suspend fun getAllSyncOrNull(): List<Data> {
-        return store.value.values.toList()
-    }
-
-    override suspend fun store(key: String, item: Data) {
-        store.update { value ->
-            value[key] = item
-
-            value
+        return store.mapNotNull { value ->
+            value?.get(key)
         }
     }
 
-    override suspend fun store(items: Map<String, Data>) {
-        store.update { value ->
-            items.forEach { (key, item) ->
-                value[key] = item
-            }
+    override fun getAll(): Flow<List<Data>> {
+        return store.map { value ->
+            value?.values?.toList().orEmpty()
+        }
+    }
 
-            value
+    override suspend fun getSyncOrNull(key: String): Data? {
+        return store.firstOrNull()?.get(key)
+    }
+
+    override suspend fun getAllSyncOrNull(): List<Data>? {
+        return store.firstOrNull()?.values?.toList()
+    }
+
+    override suspend fun store(key: String, value: Data) {
+        updateValue { storedValue ->
+            storedValue[key] = value
+
+            storedValue
+        }
+    }
+
+    override suspend fun store(values: Map<String, Data>) {
+        updateValue { storedValue ->
+            storedValue.putAll(values)
+
+            storedValue
         }
     }
 
     override suspend fun remove(key: String) {
-        store.update { value ->
-            value.remove(key)
+        updateValue { storedValue ->
+            storedValue.remove(key)
 
-            value
+            storedValue
+        }
+    }
+
+    override suspend fun remove(keys: Collection<String>) {
+        updateValue { value ->
+            HashMap(value.filterKeys { it !in keys })
         }
     }
 
     override suspend fun clear() {
-        store.update { hashMapOf() }
+        store.emit(value = null)
+    }
+
+    private suspend inline fun updateValue(update: (HashMap<String, Data>) -> HashMap<String, Data>) {
+        val storedData = store.firstOrNull() ?: hashMapOf()
+        val updatedData = update(storedData)
+
+        store.emit(updatedData)
     }
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/datastore/SharedPreferencesDataStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/datastore/SharedPreferencesDataStore.kt
index cd2ed5c463..417b4e9ac4 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/datastore/SharedPreferencesDataStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/datastore/SharedPreferencesDataStore.kt
@@ -4,61 +4,63 @@ import android.content.Context
 import android.content.Context.MODE_PRIVATE
 import android.content.SharedPreferences
 import androidx.core.content.edit
-import com.squareup.moshi.JsonAdapter
 import com.tangem.datasource.local.datastore.core.StringKeyDataStore
 import com.tangem.datasource.local.datastore.utils.Trigger
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.mapNotNull
 import timber.log.Timber
 
-internal class SharedPreferencesDataStore<Value : Any>(
+internal abstract class SharedPreferencesDataStore<Value : Any>(
     preferencesName: String,
-    private val context: Context,
-    private val adapter: JsonAdapter<Value>,
+    context: Context,
 ) : StringKeyDataStore<Value> {
 
-    private val sharedPreferences: SharedPreferences by lazy {
+    protected val sharedPreferences: SharedPreferences by lazy {
         context.getSharedPreferences(preferencesName, MODE_PRIVATE)
     }
 
     private val writeTrigger = Trigger()
 
+    abstract fun getByKey(key: String): Value?
+
+    abstract fun storeByKey(key: String, value: Value)
+
+    override suspend fun isEmpty(): Boolean {
+        return sharedPreferences.all.isEmpty()
+    }
+
+    override suspend fun contains(key: String): Boolean {
+        return sharedPreferences.contains(key)
+    }
+
     override fun get(key: String): Flow<Value> {
         return writeTrigger
-            .map { getInternal(key) }
-            .filterNotNull()
+            .mapNotNull { getInternal(key) }
             .distinctUntilChanged()
     }
 
     override fun getAll(): Flow<List<Value>> {
-        return writeTrigger
-            .map { getAllInternal() }
-            .distinctUntilChanged()
+        throw UnsupportedOperationException("Unknown key")
     }
 
-    override suspend fun getSyncOrNull(key: String): Value? {
-        return getInternal(key)
-    }
+    override suspend fun getSyncOrNull(key: String): Value? = getInternal(key)
 
     override suspend fun getAllSyncOrNull(): List<Value> {
-        return getAllInternal()
+        throw UnsupportedOperationException("Unknown key")
     }
 
-    override suspend fun store(key: String, item: Value) {
+    override suspend fun store(key: String, value: Value) {
         try {
-            val json = adapter.toJson(item)
-
-            sharedPreferences.edit { putString(key, json) }
+            storeByKey(key, value)
             writeTrigger.trigger()
         } catch (e: Throwable) {
             Timber.e(e, "Unable to edit preferences: $key")
         }
     }
 
-    override suspend fun store(items: Map<String, Value>) {
-        items.forEach { (key, item) ->
+    override suspend fun store(values: Map<String, Value>) {
+        values.forEach { (key, item) ->
             store(key, item)
         }
     }
@@ -68,32 +70,29 @@ internal class SharedPreferencesDataStore<Value : Any>(
         writeTrigger.trigger()
     }
 
+    override suspend fun remove(keys: Collection<String>) {
+        sharedPreferences.edit {
+            keys.forEach { key ->
+                remove(key)
+            }
+        }
+
+        writeTrigger.trigger()
+    }
+
     override suspend fun clear() {
         sharedPreferences.edit { clear() }
         writeTrigger.trigger()
     }
 
     private fun getInternal(key: String): Value? {
-        return try {
-            val json = sharedPreferences.getString(key, null) ?: return null
+        if (!sharedPreferences.contains(key)) return null
 
-            adapter.fromJson(json)
+        return try {
+            getByKey(key)
         } catch (e: Throwable) {
             Timber.e(e, "Unable to get value from preferences: $key")
             null
         }
     }
-
-    private fun getAllInternal(): List<Value> {
-        return sharedPreferences.all.mapNotNull { (key, value) ->
-            try {
-                val json = value as? String ?: return@mapNotNull null
-
-                adapter.fromJson(json)
-            } catch (e: Throwable) {
-                Timber.e(e, "Unable to convert value from JSON: $key")
-                null
-            }
-        }
-    }
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/datastore/core/DataStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/datastore/core/DataStore.kt
index 4ac5668e44..4746617f3b 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/datastore/core/DataStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/datastore/core/DataStore.kt
@@ -2,21 +2,94 @@ package com.tangem.datasource.local.datastore.core
 
 import kotlinx.coroutines.flow.Flow
 
+/**
+ * Represents a generic key-value data store.
+ *
+ * @param Key The type of the keys used to identify values in the store.
+ * @param Value The type of the values stored.
+ */
 internal interface DataStore<Key : Any, Value : Any> {
 
+    /**
+     * Checks if the data store is empty.
+     *
+     * @return `true` if the data store has no entries, otherwise `false`.
+     */
+    suspend fun isEmpty(): Boolean
+
+    /**
+     * Checks if the data store contains an entry with the specified key.
+     *
+     * @param key The key to check for presence in the store.
+     * @return `true` if the key is present, otherwise `false`.
+     */
+    suspend fun contains(key: Key): Boolean
+
+    /**
+     * Retrieves a value updates associated with the given key, as a flow.
+     *
+     * @param key The key to look up in the store.
+     * @return A flow emitting the value associated with the given key.
+     */
     fun get(key: Key): Flow<Value>
 
+    /**
+     * Retrieves all values updates from the data store, as a flow.
+     *
+     * @return A flow emitting a list of all values in the store.
+     */
     fun getAll(): Flow<List<Value>>
 
+    /**
+     * Retrieves a value associated with the given key synchronously.
+     *
+     * If the key does not exist, this method returns `null`.
+     *
+     * @param key The key to look up in the store.
+     * @return The value associated with the key, or `null` if not present.
+     */
     suspend fun getSyncOrNull(key: Key): Value?
 
-    suspend fun getAllSyncOrNull(): List<Value>
+    /**
+     * Retrieves all values from the data store synchronously.
+     *
+     * If the store is empty, this method returns `null`.
+     *
+     * @return A list of all values in the store, or `null` if empty.
+     */
+    suspend fun getAllSyncOrNull(): List<Value>?
 
-    suspend fun store(key: Key, item: Value)
+    /**
+     * Stores a value in the data store associated with the given key.
+     *
+     * @param key The key to associate with the value.
+     * @param value The value to store.
+     */
+    suspend fun store(key: Key, value: Value)
 
-    suspend fun store(items: Map<Key, Value>)
+    /**
+     * Stores multiple values in the data store with their associated keys.
+     *
+     * @param values A map of keys to values to store.
+     */
+    suspend fun store(values: Map<Key, Value>)
 
+    /**
+     * Removes a value associated with the given key from the data store.
+     *
+     * @param key The key of the value to remove.
+     */
     suspend fun remove(key: Key)
 
+    /**
+     * Removes values associated with the given keys from the data store.
+     *
+     * @param keys Keys of values to remove.
+     */
+    suspend fun remove(keys: Collection<Key>)
+
+    /**
+     * Clears all entries from the data store.
+     */
     suspend fun clear()
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/datastore/core/KeylessDataStoreDecorator.kt b/core/datasource/src/main/java/com/tangem/datasource/local/datastore/core/KeylessDataStoreDecorator.kt
index 5e74e2f386..421be2b698 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/datastore/core/KeylessDataStoreDecorator.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/datastore/core/KeylessDataStoreDecorator.kt
@@ -1,28 +1,21 @@
 package com.tangem.datasource.local.datastore.core
 
-import kotlinx.coroutines.flow.Flow
-
 internal abstract class KeylessDataStoreDecorator<Value : Any>(
     wrappedDataStore: StringKeyDataStore<Value>,
-) : StringKeyDataStoreDecorator<Unit, Value>(wrappedDataStore) {
+    private val key: String = DEFAULT_STRING_KEY,
+) : StringKeyDataStoreDecorator<String, Value>(wrappedDataStore) {
 
-    override fun provideStringKey(key: Unit): String {
-        return STRING_KEY
-    }
+    override fun provideStringKey(key: String) = key
 
-    open fun get(): Flow<Value> {
-        return get(Unit)
-    }
+    open fun get() = get(key)
 
-    open suspend fun getSyncOrNull(): Value? {
-        return getSyncOrNull(Unit)
-    }
+    open suspend fun getSyncOrNull() = getSyncOrNull(key)
 
-    open suspend fun store(item: Value) {
-        store(Unit, item)
-    }
+    open suspend fun store(item: Value) = store(key, item)
+
+    override suspend fun isEmpty(): Boolean = getSyncOrNull() == null
 
     private companion object {
-        const val STRING_KEY = "key"
+        const val DEFAULT_STRING_KEY = "key"
     }
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/datastore/core/StringKeyDataStoreDecorator.kt b/core/datasource/src/main/java/com/tangem/datasource/local/datastore/core/StringKeyDataStoreDecorator.kt
index e6afee1d93..73c2afb6d4 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/datastore/core/StringKeyDataStoreDecorator.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/datastore/core/StringKeyDataStoreDecorator.kt
@@ -8,6 +8,10 @@ internal abstract class StringKeyDataStoreDecorator<Key : Any, Value : Any>(
 
     abstract fun provideStringKey(key: Key): String
 
+    override suspend fun isEmpty(): Boolean = wrappedDataStore.isEmpty()
+
+    override suspend fun contains(key: Key): Boolean = wrappedDataStore.contains(provideStringKey(key))
+
     override fun get(key: Key): Flow<Value> {
         return wrappedDataStore.get(provideStringKey(key))
     }
@@ -16,7 +20,7 @@ internal abstract class StringKeyDataStoreDecorator<Key : Any, Value : Any>(
         return wrappedDataStore.getAll()
     }
 
-    override suspend fun getAllSyncOrNull(): List<Value> {
+    override suspend fun getAllSyncOrNull(): List<Value>? {
         return wrappedDataStore.getAllSyncOrNull()
     }
 
@@ -24,13 +28,13 @@ internal abstract class StringKeyDataStoreDecorator<Key : Any, Value : Any>(
         return wrappedDataStore.getSyncOrNull(provideStringKey(key))
     }
 
-    override suspend fun store(key: Key, item: Value) {
-        wrappedDataStore.store(provideStringKey(key), item)
+    override suspend fun store(key: Key, value: Value) {
+        wrappedDataStore.store(provideStringKey(key), value)
     }
 
-    override suspend fun store(items: Map<Key, Value>) {
+    override suspend fun store(values: Map<Key, Value>) {
         wrappedDataStore.store(
-            items = items.mapKeys { (key, _) -> provideStringKey(key) },
+            values = values.mapKeys { (key, _) -> provideStringKey(key) },
         )
     }
 
@@ -38,6 +42,10 @@ internal abstract class StringKeyDataStoreDecorator<Key : Any, Value : Any>(
         wrappedDataStore.remove(provideStringKey(key))
     }
 
+    override suspend fun remove(keys: Collection<Key>) {
+        wrappedDataStore.remove(keys.map(::provideStringKey))
+    }
+
     override suspend fun clear() {
         wrappedDataStore.clear()
     }
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/network/DefaultNetworksStatusesStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/network/DefaultNetworksStatusesStore.kt
new file mode 100644
index 0000000000..88b241c3ff
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/network/DefaultNetworksStatusesStore.kt
@@ -0,0 +1,30 @@
+package com.tangem.datasource.local.network
+
+import com.tangem.datasource.local.datastore.core.StringKeyDataStore
+import com.tangem.datasource.local.datastore.core.StringKeyDataStoreDecorator
+import com.tangem.domain.tokens.model.NetworkStatus
+import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.utils.extensions.addOrReplace
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+
+internal class DefaultNetworksStatusesStore(
+    dataStore: StringKeyDataStore<Set<NetworkStatus>>,
+) : NetworksStatusesStore, StringKeyDataStoreDecorator<UserWalletId, Set<NetworkStatus>>(dataStore) {
+
+    private val mutex = Mutex()
+
+    override fun provideStringKey(key: UserWalletId): String {
+        return key.stringValue
+    }
+
+    override suspend fun store(key: UserWalletId, value: NetworkStatus) {
+        mutex.withLock {
+            val newValues = getSyncOrNull(key)
+                ?.addOrReplace(value) { it.network == value.network }
+                ?: setOf(value)
+
+            store(key, newValues)
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/network/NetworksStatusesStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/network/NetworksStatusesStore.kt
new file mode 100644
index 0000000000..a30a1b49ab
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/network/NetworksStatusesStore.kt
@@ -0,0 +1,14 @@
+package com.tangem.datasource.local.network
+
+import com.tangem.domain.tokens.model.NetworkStatus
+import com.tangem.domain.wallets.models.UserWalletId
+import kotlinx.coroutines.flow.Flow
+
+interface NetworksStatusesStore {
+
+    fun get(key: UserWalletId): Flow<Set<NetworkStatus>>
+
+    suspend fun getSyncOrNull(key: UserWalletId): Set<NetworkStatus>?
+
+    suspend fun store(key: UserWalletId, value: NetworkStatus)
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/quote/DefaultQuotesStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/quote/DefaultQuotesStore.kt
index 78e6ffb72b..667cb0f4b1 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/quote/DefaultQuotesStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/quote/DefaultQuotesStore.kt
@@ -3,8 +3,9 @@ package com.tangem.datasource.local.quote
 import com.tangem.datasource.api.tangemTech.models.QuotesResponse
 import com.tangem.datasource.local.datastore.core.StringKeyDataStore
 import com.tangem.datasource.local.quote.model.StoredQuote
-import com.tangem.domain.tokens.models.CryptoCurrency
+import com.tangem.domain.tokens.model.CryptoCurrency
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.flow.combine
 
 internal class DefaultQuotesStore(
@@ -12,16 +13,24 @@ internal class DefaultQuotesStore(
 ) : QuotesStore {
 
     override fun get(currenciesIds: Set<CryptoCurrency.ID>): Flow<Set<StoredQuote>> {
-        val flows = currenciesIds.mapNotNull { currencyId ->
-            dataStore.get(currencyId.rawCurrencyId ?: return@mapNotNull null)
-        }
+        return channelFlow {
+            val flows = currenciesIds.mapNotNull { currencyId ->
+                currencyId.rawCurrencyId?.let(dataStore::get)
+            }
 
-        return combine(flows) { quotes -> quotes.toSet() }
+            if (dataStore.isEmpty() || flows.isEmpty()) {
+                send(emptySet())
+            }
+
+            combine(flows) { quotes -> quotes.toSet() }.collect(::send)
+        }
     }
 
     override suspend fun store(response: QuotesResponse) {
-        response.quotes.forEach { (rawCurrencyId, quote) ->
-            dataStore.store(rawCurrencyId, StoredQuote(rawCurrencyId, quote))
+        val quotes = response.quotes.mapValues { (id, quote) ->
+            StoredQuote(id, quote)
         }
+
+        dataStore.store(quotes)
     }
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/quote/QuotesStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/quote/QuotesStore.kt
index f34d0039b8..64b3bf2c9c 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/quote/QuotesStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/quote/QuotesStore.kt
@@ -2,7 +2,7 @@ package com.tangem.datasource.local.quote
 
 import com.tangem.datasource.api.tangemTech.models.QuotesResponse
 import com.tangem.datasource.local.quote.model.StoredQuote
-import com.tangem.domain.tokens.models.CryptoCurrency
+import com.tangem.domain.tokens.model.CryptoCurrency
 import kotlinx.coroutines.flow.Flow
 
 interface QuotesStore {
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/settings/AppLaunchCountStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/settings/AppLaunchCountStore.kt
new file mode 100644
index 0000000000..a2ee494307
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/settings/AppLaunchCountStore.kt
@@ -0,0 +1,21 @@
+package com.tangem.datasource.local.settings
+
+import com.tangem.datasource.local.datastore.IntSharedPreferencesDataStore
+import com.tangem.datasource.local.datastore.core.KeylessDataStoreDecorator
+import kotlinx.coroutines.flow.Flow
+
+interface AppLaunchCountStore {
+
+    fun get(): Flow<Int>
+
+    suspend fun getSyncOrNull(): Int?
+
+    suspend fun store(item: Int)
+}
+
+internal class DefaultAppLaunchCountStore(
+    store: IntSharedPreferencesDataStore,
+) : AppLaunchCountStore, KeylessDataStoreDecorator<Int>(
+    wrappedDataStore = store,
+    key = "launchCount",
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/settings/AppRatingShowingCountStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/settings/AppRatingShowingCountStore.kt
new file mode 100644
index 0000000000..dfbb452f22
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/settings/AppRatingShowingCountStore.kt
@@ -0,0 +1,21 @@
+package com.tangem.datasource.local.settings
+
+import com.tangem.datasource.local.datastore.IntSharedPreferencesDataStore
+import com.tangem.datasource.local.datastore.core.KeylessDataStoreDecorator
+import kotlinx.coroutines.flow.Flow
+
+interface AppRatingShowingCountStore {
+
+    fun get(): Flow<Int>
+
+    suspend fun getSyncOrNull(): Int?
+
+    suspend fun store(item: Int)
+}
+
+internal class DefaultAppRatingShowingCountStore(
+    store: IntSharedPreferencesDataStore,
+) : AppRatingShowingCountStore, KeylessDataStoreDecorator<Int>(
+    wrappedDataStore = store,
+    key = "showRatingDialogAtLaunchCount",
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/settings/FundsFoundDateInMillisStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/settings/FundsFoundDateInMillisStore.kt
new file mode 100644
index 0000000000..1e6a50f959
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/settings/FundsFoundDateInMillisStore.kt
@@ -0,0 +1,21 @@
+package com.tangem.datasource.local.settings
+
+import com.tangem.datasource.local.datastore.LongSharedPreferencesDataStore
+import com.tangem.datasource.local.datastore.core.KeylessDataStoreDecorator
+import kotlinx.coroutines.flow.Flow
+
+interface FundsFoundDateInMillisStore {
+
+    fun get(): Flow<Long>
+
+    suspend fun getSyncOrNull(): Long?
+
+    suspend fun store(item: Long)
+}
+
+internal class DefaultFundsFoundDateInMillisStore(
+    store: LongSharedPreferencesDataStore,
+) : FundsFoundDateInMillisStore, KeylessDataStoreDecorator<Long>(
+    wrappedDataStore = store,
+    key = "fundsFoundDate",
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/settings/UserInteractingStatusStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/settings/UserInteractingStatusStore.kt
new file mode 100644
index 0000000000..1a1ed3bf03
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/settings/UserInteractingStatusStore.kt
@@ -0,0 +1,21 @@
+package com.tangem.datasource.local.settings
+
+import com.tangem.datasource.local.datastore.BooleanSharedPreferencesDataStore
+import com.tangem.datasource.local.datastore.core.KeylessDataStoreDecorator
+import kotlinx.coroutines.flow.Flow
+
+interface UserInteractingStatusStore {
+
+    fun get(): Flow<Boolean>
+
+    suspend fun getSyncOrNull(): Boolean?
+
+    suspend fun store(item: Boolean)
+}
+
+internal class DefaultUserInteractingStatusStore(
+    store: BooleanSharedPreferencesDataStore,
+) : UserInteractingStatusStore, KeylessDataStoreDecorator<Boolean>(
+    wrappedDataStore = store,
+    key = "userWasInteractWithRating",
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/token/DefaultUserMarketCoinsStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/token/DefaultUserMarketCoinsStore.kt
new file mode 100644
index 0000000000..c08a627df9
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/token/DefaultUserMarketCoinsStore.kt
@@ -0,0 +1,18 @@
+package com.tangem.datasource.local.token
+
+import com.tangem.datasource.api.tangemTech.models.CoinsResponse
+import com.tangem.datasource.local.datastore.core.StringKeyDataStore
+import com.tangem.domain.wallets.models.UserWalletId
+
+internal class DefaultUserMarketCoinsStore(
+    private val dataStore: StringKeyDataStore<CoinsResponse>,
+) : UserMarketCoinsStore {
+
+    override suspend fun getSyncOrNull(userWalletId: UserWalletId): CoinsResponse? {
+        return dataStore.getSyncOrNull(userWalletId.stringValue)
+    }
+
+    override suspend fun store(userWalletId: UserWalletId, item: CoinsResponse) {
+        dataStore.store(userWalletId.stringValue, item)
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/token/UserMarketCoinsStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/token/UserMarketCoinsStore.kt
new file mode 100644
index 0000000000..10895699ac
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/token/UserMarketCoinsStore.kt
@@ -0,0 +1,11 @@
+package com.tangem.datasource.local.token
+
+import com.tangem.datasource.api.tangemTech.models.CoinsResponse
+import com.tangem.domain.wallets.models.UserWalletId
+
+interface UserMarketCoinsStore {
+
+    suspend fun getSyncOrNull(userWalletId: UserWalletId): CoinsResponse?
+
+    suspend fun store(userWalletId: UserWalletId, item: CoinsResponse)
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/token/UserTokensStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/token/UserTokensStore.kt
index ed175a871a..08fcb31438 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/token/UserTokensStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/token/UserTokensStore.kt
@@ -10,5 +10,5 @@ interface UserTokensStore {
 
     suspend fun getSyncOrNull(key: UserWalletId): UserTokensResponse?
 
-    suspend fun store(key: UserWalletId, item: UserTokensResponse)
+    suspend fun store(key: UserWalletId, value: UserTokensResponse)
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/txhistory/DefaultTxHistoryItemsStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/txhistory/DefaultTxHistoryItemsStore.kt
new file mode 100644
index 0000000000..7cbeb3f317
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/txhistory/DefaultTxHistoryItemsStore.kt
@@ -0,0 +1,42 @@
+package com.tangem.datasource.local.txhistory
+
+import com.tangem.datasource.local.datastore.core.StringKeyDataStore
+import com.tangem.datasource.local.datastore.core.StringKeyDataStoreDecorator
+import com.tangem.domain.txhistory.models.PaginationWrapper
+import com.tangem.domain.txhistory.models.TxHistoryItem
+import com.tangem.utils.extensions.addOrReplace
+
+internal class DefaultTxHistoryItemsStore(
+    dataStore: StringKeyDataStore<Set<PaginationWrapper<TxHistoryItem>>>,
+) : TxHistoryItemsStore,
+    StringKeyDataStoreDecorator<TxHistoryItemsStore.Key, Set<PaginationWrapper<TxHistoryItem>>>(dataStore) {
+
+    override fun provideStringKey(key: TxHistoryItemsStore.Key): String = key.toString()
+
+    override suspend fun getNextPageSyncOrNull(key: TxHistoryItemsStore.Key): Int? {
+        val storedValue = getSyncOrNull(key) ?: return null
+        val lastWrappedItems = storedValue.maxBy(PaginationWrapper<*>::page)
+        val lastPage = lastWrappedItems.page
+
+        return if (lastPage <= lastWrappedItems.totalPages) {
+            lastPage
+        } else {
+            null
+        }
+    }
+
+    override suspend fun getSyncOrNull(key: TxHistoryItemsStore.Key, page: Int): PaginationWrapper<TxHistoryItem>? {
+        val storedValue = getSyncOrNull(key)
+
+        return storedValue?.firstOrNull { it.page == page }
+    }
+
+    override suspend fun store(key: TxHistoryItemsStore.Key, value: PaginationWrapper<TxHistoryItem>) {
+        val oldValue = getSyncOrNull(key).orEmpty()
+        val newValue = oldValue.addOrReplace(value) {
+            it.page == value.page
+        }
+
+        store(key, newValue)
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/txhistory/TxHistoryItemsStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/txhistory/TxHistoryItemsStore.kt
new file mode 100644
index 0000000000..e2f288e235
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/txhistory/TxHistoryItemsStore.kt
@@ -0,0 +1,22 @@
+package com.tangem.datasource.local.txhistory
+
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.txhistory.models.PaginationWrapper
+import com.tangem.domain.txhistory.models.TxHistoryItem
+import com.tangem.domain.wallets.models.UserWalletId
+
+interface TxHistoryItemsStore {
+
+    suspend fun getNextPageSyncOrNull(key: Key): Int?
+
+    suspend fun getSyncOrNull(key: Key, page: Int): PaginationWrapper<TxHistoryItem>?
+
+    suspend fun remove(key: Key)
+
+    suspend fun store(key: Key, value: PaginationWrapper<TxHistoryItem>)
+
+    data class Key(
+        val userWalletId: UserWalletId,
+        val currency: CryptoCurrency,
+    )
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/userwallet/ShouldSaveUserWalletStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/userwallet/ShouldSaveUserWalletStore.kt
new file mode 100644
index 0000000000..cbc20ba792
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/userwallet/ShouldSaveUserWalletStore.kt
@@ -0,0 +1,24 @@
+package com.tangem.datasource.local.userwallet
+
+import com.tangem.datasource.local.datastore.BooleanSharedPreferencesDataStore
+import com.tangem.datasource.local.datastore.core.KeylessDataStoreDecorator
+import kotlinx.coroutines.flow.Flow
+
+/**
+[REDACTED_AUTHOR]
+ */
+interface ShouldSaveUserWalletStore {
+
+    fun get(): Flow<Boolean>
+
+    suspend fun getSyncOrNull(): Boolean?
+
+    suspend fun store(item: Boolean)
+}
+
+internal class DefaultShouldSaveUserWalletStore(
+    store: BooleanSharedPreferencesDataStore,
+) : ShouldSaveUserWalletStore, KeylessDataStoreDecorator<Boolean>(
+    wrappedDataStore = store,
+    key = "saveUserWallets",
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/walletmanager/DefaultWalletManagersStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/walletmanager/DefaultWalletManagersStore.kt
index 36bc7723c2..f99db26624 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/walletmanager/DefaultWalletManagersStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/walletmanager/DefaultWalletManagersStore.kt
@@ -6,6 +6,7 @@ import com.tangem.datasource.local.datastore.core.StringKeyDataStore
 import com.tangem.datasource.local.datastore.core.StringKeyDataStoreDecorator
 import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.utils.extensions.addOrReplace
+import kotlinx.coroutines.flow.Flow
 
 internal class DefaultWalletManagersStore(
     dataStore: StringKeyDataStore<List<WalletManager>>,
@@ -15,6 +16,10 @@ internal class DefaultWalletManagersStore(
         return key.stringValue
     }
 
+    override fun getAll(userWalletId: UserWalletId): Flow<List<WalletManager>> {
+        return get(key = userWalletId)
+    }
+
     override suspend fun getSyncOrNull(
         userWalletId: UserWalletId,
         blockchain: Blockchain,
@@ -28,6 +33,10 @@ internal class DefaultWalletManagersStore(
         }
     }
 
+    override suspend fun getAllSync(userWalletId: UserWalletId): List<WalletManager> {
+        return getSyncOrNull(userWalletId) ?: emptyList()
+    }
+
     override suspend fun store(userWalletId: UserWalletId, walletManager: WalletManager) {
         val walletManagers = getSyncOrNull(userWalletId)
 
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/walletmanager/WalletManagersStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/walletmanager/WalletManagersStore.kt
index c025cf6911..a820b1d7c9 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/walletmanager/WalletManagersStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/walletmanager/WalletManagersStore.kt
@@ -3,15 +3,20 @@ package com.tangem.datasource.local.walletmanager
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.WalletManager
 import com.tangem.domain.wallets.models.UserWalletId
+import kotlinx.coroutines.flow.Flow
 
 interface WalletManagersStore {
 
+    fun getAll(userWalletId: UserWalletId): Flow<List<WalletManager>>
+
     suspend fun getSyncOrNull(
         userWalletId: UserWalletId,
         blockchain: Blockchain,
         derivationPath: String?,
     ): WalletManager?
 
+    suspend fun getAllSync(userWalletId: UserWalletId): List<WalletManager>
+
     suspend fun store(userWalletId: UserWalletId, walletManager: WalletManager)
 
     suspend fun clear()
diff --git a/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json b/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json
index b7f8daf04c..9da23d2779 100644
--- a/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json
+++ b/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json
@@ -3,10 +3,6 @@
         "name": "OPTIMISM_SWAP_FEATURE_ENABLED",
         "version": "4.3.1"
     },
-    {
-        "name": "REDESIGNED_CUSTOM_TOKEN_SCREEN_ENABLED",
-        "version": "4.7.0"
-    },
     {
         "name": "NEW_CARD_SCANNING_ENABLED",
         "version": "undefined"
@@ -20,11 +16,15 @@
         "version": "undefined"
     },
     {
-        "name": "REDESIGNED_TOKEN_DETAIL_SCREEN_ENABLED",
+        "name": "SHOPIFY_DYNAMIC_ENABLED",
         "version": "undefined"
     },
     {
-        "name": "SHOPIFY_DYNAMIC_ENABLED",
+        "name": "REDESIGNED_APP_CURRENCY_SELECTOR_ENABLED",
+        "version": "undefined"
+    },
+    {
+        "name": "DARK_THEME_ENABLED",
         "version": "undefined"
     }
 ]
diff --git a/core/navigation/src/main/java/com/tangem/core/navigation/NavigationState.kt b/core/navigation/src/main/java/com/tangem/core/navigation/NavigationState.kt
index db33dd330d..9aea608408 100644
--- a/core/navigation/src/main/java/com/tangem/core/navigation/NavigationState.kt
+++ b/core/navigation/src/main/java/com/tangem/core/navigation/NavigationState.kt
@@ -35,4 +35,5 @@ enum class AppScreen(val isDialogFragment: Boolean = false) {
     Welcome,
     SaveWallet(isDialogFragment = true),
     WalletSelector(isDialogFragment = true),
+    AppCurrencySelector,
 }
\ No newline at end of file
diff --git a/core/navigation/src/main/java/com/tangem/core/navigation/ReduxNavController.kt b/core/navigation/src/main/java/com/tangem/core/navigation/ReduxNavController.kt
index ff8e8ced9e..20e37f3958 100644
--- a/core/navigation/src/main/java/com/tangem/core/navigation/ReduxNavController.kt
+++ b/core/navigation/src/main/java/com/tangem/core/navigation/ReduxNavController.kt
@@ -10,5 +10,7 @@ interface ReduxNavController {
     /** Navigate by [action] */
     fun navigate(action: NavigationAction)
 
+    fun popBackStack(screen: AppScreen? = null)
+
     fun getBackStack(): List<AppScreen>
 }
\ No newline at end of file
diff --git a/core/res/src/main/res/values-de/strings.xml b/core/res/src/main/res/values-de/strings.xml
index 0542e0607f..3bc3defd6d 100644
--- a/core/res/src/main/res/values-de/strings.xml
+++ b/core/res/src/main/res/values-de/strings.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-    <string name="alert_card_signed_transactions">Diese Karte wurde früher bereits aufgeladen und Transaktionen wurden damit signiert. Ziehen Sie eine sofortige Auszahlung aller Beträge in Betracht, wenn Sie diese Karte von einer nicht vertrauenswürdigen Quelle erhalten haben.</string>
-    <string name="alert_developer_card">Die von Ihnen gescannte Karte ist eine Entwicklungskarte. Akzeptieren Sie sie nicht als Zahlungsmittel.</string>
     <string name="alert_unsupported_card">Diese Karte ist für die Zusammenarbeit mit Tangem nicht geeignet</string>
     <string name="chat_bot_name">Tangem Bot</string>
     <string name="common_accept">Akzeptieren</string>
diff --git a/core/res/src/main/res/values-fr/strings.xml b/core/res/src/main/res/values-fr/strings.xml
index 3dcb556630..097c597e6e 100644
--- a/core/res/src/main/res/values-fr/strings.xml
+++ b/core/res/src/main/res/values-fr/strings.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-    <string name="alert_card_signed_transactions">Cette carte a déjà été rechargée et a signé des transactions avant. Envisagez la possibilité de retirer tous les fonds immédiatement si vous avez reçu cette carte d\'une source non fiable.</string>
-    <string name="alert_developer_card">La carte que vous avez scannée est une carte de développement. Ne l\'acceptez pas comme paiement.</string>
     <string name="alert_unsupported_card">Cette carte n\'est pas conçue pour fonctionner avec Tangem</string>
     <string name="chat_bot_name">Tangem Bot</string>
     <string name="common_accept">J\'accepte</string>
diff --git a/core/res/src/main/res/values-it/strings.xml b/core/res/src/main/res/values-it/strings.xml
index e9d1904611..aa5a2b3d47 100644
--- a/core/res/src/main/res/values-it/strings.xml
+++ b/core/res/src/main/res/values-it/strings.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-    <string name="alert_card_signed_transactions">Questa carta è già stata ricaricata e ha firmato transazioni in passato. Valuta la possibilità di prelevare immediatamente tutti i fondi se hai ricevuto questa carta da una fonte inaffidabile.</string>
-    <string name="alert_developer_card">La carta che hai scansionato è una carta di sviluppo. Non utilizzarla come strumento di pagamento</string>
     <string name="alert_unsupported_card">Questa carta non è progettata per funzionare con Tangem</string>
     <string name="chat_bot_name">Tangem Bot</string>
     <string name="common_accept">Accetta</string>
diff --git a/core/res/src/main/res/values-ru/strings-blockchain.xml b/core/res/src/main/res/values-ru/strings-blockchain.xml
index fcec1f9e0c..0744b44f6b 100644
--- a/core/res/src/main/res/values-ru/strings-blockchain.xml
+++ b/core/res/src/main/res/values-ru/strings-blockchain.xml
@@ -7,7 +7,7 @@
   <string name="eth_gas_required_exceeds_allowance">Недостаточно средств для совершения транзакции. Пожалуйста, пополните свой аккаунт.</string>
   <string name="generic_error_code">Произошла ошибка. Код: %s.</string>
   <string name="kaspa_withdrawal_message_warning">Из-за ограничений Kaspa в одну транзакцию может поместиться только %1$d UTXO. Это означает, что вы можете отправить только %2$s или меньше. Вам нужно уменьшить сумму.</string>
-  <string name="no_account_generic">Пополните счет на %1$s+ %2$s, чтобы создать аккаунт</string>
+  <string name="no_account_generic">Чтобы использовать сеть %1$s, вы должны оплатить резерв аккаунта (%2$s %3$s), который блокируется и не используется в вашем балансе.</string>
   <string name="no_account_polkadot">Аккаунт получателя не активирован. Отправьте %s или более для активации аккаунта.</string>
   <string name="send_error_dust_amount_format">Минимальная сумма: %s</string>
   <string name="send_error_dust_change">Сдача слишком мала</string>
diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml
index 1ed0453bfb..60fae4f2a7 100644
--- a/core/res/src/main/res/values-ru/strings.xml
+++ b/core/res/src/main/res/values-ru/strings.xml
@@ -7,17 +7,12 @@
     <string name="alert_app_feedback_sent_title">Отправлено успешно</string>
     <string name="alert_button_request_support">Обратиться в поддержку</string>
     <string name="alert_button_send_feedback">Отправить отзыв</string>
-    <string name="alert_card_signed_transactions">Эта карта ранее пополнялась и подписывала транзакции. Выведите средства как можно быстрее, если вы получили эту карту из ненадежного источника. Если это ваша карта, то не о чем беспокоиться.</string>
     <string name="alert_demo_feature_disabled">Эта функция недоступна в демонстрационном режиме</string>
-    <string name="alert_demo_message">Приложение работает в демонстрационном режиме. Средства на всех счетах ненастоящие.</string>
-    <string name="alert_developer_card">Карта, которую вы отсканировали, является картой разработчика. Не принимайте её в качестве оплаты.</string>
     <string name="alert_failed_to_send_email_title">Не удалось отправить письмо</string>
     <string name="alert_failed_to_send_transaction_message">Причина: %s</string>
     <string name="alert_failed_to_send_transaction_title">Не могу отправить транзакцию</string>
-    <string name="alert_manage_tokens_addresses_message">Внимание! Валюты на разных сетях имеют разные адреса. Убедитесь, что адрес соответствует сети, в которой вы отправляете средства.</string>
     <string name="alert_manage_tokens_unsupported_curve_message">Для активации криптографии сети %1$s необходимо сбросить кошелек до заводских настроек. Пожалуйста, выведите свои средства, чтобы не потерять их, после сброса доступ к текущему кошельку будет невозможен.</string>
     <string name="alert_manage_tokens_unsupported_message">Токены в сети Solana не поддерживаются этой картой из-за ограничений прошивки.</string>
-    <string name="alert_signed_hashes_message">Эта карта не является платежным средством. В настоящее время мы не можем сопоставить количество подписей на карте с информацией в блокчейне. Это нормально, но в редких случаях может означать, что предыдущий владелец удерживает подписанную транзакцию от публикации, что является поводом для беспокойства.\nНе принимайте эту карту в качестве физического платежа от кого-то, кому вы не доверяете.\nВо всех остальных отношениях эта карта совершенно безопасна.\nTangem — единственный аппаратный кошелек, предлагающий защиту методом подсчета подписей.</string>
     <string name="alert_troubleshooting_scan_card_title">У вас возникли трудности со сканированием карты?</string>
     <string name="alert_unsupported_card">Эта карта не предназначена для работы с этим приложением</string>
     <string name="app_settings_enable_biometrics_description">Перейдите в настройки, чтобы включить биометрическую аутентификацию в приложении Tangem</string>
@@ -28,11 +23,16 @@
     <string name="app_settings_saved_access_codes_footer">Подключите функцию хранения кодов доступа от карт на телефоне в зашифрованном виде, и при работе с картой вместо кода доступа будет запрашиваться биометрическая аутентификация.</string>
     <string name="app_settings_saved_wallet">Cохранение кошелька</string>
     <string name="app_settings_saved_wallet_footer">Подключите функцию привязки карты в приложении, а также возможность биометрической аутентификации. Подпись транзакции все так же потребует карту.</string>
+    <string name="app_settings_theme_mode_dark">Тёмная</string>
+    <string name="app_settings_theme_mode_light">Светлая</string>
+    <string name="app_settings_theme_mode_system">Как в системе</string>
+    <string name="app_settings_theme_selector_title">Тема</string>
     <string name="app_settings_title">Настройки приложения</string>
     <string name="biometric_lockout_permanent_warning_description">Пожалуйста, отсканируйте карту</string>
     <string name="biometric_lockout_warning_description">Пожалуйста, попробуйте снова через 30 секунд или отсканируйте карту</string>
     <string name="biometric_lockout_warning_title">Слишком много попыток</string>
     <string name="biometric_unavailable_warning">Вы отключили биометрическую аутентификацию на вашем телефоне и не сможете сохранять кошельки в приложении. Для сохранения кошельков, пожалуйста, включите функцию биометрической аутентификации в настройках телефона.</string>
+    <string name="button_start_backup_process">Начать резервное копирование</string>
     <plurals name="card_label_card_count">
         <item quantity="one">%d карта</item>
         <item quantity="few">%d карты</item>
@@ -43,6 +43,7 @@
     <string name="card_settings_access_code_recovery_enabled_description">Использовать эту карту для сброса кода доступа на других картах в этом кошельке</string>
     <string name="card_settings_access_code_recovery_footer">Отключить возможность сброса кода доступа на этой карте или других картах этого кошелька</string>
     <string name="card_settings_access_code_recovery_title">Восстановление кода доступа</string>
+    <string name="card_settings_action_sheet_reset">Сбросить</string>
     <string name="card_settings_action_sheet_title">Вы уверены, что хотите это сделать?</string>
     <string name="card_settings_change_access_code">Смена кода доступа</string>
     <string name="card_settings_change_access_code_footer">Код доступа будет изменен только на данной карте</string>
@@ -57,6 +58,7 @@
     <string name="chat_user_actions_title">Пожалуйста, выберите действие</string>
     <string name="chat_user_rate_agent_title">Пожалуйста, оцените работу агента</string>
     <string name="common_accept">Принять</string>
+    <string name="common_access_denied">Доступ запрещен</string>
     <string name="common_add">Добавить</string>
     <string name="common_apply">Применить</string>
     <string name="common_approval">Одобрение</string>
@@ -65,6 +67,7 @@
     <string name="common_biometric_authentication">биометрическую аутентификацию</string>
     <string name="common_biometrics">биометрией</string>
     <string name="common_buy">Купить</string>
+    <string name="common_buy_currency">Купить %1$s</string>
     <string name="common_camera_denied_alert_message">Вы не предоставили доступ к камере, пожалуйста, измените настройки конфиденциальности.</string>
     <string name="common_cancel">Отмена</string>
     <string name="common_close">Закрыть</string>
@@ -87,6 +90,7 @@
     <string name="common_like">Нравится</string>
     <string name="common_locked">Заблокирован</string>
     <string name="common_main_network">Основная сеть</string>
+    <string name="common_next">Далее</string>
     <string name="common_no">Нет</string>
     <string name="common_no_address">Нет адреса</string>
     <string name="common_no_data">Нет данных</string>
@@ -96,7 +100,6 @@
     <string name="common_reject">Отклонить</string>
     <string name="common_reload">Перезагрузить</string>
     <string name="common_rename">Переименовать</string>
-    <string name="common_reset">Сбросить</string>
     <string name="common_save_changes">Сохранить изменения</string>
     <string name="common_search">Искать</string>
     <string name="common_search_tokens">Поиск токенов</string>
@@ -114,10 +117,10 @@
     <string name="common_success">Успешно</string>
     <string name="common_swap">Обмен</string>
     <string name="common_terms_and_conditions">условия участия</string>
+    <string name="common_transaction_failed">Ошибка транзакции</string>
     <string name="common_transactions">Транзакции</string>
     <string name="common_transfer">Перевод</string>
     <string name="common_understand">Я понял</string>
-    <string name="common_unlock_needed">Необходима разблокировка</string>
     <string name="common_unreachable">Недоступно</string>
     <string name="common_yes">Да</string>
     <string name="contract_address_copied_message">Адрес контракта скопирован!</string>
@@ -139,7 +142,8 @@
     <string name="custom_token_network_input_not_selected">Не выбрано</string>
     <string name="custom_token_network_input_title">Сеть</string>
     <string name="custom_token_token_symbol_input_placeholder">Например, USDC</string>
-    <string name="custom_token_token_symbol_input_title">Символ токена</string>
+    <string name="custom_token_token_symbol_input_title">Символ</string>
+    <string name="custom_token_token_symbol_input_title_old">Символ токена</string>
     <string name="custom_token_validation_error_already_added">Этот токен/сеть уже находится в вашем списке</string>
     <string name="custom_token_validation_error_not_found">Токены могут быть созданы кем угодно. Остерегайтесь мошеннических токенов, они могут ничего не стоить</string>
     <string name="details_chat">Чат</string>
@@ -150,11 +154,13 @@
     <string name="details_manage_security_passcode">Пароль</string>
     <string name="details_manage_security_passcode_description">Перед выполнением любой команды, влекущей за собой изменение состояния карты, вам необходимо будет ввести пароль.</string>
     <string name="details_referral_title">Реферальная программа</string>
+    <string name="details_row_description_flip_to_hide">Переверните экран вашего устройства вниз, чтобы быстро скрыть и отобразить балансы</string>
     <string name="details_row_privacy_policy">Privacy policy</string>
     <string name="details_row_subtitle_signed_hashes_format">%s хэшей</string>
     <string name="details_row_title_cid">Номер карты</string>
     <string name="details_row_title_create_backup">Добавить еще карты</string>
     <string name="details_row_title_currency">Валюта приложения</string>
+    <string name="details_row_title_flip_to_hide">Скрывать балансы жестом переворота</string>
     <string name="details_row_title_issuer">Эмитент</string>
     <string name="details_row_title_send_feedback">Отправить отзыв</string>
     <string name="details_row_title_signed_hashes">Подписано</string>
@@ -187,6 +193,7 @@
     <string name="initial_message_tap_header">Приложите карту</string>
     <string name="internal_error_wallet_manager_not_found">Внутренняя ошибка: не удается найти менеджер кошельков</string>
     <string name="key_invalidated_warning_description">Вы обновили данные биометрии, отсканируйте свою карту для входа</string>
+    <string name="main_empty_tokens_list_message">Чтобы начать отслеживать свои криптоактивы и транзакции, добавьте токены</string>
     <string name="main_get_bonus_subtitle">Вы успешно прошли все уроки и теперь можете получить 1INCH токены</string>
     <plurals name="main_learn_subtitle">
         <item quantity="one">Пройдите 3 урока и получите %d 1INCH токен на свой кошелек</item>
@@ -195,21 +202,14 @@
         <item quantity="other">Пройдите 3 урока и получите %d 1INCH токенов на свой кошелек</item>
     </plurals>
     <string name="main_manage_tokens">Управление токенами</string>
-    <string name="main_no_backup_warning_subtitle">Чтобы защитить свои активы, мы советуем вам выполнить эту процедуру</string>
-    <string name="main_no_backup_warning_title">Бэкап кошелька не был произведен</string>
     <string name="main_page_balance">Баланс</string>
     <string name="main_processing_full_amount">В сумме учтены не все монеты</string>
     <string name="main_promotion_credited">1INCH токены будут зачислены на адрес вашего кошелька в сети %s в течение 48 часов</string>
     <string name="main_scan_card_warning_view_subtitle">Чтобы получить доступ ко всем сетям, вам необходимо отсканировать карту</string>
     <string name="main_scan_card_warning_view_title">Отсканируйте карту</string>
     <string name="main_tokens">Токены</string>
-    <plurals name="main_warning_missing_derivation_description">
-        <item quantity="one">Вам надо сгенерировать адрес для %d новой сети, используя вашу карту</item>
-        <item quantity="few">Вам надо сгенерировать адреса для %d новых сетей, используя вашу карту</item>
-        <item quantity="many">Вам надо сгенерировать адреса для %d новых сетей, используя вашу карту</item>
-        <item quantity="other">Вам надо сгенерировать адреса для %d новых сетей, используя вашу карту</item>
-    </plurals>
-    <string name="main_warning_missing_derivation_title">Некоторые адреса отсутствуют</string>
+    <string name="manage_tokens_add">Добавить</string>
+    <string name="manage_tokens_edit">Изменить</string>
     <string name="onboarding_access_code_feature_1_description">Вам необходимо установить единый код доступа для защиты всех ваших карт</string>
     <string name="onboarding_access_code_feature_1_title">Защита</string>
     <string name="onboarding_access_code_feature_2_description">Позже вы сможете установить индивидуальный код доступа для каждой карты</string>
@@ -298,12 +298,13 @@
     <string name="onboarding_wallet_info_title_fourth">Восстановление кода доступа</string>
     <string name="onboarding_wallet_info_title_second">Идентичные карты</string>
     <string name="onboarding_wallet_info_title_third">Код доступа</string>
-    <string name="organize_tokens_group">Группировка</string>
+    <string name="organize_tokens_group">Группы</string>
     <string name="organize_tokens_sort_by_balance">По балансу</string>
     <string name="organize_tokens_title">Сортировка токенов</string>
-    <string name="organize_tokens_ungroup">Разгруппировать</string>
+    <string name="organize_tokens_ungroup">Список</string>
     <string name="receive_bottom_sheet_title">%1$s %2$s адрес в сети %3$s</string>
     <string name="receive_bottom_sheet_warning_message">%1$s (%2$s) в сети %3$s</string>
+    <string name="receive_bottom_sheet_warning_message_full">Отправляйте только %s на этот адрес. Использование другой сети может привести к утрате средств.</string>
     <string name="referral_button_participate">Участвовать</string>
     <string name="referral_error_failed_to_load_info">Не удалось загрузить информацию по реферальной программе. Пожалуйста, попробуйте позже.</string>
     <string name="referral_error_failed_to_load_info_with_reason">Не удалось загрузить информацию по реферальной программе. Код ошибки: %s. Пожалуйста, попробуйте позже.</string>
@@ -341,7 +342,8 @@
     </plurals>
     <string name="registration_task_alert_message">Пожалуйста, удерживайте карту до завершения операции</string>
     <string name="reset_card_to_factory_button_title">Сбросить карту</string>
-    <string name="reset_card_to_factory_warning_message">Я понимаю, что после выполнения этого действия у меня больше не будет доступа к текущему кошельку</string>
+    <string name="reset_card_to_factory_condition_1">Я понимаю, что после выполнения этого действия у меня больше не будет доступа к текущему кошельку</string>
+    <string name="reset_card_to_factory_condition_2">Я понимаю, что не смогу этой картой восстановить пароль на остальных картах этого кошелька, если я его забуду</string>
     <string name="reset_card_with_backup_to_factory_message">Сброс к заводским настройкам приведет к полному удалению кошелька с выбранной карты. Вы не сможете восстановить текущий кошелек или использовать данную карту для восстановления кода доступа.</string>
     <string name="reset_card_without_backup_to_factory_message">Сброс к заводским настройкам приведет к полному удалению кошелька с выбранной карты. Вы не сможете восстановить текущий кошелек.</string>
     <string name="russian_bank_card_warning_subtitle">У вас есть карта банка другой страны, а также вид на жительство или регистрация вне РФ?</string>
@@ -386,10 +388,9 @@
     <string name="shop_other_payment_methods">Другие способы оплаты</string>
     <string name="shop_pre_order_now">Сделать предзаказ</string>
     <string name="shop_total">Итого</string>
-    <string name="solana_rent_warning">Сеть Solana взимает арендную плату в размере %1$s каждые 2 дня. Аккаунты, которые не могут позволить себе арендную плату, удаляются из сети. Пополните свой счет более чем на %2$s, чтобы не платить арендную плату.</string>
     <string name="story_awe_description">Держите свои криптосбережения в безопасности. Приватные ключи надежно хранятся на карте.</string>
     <string name="story_awe_title">Революционный аппаратный кошелек</string>
-    <string name="story_backup_description">До **трех карт** с одним кошельком</string>
+    <string name="story_backup_description">До трех карт с одним кошельком</string>
     <string name="story_backup_description_1">До</string>
     <string name="story_backup_description_2_bold">трех карт</string>
     <string name="story_backup_description_3">с одним кошельком</string>
@@ -400,16 +401,9 @@
     <string name="story_finish_title">Кошелек для каждого</string>
     <string name="story_learn_description">Пройдите 3 урока, получите скидку на покупку Tangem Wallet и 1INCH токены</string>
     <string name="story_learn_learn">Пройти обучение</string>
-    <string name="story_meet_borrow">Занимайте</string>
-    <string name="story_meet_buy">Покупайте</string>
-    <string name="story_meet_exchange">Обменивайте</string>
-    <string name="story_meet_lend">Вкладывайте</string>
-    <string name="story_meet_pay">Расплачивайтесь</string>
-    <string name="story_meet_send">Отправляйте</string>
-    <string name="story_meet_store">Храните</string>
-    <string name="story_meet_title">Встречайте\nTangem</string>
+    <string name="story_meet_title">Встречайте Tangem</string>
     <string name="story_web3_description">Обменивайте, покупайте NFT, получайте займы и делайте вклады в более чем 100 различных децентрализованных сервисах</string>
-    <string name="story_web3_title">Поддержка DeFi</string>
+    <string name="story_web3_title">Поддержка Web 3.0</string>
     <string name="swapping_approve_information_text">Подтверждения считаются отраслевым стандартом для всех децентрализованных бирж и защищают ваш кошелек от доступа со стороны смарт-контракта без вашего разрешения. По замыслу смарт-контракты не могут получить доступ к вашим токенам, если вы не одобрите доступ со своей стороны. «Разблокируя» свои токены, вы даете смарт-контракту 1inch разрешение тратить ваши активы. Майнеры сети получают компенсацию за газ (оплачиваемый вами) за запись этого действия в блокчейне. Как только разрешение будет предоставлено, вы сможете обменять свой токен.</string>
     <string name="swapping_approve_information_title">Подтвердить</string>
     <string name="swapping_error_wrapper">Ошибка: %s</string>
@@ -450,8 +444,6 @@
     <string name="token_details_hide_alert_message">Вы скрываете токен с главного экрана, но в любой момент сможете добавить его обратно через страницу управления токенами.</string>
     <string name="token_details_hide_alert_title">Скрыть %s</string>
     <string name="token_details_hide_token">Скрыть токен</string>
-    <string name="token_details_send_blocked_fee_format">%1$s — это токен в сети %2$s. Чтобы отправить транзакцию %3$s, необходимо пополнить баланс %4$s (%5$s) для оплаты комиссии сети.</string>
-    <string name="token_details_send_blocked_tx_format">Пожалуйста, дождитесь завершения транзакции %s, чтобы иметь возможность отправить средства</string>
     <string name="token_details_token_type_subtitle">%1$s токен в сети %%image%% %2$s</string>
     <string name="token_details_unable_hide_alert_message">Токен %1$s является основной валютой в сети %2$s и не может быть скрыт до тех пор, пока у вас в списке есть другие токены этой сети.</string>
     <string name="token_details_unable_hide_alert_title">Невозможно скрыть %s</string>
@@ -476,7 +468,6 @@
     <string name="twins_recreate_warning">Это действие необратимо. У вас не будет доступа к старому кошельку.</string>
     <string name="twins_scan_twin_with_number">Приложите twin-карту с номером %s и не убирайте до окончания операции</string>
     <string name="unlock_wallet_description_full">Используйте %s или отсканируйте карту, чтобы получить доступ к своему кошельку</string>
-    <string name="unlock_wallet_description_short">Используйте %s или отсканируйте карту</string>
     <string name="user_wallet_list_add_button">Добавить новый кошелек</string>
     <string name="user_wallet_list_delete_prompt">Вы уверены, что хотите удалить этот кошелек?</string>
     <string name="user_wallet_list_editing_count">%d выбрано</string>
@@ -487,9 +478,9 @@
     <string name="user_wallet_list_rename_popup_title">Переименование кошелька</string>
     <string name="user_wallet_list_single_header">Одновалютные</string>
     <string name="user_wallet_list_title">Мои кошельки</string>
-    <string name="user_wallet_list_unlock_all">Разблокировать все с %s</string>
+    <string name="user_wallet_list_unlock_all">Разблокировать все</string>
+    <string name="user_wallet_list_unlock_all_with">Разблокировать все с %s</string>
     <string name="wallet_address_button_explore">История транзакций</string>
-    <string name="wallet_balance_blockchain_unreachable">Сеть недоступна</string>
     <string name="wallet_balance_blockchain_unreachable_try_later">Блокчейн недоступен. Попробуйте позже.</string>
     <string name="wallet_balance_loading">Баланс загружается…</string>
     <string name="wallet_balance_missing_derivation">Отсканируйте карту</string>
@@ -520,6 +511,7 @@
     <string name="wallet_connect_network_not_found_format">Сеть %s не найдена. Пожалуйста, добавьте её и попробуйте заново.</string>
     <string name="wallet_connect_no_sessions_message">Нет открытых сессий WalletConnect</string>
     <string name="wallet_connect_no_sessions_title">Упс. Нет сессий.</string>
+    <string name="wallet_connect_pairing_error">Не удалось создать пару WalletConnect: %1$s</string>
     <string name="wallet_connect_paste_from_clipboard">Вставить из буфера обмена</string>
     <string name="wallet_connect_personal_sign_message">Сообщение для %1$s:\n%2$s</string>
     <string name="wallet_connect_request_session_start">Запрос на открытие сессии для\n%1$s\n\nСЕТЬ: %2$s\n\nURL: %3$s</string>
@@ -550,19 +542,50 @@
     <string name="wallet_pending_tx_sending">Отправка</string>
     <string name="wallet_pending_tx_sending_address_format">к %s</string>
     <string name="wallet_title">Tangem</string>
-    <string name="warning_button_can_be_better">Можно лучше</string>
+    <string name="warning_access_denied_message">Используйте %s или отсканируйте карту, чтобы разблокировать доступ к вашему кошельку</string>
+    <string name="warning_button_could_be_better">Можно лучше</string>
     <string name="warning_button_learn_more">Узнать больше</string>
+    <string name="warning_button_like_it">Нравится</string>
     <string name="warning_button_ok">Понятно!</string>
     <string name="warning_button_really_cool">Очень круто!</string>
-    <string name="warning_existential_deposit_message">Сеть %1$s использует концепцию экзистенциального депозита. Если баланс вашего счета опустится ниже %2$s, он будет деактивирован, а все оставшиеся средства будут уничтожены.</string>
-    <string name="warning_failed_to_verify_card_message">Эта карта может быть производственным образцом или подделкой</string>
-    <string name="warning_failed_to_verify_card_title">Проверка подлинности не удалась</string>
-    <string name="warning_important_security_info">Важная информация о безопасности %s</string>
-    <string name="warning_low_signatures_format">На этой карте осталось только %s подписей. Вы должны вывести все свои средства.</string>
-    <string name="warning_rate_app_message">Как вам Tangem?</string>
-    <string name="warning_rate_app_title">Один вопрос</string>
-    <string name="warning_signed_tx_previously">Эта карта подписывала транзакции в прошлом</string>
-    <string name="warning_testnet_card_message">Это тестовая карта. Не принимайте её в качестве оплаты. Эта карта должна использоваться только в целях тестирования и разработки.</string>
+    <string name="warning_demo_mode_message">Вы находитесь в режиме демо</string>
+    <string name="warning_demo_mode_title">Демо режим включен</string>
+    <string name="warning_developer_card_message">Отсканированная вами карта является картой разработчика. Не используйте ее для создания своего кошелька.</string>
+    <string name="warning_developer_card_title">Не для пользователя!</string>
+    <string name="warning_existential_deposit_message">Cеть %1$s использует концепцию экзистенциального депозита. Если баланс вашего счета будет ниже %2$s, то он будет деактивирован, а средства на счете уничтожены.</string>
+    <string name="warning_existential_deposit_title">Для работы с сетью необходим депозит</string>
+    <string name="warning_failed_to_verify_card_message">Возможно, данная карта - образец или подделка</string>
+    <string name="warning_failed_to_verify_card_title">Ошибка проверки подлинности</string>
+    <string name="warning_low_signatures_message">На этой карте осталось всего %s подписей. Вам следует вывести все ваши средства.</string>
+    <string name="warning_low_signatures_title">Малое количество подписей</string>
+    <string name="warning_manage_tokens_legacy_derivation_message">Токены на разных сетях могут иметь разные адреса. Пожалуйста, убедитесь при переводе средств, что ваш адрес соответствует сети.</string>
+    <plurals name="warning_missing_derivation_message">
+        <item quantity="one">Используйте вашу карту, чтобы сгенерировать адрес для %d новой сети</item>
+        <item quantity="few">Используйте вашу карту, чтобы сгенерировать адреса для %d новых сетей</item>
+        <item quantity="many">Используйте вашу карту, чтобы сгенерировать адреса для %d новых сетей</item>
+        <item quantity="other">Используйте вашу карту, чтобы сгенерировать адреса для %d новых сетей</item>
+    </plurals>
+    <string name="warning_missing_derivation_title">Некоторые адреса отсутствуют</string>
+    <string name="warning_network_unreachable_message">В данный момент сеть недоступна. Пожалуйста, попробуйте позже.</string>
+    <string name="warning_network_unreachable_title">Сеть недоступна</string>
+    <string name="warning_no_account_title">Пополните ваш кошелек</string>
+    <string name="warning_no_backup_message">Ваш кошелек не имеет резервной копии. Проведите эту процедуру сейчас, чтобы защитить ваши активы.</string>
+    <string name="warning_no_backup_title">Резервная копия отсутствует</string>
+    <string name="warning_number_of_signed_hashes_incorrect_message">Эта карта ранее использовалась для подписи транзакций. Если она получена от ненадежного источника, рассмотрите возможность вывода своих средств. Если это ваша карта, дополнительных действий не требуется.</string>
+    <string name="warning_number_of_signed_hashes_incorrect_title">Карта уже подписывала транзакции</string>
+    <string name="warning_old_device_old_card_title">Устройство несовместимо</string>
+    <string name="warning_rate_app_message">Ваш отзыв мотивирует нас сделать кошелек Tangem еще лучше</string>
+    <string name="warning_rate_app_title">Нравится Tangem?</string>
+    <string name="warning_rent_fee_title">Необходима плата за аренду сети</string>
+    <string name="warning_send_blocked_funds_for_fee_message">%1$s - это токен в сети %2$s. Для совершения транзакции %3$s, вам необходимо внести депозит в размере %4$s (%5$s), чтобы покрыть комиссию сети.</string>
+    <string name="warning_send_blocked_funds_for_fee_title">Недостаточно %1$s для оплаты комиссии сети</string>
+    <string name="warning_send_blocked_pending_transactions_message">Отправка средств станет доступной после завершения транзакции %s</string>
+    <string name="warning_send_blocked_pending_transactions_title">Транзакция в обработке</string>
+    <string name="warning_solana_rent_fee_message">Сеть Solana взимает арендную плату в размере %1$s каждые 2 дня. Аккаунты, которые не могут позволить себе арендную плату, удаляются из сети. Пополните свой счет более чем на %2$s, чтобы не платить арендную плату.</string>
+    <string name="warning_some_networks_unreachable_message">Некоторые сети в настоящее время недоступны. Пожалуйста, повторите попытку позже.</string>
+    <string name="warning_some_networks_unreachable_title">Некоторые сети недоступны</string>
+    <string name="warning_testnet_card_message">Это Testnet карта. Он не может обрабатывать транзакции и используется только в целях тестирования и разработки.</string>
+    <string name="warning_testnet_card_title">Только для целей тестирования</string>
     <string name="welcome_interrupted_backup_alert_discard">Отказаться</string>
     <string name="welcome_interrupted_backup_alert_message">Вы не закончили резервное копирование. Хотите продолжить?</string>
     <string name="welcome_interrupted_backup_alert_resume">Да, возобновить</string>
@@ -573,5 +596,5 @@
     <string name="welcome_unlock">Войти с %s</string>
     <string name="welcome_unlock_card">Сканировать карту</string>
     <string name="welcome_unlock_description">Используйте %s или отсканируйте карту для входа в приложение</string>
-    <string name="welcome_unlock_title">С возвращением!</string>
+    <string name="welcome_unlock_title">C возвращением!</string>
 </resources>
diff --git a/core/res/src/main/res/values-zh-rTW/strings.xml b/core/res/src/main/res/values-zh-rTW/strings.xml
index 294f3413b7..b80f9ce410 100644
--- a/core/res/src/main/res/values-zh-rTW/strings.xml
+++ b/core/res/src/main/res/values-zh-rTW/strings.xml
@@ -7,16 +7,11 @@
     <string name="alert_app_feedback_sent_title">成功送出</string>
     <string name="alert_button_request_support">請求支持</string>
     <string name="alert_button_send_feedback">發送反饋</string>
-    <string name="alert_card_signed_transactions">此卡過去已經充值並簽署過交易。如果您從不受信任的來源收到此卡，請考慮立即提取所有資金。如果是您的卡，則無需擔心</string>
     <string name="alert_demo_feature_disabled">此功能不在展示模式中提供</string>
-    <string name="alert_demo_message">您正在展示模式。所有資產皆不是真的</string>
-    <string name="alert_developer_card">您掃描的卡是開發卡。不要用它作為付款方式</string>
     <string name="alert_failed_to_send_email_title">發送電子郵件失敗</string>
     <string name="alert_failed_to_send_transaction_message">原因：%s</string>
     <string name="alert_failed_to_send_transaction_title">無法發送交易</string>
-    <string name="alert_manage_tokens_addresses_message">請注意代幣在不同的網路有不同的地址。請再次檢查正確的地址</string>
     <string name="alert_manage_tokens_unsupported_message">此卡不支持Solana網路上的代幣因為韌體限制</string>
-    <string name="alert_signed_hashes_message">這張卡不是不記名票據。我們目前無法將卡上的簽名計數與區塊鏈上的信息相匹配。這很正常，但在極少數情況下可能意味著以前的持有人正在阻止離線簽名，這是安全問題。不要接受此卡作為您不信任的人的實物付款。它在所有其他方面都非常安全。Tangem 是唯一提供簽名計數保護的硬件錢包。</string>
     <string name="alert_troubleshooting_scan_card_title">有困難在掃描卡上嗎？</string>
     <string name="alert_unsupported_card">此卡不適用於此app</string>
     <string name="app_settings_enable_biometrics_description">轉到設置以在 Tangem App 中啟用生物識別身份驗證</string>
@@ -38,6 +33,7 @@
     <string name="card_settings_access_code_recovery_enabled_description">允許您使用此卡重置此錢包中其他卡上的訪問密碼</string>
     <string name="card_settings_access_code_recovery_footer">禁用重置此卡或此錢包中其他卡上的訪問密碼的功能</string>
     <string name="card_settings_access_code_recovery_title">恢復訪問密碼</string>
+    <string name="card_settings_action_sheet_reset">重置</string>
     <string name="card_settings_action_sheet_title">您確定要這麼做嗎？</string>
     <string name="card_settings_change_access_code">更改訪問密碼</string>
     <string name="card_settings_change_access_code_footer">訪問密碼將僅在此卡上更改</string>
@@ -80,7 +76,6 @@
     <string name="common_origin_card">主卡片</string>
     <string name="common_reject">拒絕</string>
     <string name="common_rename">重新命名</string>
-    <string name="common_reset">重置</string>
     <string name="common_save_changes">保存設置</string>
     <string name="common_search">搜索</string>
     <string name="common_search_tokens">搜尋代幣</string>
@@ -117,7 +112,7 @@
     <string name="custom_token_network_input_not_selected">未選擇</string>
     <string name="custom_token_network_input_title">網路</string>
     <string name="custom_token_token_symbol_input_placeholder">如 USDC</string>
-    <string name="custom_token_token_symbol_input_title">代幣符號</string>
+    <string name="custom_token_token_symbol_input_title_old">代幣符號</string>
     <string name="custom_token_validation_error_already_added">此代幣/網路已被加入</string>
     <string name="custom_token_validation_error_not_found">請注意代幣可以被任何人創造。小心詐騙</string>
     <string name="details_chat">交談</string>
@@ -153,7 +148,6 @@
     <string name="feedback_subject_support">反饋</string>
     <string name="feedback_subject_support_tangem">Tangem反饋</string>
     <string name="feedback_subject_tx_failed">無法發送交易</string>
-    <string name="home_button_order">訂購</string>
     <string name="home_button_scan">掃描卡片</string>
     <string name="initial_message_change_access_code_body">要更改訪問密碼，請完全按照上圖所示連接手機和卡片</string>
     <string name="initial_message_change_passcode_body">要更改密碼，請完全按照上圖所示連接手機和卡</string>
@@ -166,8 +160,6 @@
     <string name="internal_error_wallet_manager_not_found">內部錯誤：找不到錢包管理器</string>
     <string name="key_invalidated_warning_description">您已更新生物識別登入，掃描您的卡進入</string>
     <string name="main_manage_tokens">管理代幣</string>
-    <string name="main_no_backup_warning_subtitle">為了保護您的資產，我們建議您執行此程序</string>
-    <string name="main_no_backup_warning_title">您的錢包尚未備份</string>
     <string name="main_page_balance">總餘額</string>
     <string name="main_processing_full_amount">該金額不包括您的部分資金</string>
     <string name="main_scan_card_warning_view_subtitle">要訪問所有的網路您需要掃描卡片</string>
@@ -277,10 +269,9 @@
     </plurals>
     <string name="registration_task_alert_message">請持有卡片直至操作完成</string>
     <string name="reset_card_to_factory_button_title">重置卡片</string>
-    <string name="reset_card_to_factory_warning_message">我了解執行此操作後，我將無法再訪問當前錢包</string>
+    <string name="reset_card_to_factory_condition_1">我了解執行此操作後，我將無法再訪問當前錢包</string>
     <string name="reset_card_with_backup_to_factory_message">恢復原廠設置將從所選卡中完全刪除錢包。您將無法恢復當前錢包或使用卡恢復訪問密碼</string>
     <string name="reset_card_without_backup_to_factory_message">恢復原廠設置將從所選卡中完全刪除錢包並將其從應用程序中刪除。您將無法恢復當前錢包</string>
-    <string name="russian_bank_card_warning_subtitle">您有其他國家的銀行卡或銀聯卡嗎？</string>
     <string name="russian_bank_card_warning_title">目前不接受俄羅斯銀行卡</string>
     <string name="save_user_wallet_agreement_access_description">登錄應用程序並在不掃描卡片的情況下檢查您的資產</string>
     <string name="save_user_wallet_agreement_access_title">訪問應用程序</string>
@@ -321,10 +312,9 @@
     <string name="shop_one_wallet">Tangem Wallet</string>
     <string name="shop_other_payment_methods">其他付款方式</string>
     <string name="shop_total">總計</string>
-    <string name="solana_rent_warning">Solana 網絡每 2 天收取 %1$s 的費用。無法付此費用的帳戶將從網絡中清除。向您的帳戶存入超過 %2$s 即可免費使用</string>
     <string name="story_awe_description">安全地存儲您的加密貨幣，同時將私鑰保存在您的卡中</string>
     <string name="story_awe_title">創新式的硬體錢包</string>
-    <string name="story_backup_description">最多 **3張實體卡片** 到一個錢包</string>
+    <string name="story_backup_description">最多 3張實體卡片 到一個錢包</string>
     <string name="story_backup_description_1">最多</string>
     <string name="story_backup_description_2_bold">3張實體卡片</string>
     <string name="story_backup_description_3">到一個錢包</string>
@@ -333,16 +323,9 @@
     <string name="story_currencies_title">千種虛擬貨幣</string>
     <string name="story_finish_description">隨時隨地使用它，不需要接線或電池，只需要你的卡片和手機</string>
     <string name="story_finish_title">適合每個人的冷錢包</string>
-    <string name="story_meet_borrow">借入</string>
-    <string name="story_meet_buy">購買</string>
-    <string name="story_meet_exchange">交易</string>
-    <string name="story_meet_lend">借出</string>
-    <string name="story_meet_pay">付款</string>
-    <string name="story_meet_send">發送</string>
-    <string name="story_meet_store">保存</string>
     <string name="story_meet_title">認識Tangem</string>
     <string name="story_web3_description">交易、購買NFT、自由穿梭於100+去中心化服務</string>
-    <string name="story_web3_title">兼容DeFi</string>
+    <string name="story_web3_title">兼容Web3.0</string>
     <string name="swapping_approve_information_text">批准被視為所有去中心化交易所的行業標準，並保護您的錢包在未經您許可的情況下不被智能合約訪問。按照設計，智能合約無法訪問您的代幣，除非您從您的終端批准訪問。通過“解鎖”您的代幣，您將獲得 1inch 智能合約使用您的資產的權限。網絡的礦工將獲得Gas Fee（由您支付）作為補償，以在區塊鏈上記錄此操作。一旦獲得許可，您就可以交易您的代幣。</string>
     <string name="swapping_approve_information_title">批准</string>
     <string name="swapping_error_wrapper">錯誤： %s</string>
@@ -376,8 +359,6 @@
     <string name="token_details_hide_alert_message">您即將在主屏幕上隱藏此代幣。您可以隨時通過管理代幣頁面將其添加回來。</string>
     <string name="token_details_hide_alert_title">隱藏 %s</string>
     <string name="token_details_hide_token">隱藏代幣</string>
-    <string name="token_details_send_blocked_fee_format">%1$s 是 %2$s 網絡中的代幣， 要進行 %3$s 交易，您需要存入一些 %4$s (%5$s) 以支付網絡費用</string>
-    <string name="token_details_send_blocked_tx_format">請等待 %s 交易完成才能發送資金</string>
     <string name="token_details_unable_hide_alert_message">%1$s 代幣是 %2$s 網絡上的主要貨幣，只要列表中還有該網絡上的其他代幣，它就無法被隱藏。</string>
     <string name="token_details_unable_hide_alert_title">無法隱藏 %s</string>
     <string name="token_item_no_rate">無費用</string>
@@ -405,9 +386,8 @@
     <string name="user_wallet_list_rename_popup_title">重新命名錢包</string>
     <string name="user_wallet_list_single_header">單一幣種</string>
     <string name="user_wallet_list_title">我的錢包</string>
-    <string name="user_wallet_list_unlock_all">用 %s 解鎖全部</string>
+    <string name="user_wallet_list_unlock_all_with">用 %s 解鎖全部</string>
     <string name="wallet_address_button_explore">交易記錄</string>
-    <string name="wallet_balance_blockchain_unreachable">網路無法使用</string>
     <string name="wallet_balance_blockchain_unreachable_try_later">區塊鍊無法使用。稍後再試</string>
     <string name="wallet_balance_loading">餘額加載中</string>
     <string name="wallet_balance_missing_derivation">掃描卡片</string>
@@ -458,6 +438,7 @@
     <string name="wallet_error_no_account">帳號尚未被創造</string>
     <string name="wallet_error_unsupported_blockchain">不支持此卡</string>
     <string name="wallet_error_unsupported_blockchain_subtitle">您的 Tangem 卡是為與不同的應用程序一起工作而設計的。請查看卡片上的名稱和說明，並安裝正確的應用程序</string>
+    <string name="wallet_marketplace_block_title">%s市場價格</string>
     <string name="wallet_notification_address_copied">地址已復製到剪貼板</string>
     <string name="wallet_notification_no_internet">無網路</string>
     <string name="wallet_pending_tx_receiving">接收中</string>
@@ -465,19 +446,14 @@
     <string name="wallet_pending_tx_sending">發送中</string>
     <string name="wallet_pending_tx_sending_address_format">至%s</string>
     <string name="wallet_title">Tangem</string>
-    <string name="warning_button_can_be_better">可以更好</string>
+    <string name="warning_button_could_be_better">可以更好</string>
     <string name="warning_button_learn_more">了解更多</string>
     <string name="warning_button_ok">了解</string>
     <string name="warning_button_really_cool">真的很酷！</string>
-    <string name="warning_existential_deposit_message">%1$s 網絡有一個 Existential Deposit 的概念。如果您的帳戶低於 %2$s，它將被停用，所有剩餘資金將被銷毀</string>
     <string name="warning_failed_to_verify_card_message">此卡可能是生產樣本或偽造品</string>
     <string name="warning_failed_to_verify_card_title">認證檢查失敗</string>
-    <string name="warning_important_security_info">重要安全信息 %s</string>
-    <string name="warning_low_signatures_format">此卡上只有 %s 個簽名可用。您必須提取所有資金</string>
-    <string name="warning_rate_app_message">你喜歡 Tangem 嗎？</string>
-    <string name="warning_rate_app_title">一個問題</string>
-    <string name="warning_signed_tx_previously">此卡過去曾簽署過交易</string>
-    <string name="warning_testnet_card_message">這是一張測試網卡。不要接受它作為付款。 此卡只能用於測試和開發目的</string>
+    <string name="warning_network_unreachable_title">網路無法使用</string>
+    <string name="warning_solana_rent_fee_message">Solana 網絡每 2 天收取 %1$s 的費用。無法付此費用的帳戶將從網絡中清除。向您的帳戶存入超過 %2$s 即可免費使用</string>
     <string name="welcome_interrupted_backup_alert_discard">捨棄</string>
     <string name="welcome_interrupted_backup_alert_message">您有一個備份中斷了，您想繼續嗎？</string>
     <string name="welcome_interrupted_backup_alert_resume">是的，恢復</string>
diff --git a/core/res/src/main/res/values/strings-blockchain.xml b/core/res/src/main/res/values/strings-blockchain.xml
index 7e938d5420..bb28ad284c 100644
--- a/core/res/src/main/res/values/strings-blockchain.xml
+++ b/core/res/src/main/res/values/strings-blockchain.xml
@@ -7,7 +7,7 @@
   <string name="eth_gas_required_exceeds_allowance">Not enough funds for the transaction. Please top up your account.</string>
   <string name="generic_error_code">An error occurred. Code: %s.</string>
   <string name="kaspa_withdrawal_message_warning">Due to Kaspa limitations only %1$d UTXOs can fit in a single transaction. This means you can only send %2$s or less. You need to reduce the amount.</string>
-  <string name="no_account_generic">Load %1$s+ %2$s to create account</string>
+  <string name="no_account_generic">To use the %1$s network, you must pay the account reserve (%2$s %3$s), which locks up and hides that amount indefinitely.</string>
   <string name="no_account_polkadot">Destination account is not active. Send %s or more to activate the account.</string>
   <string name="send_error_dust_amount_format">Minimum amount is %s</string>
   <string name="send_error_dust_change">Change is too small</string>
diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml
index 186b92d9ea..d677e0eb3c 100644
--- a/core/res/src/main/res/values/strings.xml
+++ b/core/res/src/main/res/values/strings.xml
@@ -7,17 +7,12 @@
     <string name="alert_app_feedback_sent_title">Sent successfully</string>
     <string name="alert_button_request_support">Request support</string>
     <string name="alert_button_send_feedback">Send feedback</string>
-    <string name="alert_card_signed_transactions">This card has been already topped up and signed transactions in the past. Consider immediate withdrawal of all funds if you have received this card from an untrusted source. If it\'s your card, there is nothing to worry about.</string>
     <string name="alert_demo_feature_disabled">This feature is disabled in Demo mode</string>
-    <string name="alert_demo_message">You are currently running in Demo mode. All funds are not real.</string>
-    <string name="alert_developer_card">The card you scanned is a development card. Don\'t accept it as a payment.</string>
     <string name="alert_failed_to_send_email_title">Failed to send the email</string>
     <string name="alert_failed_to_send_transaction_message">Reason: %s</string>
     <string name="alert_failed_to_send_transaction_title">Can\'t send a transaction</string>
-    <string name="alert_manage_tokens_addresses_message">Note that tokens on different networks have different addresses. Double check that your address matches the network when you transfer funds.</string>
     <string name="alert_manage_tokens_unsupported_curve_message">To activate the %1$s blockchain\'s cryptographic encryption, you\'ll need to reset the wallet to factory settings. Please withdraw your funds before doing so to ensure that you don\'t lose them, and then complete the reset process. Access to the current wallet will not be possible after the reset.</string>
     <string name="alert_manage_tokens_unsupported_message">Tokens in Solana network are not supported by this card due to firmware limitation.</string>
-    <string name="alert_signed_hashes_message">This card is not a bearer note. We can\'t currently match the signature count on the card with the information on the blockchain. This is normal but in rare cases can mean a previous holder is holding back an offline signature, which is a security concern.\nDo not accept this card as physical payment from someone you don\'t trust.\nIt\'s perfectly safe in all other respects.\nTangem is the only hardware wallet to offer signature count protection.</string>
     <string name="alert_troubleshooting_scan_card_title">Are you having difficulty scanning your card?</string>
     <string name="alert_unsupported_card">This card is not designed to work with this app</string>
     <string name="app_settings_enable_biometrics_description">Go to settings to enable biometric authentication in the Tangem App</string>
@@ -28,11 +23,16 @@
     <string name="app_settings_saved_access_codes_footer">Biometric authentication will be requested instead of the access code for interactions with your card.</string>
     <string name="app_settings_saved_wallet">Keep the wallet in the app</string>
     <string name="app_settings_saved_wallet_footer">Enable to link all the wallets to Tangem app. Biometric authentication will be required for unlocking the app. Transaction signing requires tapping your Tangem card.</string>
+    <string name="app_settings_theme_mode_dark">Dark</string>
+    <string name="app_settings_theme_mode_light">Light</string>
+    <string name="app_settings_theme_mode_system">System default</string>
+    <string name="app_settings_theme_selector_title">Theme</string>
     <string name="app_settings_title">App Settings</string>
     <string name="biometric_lockout_permanent_warning_description">Please scan the card</string>
     <string name="biometric_lockout_warning_description">Please try again in 30 seconds or scan the card</string>
     <string name="biometric_lockout_warning_title">Too many attempts</string>
     <string name="biometric_unavailable_warning">You have disabled biometric authentication on your phone and will not be able to save wallets in the app. To save wallets, please enable the biometric authentication function in your phone settings.</string>
+    <string name="button_start_backup_process">Start backup process</string>
     <plurals name="card_label_card_count">
         <item quantity="one">%d card</item>
         <item quantity="other">%d cards</item>
@@ -41,6 +41,7 @@
     <string name="card_settings_access_code_recovery_enabled_description">Allows you to use this card to reset access code on other cards in this wallet</string>
     <string name="card_settings_access_code_recovery_footer">Disable the ability to reset the access code on this card or other cards in this wallet</string>
     <string name="card_settings_access_code_recovery_title">Access code recovery</string>
+    <string name="card_settings_action_sheet_reset">Reset</string>
     <string name="card_settings_action_sheet_title">Are you sure you want to do this?</string>
     <string name="card_settings_change_access_code">Change Access Code</string>
     <string name="card_settings_change_access_code_footer">Access code will be changed on this card only</string>
@@ -55,6 +56,7 @@
     <string name="chat_user_actions_title">Please select an action</string>
     <string name="chat_user_rate_agent_title">Please, rate the work of the agent</string>
     <string name="common_accept">Accept</string>
+    <string name="common_access_denied">Access denied</string>
     <string name="common_add">Add</string>
     <string name="common_apply">Apply</string>
     <string name="common_approval">Approval</string>
@@ -63,6 +65,7 @@
     <string name="common_biometric_authentication">biometric authentication</string>
     <string name="common_biometrics">biometrics</string>
     <string name="common_buy">Buy</string>
+    <string name="common_buy_currency">Buy %1$s</string>
     <string name="common_camera_denied_alert_message">You have not given access to your camera, please adjust your privacy settings</string>
     <string name="common_cancel">Cancel</string>
     <string name="common_close">Close</string>
@@ -86,6 +89,7 @@
     <string name="common_like">Like</string>
     <string name="common_locked">Locked</string>
     <string name="common_main_network">Main network</string>
+    <string name="common_next">Next</string>
     <string name="common_no">No</string>
     <string name="common_no_address">No address</string>
     <string name="common_no_data">No data</string>
@@ -95,7 +99,6 @@
     <string name="common_reject">Reject</string>
     <string name="common_reload">Reload</string>
     <string name="common_rename">Rename</string>
-    <string name="common_reset">Reset</string>
     <string name="common_save_changes">Save changes</string>
     <string name="common_search">Search</string>
     <string name="common_search_tokens">Search tokens</string>
@@ -113,10 +116,10 @@
     <string name="common_success">Success</string>
     <string name="common_swap">Swap</string>
     <string name="common_terms_and_conditions">terms and conditions</string>
+    <string name="common_transaction_failed">Transaction failed</string>
     <string name="common_transactions">Transactions</string>
     <string name="common_transfer">Transfer</string>
     <string name="common_understand">I understand</string>
-    <string name="common_unlock_needed">Unlock needed</string>
     <string name="common_unreachable">Unreachable</string>
     <string name="common_yes">Yes</string>
     <string name="contract_address_copied_message">Contract address copied!</string>
@@ -129,7 +132,10 @@
     <string name="custom_token_creation_error_required_field">Required field</string>
     <string name="custom_token_creation_error_wrong_decimals">Decimal number must be a valid integer, no higher than %d</string>
     <string name="custom_token_custom_derivation">Custom derivation</string>
+    <string name="custom_token_custom_derivation_placeholder">E. g. m/00\'/0000\'/0\'/0/0</string>
+    <string name="custom_token_custom_derivation_title">Enter custom derivation</string>
     <string name="custom_token_decimals_input_title">Decimals</string>
+    <string name="custom_token_derivation_path">Derivation Path</string>
     <string name="custom_token_derivation_path_default">Default</string>
     <string name="custom_token_derivation_path_input_title">BIP44 coin type</string>
     <string name="custom_token_invalid_derivation_path">The derivation path you\'ve entered is not valid</string>
@@ -137,8 +143,11 @@
     <string name="custom_token_name_input_title">Name</string>
     <string name="custom_token_network_input_not_selected">Not selected</string>
     <string name="custom_token_network_input_title">Network</string>
+    <string name="custom_token_network_selector_title">Token network</string>
+    <string name="custom_token_subtitle">You can manually add a token that is not natively supported by Tangem</string>
     <string name="custom_token_token_symbol_input_placeholder">E.g. USDC</string>
-    <string name="custom_token_token_symbol_input_title">Token symbol</string>
+    <string name="custom_token_token_symbol_input_title">Symbol</string>
+    <string name="custom_token_token_symbol_input_title_old">Token symbol</string>
     <string name="custom_token_validation_error_already_added">This token/network has already been added to your list</string>
     <string name="custom_token_validation_error_not_found">Note that tokens can be created by anyone. Be aware of adding scam tokens, they can cost nothing.</string>
     <string name="details_chat">Chat</string>
@@ -149,11 +158,13 @@
     <string name="details_manage_security_passcode">Passcode</string>
     <string name="details_manage_security_passcode_description">Before executing any command entailing a change of the card state, you will have to enter the passcode.</string>
     <string name="details_referral_title">Referral program</string>
+    <string name="details_row_description_flip_to_hide">Flip your device screen down to quickly hide and show balances</string>
     <string name="details_row_privacy_policy">Privacy policy</string>
     <string name="details_row_subtitle_signed_hashes_format">%s hashes</string>
     <string name="details_row_title_cid">Card ID</string>
     <string name="details_row_title_create_backup">Link More Cards</string>
     <string name="details_row_title_currency">App Currency</string>
+    <string name="details_row_title_flip_to_hide">Flip-to-Hide Balances</string>
     <string name="details_row_title_issuer">Issuer</string>
     <string name="details_row_title_send_feedback">Send Feedback</string>
     <string name="details_row_title_signed_hashes">Signed</string>
@@ -174,7 +185,7 @@
     <string name="feedback_subject_support">Feedback</string>
     <string name="feedback_subject_support_tangem">Tangem feedback</string>
     <string name="feedback_subject_tx_failed">Can\'t send a transaction</string>
-    <string name="home_button_order">Order</string>
+    <string name="home_button_order">Order card</string>
     <string name="home_button_scan">Scan card</string>
     <string name="initial_message_change_access_code_body">To change the access code tap the card as shown above and do not remove until the end of the operation</string>
     <string name="initial_message_change_passcode_body">To change the passcode tap the card as shown above and do not remove until the end of the operation</string>
@@ -186,26 +197,41 @@
     <string name="initial_message_tap_header">Tap the card</string>
     <string name="internal_error_wallet_manager_not_found">Internal error: wallet manager not found</string>
     <string name="key_invalidated_warning_description">You have updated biometrics, scan your card to enter</string>
-    <string name="main_empty_tokens_list_message">To begin tracking your crypto assets and transactions, add tokens.</string>
+    <string name="main_empty_tokens_list_message">To begin tracking your crypto assets and transactions, add tokens</string>
     <string name="main_get_bonus_subtitle">You have completed all of the lessons, and are now eligible to receive your 1INCH tokens</string>
     <plurals name="main_learn_subtitle">
         <item quantity="one">Complete three lessons and receive %d 1INCH token to your wallet</item>
         <item quantity="other">Complete three lessons and receive %d 1INCH tokens to your wallet</item>
     </plurals>
     <string name="main_manage_tokens">Manage tokens</string>
-    <string name="main_no_backup_warning_subtitle">To protect your assets, we advise you to carry out this procedure</string>
-    <string name="main_no_backup_warning_title">Your wallet has not been backed up</string>
     <string name="main_page_balance">Total balance</string>
     <string name="main_processing_full_amount">The amount does not include some of your funds</string>
     <string name="main_promotion_credited">1INCH tokens will be credited to your %s wallet address within 48 hours</string>
     <string name="main_scan_card_warning_view_subtitle">To access all the networks you need to scan the card</string>
     <string name="main_scan_card_warning_view_title">Scan your card</string>
     <string name="main_tokens">Tokens</string>
-    <plurals name="main_warning_missing_derivation_description">
-        <item quantity="one">You need to generate address for %d new network using your card</item>
-        <item quantity="other">You need to generate addresses for %d new networks using your card</item>
+    <string name="manage_tokens_add">Add</string>
+    <string name="manage_tokens_edit">Edit</string>
+    <string name="manage_tokens_network_selector_native_subtitle">Blockchain the cryptocurrency was initially created</string>
+    <string name="manage_tokens_network_selector_native_title">Native network</string>
+    <string name="manage_tokens_network_selector_non_native_info">Using non-native networks for tokens enables cross-blockchain interoperability, allowing assets to be utilized in diverse decentralized applications and smart contracts across platforms. However, this often involves a custodian or smart contract to hold the original asset securely, introducing centralization and counterparty risk.</string>
+    <string name="manage_tokens_network_selector_non_native_subtitle">Not original or primary blockchain the token is hosted</string>
+    <string name="manage_tokens_network_selector_non_native_title">Non-native networks</string>
+    <string name="manage_tokens_network_selector_other_subtitle">Blockchain the cryptocurrency was initially created</string>
+    <string name="manage_tokens_network_selector_other_title">Networks</string>
+    <string name="manage_tokens_network_selector_title">Choose networks</string>
+    <string name="manage_tokens_network_selector_wallet">Wallet</string>
+    <string name="manage_tokens_nothing_found">Couldn’t find this token, you can add it manually</string>
+    <string name="manage_tokens_number_of_wallets">%d of %#@total_wallets@</string>
+    <plurals name="manage_tokens_number_of_walletstotal_wallets">
+        <item quantity="one">%d wallet</item>
+        <item quantity="other">%d wallets</item>
     </plurals>
-    <string name="main_warning_missing_derivation_title">Some addresses are missing</string>
+    <string name="manage_tokens_search_placeholder">e.g. BTC I trust, hodl I must</string>
+    <string name="manage_tokens_title">Coin market cap</string>
+    <string name="manage_tokens_unavailable_description">The selected token is currently unavailable for actions within the crypto wallet. But worry not, you can express your interest by upvoting it.</string>
+    <string name="manage_tokens_unavailable_vote">Upvote</string>
+    <string name="manage_tokens_wallet_selector_title">Choose wallet</string>
     <string name="onboarding_access_code_feature_1_description">You have to set up a single access code to protect all your wallets</string>
     <string name="onboarding_access_code_feature_1_title">Protect</string>
     <string name="onboarding_access_code_feature_2_description">You can set up an individual access code on each card later</string>
@@ -233,7 +259,7 @@
     <string name="onboarding_button_skip_backup">Skip for later</string>
     <string name="onboarding_button_what_does_it_mean">How does it work?</string>
     <string name="onboarding_create_wallet_body">Let\'s generate all the keys on your card and create a secure wallet</string>
-    <string name="onboarding_create_wallet_button_create_wallet">Create a wallet</string>
+    <string name="onboarding_create_wallet_button_create_wallet">Create wallet</string>
     <string name="onboarding_create_wallet_header">Create a wallet</string>
     <string name="onboarding_create_wallet_options_button_options">Other options</string>
     <string name="onboarding_create_wallet_options_message">Your keys will be securely generated inside the card. There is no seed phrase, which means nobody can export or steal it.</string>
@@ -334,7 +360,8 @@
     </plurals>
     <string name="registration_task_alert_message">Please hold the card until the operation complete</string>
     <string name="reset_card_to_factory_button_title">Reset the Card</string>
-    <string name="reset_card_to_factory_warning_message">I understand that after performing this action, I will no longer have access to the current wallet</string>
+    <string name="reset_card_to_factory_condition_1">I understand that after performing this action, I will no longer have access to the current wallet</string>
+    <string name="reset_card_to_factory_condition_2">I realize that I can\'t use this card to recover my access code on the other cards of the current wallet</string>
     <string name="reset_card_with_backup_to_factory_message">Factory Reset will completely delete the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code.</string>
     <string name="reset_card_without_backup_to_factory_message">Factory Reset will completely delete the wallet from the selected card and remove it from the app. You will not be able to restore the current wallet.</string>
     <string name="russian_bank_card_warning_subtitle">Do you have a bank card from another country and a residence permit or registration outside the Russian Federation?</string>
@@ -379,10 +406,9 @@
     <string name="shop_other_payment_methods">Other payment methods</string>
     <string name="shop_pre_order_now">Pre-order now</string>
     <string name="shop_total">Total</string>
-    <string name="solana_rent_warning">Solana network charges a rent of %1$s every 2 days. Accounts that can\'t afford the rent are purged from the network. Deposit your account with more than %2$s to use it for free.</string>
     <string name="story_awe_description">Store your crypto assets secure while keeping private keys contained in your card</string>
     <string name="story_awe_title">Revolutionary Hardware Wallet</string>
-    <string name="story_backup_description">Up to **3 physical cards** to one wallet</string>
+    <string name="story_backup_description">Up to 3 physical cards to one wallet</string>
     <string name="story_backup_description_1">Up to</string>
     <string name="story_backup_description_2_bold">3 physical cards</string>
     <string name="story_backup_description_3">to one wallet</string>
@@ -393,16 +419,9 @@
     <string name="story_finish_title">The Wallet for Everyone</string>
     <string name="story_learn_description">Take three lessons, get a discount on your Tangem Wallet, and receive 1INCH tokens to your wallet</string>
     <string name="story_learn_learn">Learn</string>
-    <string name="story_meet_borrow">Borrow</string>
-    <string name="story_meet_buy">Buy</string>
-    <string name="story_meet_exchange">Exchange</string>
-    <string name="story_meet_lend">Lend</string>
-    <string name="story_meet_pay">Pay</string>
-    <string name="story_meet_send">Send</string>
-    <string name="story_meet_store">Store</string>
-    <string name="story_meet_title">Meet\nTangem</string>
+    <string name="story_meet_title">Meet Tangem</string>
     <string name="story_web3_description">Exchange, buy NFT\'s, make loans and deposits in more than 100 different decentralized services</string>
-    <string name="story_web3_title">DeFi Compatible</string>
+    <string name="story_web3_title">Web 3.0 Compatible</string>
     <string name="swapping_approve_information_text">Approvals are considered an industry standard across all decentralized exchanges and protect your wallet from being accessed by a smart contract without your permission. By design, smart contracts can\'t access your tokens unless you approve access from your end. By \"unlocking\" your tokens, you are give permission to the 1inch smart contract to spend your assets. The miners of the network are compensated with a gas fee (paid by you) to record this action on the blockchain. Once permission has been granted you will be able to swap your token.</string>
     <string name="swapping_approve_information_title">Approve</string>
     <string name="swapping_error_wrapper">Error: %s</string>
@@ -441,8 +460,6 @@
     <string name="token_details_hide_alert_message">You are about to hide this token from the main screen. You can add it back anytime through the manage tokens page.</string>
     <string name="token_details_hide_alert_title">Hide %s</string>
     <string name="token_details_hide_token">Hide token</string>
-    <string name="token_details_send_blocked_fee_format">%1$s is a token in the %2$s network. To make a %3$s transaction you need to deposit some %4$s (%5$s) to cover the network fee.</string>
-    <string name="token_details_send_blocked_tx_format">Please wait for %s transaction to complete to be able to send funds</string>
     <string name="token_details_token_type_subtitle">%1$s token in %%image%% %2$s network</string>
     <string name="token_details_unable_hide_alert_message">The %1$s token is the main currency on the %2$s network and cannot be hidden as long as you have other tokens on this network in the list.</string>
     <string name="token_details_unable_hide_alert_title">Unable to hide %s</string>
@@ -467,7 +484,6 @@
     <string name="twins_recreate_warning">This action is irreversible. You will not have access to the old wallet.</string>
     <string name="twins_scan_twin_with_number">Tap the twin card with number %s and do not remove until the end of the operation</string>
     <string name="unlock_wallet_description_full">Use %s or scan a card to have an access to your wallet</string>
-    <string name="unlock_wallet_description_short">Use %s or scan a card</string>
     <string name="user_wallet_list_add_button">Add new wallet</string>
     <string name="user_wallet_list_delete_prompt">Are you sure you want to delete this wallet?</string>
     <string name="user_wallet_list_editing_count">%d selected</string>
@@ -478,9 +494,9 @@
     <string name="user_wallet_list_rename_popup_title">Rename Wallet</string>
     <string name="user_wallet_list_single_header">Single-currency</string>
     <string name="user_wallet_list_title">My Wallets</string>
-    <string name="user_wallet_list_unlock_all">Unlock all with %s</string>
+    <string name="user_wallet_list_unlock_all">Unlock all</string>
+    <string name="user_wallet_list_unlock_all_with">Unlock all with %s</string>
     <string name="wallet_address_button_explore">Transaction history</string>
-    <string name="wallet_balance_blockchain_unreachable">Network is unreachable</string>
     <string name="wallet_balance_blockchain_unreachable_try_later">Blockchain is unreachable. Try later</string>
     <string name="wallet_balance_loading">Balance is loading…</string>
     <string name="wallet_balance_missing_derivation">Scan the card</string>
@@ -511,6 +527,7 @@
     <string name="wallet_connect_network_not_found_format">%s network not found. Please, add it first and try again.</string>
     <string name="wallet_connect_no_sessions_message">No opened WalletConnect sessions</string>
     <string name="wallet_connect_no_sessions_title">Ooops. No Sessions.</string>
+    <string name="wallet_connect_pairing_error">Failed to pairing WalletConnect session: %1$s</string>
     <string name="wallet_connect_paste_from_clipboard">Paste from clipboard</string>
     <string name="wallet_connect_personal_sign_message">Message for %1$s:\n%2$s</string>
     <string name="wallet_connect_request_session_start">Request to start a session for\n%1$s\n\nNETWORK: %2$s\n\nURL: %3$s</string>
@@ -541,19 +558,48 @@
     <string name="wallet_pending_tx_sending">Sending</string>
     <string name="wallet_pending_tx_sending_address_format">to %s</string>
     <string name="wallet_title">Tangem</string>
-    <string name="warning_button_can_be_better">Can be better</string>
+    <string name="warning_access_denied_message">Use %s or scan a card to unlock access to your wallet</string>
+    <string name="warning_button_could_be_better">Could be better</string>
     <string name="warning_button_learn_more">Learn more</string>
+    <string name="warning_button_like_it">Like it</string>
     <string name="warning_button_ok">Ok, Got it!</string>
     <string name="warning_button_really_cool">Really cool!</string>
-    <string name="warning_existential_deposit_message">%1$s network has a concept of Existential Deposit. If your account drops below %2$s it will be deactivated and any remaining funds will be destroyed.</string>
+    <string name="warning_demo_mode_message">You are currently in the Demo mode</string>
+    <string name="warning_demo_mode_title">Demo mode active</string>
+    <string name="warning_developer_card_message">The card you scanned is a developer card. Do not use it to create your wallet.</string>
+    <string name="warning_developer_card_title">Not for users!</string>
+    <string name="warning_existential_deposit_message">%1$s network requires an Existential Deposit. If your account drops below %2$s, it will be deactivated, and any remaining funds will be destroyed.</string>
+    <string name="warning_existential_deposit_title">Network requires Existential Deposit</string>
     <string name="warning_failed_to_verify_card_message">This card might be a production sample or counterfeit</string>
     <string name="warning_failed_to_verify_card_title">Authenticity check failed</string>
-    <string name="warning_important_security_info">Important security information %s</string>
-    <string name="warning_low_signatures_format">There are only %s signatures available on this card. You must withdraw all of your funds.</string>
-    <string name="warning_rate_app_message">How do you like Tangem?</string>
-    <string name="warning_rate_app_title">One question</string>
-    <string name="warning_signed_tx_previously">This card has signed transactions in the past</string>
-    <string name="warning_testnet_card_message">This is a Testnet card. Don\'t accept it as a payment. This card must only be used for testing and development purposes.</string>
+    <string name="warning_low_signatures_message">Only %s signatures are left on this card. You must withdraw all of your funds.</string>
+    <string name="warning_low_signatures_title">Low signature count</string>
+    <string name="warning_manage_tokens_legacy_derivation_message">Tokens on different networks can have different addresses. Double-check that your address matches the network when you transfer funds.</string>
+    <plurals name="warning_missing_derivation_message">
+        <item quantity="one">Use your card to generate an address for %d new network</item>
+        <item quantity="other">Use your card to generate an addresses for %d new networks</item>
+    </plurals>
+    <string name="warning_missing_derivation_title">Some addresses are missing</string>
+    <string name="warning_network_unreachable_message">The network is currently unreachable. Please try again later.</string>
+    <string name="warning_network_unreachable_title">Network is unreachable</string>
+    <string name="warning_no_account_title">Top up your wallet</string>
+    <string name="warning_no_backup_message">Your wallet hasn\'t been backed up. Carry out this procedure to protect your assets now.</string>
+    <string name="warning_no_backup_title">Missing backup</string>
+    <string name="warning_number_of_signed_hashes_incorrect_message">This card has been previously used for transactions. If received from an untrusted source, consider withdrawing all funds. If it\'s your card, no action is required.</string>
+    <string name="warning_number_of_signed_hashes_incorrect_title">Card has already signed transactions</string>
+    <string name="warning_old_device_old_card_title">Device incompatibility detected</string>
+    <string name="warning_rate_app_message">Your review keeps us motivated to make Tangem Wallet even better</string>
+    <string name="warning_rate_app_title">Enjoying Tangem?</string>
+    <string name="warning_rent_fee_title">Network rent fee required</string>
+    <string name="warning_send_blocked_funds_for_fee_message">%1$s is a token in the %2$s network. To make a %3$s transaction, you must deposit some %4$s (%5$s) to cover the network fee.</string>
+    <string name="warning_send_blocked_funds_for_fee_title">Insufficient %1$s to cover network fee</string>
+    <string name="warning_send_blocked_pending_transactions_message">Sending funds will be available once the %s transaction is complete</string>
+    <string name="warning_send_blocked_pending_transactions_title">Transaction pending</string>
+    <string name="warning_solana_rent_fee_message">Solana network charges a rent of %1$s every 2 days. Accounts that can\'t afford the rent are purged from the network. Deposit your account with more than %2$s to use it for free.</string>
+    <string name="warning_some_networks_unreachable_message">Some networks currently are unreachable. Please try again later.</string>
+    <string name="warning_some_networks_unreachable_title">Some networks are unreachable</string>
+    <string name="warning_testnet_card_message">This is a Testnet card. It cannot process transactions and should only be used for testing and development purposes.</string>
+    <string name="warning_testnet_card_title">For testing purposes only</string>
     <string name="welcome_interrupted_backup_alert_discard">Discard</string>
     <string name="welcome_interrupted_backup_alert_message">You have an interrupted backup. Do you want to resume?</string>
     <string name="welcome_interrupted_backup_alert_resume">Yes, resume</string>
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
index 20d4303b93..3a09e91308 100644
--- a/core/ui/build.gradle.kts
+++ b/core/ui/build.gradle.kts
@@ -5,6 +5,9 @@ plugins {
 }
 
 dependencies {
+    /** Project - Common */
+    implementation(projects.common)
+
     /** Project - Domain */
     implementation(projects.domain.tokens.models)
     implementation(projects.domain.appTheme.models)
@@ -15,6 +18,7 @@ dependencies {
     /** AndroidX libraries */
     implementation(deps.androidx.fragment.ktx)
     implementation(deps.androidx.paging.runtime)
+    implementation(deps.androidx.palette)
 
     /** Compose */
     implementation(deps.compose.constraintLayout)
@@ -29,4 +33,6 @@ dependencies {
     implementation(deps.material)
     implementation(deps.compose.shimmer)
     implementation(deps.kotlin.immutable.collections)
+    implementation(deps.zxing.qrCore)
+    implementation(deps.jodatime)
 }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/Dialogs.kt b/core/ui/src/main/java/com/tangem/core/ui/components/Dialogs.kt
index 24a2316d60..41e2d008b6 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/Dialogs.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/Dialogs.kt
@@ -1,44 +1,33 @@
 package com.tangem.core.ui.components
 
+import androidx.compose.foundation.LocalIndication
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.material.RadioButton
+import androidx.compose.material.RadioButtonDefaults
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.TextFieldValue
 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.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import com.tangem.core.ui.R
+import com.tangem.core.ui.components.SelctorDialogParamsProvider.SelectorDialogParams
 import com.tangem.core.ui.res.TangemTheme
-
-/**
- * Dialog button params
- *
- * @param title Button text. If not provided default values will be used
- * @param warning If true then button text will be in theme warning color
- * @param enabled If false button will be disabled
- * @param onClick Button click callback
- */
-data class DialogButton(
-    val title: String? = null,
-    val warning: Boolean = false,
-    val enabled: Boolean = true,
-    val onClick: () -> Unit,
-)
-
-/**
- * Additional params for dialog text field
- */
-data class AdditionalTextInputDialogParams(
-    val label: String? = null,
-    val placeholder: String? = null,
-    val caption: String? = null,
-    val enabled: Boolean = true,
-    val isError: Boolean = false,
-)
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
 
 /**
  * Simple alert dialog with a message and 'OK' button
@@ -129,6 +118,54 @@ fun TextInputDialog(
     )
 }
 
+@Composable
+fun SelectorDialog(
+    selectedItemIndex: Int,
+    items: ImmutableList<String>,
+    confirmButton: DialogButton,
+    onSelect: (index: Int) -> Unit,
+    onDismissDialog: () -> Unit,
+    title: String? = null,
+    isDismissable: Boolean = true,
+) {
+    TangemDialog(
+        type = DialogType.Selector(selectedItemIndex, items, onSelect),
+        confirmButton = confirmButton,
+        title = title,
+        onDismissDialog = onDismissDialog,
+        properties = DialogProperties(
+            dismissOnBackPress = isDismissable,
+            dismissOnClickOutside = isDismissable,
+        ),
+    )
+}
+
+/**
+ * Dialog button params
+ *
+ * @param title Button text. If not provided default values will be used
+ * @param warning If true then button text will be in theme warning color
+ * @param enabled If false button will be disabled
+ * @param onClick Button click callback
+ */
+data class DialogButton(
+    val title: String? = null,
+    val warning: Boolean = false,
+    val enabled: Boolean = true,
+    val onClick: () -> Unit,
+)
+
+/**
+ * Additional params for dialog text field
+ */
+data class AdditionalTextInputDialogParams(
+    val label: String? = null,
+    val placeholder: String? = null,
+    val caption: String? = null,
+    val enabled: Boolean = true,
+    val isError: Boolean = false,
+)
+
 // region Defaults
 @Composable
 private fun TangemDialog(
@@ -146,15 +183,18 @@ private fun TangemDialog(
                     shape = TangemTheme.shapes.roundedCornersLarge,
                     color = TangemTheme.colors.background.plain,
                 )
-                .padding(all = TangemTheme.dimens.spacing24),
+                .padding(vertical = TangemTheme.dimens.spacing24),
         ) {
             if (title != null) {
                 Text(
-                    modifier = Modifier.fillMaxWidth(),
+                    modifier = Modifier
+                        .padding(horizontal = TangemTheme.dimens.spacing24)
+                        .fillMaxWidth(),
                     text = title,
                     style = when (type) {
                         is DialogType.Message -> TangemTheme.typography.h2
                         is DialogType.TextInput -> TangemTheme.typography.h3
+                        is DialogType.Selector -> TangemTheme.typography.h2
                     },
                     color = TangemTheme.colors.text.primary1,
                 )
@@ -162,7 +202,13 @@ private fun TangemDialog(
             }
             DialogContent(type = type)
             SpacerH24()
-            DialogButtons(confirmButton = confirmButton, dismissButton = dismissButton)
+            DialogButtons(
+                modifier = Modifier
+                    .padding(horizontal = TangemTheme.dimens.spacing24)
+                    .fillMaxWidth(),
+                confirmButton = confirmButton,
+                dismissButton = dismissButton,
+            )
         }
     }
 }
@@ -177,7 +223,9 @@ private fun DialogContent(type: DialogType, modifier: Modifier = Modifier) {
         when (type) {
             is DialogType.Message -> {
                 Text(
-                    modifier = Modifier.fillMaxWidth(),
+                    modifier = Modifier
+                        .padding(horizontal = TangemTheme.dimens.spacing24)
+                        .fillMaxWidth(),
                     text = type.message,
                     style = TangemTheme.typography.body2,
                     color = TangemTheme.colors.text.secondary,
@@ -185,7 +233,9 @@ private fun DialogContent(type: DialogType, modifier: Modifier = Modifier) {
             }
             is DialogType.TextInput -> {
                 OutlineTextField(
-                    modifier = Modifier.fillMaxWidth(),
+                    modifier = Modifier
+                        .padding(horizontal = TangemTheme.dimens.spacing24)
+                        .fillMaxWidth(),
                     value = type.value,
                     label = type.params.label,
                     placeholder = type.params.placeholder,
@@ -197,6 +247,14 @@ private fun DialogContent(type: DialogType, modifier: Modifier = Modifier) {
                     },
                 )
             }
+            is DialogType.Selector -> {
+                SelectorDialogContent(
+                    modifier = Modifier.fillMaxWidth(),
+                    selectedItemIndex = type.selectedItemIndex,
+                    items = type.items,
+                    onSelect = type.onSelect,
+                )
+            }
         }
     }
 }
@@ -204,7 +262,7 @@ private fun DialogContent(type: DialogType, modifier: Modifier = Modifier) {
 @Composable
 private fun DialogButtons(confirmButton: DialogButton, dismissButton: DialogButton?, modifier: Modifier = Modifier) {
     Row(
-        modifier = modifier.fillMaxWidth(),
+        modifier = modifier,
         horizontalArrangement = Arrangement.spacedBy(
             space = TangemTheme.dimens.spacing4,
             alignment = Alignment.End,
@@ -252,14 +310,72 @@ private fun DialogButton(
     }
 }
 
-private sealed interface DialogType {
-    data class Message(val message: String) : DialogType
+@Composable
+private fun SelectorDialogContent(
+    selectedItemIndex: Int,
+    items: ImmutableList<String>,
+    onSelect: (index: Int) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    LazyColumn(modifier = modifier) {
+        itemsIndexed(items = items) { index, itemText ->
+            val onClick = remember(index) {
+                { onSelect(index) }
+            }
+
+            val interactionSource = remember { MutableInteractionSource() }
+
+            Row(
+                modifier = Modifier
+                    .clickable(
+                        interactionSource = interactionSource,
+                        indication = LocalIndication.current,
+                        onClick = onClick,
+                    )
+                    .padding(
+                        vertical = TangemTheme.dimens.spacing16,
+                        horizontal = TangemTheme.dimens.spacing18,
+                    )
+                    .fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing16),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                RadioButton(
+                    modifier = Modifier.size(TangemTheme.dimens.size24),
+                    selected = index == selectedItemIndex,
+                    onClick = onClick,
+                    colors = RadioButtonDefaults.colors(
+                        selectedColor = TangemTheme.colors.icon.accent,
+                        unselectedColor = TangemTheme.colors.icon.secondary,
+                    ),
+                    interactionSource = interactionSource,
+                )
+                Text(
+                    text = itemText,
+                    style = TangemTheme.typography.body1,
+                    color = TangemTheme.colors.text.primary1,
+                )
+            }
+        }
+    }
+}
+
+@Immutable
+private sealed class DialogType {
+
+    data class Message(val message: String) : DialogType()
 
     data class TextInput(
         val value: TextFieldValue,
         val onValueChange: (TextFieldValue) -> Unit,
         val params: AdditionalTextInputDialogParams = AdditionalTextInputDialogParams(),
-    ) : DialogType
+    ) : DialogType()
+
+    data class Selector(
+        val selectedItemIndex: Int,
+        val items: ImmutableList<String>,
+        val onSelect: (index: Int) -> Unit,
+    ) : DialogType()
 }
 // endregion Defaults
 
@@ -381,4 +497,65 @@ private fun TextInputDialogPreview_Dark() {
         TextInputDialogSample()
     }
 }
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun SelectorDialogPreview_Light(
+    @PreviewParameter(SelctorDialogParamsProvider::class) param: SelectorDialogParams,
+) {
+    TangemTheme(isDark = false) {
+        SelectorDialog(
+            title = param.title,
+            items = param.items,
+            selectedItemIndex = param.selectedItemIndex,
+            confirmButton = DialogButton(title = "Cancel", onClick = {}),
+            onSelect = {},
+            onDismissDialog = {},
+        )
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun SelectorDialogPreview_Dark(
+    @PreviewParameter(SelctorDialogParamsProvider::class) param: SelectorDialogParams,
+) {
+    TangemTheme(isDark = true) {
+        SelectorDialog(
+            title = param.title,
+            items = param.items,
+            selectedItemIndex = param.selectedItemIndex,
+            confirmButton = DialogButton(title = "Cancel", onClick = {}),
+            onSelect = {},
+            onDismissDialog = {},
+        )
+    }
+}
+
+private class SelctorDialogParamsProvider : CollectionPreviewParameterProvider<SelectorDialogParams>(
+    collection = listOf(
+        SelectorDialogParams(
+            title = "Theme",
+            selectedItemIndex = 0,
+            persistentListOf("Light", "Dark", "Follow system"),
+        ),
+        SelectorDialogParams(
+            title = null,
+            selectedItemIndex = 2,
+            persistentListOf("Light", "Dark", "Follow system"),
+        ),
+        SelectorDialogParams(
+            title = "Count",
+            selectedItemIndex = 8,
+            List(size = 10) { it.toString() }.toImmutableList(),
+        ),
+    ),
+) {
+
+    data class SelectorDialogParams(
+        val title: String?,
+        val selectedItemIndex: Int,
+        val items: ImmutableList<String>,
+    )
+}
 // endregion Preview
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/QrCode.kt b/core/ui/src/main/java/com/tangem/core/ui/components/QrCode.kt
new file mode 100644
index 0000000000..afda35efe7
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/QrCode.kt
@@ -0,0 +1,29 @@
+package com.tangem.core.ui.components
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.graphics.painter.BitmapPainter
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.Dp
+import com.tangem.core.ui.extensions.toQrCode
+import com.tangem.core.ui.res.TangemTheme
+
+@Composable
+fun rememberQrPainters(
+    content: List<String>,
+    size: Dp = TangemTheme.dimens.size248,
+    padding: Dp = TangemTheme.dimens.spacing0,
+): List<BitmapPainter> {
+    val density = LocalDensity.current
+    return remember(content) {
+        content.map { code ->
+            BitmapPainter(
+                code.toQrCode(
+                    sizePx = with(density) { size.roundToPx() },
+                    paddingPx = with(density) { padding.roundToPx() },
+                ).asImageBitmap(),
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/ResizableText.kt b/core/ui/src/main/java/com/tangem/core/ui/components/ResizableText.kt
index 0c4c0c3610..8801cb7983 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/ResizableText.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/ResizableText.kt
@@ -1,14 +1,15 @@
 package com.tangem.core.ui.components
 
+import androidx.annotation.FloatRange
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.drawWithContent
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.sp
 
@@ -19,6 +20,8 @@ fun ResizableText(
     fontSizeRange: FontSizeRange,
     modifier: Modifier = Modifier,
     color: Color = Color.Unspecified,
+    overflow: TextOverflow = TextOverflow.Clip,
+    maxLines: Int = Int.MAX_VALUE,
     style: TextStyle = LocalTextStyle.current,
 ) {
     val fontSizeValue = remember { mutableStateOf(fontSizeRange.max.value) }
@@ -32,12 +35,13 @@ fun ResizableText(
     }
 
     Text(
-        modifier = modifier.drawWithContent { if (readyToDraw.value) drawContent() },
         text = text,
+        modifier = modifier.drawWithContent { if (readyToDraw.value) drawContent() },
         color = color,
-        softWrap = false,
-        style = style,
         fontSize = fontSizeValue.value.sp,
+        overflow = overflow,
+        softWrap = false,
+        maxLines = maxLines,
         onTextLayout = {
             if (it.hasVisualOverflow) {
                 val nextFontSizeValue = fontSizeValue.value - fontSizeRange.step.value
@@ -51,6 +55,64 @@ fun ResizableText(
                 readyToDraw.value = true
             }
         },
+        style = style,
+    )
+}
+
+/**
+ * A Composable function that displays text which can be resized based on its content's overflow.
+ *
+ * This function draws text on the screen and checks if it overflows. If the text overflows,
+ * its font size is reduced recursively until it either fits the available space or reaches a
+ * specified minimum font size.
+ */
+@Composable
+fun ResizableText(
+    text: String,
+    modifier: Modifier = Modifier,
+    color: Color = Color.Unspecified,
+    textAlign: TextAlign? = null,
+    overflow: TextOverflow = TextOverflow.Clip,
+    softWrap: Boolean = true,
+    maxLines: Int = Int.MAX_VALUE,
+    style: TextStyle = LocalTextStyle.current,
+    minFontSize: TextUnit = TextUnit.Unspecified,
+    @FloatRange(from = 0.0, to = 1.0, fromInclusive = false, toInclusive = false)
+    reduceFactor: Double = 0.9,
+) {
+    var fontSize by remember { mutableStateOf(style.fontSize) }
+    var readyToDraw by remember { mutableStateOf(value = false) }
+
+    Text(
+        modifier = modifier.drawWithContent {
+            if (readyToDraw) drawContent()
+        },
+        text = text,
+        color = color,
+        fontSize = fontSize,
+        textAlign = textAlign,
+        overflow = overflow,
+        softWrap = softWrap,
+        maxLines = maxLines,
+        style = style,
+        onTextLayout = { result ->
+            fun reduceFontSize() {
+                val reducedFontSize = fontSize * reduceFactor
+
+                if (minFontSize != TextUnit.Unspecified && reducedFontSize <= minFontSize) {
+                    fontSize = minFontSize
+                    readyToDraw = true
+                } else {
+                    fontSize = reducedFontSize
+                }
+            }
+
+            if (result.hasVisualOverflow) {
+                reduceFontSize()
+            } else {
+                readyToDraw = true
+            }
+        },
     )
 }
 
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/Shimmers.kt b/core/ui/src/main/java/com/tangem/core/ui/components/Shimmers.kt
index 640f986b3e..311fe1aae8 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/Shimmers.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/Shimmers.kt
@@ -1,15 +1,25 @@
 package com.tangem.core.ui.components
 
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.BlendMode
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
+import com.tangem.core.ui.res.LocalIsInDarkTheme
+import com.tangem.core.ui.res.TangemColorPalette
 import com.tangem.core.ui.res.TangemTheme
-import com.valentinilk.shimmer.shimmer
+import com.valentinilk.shimmer.*
 
 /**
  * Rectangle shimmer item with rounded shape from DS
@@ -18,11 +28,8 @@ import com.valentinilk.shimmer.shimmer
 fun RectangleShimmer(modifier: Modifier = Modifier, radius: Dp = TangemTheme.dimens.radius6) {
     Box(
         modifier = modifier
-            .shimmer()
-            .background(
-                color = TangemTheme.colors.button.secondary,
-                shape = RoundedCornerShape(size = radius),
-            ),
+            .clip(RoundedCornerShape(size = radius))
+            .shimmer(TangemShimmer),
     )
 }
 
@@ -34,27 +41,67 @@ fun RectangleShimmer(modifier: Modifier = Modifier, radius: Dp = TangemTheme.dim
 fun CircleShimmer(modifier: Modifier = Modifier) {
     Box(
         modifier = modifier
-            .shimmer()
-            .background(
-                color = TangemTheme.colors.button.secondary,
-                shape = CircleShape,
-            ),
+            .clip(CircleShape)
+            .shimmer(TangemShimmer),
     )
 }
 
+private val TangemShimmer: Shimmer
+    @Composable
+    get() = rememberShimmer(
+        shimmerBounds = ShimmerBounds.View,
+        theme = defaultShimmerTheme.copy(
+            animationSpec = infiniteRepeatable(
+                animation = tween(
+                    durationMillis = 800,
+                    easing = LinearEasing,
+                    delayMillis = 800,
+                ),
+                repeatMode = RepeatMode.Restart,
+            ),
+            shaderColors = TangemShimmerColors,
+            blendMode = BlendMode.Src,
+            shaderColorStops = null,
+        ),
+    )
+
+private val TangemShimmerColors: List<Color>
+    @Composable
+    @ReadOnlyComposable
+    get() {
+        val isInDarkTheme = LocalIsInDarkTheme.current
+
+        return buildList {
+            if (isInDarkTheme) {
+                TangemColorPalette.Dark3.let(::add)
+                TangemColorPalette.Dark4.let(::add)
+                TangemColorPalette.Dark6.let(::add)
+                TangemColorPalette.Dark4.let(::add)
+                TangemColorPalette.Dark3.let(::add)
+            } else {
+                TangemColorPalette.Light2.let(::add)
+                TangemColorPalette.Light1.let(::add)
+                TangemColorPalette.White.let(::add)
+                TangemColorPalette.Light1.let(::add)
+                TangemColorPalette.Light2.let(::add)
+            }
+        }
+    }
+
 // region preview
 
 @Composable
 private fun ShimmersPreview() {
     Column(
-        modifier = Modifier.fillMaxWidth(),
+        modifier = Modifier
+            .fillMaxWidth()
+            .background(TangemTheme.colors.background.primary),
         verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing18),
     ) {
         RectangleShimmer(
-            modifier = Modifier.size(
-                width = TangemTheme.dimens.size72,
-                height = TangemTheme.dimens.size12,
-            ),
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(TangemTheme.dimens.size24),
         )
         CircleShimmer(modifier = Modifier.size(size = TangemTheme.dimens.size42))
     }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/TextFields.kt b/core/ui/src/main/java/com/tangem/core/ui/components/TextFields.kt
index 2575fee4ad..e954cbd32d 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/TextFields.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/TextFields.kt
@@ -9,29 +9,11 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.interaction.InteractionSource
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.collectIsFocusedAsState
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.heightIn
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.Divider
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Text
-import androidx.compose.material.TextFieldColors
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.State
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.material.*
+import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
@@ -43,7 +25,6 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.R
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.core.ui.res.TangemTypography
 
 /**
  * [Show in Figma](https://www.figma.com/file/14ISV23YB1yVW1uNVwqrKv/Android?node-id=213%3A218&t=TmfD6UBHPg9uYfev-4)
@@ -121,7 +102,7 @@ private fun TangemTextField(
                 if (!label.isNullOrEmpty()) {
                     Text(
                         text = label,
-                        style = TangemTheme.typography.caption,
+                        style = TangemTheme.typography.caption2,
                         color = colors.labelColor(
                             enabled = enabled,
                             error = isError,
@@ -179,7 +160,7 @@ private fun TangemTextField(
                         .fillMaxWidth()
                         .padding(horizontal = 16.dp),
                     text = caption,
-                    style = TangemTypography.body1,
+                    style = TangemTheme.typography.body1,
                     color = colors.captionColor(enabled = enabled, isError = isError).value,
                 )
             }
@@ -210,8 +191,8 @@ object TangemTextFieldsDefault {
             cursorColor = TangemTheme.colors.icon.primary1,
             errorCursorColor = TangemTheme.colors.icon.warning,
             focusedIndicatorColor = TangemTheme.colors.icon.primary1,
-            unfocusedIndicatorColor = TangemTheme.colors.stroke.primary,
-            disabledIndicatorColor = TangemTheme.colors.stroke.primary,
+            unfocusedIndicatorColor = TangemTheme.colors.stroke.secondary,
+            disabledIndicatorColor = TangemTheme.colors.stroke.secondary,
             errorIndicatorColor = TangemTheme.colors.icon.warning,
             leadingIconColor = TangemTheme.colors.icon.informative,
             disabledLeadingIconColor = Color.Transparent,
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithSearch.kt b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithSearch.kt
index 55b0a08fe3..867774adfb 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithSearch.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithSearch.kt
@@ -4,26 +4,11 @@ import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.defaultMinSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.material.TextField
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
+import androidx.compose.material.*
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
@@ -64,7 +49,7 @@ fun ExpandableSearchView(
     onBackClick: () -> Unit,
     onSearchChange: (String) -> Unit,
     onSearchDisplayClose: () -> Unit,
-    onFocusChange: (Boolean) -> Unit,
+    onFocusChange: (Boolean) -> Unit = {},
     title: String? = null,
     placeholderSearchText: String = "",
     expandedInitially: Boolean = false,
@@ -169,7 +154,7 @@ private fun SubtitleView(subtitle: String, icon: Painter?) {
             text = subtitle,
             color = TangemTheme.colors.text.secondary,
             maxLines = 1,
-            style = TangemTheme.typography.caption,
+            style = TangemTheme.typography.caption2,
         )
     }
 }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheet.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheet.kt
new file mode 100644
index 0000000000..2d9d85b164
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheet.kt
@@ -0,0 +1,54 @@
+package com.tangem.core.ui.components.bottomsheets
+
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.SheetState
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.*
+import com.tangem.core.ui.res.TangemTheme
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.launch
+
+/**
+ * Tangem bottom sheet with custom draggable header and config
+ *
+ * @param config  data model containing logic and ui models
+ * @param content custom bottom sheet content
+ */
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+inline fun <reified T : TangemBottomSheetConfigContent> TangemBottomSheet(
+    config: TangemBottomSheetConfig,
+    crossinline content: @Composable ColumnScope.(T) -> Unit,
+) {
+    var isVisible by remember { mutableStateOf(value = config.isShow) }
+
+    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+    if (isVisible && config.content is T) {
+        ModalBottomSheet(
+            onDismissRequest = config.onDismissRequest,
+            sheetState = sheetState,
+            containerColor = TangemTheme.colors.background.primary,
+            shape = TangemTheme.shapes.bottomSheetLarge,
+            dragHandle = { TangemBottomSheetDraggableHeader() },
+        ) {
+            content(config.content)
+        }
+    }
+
+    LaunchedEffect(key1 = config.isShow) {
+        if (config.isShow) {
+            isVisible = true
+        } else {
+            sheetState.collapse { isVisible = false }
+        }
+    }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+suspend fun SheetState.collapse(onCollapsed: () -> Unit) {
+    coroutineScope {
+        launch { hide() }.invokeOnCompletion { onCollapsed() }
+    }
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheetConfig.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheetConfig.kt
new file mode 100644
index 0000000000..0bb0162ccc
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheetConfig.kt
@@ -0,0 +1,14 @@
+package com.tangem.core.ui.components.bottomsheets
+
+/**
+ * Tangem bottom sheet config
+ *
+ * @property isShow           flag that determine if bottom sheet is shown
+ * @property onDismissRequest lambda be invoked when bottom sheet is dismissed
+ * @property content          content config
+ */
+data class TangemBottomSheetConfig(
+    val isShow: Boolean,
+    val onDismissRequest: () -> Unit,
+    val content: TangemBottomSheetConfigContent,
+)
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheetConfigContent.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheetConfigContent.kt
new file mode 100644
index 0000000000..409e1430d0
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheetConfigContent.kt
@@ -0,0 +1,9 @@
+package com.tangem.core.ui.components.bottomsheets
+
+import androidx.compose.runtime.Immutable
+
+/**
+ * General interface for bottom sheet config model
+ */
+@Immutable
+interface TangemBottomSheetConfigContent
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheetDraggableHeader.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheetDraggableHeader.kt
new file mode 100644
index 0000000000..5b1e13f57a
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheetDraggableHeader.kt
@@ -0,0 +1,33 @@
+package com.tangem.core.ui.components.bottomsheets
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import com.tangem.core.ui.res.TangemTheme
+
+@Composable
+fun TangemBottomSheetDraggableHeader() {
+    Surface(
+        modifier = Modifier
+            .height(TangemTheme.dimens.size20),
+        color = TangemTheme.colors.background.primary,
+    ) {
+        Box(
+            modifier = Modifier
+                .padding(vertical = TangemTheme.dimens.spacing8)
+                .size(
+                    width = TangemTheme.dimens.size32,
+                    height = TangemTheme.dimens.size4,
+                )
+                .background(
+                    color = TangemTheme.colors.icon.inactive,
+                    shape = TangemTheme.shapes.roundedCornersSmall,
+                ),
+        )
+    }
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/chooseaddress/ChooseAddressBottomSheet.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/chooseaddress/ChooseAddressBottomSheet.kt
new file mode 100644
index 0000000000..4bec68b142
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/chooseaddress/ChooseAddressBottomSheet.kt
@@ -0,0 +1,33 @@
+package com.tangem.core.ui.components.bottomsheets.chooseaddress
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import com.tangem.core.ui.R
+import com.tangem.core.ui.components.SimpleSettingsRow
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheet
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
+import com.tangem.core.ui.res.TangemTheme
+
+@Composable
+fun ChooseAddressBottomSheet(config: TangemBottomSheetConfig) {
+    TangemBottomSheet(config) { content: ChooseAddressBottomSheetConfig ->
+        ChooseAddressBottomSheetContent(content = content)
+    }
+}
+
+@Composable
+private fun ChooseAddressBottomSheetContent(content: ChooseAddressBottomSheetConfig) {
+    Column(
+        modifier = Modifier.background(TangemTheme.colors.background.primary),
+    ) {
+        content.addressModels.forEach { addressModel ->
+            SimpleSettingsRow(
+                title = addressModel.type.name,
+                icon = R.drawable.ic_arrow_top_right_24,
+                onItemsClick = { content.onClick(addressModel) },
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/chooseaddress/ChooseAddressBottomSheetConfig.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/chooseaddress/ChooseAddressBottomSheetConfig.kt
new file mode 100644
index 0000000000..2bbbe6c79e
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/chooseaddress/ChooseAddressBottomSheetConfig.kt
@@ -0,0 +1,10 @@
+package com.tangem.core.ui.components.bottomsheets.chooseaddress
+
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfigContent
+import com.tangem.core.ui.components.bottomsheets.tokenreceive.AddressModel
+import kotlinx.collections.immutable.ImmutableList
+
+class ChooseAddressBottomSheetConfig(
+    val addressModels: ImmutableList<AddressModel>,
+    val onClick: (AddressModel) -> Unit,
+) : TangemBottomSheetConfigContent
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/AddressModel.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/AddressModel.kt
new file mode 100644
index 0000000000..0314b21846
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/AddressModel.kt
@@ -0,0 +1,10 @@
+package com.tangem.core.ui.components.bottomsheets.tokenreceive
+
+data class AddressModel(
+    val value: String,
+    val type: Type = Type.Default,
+) {
+    enum class Type {
+        Legacy, Default
+    }
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheet.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheet.kt
new file mode 100644
index 0000000000..0555bfe0e1
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheet.kt
@@ -0,0 +1,195 @@
+package com.tangem.core.ui.components.bottomsheets.tokenreceive
+
+import android.widget.Toast
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.style.TextAlign
+import com.tangem.core.ui.R
+import com.tangem.core.ui.components.MiddleEllipsisText
+import com.tangem.core.ui.components.SecondaryButtonIconStart
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheet
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
+import com.tangem.core.ui.components.rememberQrPainters
+import com.tangem.core.ui.extensions.shareText
+import com.tangem.core.ui.res.TangemTheme
+
+@Composable
+fun TokenReceiveBottomSheet(config: TangemBottomSheetConfig) {
+    TangemBottomSheet(config) { content: TokenReceiveBottomSheetConfig ->
+        TokenReceiveBottomSheetContent(content = content)
+    }
+}
+
+@Composable
+private fun TokenReceiveBottomSheetContent(content: TokenReceiveBottomSheetConfig) {
+    var selectedAddress by remember { mutableStateOf(content.addresses.first()) }
+    Column(
+        modifier = Modifier
+            .padding(
+                start = TangemTheme.dimens.spacing24,
+                top = TangemTheme.dimens.spacing24,
+                end = TangemTheme.dimens.spacing24,
+                bottom = TangemTheme.dimens.spacing16,
+            ),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(space = TangemTheme.dimens.spacing24),
+    ) {
+        QrCodeContent(
+            content = content,
+            onAddressChange = { selectedAddress = it },
+        )
+        Text(
+            text = stringResource(R.string.receive_bottom_sheet_warning_message_full, content.name),
+            color = TangemTheme.colors.text.secondary,
+            textAlign = TextAlign.Center,
+            style = TangemTheme.typography.caption2,
+        )
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing16),
+        ) {
+            val clipboardManager = LocalClipboardManager.current
+            val hapticFeedback = LocalHapticFeedback.current
+            val context = LocalContext.current
+            SecondaryButtonIconStart(
+                modifier = Modifier.weight(1f),
+                text = stringResource(id = R.string.common_copy),
+                iconResId = R.drawable.ic_copy_24,
+                onClick = {
+                    content.onCopyClick.invoke()
+                    hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
+                    clipboardManager.setText(AnnotatedString(selectedAddress.value))
+                    Toast.makeText(context, R.string.wallet_notification_address_copied, Toast.LENGTH_SHORT).show()
+                },
+            )
+            SecondaryButtonIconStart(
+                modifier = Modifier.weight(1f),
+                text = stringResource(id = R.string.common_share),
+                iconResId = R.drawable.ic_share_24,
+                onClick = {
+                    content.onShareClick.invoke()
+                    hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
+                    context.shareText(selectedAddress.value)
+                },
+            )
+        }
+    }
+}
+
+@Suppress("LongMethod")
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+private fun QrCodeContent(content: TokenReceiveBottomSheetConfig, onAddressChange: (AddressModel) -> Unit) {
+    val qrCodes = rememberQrPainters(content.addresses.map(AddressModel::value))
+    val pagerState = rememberPagerState(
+        initialPage = 0,
+        initialPageOffsetFraction = 0f,
+    ) {
+        content.addresses.count()
+    }
+
+    LaunchedEffect(key1 = pagerState.currentPage) {
+        onAddressChange.invoke(content.addresses[pagerState.currentPage])
+    }
+
+    HorizontalPager(
+        state = pagerState,
+    ) { currentPage ->
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing24),
+        ) {
+            Text(
+                text = stringResource(
+                    R.string.receive_bottom_sheet_warning_message,
+                    getName(content = content, index = pagerState.currentPage),
+                    content.symbol,
+                    content.network,
+                ),
+                color = TangemTheme.colors.text.primary1,
+                textAlign = TextAlign.Center,
+                style = TangemTheme.typography.h3,
+            )
+            Image(
+                painter = qrCodes[currentPage],
+                contentDescription = null,
+                contentScale = ContentScale.Fit,
+                modifier = Modifier
+                    .size(TangemTheme.dimens.size248),
+            )
+            MiddleEllipsisText(
+                text = content.addresses[currentPage].value,
+                color = TangemTheme.colors.text.primary1,
+                textAlign = TextAlign.Center,
+                style = TangemTheme.typography.subtitle1,
+            )
+        }
+    }
+
+    if (pagerState.pageCount > 1) {
+        val indicatorState = rememberLazyListState()
+        val selectedColor = TangemTheme.colors.icon.primary1
+        val unselectedColor = TangemTheme.colors.icon.informative
+        LazyRow(
+            modifier = Modifier
+                .height(TangemTheme.dimens.size20),
+            state = indicatorState,
+            horizontalArrangement = Arrangement.Center,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            repeat(pagerState.pageCount) { iteration ->
+                item(key = iteration) {
+                    val color = if (pagerState.currentPage == iteration) {
+                        selectedColor
+                    } else {
+                        unselectedColor
+                    }
+                    Box(
+                        modifier = Modifier
+                            .padding(
+                                start = TangemTheme.dimens.spacing4,
+                                top = TangemTheme.dimens.spacing6,
+                                end = TangemTheme.dimens.spacing4,
+                                bottom = TangemTheme.dimens.spacing6,
+                            )
+                            .background(color, CircleShape)
+                            .size(TangemTheme.dimens.size7),
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun getName(content: TokenReceiveBottomSheetConfig, index: Int): String {
+    return if (content.addresses.size < 2) {
+        content.name
+    } else {
+        "${
+        stringResource(
+            id = when (content.addresses[index].type) {
+                AddressModel.Type.Default -> R.string.address_type_default
+                AddressModel.Type.Legacy -> R.string.address_type_legacy
+            },
+        )
+        } ${content.name}"
+    }
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheetConfig.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheetConfig.kt
new file mode 100644
index 0000000000..c2531a839d
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheetConfig.kt
@@ -0,0 +1,12 @@
+package com.tangem.core.ui.components.bottomsheets.tokenreceive
+
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfigContent
+
+class TokenReceiveBottomSheetConfig(
+    val name: String,
+    val symbol: String,
+    val network: String,
+    val addresses: List<AddressModel>,
+    val onCopyClick: () -> Unit,
+    val onShareClick: () -> Unit,
+) : TangemBottomSheetConfigContent
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/HorizontalActionChips.kt b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/HorizontalActionChips.kt
index b34aa9c970..3a5bbafce5 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/HorizontalActionChips.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/HorizontalActionChips.kt
@@ -31,9 +31,9 @@ fun HorizontalActionChips(
         verticalAlignment = Alignment.CenterVertically,
         contentPadding = contentPadding,
     ) {
+        // do not use key cause when change items order, list is scrolled
         items(
             items = buttons,
-            key = { config -> config.text.hashCode() },
             itemContent = { ActionButton(config = it) },
         )
     }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/actions/Actions.kt b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/actions/Actions.kt
index 2167ad385c..02cf8f05ba 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/actions/Actions.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/actions/Actions.kt
@@ -20,7 +20,6 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
 import com.tangem.core.ui.R
 import com.tangem.core.ui.components.SpacerW8
-import com.tangem.core.ui.components.buttons.common.*
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.res.TangemTheme
@@ -99,7 +98,7 @@ private fun Button(
         val iconTint by animateColorAsState(
             targetValue = when {
                 !config.enabled -> TangemTheme.colors.icon.informative
-                config.dimContent -> TangemTheme.colors.icon.secondary
+                config.dimContent -> TangemTheme.colors.icon.informative
                 else -> TangemTheme.colors.icon.primary1
             },
             label = "Update tint color",
@@ -117,7 +116,7 @@ private fun Button(
         val textColor by animateColorAsState(
             targetValue = when {
                 !config.enabled -> TangemTheme.colors.text.disabled
-                config.dimContent -> TangemTheme.colors.text.secondary
+                config.dimContent -> TangemTheme.colors.text.tertiary
                 else -> TangemTheme.colors.text.primary1
             },
             label = "Update text color",
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/common/TangemButton.kt b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/common/TangemButton.kt
index 6560c617e0..fc114059fe 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/common/TangemButton.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/common/TangemButton.kt
@@ -1,20 +1,19 @@
 package com.tangem.core.ui.components.buttons.common
 
-import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.heightIn
-import androidx.compose.foundation.layout.requiredSizeIn
+import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import com.tangem.core.ui.components.SpacerW
+import androidx.compose.ui.unit.sp
+import com.tangem.core.ui.components.ResizableText
 import com.tangem.core.ui.res.TangemTheme
 
 @Suppress("LongParameterList")
@@ -40,31 +39,35 @@ fun TangemButton(
         colors = colors,
         contentPadding = size.toContentPadding(icon = icon),
     ) {
+        val maxContentSize = getMaxButtonContentSize(buttonTextStyle = textStyle)
+
         ButtonContentContainer(
             buttonIcon = icon,
             iconPadding = size.toIconPadding(),
             showProgress = showProgress,
             progressIndicator = {
                 CircularProgressIndicator(
-                    modifier = Modifier.buttonContentSize(textStyle),
+                    modifier = Modifier.buttonContentSize(maxContentSize),
                     color = colors.contentColor(enabled = enabled).value,
-                    strokeWidth = TangemTheme.dimens.size4,
                 )
             },
             text = {
-                Text(
-                    modifier = Modifier.alignByBaseline(),
+                ResizableText(
+                    modifier = Modifier
+                        .weight(1f, fill = false)
+                        .heightIn(MinButtonContentSize, maxContentSize),
                     text = text,
                     style = textStyle,
                     color = colors.contentColor(enabled = enabled).value,
                     textAlign = TextAlign.Center,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
+                    minFontSize = 12.sp,
                 )
             },
             icon = { iconResId ->
                 Icon(
-                    modifier = Modifier.buttonContentSize(textStyle),
+                    modifier = Modifier.buttonContentSize(maxContentSize),
                     painter = painterResource(id = iconResId),
                     tint = colors.contentColor(enabled = enabled).value,
                     contentDescription = null,
@@ -89,26 +92,36 @@ private inline fun RowScope.ButtonContentContainer(
     } else {
         if (buttonIcon is TangemButtonIconPosition.Start) {
             icon(buttonIcon.iconResId)
-            SpacerW(width = iconPadding)
+            Spacer(modifier = Modifier.requiredWidth(iconPadding))
         }
         text()
         if (buttonIcon is TangemButtonIconPosition.End) {
-            SpacerW(width = iconPadding)
+            Spacer(modifier = Modifier.requiredWidth(iconPadding))
             icon(buttonIcon.iconResId)
         }
     }
 }
 
-private fun Modifier.buttonContentSize(buttonTextStyle: TextStyle): Modifier = composed {
-    val minContentElementSize = TangemTheme.dimens.size20
-    val maxContentElementSize = remember(key1 = buttonTextStyle.lineHeight) {
-        buttonTextStyle.lineHeight.value.dp + 4.dp
+private val MinButtonContentSize: Dp
+    @Composable
+    @ReadOnlyComposable
+    get() = TangemTheme.dimens.size20
+
+@Composable
+@ReadOnlyComposable
+private fun getMaxButtonContentSize(buttonTextStyle: TextStyle): Dp {
+    val buttonLineHeight = with(LocalDensity.current) {
+        buttonTextStyle.lineHeight.toDp()
     }
 
+    return buttonLineHeight.coerceAtLeast(MinButtonContentSize)
+}
+
+private fun Modifier.buttonContentSize(maxSize: Dp): Modifier = composed {
     this.requiredSizeIn(
-        minWidth = minContentElementSize,
-        minHeight = minContentElementSize,
-        maxWidth = maxContentElementSize,
-        maxHeight = maxContentElementSize,
+        minWidth = MinButtonContentSize,
+        minHeight = MinButtonContentSize,
+        maxWidth = maxSize,
+        maxHeight = maxSize,
     )
 }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/marketprice/MarketPriceBlock.kt b/core/ui/src/main/java/com/tangem/core/ui/components/marketprice/MarketPriceBlock.kt
index f498b4caf7..40cb551701 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/marketprice/MarketPriceBlock.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/marketprice/MarketPriceBlock.kt
@@ -2,10 +2,10 @@ package com.tangem.core.ui.components.marketprice
 
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.ExperimentalAnimationApi
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Icon
 import androidx.compose.material.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -51,7 +51,7 @@ fun MarketPriceBlock(state: MarketPriceBlockState, modifier: Modifier = Modifier
         verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing6),
         horizontalAlignment = Alignment.Start,
     ) {
-        Title(currencyName = state.currencyName)
+        Title(currencyName = state.currencySymbol)
 
         Content(state = state, rootWidth = rootWidth)
     }
@@ -130,27 +130,31 @@ private fun Price(price: String, modifier: Modifier = Modifier) {
 
 @OptIn(ExperimentalAnimationApi::class)
 @Composable
-private fun PriceChangeInPercent(config: PriceChangeConfig) {
+private fun PriceChangeInPercent(config: PriceChangeState.Content) {
     AnimatedContent(targetState = config.type, label = "Update price change") { type ->
         Row(
             verticalAlignment = Alignment.CenterVertically,
             horizontalArrangement = Arrangement.spacedBy(space = TangemTheme.dimens.spacing4),
         ) {
-            Image(
+            Icon(
                 painter = painterResource(
                     id = when (type) {
-                        PriceChangeConfig.Type.UP -> R.drawable.img_arrow_up_8
-                        PriceChangeConfig.Type.DOWN -> R.drawable.img_arrow_down_8
+                        PriceChangeType.UP -> R.drawable.ic_arrow_up_8
+                        PriceChangeType.DOWN -> R.drawable.ic_arrow_down_8
                     },
                 ),
+                tint = when (type) {
+                    PriceChangeType.UP -> TangemTheme.colors.icon.accent
+                    PriceChangeType.DOWN -> TangemTheme.colors.icon.warning
+                },
                 contentDescription = null,
             )
 
             Text(
                 text = config.valueInPercent,
                 color = when (type) {
-                    PriceChangeConfig.Type.UP -> TangemTheme.colors.text.accent
-                    PriceChangeConfig.Type.DOWN -> TangemTheme.colors.text.warning
+                    PriceChangeType.UP -> TangemTheme.colors.text.accent
+                    PriceChangeType.DOWN -> TangemTheme.colors.text.warning
                 },
                 style = TangemTheme.typography.body2,
             )
@@ -209,22 +213,22 @@ private fun Preview_MarketPriceBlock_Dark(
 private class WalletMarketPriceBlockStateProvider : CollectionPreviewParameterProvider<MarketPriceBlockState>(
     collection = listOf(
         MarketPriceBlockState.Content(
-            currencyName = "BTC",
+            currencySymbol = "BTC",
             price = "98900 $",
-            priceChangeConfig = PriceChangeConfig(
+            priceChangeConfig = PriceChangeState.Content(
                 valueInPercent = "5.16%",
-                type = PriceChangeConfig.Type.DOWN,
+                type = PriceChangeType.DOWN,
             ),
         ),
         MarketPriceBlockState.Content(
-            currencyName = "BTC",
+            currencySymbol = "BTC",
             price = "98900 $",
-            priceChangeConfig = PriceChangeConfig(
+            priceChangeConfig = PriceChangeState.Content(
                 valueInPercent = "10.89%",
-                type = PriceChangeConfig.Type.UP,
+                type = PriceChangeType.UP,
             ),
         ),
-        MarketPriceBlockState.Loading(currencyName = "BTC"),
-        MarketPriceBlockState.Error(currencyName = "BTC"),
+        MarketPriceBlockState.Loading(currencySymbol = "BTC"),
+        MarketPriceBlockState.Error(currencySymbol = "BTC"),
     ),
 )
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/marketprice/MarketPriceBlockState.kt b/core/ui/src/main/java/com/tangem/core/ui/components/marketprice/MarketPriceBlockState.kt
index 30b652ea68..566ce6fef6 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/marketprice/MarketPriceBlockState.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/marketprice/MarketPriceBlockState.kt
@@ -5,15 +5,15 @@ import androidx.compose.runtime.Immutable
 @Immutable
 sealed interface MarketPriceBlockState {
 
-    val currencyName: String
+    val currencySymbol: String
 
-    data class Error(override val currencyName: String) : MarketPriceBlockState
+    data class Error(override val currencySymbol: String) : MarketPriceBlockState
 
-    data class Loading(override val currencyName: String) : MarketPriceBlockState
+    data class Loading(override val currencySymbol: String) : MarketPriceBlockState
 
     data class Content(
-        override val currencyName: String,
+        override val currencySymbol: String,
         val price: String,
-        val priceChangeConfig: PriceChangeConfig,
+        val priceChangeConfig: PriceChangeState.Content,
     ) : MarketPriceBlockState
 }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/marketprice/PriceChangeConfig.kt b/core/ui/src/main/java/com/tangem/core/ui/components/marketprice/PriceChangeConfig.kt
deleted file mode 100644
index 60af2367e5..0000000000
--- a/core/ui/src/main/java/com/tangem/core/ui/components/marketprice/PriceChangeConfig.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.tangem.core.ui.components.marketprice
-
-data class PriceChangeConfig(val valueInPercent: String, val type: Type) {
-
-    /** Price changing type */
-    enum class Type {
-        UP, DOWN
-    }
-}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/marketprice/PriceChangeState.kt b/core/ui/src/main/java/com/tangem/core/ui/components/marketprice/PriceChangeState.kt
new file mode 100644
index 0000000000..5130e77203
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/marketprice/PriceChangeState.kt
@@ -0,0 +1,13 @@
+package com.tangem.core.ui.components.marketprice
+
+sealed class PriceChangeState {
+
+    data class Content(val valueInPercent: String, val type: PriceChangeType) : PriceChangeState()
+
+    object Unknown : PriceChangeState()
+}
+
+/** Price changing type */
+enum class PriceChangeType {
+    UP, DOWN
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/notifications/Notification.kt b/core/ui/src/main/java/com/tangem/core/ui/components/notifications/Notification.kt
index 76b7894881..56b449ec3a 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/notifications/Notification.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/notifications/Notification.kt
@@ -1,112 +1,140 @@
 package com.tangem.core.ui.components.notifications
 
 import androidx.annotation.DrawableRes
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
+import androidx.compose.foundation.LocalIndication
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Icon
-import androidx.compose.material3.Text
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
 import com.tangem.core.ui.R
-import com.tangem.core.ui.components.SpacerH2
+import com.tangem.core.ui.components.*
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resolveReference
-import com.tangem.core.ui.res.TangemColorPalette
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.components.notifications.NotificationConfig.ButtonsState as NotificationButtonsState
 
 /**
  * Notification component from Design system.
  * Use this for Notification with title, subtitle, clickable or not.
  *
- * @param state    component state
+ * @param config   component config
  * @param modifier modifier
+ * @param iconTint icon tint
  *
  * @see <a href = "https://www.figma.com/file/14ISV23YB1yVW1uNVwqrKv/Android?node-id=1045-807&t=6CVvYDJe0sB7wBKE-0"
  * >Figma component</a>
  */
 @Composable
-fun Notification(state: NotificationState, modifier: Modifier = Modifier) {
-    Box(
-        modifier = modifier
-            .clip(shape = RoundedCornerShape(size = TangemTheme.dimens.radius18))
-            .background(
-                color = TangemTheme.colors.button.secondary,
-                shape = RoundedCornerShape(size = TangemTheme.dimens.radius18),
-            )
-            .clickable(
-                enabled = when (state) {
-                    is NotificationState.Clickable -> true
-                    is NotificationState.Simple, is NotificationState.Closable -> false
-                },
-                onClick = if (state is NotificationState.Clickable) {
-                    state.onClick
-                } else {
-                    {}
-                },
-            ),
-    ) {
-        Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(horizontal = TangemTheme.dimens.spacing12, vertical = TangemTheme.dimens.spacing8),
+fun Notification(config: NotificationConfig, modifier: Modifier = Modifier, iconTint: Color? = null) {
+    BaseContainer(buttonsState = config.buttonsState, onClick = config.onClick, modifier = modifier) {
+        Column(
+            modifier = Modifier.padding(all = TangemTheme.dimens.spacing12),
+            verticalArrangement = Arrangement.spacedBy(space = TangemTheme.dimens.spacing12),
         ) {
-            NotificationIcon(
-                iconResId = state.iconResId,
-                iconTint = state.tint,
+            MainContent(
+                iconResId = config.iconResId,
+                iconTint = iconTint,
+                title = config.title,
+                subtitle = config.subtitle,
+                isClickableComponent = config.onClick != null,
+            )
+
+            Buttons(state = config.buttonsState)
+        }
+
+        CloseableIconButton(
+            onClick = config.onCloseClick,
+            modifier = Modifier.align(alignment = Alignment.TopEnd),
+        )
+    }
+}
+
+@Composable
+private fun BaseContainer(
+    buttonsState: NotificationConfig.ButtonsState?,
+    onClick: (() -> Unit)?,
+    modifier: Modifier = Modifier,
+    content: @Composable BoxScope.() -> Unit,
+) {
+    val containerColor by rememberUpdatedState(
+        newValue = if (buttonsState != null || onClick != null) {
+            TangemTheme.colors.background.primary
+        } else {
+            TangemTheme.colors.button.disabled
+        },
+    )
+
+    Surface(
+        onClick = onClick ?: {},
+        modifier = modifier
+            .defaultMinSize(minHeight = TangemTheme.dimens.size62)
+            .fillMaxWidth(),
+        enabled = onClick != null,
+        shape = TangemTheme.shapes.roundedCornersXMedium,
+        color = containerColor,
+    ) {
+        Box(content = content)
+    }
+}
+
+@Composable
+private fun MainContent(
+    iconResId: Int,
+    iconTint: Color?,
+    title: TextReference,
+    subtitle: TextReference,
+    isClickableComponent: Boolean,
+) {
+    Row {
+        Icon(
+            iconResId = iconResId,
+            tint = iconTint,
+            modifier = Modifier.align(alignment = Alignment.CenterVertically),
+        )
+
+        SpacerW(width = TangemTheme.dimens.spacing10)
+
+        TextsBlock(title = title, subtitle = subtitle)
+
+        if (isClickableComponent) {
+            SpacerWMax()
+
+            Icon(
+                painter = painterResource(id = R.drawable.ic_chevron_right_24),
+                contentDescription = null,
                 modifier = Modifier
                     .size(size = TangemTheme.dimens.size20)
-                    .align(alignment = Alignment.CenterStart),
+                    .align(alignment = Alignment.CenterVertically),
+                tint = TangemTheme.colors.icon.informative,
             )
-
-            NotificationInfoBlock(
-                title = state.title.resolveReference(),
-                subtitle = state.subtitle?.resolveReference(),
-                modifier = Modifier.align(alignment = Alignment.CenterStart),
-            )
-
-            if (state is NotificationState.Closable) {
-                Icon(
-                    modifier = Modifier
-                        .size(size = TangemTheme.dimens.size20)
-                        .align(alignment = Alignment.TopEnd),
-                    painter = painterResource(id = R.drawable.ic_close_24),
-                    contentDescription = null,
-                    tint = TangemTheme.colors.icon.informative,
-                )
-            }
-
-            if (state is NotificationState.Clickable) {
-                Icon(
-                    modifier = Modifier
-                        .size(size = TangemTheme.dimens.size20)
-                        .align(alignment = Alignment.CenterEnd),
-                    painter = painterResource(id = R.drawable.ic_chevron_right_24),
-                    contentDescription = null,
-                    tint = TangemTheme.colors.icon.informative,
-                )
-            }
         }
     }
 }
 
 @Composable
-private fun NotificationIcon(@DrawableRes iconResId: Int, iconTint: Color?, modifier: Modifier = Modifier) {
-    if (iconTint != null) {
+private fun Icon(@DrawableRes iconResId: Int, tint: Color?, modifier: Modifier = Modifier) {
+    if (tint != null) {
         Icon(
             painter = painterResource(id = iconResId),
             contentDescription = null,
             modifier = modifier,
-            tint = iconTint,
+            tint = tint,
         )
     } else {
         Image(
@@ -118,20 +146,104 @@ private fun NotificationIcon(@DrawableRes iconResId: Int, iconTint: Color?, modi
 }
 
 @Composable
-private fun NotificationInfoBlock(title: String, subtitle: String?, modifier: Modifier = Modifier) {
-    Column(modifier = modifier.padding(horizontal = TangemTheme.dimens.spacing30)) {
+private fun TextsBlock(title: TextReference, subtitle: TextReference) {
+    Column(verticalArrangement = Arrangement.spacedBy(space = TangemTheme.dimens.spacing2)) {
         Text(
-            text = title,
+            text = title.resolveReference(),
             color = TangemTheme.colors.text.primary1,
-            style = TangemTheme.typography.body2,
+            style = TangemTheme.typography.button,
         )
 
-        if (!subtitle.isNullOrEmpty()) {
-            SpacerH2()
-            Text(
-                text = subtitle,
-                color = TangemTheme.colors.text.tertiary,
-                style = TangemTheme.typography.caption,
+        Text(
+            text = subtitle.resolveReference(),
+            color = TangemTheme.colors.text.tertiary,
+            style = TangemTheme.typography.caption2,
+        )
+    }
+}
+
+@Composable
+private fun Buttons(state: NotificationButtonsState?) {
+    when (state) {
+        is NotificationButtonsState.SecondaryButtonConfig -> SingleSecondaryButton(config = state)
+        is NotificationButtonsState.PrimaryButtonConfig -> SinglePrimaryButton(config = state)
+        is NotificationButtonsState.PairButtonsConfig -> PairButtons(config = state)
+        null -> Unit
+    }
+}
+
+@Composable
+private fun SingleSecondaryButton(config: NotificationButtonsState.SecondaryButtonConfig) {
+    SecondaryButton(
+        text = config.text.resolveReference(),
+        onClick = config.onClick,
+        modifier = Modifier.fillMaxWidth(),
+    )
+}
+
+@Composable
+private fun SinglePrimaryButton(config: NotificationButtonsState.PrimaryButtonConfig) {
+    if (config.iconResId != null) {
+        PrimaryButtonIconEnd(
+            text = config.text.resolveReference(),
+            iconResId = config.iconResId,
+            onClick = config.onClick,
+            modifier = Modifier.fillMaxWidth(),
+        )
+    } else {
+        PrimaryButton(
+            text = config.text.resolveReference(),
+            onClick = config.onClick,
+            modifier = Modifier.fillMaxWidth(),
+        )
+    }
+}
+
+@Composable
+private fun PairButtons(config: NotificationButtonsState.PairButtonsConfig) {
+    Row(horizontalArrangement = Arrangement.spacedBy(space = TangemTheme.dimens.spacing8)) {
+        SecondaryButton(
+            text = config.secondaryText.resolveReference(),
+            onClick = config.onSecondaryClick,
+            modifier = Modifier.weight(weight = 1f),
+        )
+
+        PrimaryButton(
+            text = config.primaryText.resolveReference(),
+            onClick = config.onPrimaryClick,
+            modifier = Modifier.weight(weight = 1f),
+        )
+    }
+}
+
+@Composable
+private fun CloseableIconButton(onClick: (() -> Unit)?, modifier: Modifier = Modifier) {
+    AnimatedVisibility(visible = onClick != null, modifier = modifier) {
+        onClick ?: return@AnimatedVisibility
+
+        /*
+         * Implement a custom ripple because the design layout doesn't match the Material Design.
+         * Material Icon has a size 24x24 and Material IconButton has a size 48x48,
+         * but icon from Figma has a size 16x16.
+         */
+        Box(
+            modifier = Modifier
+                .size(size = TangemTheme.dimens.size40)
+                .clip(shape = CircleShape)
+                .clickable(
+                    interactionSource = remember { MutableInteractionSource() },
+                    indication = LocalIndication.current,
+                    role = Role.Button,
+                    onClick = onClick,
+                ),
+        ) {
+            Icon(
+                painter = painterResource(id = R.drawable.ic_close_24),
+                contentDescription = null,
+                modifier = Modifier
+                    .size(size = TangemTheme.dimens.size16)
+                    .align(alignment = Alignment.Center),
+                tint = TangemTheme.colors.icon.inactive,
             )
         }
     }
@@ -139,72 +251,83 @@ private fun NotificationInfoBlock(title: String, subtitle: String?, modifier: Mo
 
 @Preview
 @Composable
-private fun Preview_WarningNotification_Light(
-    @PreviewParameter(NotificationStateProvider::class)
-    state: NotificationState,
+private fun Preview_Notification_Light(
+    @PreviewParameter(NotificationConfigProvider::class)
+    config: NotificationConfig,
 ) {
     TangemTheme(isDark = false) {
-        Notification(state)
+        Notification(config)
     }
 }
 
 @Preview
 @Composable
-private fun Preview_WarningNotification_Dark(
-    @PreviewParameter(NotificationStateProvider::class)
-    state: NotificationState,
+private fun Preview_Notification_Dark(
+    @PreviewParameter(NotificationConfigProvider::class) config: NotificationConfig,
 ) {
     TangemTheme(isDark = true) {
-        Notification(state)
+        Notification(config)
     }
 }
 
-private class NotificationStateProvider : CollectionPreviewParameterProvider<NotificationState>(
+private class NotificationConfigProvider : CollectionPreviewParameterProvider<NotificationConfig>(
     collection = listOf(
-        NotificationState.Simple(
-            title = TextReference.Str(value = "Your wallet hasn’t been backed up"),
+        NotificationConfig(
+            title = TextReference.Str(value = "Development card"),
             subtitle = TextReference.Str(
-                value = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt " +
-                    "ut labore et...",
+                value = "The card you scanned is a development card.\nDon’t accept it as a payment.",
             ),
-            iconResId = R.drawable.img_attention_20,
-        ),
-        NotificationState.Simple(
-            title = TextReference.Str("Your wallet hasn’t been backed up"),
-            subtitle = null,
             iconResId = R.drawable.ic_alert_circle_24,
-            tint = TangemColorPalette.Amaranth,
         ),
-        NotificationState.Clickable(
-            title = TextReference.Str(value = "Your wallet hasn’t been backed up"),
-            subtitle = TextReference.Str(
-                value = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt " +
-                    "ut labore et...",
-            ),
+        NotificationConfig(
+            title = TextReference.Str(value = "Some networks are unreachable"),
+            subtitle = TextReference.Str(value = "Check your network connection"),
             iconResId = R.drawable.img_attention_20,
+        ),
+        NotificationConfig(
+            title = TextReference.Str(value = "Used card"),
+            subtitle = TextReference.Str(value = "The card signed transactions in the past"),
+            iconResId = R.drawable.ic_alert_circle_24,
             onClick = {},
         ),
-        NotificationState.Clickable(
+        NotificationConfig(
             title = TextReference.Str(value = "Your wallet hasn’t been backed up"),
-            subtitle = null,
-            iconResId = R.drawable.ic_alert_circle_24,
-            tint = TangemColorPalette.Amaranth,
-            onClick = {},
-        ),
-        NotificationState.Closable(
-            title = TextReference.Str(value = "Your wallet hasn’t been backed up"),
-            subtitle = TextReference.Str(
-                value = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt " +
-                    "ut labore et...",
-            ),
+            subtitle = TextReference.Str(value = "To protect your assets, we advise you to carry out this procedure"),
             iconResId = R.drawable.img_attention_20,
-            onCloseClick = {},
+            buttonsState = NotificationButtonsState.SecondaryButtonConfig(
+                text = TextReference.Str(value = "Start backup process"),
+                onClick = {},
+            ),
         ),
-        NotificationState.Closable(
-            title = TextReference.Str(value = "Your wallet hasn’t been backed up"),
-            subtitle = null,
+        NotificationConfig(
+            title = TextReference.Str(value = "Some addresses are missing"),
+            subtitle = TextReference.Str(value = "Generate addresses for 2 new networks using your card"),
             iconResId = R.drawable.ic_alert_circle_24,
-            tint = TangemColorPalette.Amaranth,
+            buttonsState = NotificationButtonsState.PrimaryButtonConfig(
+                text = TextReference.Str(value = "Generate addresses"),
+                iconResId = R.drawable.ic_tangem_24,
+                onClick = {},
+            ),
+        ),
+        NotificationConfig(
+            title = TextReference.Str(value = "Rate the app"),
+            subtitle = TextReference.Str(value = "How do you like Tangem?"),
+            iconResId = R.drawable.img_attention_20,
+            buttonsState = NotificationButtonsState.PairButtonsConfig(
+                primaryText = TextReference.Str(value = "Love it!"),
+                onPrimaryClick = {},
+                secondaryText = TextReference.Str(value = "Can be better"),
+                onSecondaryClick = {},
+            ),
+        ),
+        NotificationConfig(
+            title = TextReference.Str(value = "Note top up"),
+            subtitle = TextReference.Str(value = "To activate card top up it with at least 1 XLM"),
+            iconResId = R.drawable.ic_alert_circle_24,
+            buttonsState = NotificationButtonsState.SecondaryButtonConfig(
+                text = TextReference.Str(value = "Top up card"),
+                onClick = {},
+            ),
             onCloseClick = {},
         ),
     ),
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/notifications/NotificationConfig.kt b/core/ui/src/main/java/com/tangem/core/ui/components/notifications/NotificationConfig.kt
new file mode 100644
index 0000000000..c5b35a183e
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/notifications/NotificationConfig.kt
@@ -0,0 +1,44 @@
+package com.tangem.core.ui.components.notifications
+
+import androidx.annotation.DrawableRes
+import com.tangem.core.ui.extensions.TextReference
+
+/**
+ * Notification component state
+ *
+ * @property title        title
+ * @property subtitle     subtitle
+ * @property iconResId    icon resource id
+ * @property buttonsState buttons state
+ * @property onClick      lambda be invoked when notification is clicked
+ * @property onCloseClick lambda be invoked when close button is clicked
+ *
+[REDACTED_AUTHOR]
+ */
+data class NotificationConfig(
+    val title: TextReference,
+    val subtitle: TextReference,
+    @DrawableRes val iconResId: Int,
+    val buttonsState: ButtonsState? = null,
+    val onClick: (() -> Unit)? = null,
+    val onCloseClick: (() -> Unit)? = null,
+) {
+
+    sealed class ButtonsState {
+
+        data class PrimaryButtonConfig(
+            val text: TextReference,
+            @DrawableRes val iconResId: Int? = null,
+            val onClick: () -> Unit,
+        ) : ButtonsState()
+
+        data class SecondaryButtonConfig(val text: TextReference, val onClick: () -> Unit) : ButtonsState()
+
+        data class PairButtonsConfig(
+            val primaryText: TextReference,
+            val onPrimaryClick: () -> Unit,
+            val secondaryText: TextReference,
+            val onSecondaryClick: () -> Unit,
+        ) : ButtonsState()
+    }
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/notifications/NotificationState.kt b/core/ui/src/main/java/com/tangem/core/ui/components/notifications/NotificationState.kt
deleted file mode 100644
index f787e62a66..0000000000
--- a/core/ui/src/main/java/com/tangem/core/ui/components/notifications/NotificationState.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.tangem.core.ui.components.notifications
-
-import androidx.annotation.DrawableRes
-import androidx.compose.ui.graphics.Color
-import com.tangem.core.ui.extensions.TextReference
-
-/**
- * Notification component state
- *
- * @property title     title
- * @property subtitle  subtitle
- * @property iconResId icon resource id
- * @property tint      icon tint
- *
-[REDACTED_AUTHOR]
- */
-sealed class NotificationState(
-    open val title: TextReference,
-    open val subtitle: TextReference? = null,
-    @DrawableRes open val iconResId: Int,
-    open val tint: Color? = null,
-) {
-
-    /**
-     * Simple notification state. Non clickable.
-     *
-     * @property title     title
-     * @property subtitle  subtitle
-     * @property iconResId icon resource id
-     * @property tint      icon tint
-     */
-    data class Simple(
-        override val title: TextReference,
-        override val subtitle: TextReference? = null,
-        @DrawableRes override val iconResId: Int,
-        override val tint: Color? = null,
-    ) : NotificationState(title, subtitle, iconResId, tint)
-
-    /**
-     * Clickable notification state
-     *
-     * @property title     title
-     * @property subtitle  subtitle
-     * @property iconResId icon resource id
-     * @property tint      icon tint
-     * @property onClick   lambda be invoked when notification component is clicked
-     */
-    data class Clickable(
-        override val title: TextReference,
-        override val subtitle: TextReference? = null,
-        @DrawableRes override val iconResId: Int,
-        override val tint: Color? = null,
-        val onClick: () -> Unit,
-    ) : NotificationState(title, subtitle, iconResId, tint)
-
-    /**
-     * Closable notification state
-     *
-     * @property title        title
-     * @property subtitle     subtitle
-     * @property iconResId    icon resource id
-     * @property tint         icon tint
-     * @property onCloseClick lambda be invoked when close button is clicked
-     */
-    data class Closable(
-        override val title: TextReference,
-        override val subtitle: TextReference? = null,
-        @DrawableRes override val iconResId: Int,
-        override val tint: Color? = null,
-        val onCloseClick: (() -> Unit)? = null,
-    ) : NotificationState(title, subtitle, iconResId, tint)
-}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/Transaction.kt b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/Transaction.kt
index b3622b4b1b..e1947a8843 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/Transaction.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/Transaction.kt
@@ -2,6 +2,7 @@ package com.tangem.core.ui.components.transactions
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -19,10 +20,13 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
 import androidx.constraintlayout.compose.ConstraintLayout
 import androidx.constraintlayout.compose.Dimension
+import com.tangem.common.Strings
 import com.tangem.core.ui.R
 import com.tangem.core.ui.components.CircleShimmer
 import com.tangem.core.ui.components.RectangleShimmer
 import com.tangem.core.ui.components.transactions.state.TransactionState
+import com.tangem.core.ui.components.transactions.state.TransactionState.Content.Direction
+import com.tangem.core.ui.components.transactions.state.TransactionState.Content.Status
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.res.TangemTheme
@@ -31,8 +35,9 @@ import java.util.UUID
 /**
  * Transaction component
  *
- * @param state    state
- * @param modifier modifier
+ * @param state            state
+ * @param isBalanceHidden  is balance hidden
+ * @param modifier         modifier
  *
  * @see <a href = "https://www.figma.com/file/RU7AIgwHtGdMfy83T5UOoR/iOS?type=design&node-id=446-438&t=71jPDxMMk4e0
  * a025-4">Figma Component</a>
@@ -40,15 +45,20 @@ import java.util.UUID
 [REDACTED_AUTHOR]
  */
 @Composable
-fun Transaction(state: TransactionState, modifier: Modifier = Modifier) {
+fun Transaction(state: TransactionState, isBalanceHidden: Boolean, modifier: Modifier = Modifier) {
     Surface(
         modifier = modifier
             .background(TangemTheme.colors.background.primary)
             .defaultMinSize(minHeight = TangemTheme.dimens.size56)
+            .clickable(
+                enabled = state is TransactionState.Content,
+                onClick = (state as? TransactionState.Content)?.onClick ?: {},
+            )
             .padding(horizontal = TangemTheme.dimens.spacing12, vertical = TangemTheme.dimens.spacing10),
         color = TangemTheme.colors.background.primary,
     ) {
         @Suppress("DestructuringDeclarationWithTooManyEntries")
+        // FIXME: split this composable to small composables(loading/content/error) to properly handle onClick
         ConstraintLayout(modifier = Modifier.fillMaxWidth()) {
             val (iconItem, titleItem, subtitleItem, amountItem, timestampItem) = createRefs()
 
@@ -87,6 +97,7 @@ fun Transaction(state: TransactionState, modifier: Modifier = Modifier) {
 
             Amount(
                 state = state,
+                isBalanceHidden = isBalanceHidden,
                 modifier = Modifier.constrainAs(amountItem) {
                     start.linkTo(titleItem.end)
                     top.linkTo(titleItem.top)
@@ -108,6 +119,7 @@ fun Transaction(state: TransactionState, modifier: Modifier = Modifier) {
     }
 }
 
+@Suppress("CyclomaticComplexMethod")
 @Composable
 private fun Icon(state: TransactionState, modifier: Modifier = Modifier) {
     when (state) {
@@ -116,44 +128,39 @@ private fun Icon(state: TransactionState, modifier: Modifier = Modifier) {
                 modifier = modifier
                     .size(TangemTheme.dimens.size40)
                     .background(
-                        color = when (state) {
-                            is TransactionState.ProcessedTransactionContent -> {
-                                TangemTheme.colors.icon.attention.copy(alpha = 0.1f)
-                            }
-                            is TransactionState.CompletedTransactionContent -> {
-                                TangemTheme.colors.background.secondary
-                            }
+                        color = when (state.status) {
+                            is Status.Unconfirmed -> TangemTheme.colors.icon.attention.copy(alpha = 0.1f)
+                            is Status.Confirmed -> TangemTheme.colors.background.secondary
+                            is Status.Failed -> TangemTheme.colors.icon.warning.copy(alpha = 0.1f)
                         },
                         shape = CircleShape,
                     ),
             ) {
                 Icon(
                     painter = painterResource(
-                        id = when (state) {
-                            is TransactionState.Sending,
-                            is TransactionState.Send,
-                            -> R.drawable.ic_arrow_up_24
-
-                            is TransactionState.Receiving,
-                            is TransactionState.Receive,
-                            -> R.drawable.ic_arrow_down_24
-
-                            is TransactionState.Approving,
-                            is TransactionState.Approved,
-                            -> R.drawable.ic_doc_24
-
-                            is TransactionState.Swapping,
-                            is TransactionState.Swapped,
-                            -> R.drawable.ic_exchange_vertical_24
+                        id = when (state.status) {
+                            is Status.Failed -> R.drawable.ic_close_24
+                            else -> when (state) {
+                                is TransactionState.Transfer -> {
+                                    when (state.direction) {
+                                        Direction.OUTGOING -> R.drawable.ic_arrow_up_24
+                                        Direction.INCOMING -> R.drawable.ic_arrow_down_24
+                                    }
+                                }
+                                is TransactionState.Approve -> R.drawable.ic_doc_24
+                                is TransactionState.Swap -> R.drawable.ic_exchange_vertical_24
+                                is TransactionState.Custom -> R.drawable.ic_exchange_vertical_24
+                            }
                         },
                     ),
                     contentDescription = null,
                     modifier = Modifier
                         .size(TangemTheme.dimens.size20)
                         .align(Alignment.Center),
-                    tint = when (state) {
-                        is TransactionState.ProcessedTransactionContent -> TangemTheme.colors.icon.attention
-                        is TransactionState.CompletedTransactionContent -> TangemTheme.colors.icon.informative
+                    tint = when (state.status) {
+                        Status.Confirmed -> TangemTheme.colors.icon.informative
+                        Status.Unconfirmed -> TangemTheme.colors.icon.attention
+                        Status.Failed -> TangemTheme.colors.icon.warning
                     },
                 )
             }
@@ -179,43 +186,28 @@ private fun Icon(state: TransactionState, modifier: Modifier = Modifier) {
 @Composable
 private fun Title(state: TransactionState, modifier: Modifier = Modifier) {
     when (state) {
-        is TransactionState.ProcessedTransactionContent -> {
+        is TransactionState.Content -> {
             Row(modifier = modifier, horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing6)) {
                 Text(
-                    text = stringResource(
-                        id = when (state) {
-                            is TransactionState.Sending -> R.string.common_transfer
-                            is TransactionState.Receiving -> R.string.common_transfer
-                            is TransactionState.Approving -> R.string.common_approval
-                            is TransactionState.Swapping -> R.string.common_swap
-                        },
-                    ),
+                    text = when (state) {
+                        is TransactionState.Approve -> stringResource(R.string.common_approval)
+                        is TransactionState.Transfer -> stringResource(R.string.common_transfer)
+                        is TransactionState.Swap -> stringResource(R.string.common_swap)
+                        is TransactionState.Custom -> state.title.resolveReference()
+                    },
                     color = TangemTheme.colors.text.primary1,
                     style = TangemTheme.typography.subtitle2,
                 )
 
-                Image(
-                    modifier = Modifier.align(Alignment.CenterVertically),
-                    painter = painterResource(id = R.drawable.img_loader_15),
-                    contentDescription = null,
-                )
+                if (state.status is Status.Unconfirmed) {
+                    Image(
+                        modifier = Modifier.align(Alignment.CenterVertically),
+                        painter = painterResource(id = R.drawable.img_loader_15),
+                        contentDescription = null,
+                    )
+                }
             }
         }
-        is TransactionState.CompletedTransactionContent -> {
-            Text(
-                text = stringResource(
-                    id = when (state) {
-                        is TransactionState.Send -> R.string.common_transfer
-                        is TransactionState.Receive -> R.string.common_transfer
-                        is TransactionState.Approved -> R.string.common_approval
-                        is TransactionState.Swapped -> R.string.common_swap
-                    },
-                ),
-                modifier = modifier,
-                color = TangemTheme.colors.text.primary1,
-                style = TangemTheme.typography.subtitle2,
-            )
-        }
         is TransactionState.Loading -> {
             RectangleShimmer(
                 modifier = modifier.size(width = TangemTheme.dimens.size70, height = TangemTheme.dimens.size12),
@@ -234,32 +226,42 @@ private fun Subtitle(state: TransactionState, modifier: Modifier = Modifier) {
     when (state) {
         is TransactionState.Content -> {
             Text(
-                text = when (state) {
-                    is TransactionState.Sending,
-                    is TransactionState.Send,
-                    -> stringResource(
-                        id = R.string.transaction_history_transaction_to_address,
-                        state.address.resolveReference(),
-                    )
-                    is TransactionState.Receiving,
-                    is TransactionState.Receive,
-                    is TransactionState.Approving,
-                    is TransactionState.Approved,
-                    -> stringResource(
-                        id = R.string.transaction_history_transaction_from_address,
-                        state.address.resolveReference(),
-                    )
-                    is TransactionState.Swapping,
-                    is TransactionState.Swapped,
-                    -> stringResource(
-                        id = R.string.transaction_history_contract_address,
-                        state.address.resolveReference(),
-                    )
+                text = when (state.status) {
+                    is Status.Failed -> stringResource(id = R.string.common_transaction_failed)
+                    else -> when (state) {
+                        is TransactionState.Transfer -> {
+                            when (state.direction) {
+                                Direction.OUTGOING -> stringResource(
+                                    id = R.string.transaction_history_transaction_to_address,
+                                    state.address.resolveReference(),
+                                )
+                                Direction.INCOMING -> stringResource(
+                                    id = R.string.transaction_history_transaction_from_address,
+                                    state.address.resolveReference(),
+                                )
+                            }
+                        }
+                        is TransactionState.Approve -> stringResource(
+                            id = R.string.transaction_history_transaction_from_address,
+                            state.address.resolveReference(),
+                        )
+                        is TransactionState.Swap -> stringResource(
+                            id = R.string.transaction_history_contract_address,
+                            state.address.resolveReference(),
+                        )
+                        is TransactionState.Custom -> stringResource(
+                            id = when (state.direction) {
+                                Direction.OUTGOING -> R.string.transaction_history_transaction_to_address
+                                Direction.INCOMING -> R.string.transaction_history_transaction_from_address
+                            },
+                            state.subtitle.resolveReference(),
+                        )
+                    }
                 },
                 modifier = modifier,
                 textAlign = TextAlign.Start,
                 color = TangemTheme.colors.text.tertiary,
-                style = TangemTheme.typography.caption,
+                style = TangemTheme.typography.caption2,
             )
         }
         is TransactionState.Loading -> {
@@ -276,14 +278,17 @@ private fun Subtitle(state: TransactionState, modifier: Modifier = Modifier) {
 }
 
 @Composable
-private fun Amount(state: TransactionState, modifier: Modifier = Modifier) {
+private fun Amount(state: TransactionState, isBalanceHidden: Boolean, modifier: Modifier = Modifier) {
     when (state) {
         is TransactionState.Content -> {
             Text(
-                text = state.amount,
+                text = if (isBalanceHidden) Strings.STARS else state.amount,
                 modifier = modifier,
                 textAlign = TextAlign.End,
-                color = TangemTheme.colors.text.primary1,
+                color = when (state.direction) {
+                    Direction.INCOMING -> TangemTheme.colors.text.accent
+                    Direction.OUTGOING -> TangemTheme.colors.text.primary1
+                },
                 style = TangemTheme.typography.body2,
             )
         }
@@ -309,7 +314,7 @@ private fun Timestamp(state: TransactionState, modifier: Modifier = Modifier) {
                 modifier = modifier,
                 textAlign = TextAlign.End,
                 color = TangemTheme.colors.text.tertiary,
-                style = TangemTheme.typography.caption,
+                style = TangemTheme.typography.caption2,
             )
         }
         is TransactionState.Loading -> {
@@ -341,7 +346,7 @@ private fun Preview_TransactionItem_LightTheme(
     @PreviewParameter(TransactionItemStateProvider::class) state: TransactionState,
 ) {
     TangemTheme(isDark = false) {
-        Transaction(state)
+        Transaction(state = state, isBalanceHidden = false)
     }
 }
 
@@ -351,59 +356,87 @@ private fun Preview_TransactionItem_DarkTheme(
     @PreviewParameter(TransactionItemStateProvider::class) state: TransactionState,
 ) {
     TangemTheme(isDark = true) {
-        Transaction(state)
+        Transaction(state = state, isBalanceHidden = false)
     }
 }
 
 private class TransactionItemStateProvider : CollectionPreviewParameterProvider<TransactionState>(
     collection = listOf(
-        TransactionState.Sending(
+        TransactionState.Transfer(
             txHash = UUID.randomUUID().toString(),
             address = TextReference.Str("33BddS...ga2B"),
             amount = "-0.500913 BTC",
             timestamp = "8:41",
+            status = Status.Confirmed,
+            direction = Direction.OUTGOING,
+            onClick = {},
         ),
-        TransactionState.Receiving(
+        TransactionState.Transfer(
             txHash = UUID.randomUUID().toString(),
             address = TextReference.Str("33BddS...ga2B"),
             amount = "+0.500913 BTC",
             timestamp = "8:41",
+            status = Status.Unconfirmed,
+            direction = Direction.INCOMING,
+            onClick = {},
         ),
-        TransactionState.Approving(
+        TransactionState.Approve(
             txHash = UUID.randomUUID().toString(),
             address = TextReference.Str("33BddS...ga2B"),
             amount = "+0.500913 BTC",
             timestamp = "8:41",
+            status = Status.Unconfirmed,
+            direction = Direction.OUTGOING,
+            onClick = {},
         ),
-        TransactionState.Swapping(
+        TransactionState.Approve(
             txHash = UUID.randomUUID().toString(),
             address = TextReference.Str("33BddS...ga2B"),
             amount = "+0.500913 BTC",
             timestamp = "8:41",
+            status = Status.Failed,
+            direction = Direction.OUTGOING,
+            onClick = {},
         ),
-        TransactionState.Send(
-            txHash = UUID.randomUUID().toString(),
-            address = TextReference.Str("33BddS...ga2B"),
-            amount = "-0.500913 BTC",
-            timestamp = "8:41",
-        ),
-        TransactionState.Receive(
+        TransactionState.Approve(
             txHash = UUID.randomUUID().toString(),
             address = TextReference.Str("33BddS...ga2B"),
             amount = "+0.500913 BTC",
             timestamp = "8:41",
+            status = Status.Confirmed,
+            direction = Direction.OUTGOING,
+            onClick = {},
         ),
-        TransactionState.Approved(
+        TransactionState.Swap(
             txHash = UUID.randomUUID().toString(),
             address = TextReference.Str("33BddS...ga2B"),
             amount = "+0.500913 BTC",
             timestamp = "8:41",
+            status = Status.Unconfirmed,
+            direction = Direction.INCOMING,
+            onClick = {},
         ),
-        TransactionState.Swapped(
+        TransactionState.Custom(
             txHash = UUID.randomUUID().toString(),
             address = TextReference.Str("33BddS...ga2B"),
             amount = "+0.500913 BTC",
             timestamp = "8:41",
+            status = Status.Confirmed,
+            direction = Direction.INCOMING,
+            title = TextReference.Str("Submit"),
+            subtitle = TextReference.Str("33BddS...ga2B"),
+            onClick = {},
+        ),
+        TransactionState.Custom(
+            txHash = UUID.randomUUID().toString(),
+            address = TextReference.Str("33BddS...ga2B"),
+            amount = "+0.500913 BTC",
+            timestamp = "8:41",
+            status = Status.Confirmed,
+            direction = Direction.OUTGOING,
+            title = TextReference.Str("Submit"),
+            subtitle = TextReference.Str("33BddS...ga2B"),
+            onClick = {},
         ),
         TransactionState.Loading(txHash = UUID.randomUUID().toString()),
     ),
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/TransactionList.kt b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/TransactionList.kt
index 93a6d16058..3314333a5e 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/TransactionList.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/TransactionList.kt
@@ -4,7 +4,6 @@ import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyListScope
-import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.ui.Modifier
 import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.itemContentType
@@ -25,20 +24,19 @@ import com.tangem.core.ui.res.TangemTheme
 fun LazyListScope.txHistoryItems(
     state: TxHistoryState,
     txHistoryItems: LazyPagingItems<TxHistoryState.TxHistoryItemState>?,
+    isBalanceHidden: Boolean,
     modifier: Modifier = Modifier,
 ) {
     when (state) {
         is TxHistoryState.Content -> {
             contentItems(
                 txHistoryItems = requireNotNull(txHistoryItems),
+                isBalanceHidden = isBalanceHidden,
                 modifier = modifier,
             )
         }
         is TxHistoryState.Empty -> {
-            nonContentItem(
-                state = EmptyTransactionsBlockState.Empty(onClick = state.onBuyClick),
-                modifier = modifier,
-            )
+            nonContentItem(state = EmptyTransactionsBlockState.Empty, modifier = modifier)
         }
         is TxHistoryState.Error -> {
             nonContentItem(
@@ -58,38 +56,34 @@ fun LazyListScope.txHistoryItems(
 @OptIn(ExperimentalFoundationApi::class)
 private fun LazyListScope.contentItems(
     txHistoryItems: LazyPagingItems<TxHistoryState.TxHistoryItemState>,
+    isBalanceHidden: Boolean,
     modifier: Modifier = Modifier,
 ) {
-    txHistoryItems.itemKey { item ->
-        when (item) {
-            is TxHistoryState.TxHistoryItemState.GroupTitle -> item.title
-            is TxHistoryState.TxHistoryItemState.Title -> item.onExploreClick.hashCode()
-            is TxHistoryState.TxHistoryItemState.Transaction -> item.state.txHash
-        }
-    }
-
-    txHistoryItems.itemContentType { it::class.java }
-
-    itemsIndexed(
-        items = txHistoryItems.itemSnapshotList.items,
-        key = { _, item ->
+    items(
+        count = txHistoryItems.itemCount,
+        key = txHistoryItems.itemKey { item ->
             when (item) {
                 is TxHistoryState.TxHistoryItemState.GroupTitle -> item.title
                 is TxHistoryState.TxHistoryItemState.Title -> item.onExploreClick.hashCode()
                 is TxHistoryState.TxHistoryItemState.Transaction -> item.state.txHash
             }
         },
-    ) { index, item ->
-        TxHistoryListItem(
-            state = item,
-            modifier = modifier
-                .animateItemPlacement()
-                .roundedShapeItemDecoration(
-                    currentIndex = index,
-                    lastIndex = txHistoryItems.itemSnapshotList.lastIndex,
-                ),
-        )
-    }
+        contentType = txHistoryItems.itemContentType { it::class.java },
+        itemContent = { index ->
+            txHistoryItems[index]?.let { item ->
+                TxHistoryListItem(
+                    state = item,
+                    isBalanceHidden = isBalanceHidden,
+                    modifier = modifier
+                        .animateItemPlacement()
+                        .roundedShapeItemDecoration(
+                            currentIndex = index,
+                            lastIndex = txHistoryItems.itemSnapshotList.lastIndex,
+                        ),
+                )
+            }
+        },
+    )
 }
 
 @OptIn(ExperimentalFoundationApi::class)
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/TxHistoryContentItem.kt b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/TxHistoryContentItem.kt
index 6f918f3cad..b532c2d533 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/TxHistoryContentItem.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/TxHistoryContentItem.kt
@@ -5,7 +5,11 @@ import androidx.compose.ui.Modifier
 import com.tangem.core.ui.components.transactions.state.TxHistoryState
 
 @Composable
-internal fun TxHistoryListItem(state: TxHistoryState.TxHistoryItemState, modifier: Modifier = Modifier) {
+internal fun TxHistoryListItem(
+    state: TxHistoryState.TxHistoryItemState,
+    isBalanceHidden: Boolean,
+    modifier: Modifier = Modifier,
+) {
     when (state) {
         is TxHistoryState.TxHistoryItemState.GroupTitle -> {
             TxHistoryGroupTitle(config = state, modifier = modifier)
@@ -14,7 +18,11 @@ internal fun TxHistoryListItem(state: TxHistoryState.TxHistoryItemState, modifie
             TxHistoryTitle(config = state, modifier = modifier)
         }
         is TxHistoryState.TxHistoryItemState.Transaction -> {
-            Transaction(state = state.state, modifier = modifier)
+            Transaction(
+                state = state.state,
+                isBalanceHidden = isBalanceHidden,
+                modifier = modifier,
+            )
         }
     }
 }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/empty/EmptyTransactionBlock.kt b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/empty/EmptyTransactionBlock.kt
index 4045bf505e..7e5efdd446 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/empty/EmptyTransactionBlock.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/empty/EmptyTransactionBlock.kt
@@ -47,7 +47,9 @@ fun EmptyTransactionBlock(state: EmptyTransactionsBlockState, modifier: Modifier
             color = TangemTheme.colors.text.secondary,
         )
 
-        ActionButton(config = state.actionButtonConfig)
+        state.actionButtonConfig?.let {
+            ActionButton(config = it)
+        }
     }
 }
 
@@ -73,7 +75,7 @@ private fun EmptyTransactionBlock_Dark(
 
 private class EmptyTransactionBlockStateProvider : CollectionPreviewParameterProvider<EmptyTransactionsBlockState>(
     collection = listOf(
-        EmptyTransactionsBlockState.Empty(onClick = {}),
+        EmptyTransactionsBlockState.Empty,
         EmptyTransactionsBlockState.FailedToLoad(onClick = {}),
         EmptyTransactionsBlockState.NotImplemented(onClick = {}),
     ),
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/empty/EmptyTransactionsBlockState.kt b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/empty/EmptyTransactionsBlockState.kt
index d4c4dad238..6aa8c653c2 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/empty/EmptyTransactionsBlockState.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/empty/EmptyTransactionsBlockState.kt
@@ -5,12 +5,12 @@ import com.tangem.core.ui.components.buttons.actions.ActionButtonConfig
 import com.tangem.core.ui.extensions.TextReference
 
 sealed class EmptyTransactionsBlockState(
+    val actionButtonConfig: ActionButtonConfig? = null,
     val iconRes: Int,
     val text: TextReference,
-    val actionButtonConfig: ActionButtonConfig,
 ) {
 
-    class FailedToLoad(onClick: () -> Unit) : EmptyTransactionsBlockState(
+    data class FailedToLoad(val onClick: () -> Unit) : EmptyTransactionsBlockState(
         actionButtonConfig = ActionButtonConfig(
             text = TextReference.Res(R.string.common_reload),
             iconResId = R.drawable.ic_refresh_24,
@@ -21,18 +21,12 @@ sealed class EmptyTransactionsBlockState(
         text = TextReference.Res(R.string.transaction_history_error_failed_to_load),
     )
 
-    class Empty(onClick: (() -> Unit)?) : EmptyTransactionsBlockState(
-        actionButtonConfig = ActionButtonConfig(
-            text = TextReference.Res(R.string.common_buy),
-            iconResId = R.drawable.ic_plus_24,
-            onClick = onClick ?: {},
-            enabled = onClick != null,
-        ),
-        iconRes = R.drawable.img_coin_64,
+    object Empty : EmptyTransactionsBlockState(
+        iconRes = R.drawable.ic_empty_token_64,
         text = TextReference.Res(R.string.transaction_history_empty_transactions),
     )
 
-    class NotImplemented(onClick: () -> Unit) : EmptyTransactionsBlockState(
+    data class NotImplemented(val onClick: () -> Unit) : EmptyTransactionsBlockState(
         actionButtonConfig = ActionButtonConfig(
             text = TextReference.Res(R.string.common_explore_transaction_history),
             iconResId = R.drawable.ic_arrow_top_right_24,
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/intents/TxHistoryClickIntents.kt b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/intents/TxHistoryClickIntents.kt
deleted file mode 100644
index 4abce062be..0000000000
--- a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/intents/TxHistoryClickIntents.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.tangem.core.ui.components.transactions.intents
-
-interface TxHistoryClickIntents {
-
-    fun onBuyClick()
-
-    fun onReloadClick()
-
-    fun onExploreClick()
-}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/state/TransactionState.kt b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/state/TransactionState.kt
index 8178e83e61..c513c83fba 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/state/TransactionState.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/state/TransactionState.kt
@@ -15,127 +15,50 @@ sealed interface TransactionState {
     /**
      * Content state
      *
-     * @property txHash    transaction hash
      * @property address   address
      * @property amount    amount
      * @property timestamp timestamp
+     * @property status    transaction status
+     * @property direction transaction direction
+     * @property onClick   Lambda be invoked when manage button is clicked
      */
-    sealed class Content(
-        override val txHash: String,
-        open val address: TextReference,
-        open val amount: String,
-        open val timestamp: String,
-    ) : TransactionState {
+    sealed class Content : TransactionState {
+
+        abstract val address: TextReference
+        abstract val amount: String
+        abstract val timestamp: String
+        abstract val status: Status
+        abstract val direction: Direction
+        abstract val onClick: () -> Unit
 
         fun copySealed(
             txHash: String = this.txHash,
             address: TextReference = this.address,
             amount: String = this.amount,
             timestamp: String = this.timestamp,
+            status: Status = this.status,
+            direction: Direction = this.direction,
         ): Content {
             return when (this) {
-                is Approved -> copy(txHash, address, amount, timestamp)
-                is Receive -> copy(txHash, address, amount, timestamp)
-                is Send -> copy(txHash, address, amount, timestamp)
-                is Swapped -> copy(txHash, address, amount, timestamp)
-                is Approving -> copy(txHash, address, amount, timestamp)
-                is Receiving -> copy(txHash, address, amount, timestamp)
-                is Sending -> copy(txHash, address, amount, timestamp)
-                is Swapping -> copy(txHash, address, amount, timestamp)
+                is Approve -> copy(txHash, address, amount, timestamp, status, direction)
+                is Transfer -> copy(txHash, address, amount, timestamp, status, direction)
+                is Swap -> copy(txHash, address, amount, timestamp, status, direction)
+                is Custom -> copy(txHash, address, amount, timestamp, status, direction)
             }
         }
+
+        sealed class Status {
+            object Failed : Status()
+            object Confirmed : Status()
+            object Unconfirmed : Status()
+        }
+
+        enum class Direction {
+            INCOMING,
+            OUTGOING,
+        }
     }
 
-    /**
-     * Content state for processed transaction
-     *
-     * @property txHash    transaction hash
-     * @property address   address
-     * @property amount    amount
-     * @property timestamp timestamp
-     */
-    sealed class ProcessedTransactionContent(
-        override val txHash: String,
-        override val address: TextReference,
-        override val amount: String,
-        override val timestamp: String,
-    ) : Content(txHash, address, amount, timestamp)
-
-    /**
-     * Content state for completed transaction
-     *
-     * @property txHash    transaction hash
-     * @property address   address
-     * @property amount    amount
-     * @property timestamp timestamp
-     */
-    sealed class CompletedTransactionContent(
-        override val txHash: String,
-        override val address: TextReference,
-        override val amount: String,
-        override val timestamp: String,
-    ) : Content(txHash, address, amount, timestamp)
-
-    /**
-     * Processed sending transaction state
-     *
-     * @property txHash    transaction hash
-     * @property address   address
-     * @property amount    amount
-     * @property timestamp timestamp
-     */
-    data class Sending(
-        override val txHash: String,
-        override val address: TextReference,
-        override val amount: String,
-        override val timestamp: String,
-    ) : ProcessedTransactionContent(txHash, address, amount, timestamp)
-
-    /**
-     * Processed receiving transaction state
-     *
-     * @property txHash    transaction hash
-     * @property address   address
-     * @property amount    amount
-     * @property timestamp timestamp
-     */
-    data class Receiving(
-        override val txHash: String,
-        override val address: TextReference,
-        override val amount: String,
-        override val timestamp: String,
-    ) : ProcessedTransactionContent(txHash, address, amount, timestamp)
-
-    /**
-     * Processed approving transaction state
-     *
-     * @property txHash    transaction hash
-     * @property address   address
-     * @property amount    amount
-     * @property timestamp timestamp
-     */
-    data class Approving(
-        override val txHash: String,
-        override val address: TextReference,
-        override val amount: String,
-        override val timestamp: String,
-    ) : ProcessedTransactionContent(txHash, address, amount, timestamp)
-
-    /**
-     * Processed swapping transaction state
-     *
-     * @property txHash    transaction hash
-     * @property address   address
-     * @property amount    amount
-     * @property timestamp timestamp
-     */
-    data class Swapping(
-        override val txHash: String,
-        override val address: TextReference,
-        override val amount: String,
-        override val timestamp: String,
-    ) : ProcessedTransactionContent(txHash, address, amount, timestamp)
-
     /**
      * Completed sending transaction state
      *
@@ -143,28 +66,17 @@ sealed interface TransactionState {
      * @property address   address
      * @property amount    amount
      * @property timestamp timestamp
+     * @property direction transaction direction
      */
-    data class Send(
+    data class Transfer(
         override val txHash: String,
         override val address: TextReference,
         override val amount: String,
         override val timestamp: String,
-    ) : CompletedTransactionContent(txHash, address, amount, timestamp)
-
-    /**
-     * Completed receiving transaction state
-     *
-     * @property txHash    transaction hash
-     * @property address   address
-     * @property amount    amount
-     * @property timestamp timestamp
-     */
-    data class Receive(
-        override val txHash: String,
-        override val address: TextReference,
-        override val amount: String,
-        override val timestamp: String,
-    ) : CompletedTransactionContent(txHash, address, amount, timestamp)
+        override val status: Status,
+        override val direction: Direction,
+        override val onClick: () -> Unit,
+    ) : Content()
 
     /**
      * Completed approving transaction state
@@ -173,13 +85,17 @@ sealed interface TransactionState {
      * @property address   address
      * @property amount    amount
      * @property timestamp timestamp
+     * @property direction transaction direction
      */
-    data class Approved(
+    data class Approve(
         override val txHash: String,
         override val address: TextReference,
         override val amount: String,
         override val timestamp: String,
-    ) : CompletedTransactionContent(txHash, address, amount, timestamp)
+        override val status: Status,
+        override val direction: Direction,
+        override val onClick: () -> Unit,
+    ) : Content()
 
     /**
      * Completed swapping transaction state
@@ -188,13 +104,29 @@ sealed interface TransactionState {
      * @property address   address
      * @property amount    amount
      * @property timestamp timestamp
+     * @property direction transaction direction
      */
-    data class Swapped(
+    data class Swap(
         override val txHash: String,
         override val address: TextReference,
         override val amount: String,
         override val timestamp: String,
-    ) : CompletedTransactionContent(txHash, address, amount, timestamp)
+        override val status: Status,
+        override val direction: Direction,
+        override val onClick: () -> Unit,
+    ) : Content()
+
+    data class Custom(
+        override val txHash: String,
+        override val address: TextReference,
+        override val amount: String,
+        override val timestamp: String,
+        override val status: Status,
+        override val direction: Direction,
+        override val onClick: () -> Unit,
+        val title: TextReference,
+        val subtitle: TextReference,
+    ) : Content()
 
     /**
      * Loading state
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/state/TxHistoryState.kt b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/state/TxHistoryState.kt
index a6035f48dc..c6a42aacbb 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/state/TxHistoryState.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/state/TxHistoryState.kt
@@ -13,12 +13,8 @@ sealed interface TxHistoryState {
      */
     data class Content(val contentItems: MutableStateFlow<PagingData<TxHistoryItemState>>) : TxHistoryState
 
-    /**
-     * Empty state
-     *
-     * @property onBuyClick lambda be invoke when buy button was clicked
-     */
-    data class Empty(val onBuyClick: () -> Unit) : TxHistoryState
+    /** Empty state */
+    object Empty : TxHistoryState
 
     /**
      * Not supported tx history state
diff --git a/core/ui/src/main/java/com/tangem/core/ui/event/EventEffect.kt b/core/ui/src/main/java/com/tangem/core/ui/event/EventEffect.kt
index 49abda9299..e6f3ad0d84 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/event/EventEffect.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/event/EventEffect.kt
@@ -13,11 +13,12 @@ import androidx.compose.runtime.NonRestartableComposable
  */
 @Composable
 @NonRestartableComposable
-fun EventEffect(event: StateEvent, onTrigger: suspend () -> Unit) {
+@Suppress("UnnecessaryEventHandlerParameter")
+fun <A> EventEffect(event: StateEvent<A>, onTrigger: suspend (data: A) -> Unit) {
     LaunchedEffect(event) {
-        if (event is StateEvent.Triggered) {
-            onTrigger()
-            event.consume()
+        if (event is StateEvent.Triggered<A>) {
+            onTrigger(event.data)
+            event.onConsume()
         }
     }
 }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/event/StateEvent.kt b/core/ui/src/main/java/com/tangem/core/ui/event/StateEvent.kt
index d0f495b944..1860808b1d 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/event/StateEvent.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/event/StateEvent.kt
@@ -9,32 +9,34 @@ import androidx.compose.runtime.Immutable
  * re-triggered on recompositions or state changes.
  */
 @Immutable
-sealed class StateEvent {
-
-    /** Defines the action to be executed when the event is consumed. */
-    protected abstract val onConsume: () -> Unit
+sealed class StateEvent<in A> {
 
     /**
      * Represents an already consumed state event.
      * Events of this type will not trigger any further actions.
      */
-    object Consumed : StateEvent() {
-        override val onConsume: () -> Unit = {}
+    class Consumed<A> : StateEvent<A>() {
+
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            return other is Consumed<*>
+        }
+
+        override fun hashCode(): Int {
+            return javaClass.hashCode()
+        }
     }
 
     /**
      * Represents a state event that has been triggered but not yet consumed.
      *
+     * @property data The data provided by the event.
      * @property onConsume The action to be executed when the event is consumed.
      */
-    data class Triggered(override val onConsume: () -> Unit) : StateEvent()
-
-    /**
-     * Consumes the event, triggering any associated action.
-     */
-    fun consume() {
-        onConsume()
-    }
+    data class Triggered<A>(
+        val data: A,
+        internal val onConsume: () -> Unit,
+    ) : StateEvent<A>()
 }
 
 /**
@@ -43,9 +45,11 @@ sealed class StateEvent {
  * @param onConsume The action to be executed when the event is consumed.
  * @return A triggered state event.
  */
-fun triggered(onConsume: () -> Unit): StateEvent.Triggered = StateEvent.Triggered(onConsume)
+fun <A> triggeredEvent(data: A, onConsume: () -> Unit): StateEvent<A> = StateEvent.Triggered(data, onConsume)
 
 /**
- * Represents a statically defined [StateEvent.Consumed] event.
+ * Creates a [StateEvent.Consumed] instance.
+ *
+ * @return A consumed state event.
  */
-val consumed: StateEvent.Consumed = StateEvent.Consumed
\ No newline at end of file
+fun <A> consumedEvent(): StateEvent<A> = StateEvent.Consumed()
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt b/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt
index 9481be4e27..38da5c44af 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt
@@ -28,6 +28,7 @@ fun getActiveIconRes(blockchainId: String): Int {
         "GNO" -> R.drawable.img_gnosis_22
         "ETH-Pow", "ETH-Pow/test" -> R.drawable.img_eth_pow_22
         "ETH-Fair" -> R.drawable.img_eth_fair_22
+        "NEAR", "NEAR/test" -> R.drawable.img_near_22
         "Polkadot", "Polkadot/test" -> R.drawable.img_polkadot_22
         "Kusama" -> R.drawable.img_kusama_22
         "OPTIMISM", "OPTIMISM/test" -> R.drawable.img_optimism_22
@@ -50,19 +51,14 @@ fun getActiveIconRes(blockchainId: String): Int {
 
 @Suppress("ComplexMethod")
 @DrawableRes
-fun getActiveIconResByCoinId(coinId: String, networkId: String): Int {
+fun getActiveIconResByCoinId(coinId: String): Int {
     return when (coinId) {
         "binancecoin" -> R.drawable.img_bsc_22
         "bitcoin" -> R.drawable.img_btc_22
         "bitcoin-cash" -> R.drawable.img_btc_cash_22
-        "ethereum" -> {
-            when (networkId) {
-                "ethereum" -> R.drawable.img_eth_22
-                "arbitrum-one" -> R.drawable.img_arbitrum_22
-                "optimistic-ethereum" -> R.drawable.img_optimism_22
-                else -> R.drawable.ic_alert_24
-            }
-        }
+        "ethereum" -> R.drawable.img_eth_22
+        "arbitrum-one" -> R.drawable.img_arbitrum_22
+        "optimistic-ethereum" -> R.drawable.img_optimism_22
         "ethereum-classic" -> R.drawable.img_eth_classic_22
         "stellar" -> R.drawable.img_stellar_22
         "cardano" -> R.drawable.img_cardano_22
@@ -91,6 +87,7 @@ fun getActiveIconResByCoinId(coinId: String, networkId: String): Int {
         "telos" -> R.drawable.img_telos_22
         "octaspace" -> R.drawable.img_octaspace_22
         "chia" -> R.drawable.img_chia_22
+        "near" -> R.drawable.img_near_22
         else -> R.drawable.ic_alert_24
     }
 }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/extensions/Context.kt b/core/ui/src/main/java/com/tangem/core/ui/extensions/Context.kt
new file mode 100644
index 0000000000..17439269f9
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/extensions/Context.kt
@@ -0,0 +1,15 @@
+package com.tangem.core.ui.extensions
+
+import android.content.Context
+import android.content.Intent
+import androidx.core.content.ContextCompat
+
+fun Context.shareText(text: String) {
+    val sendIntent: Intent = Intent().apply {
+        action = Intent.ACTION_SEND
+        putExtra(Intent.EXTRA_TEXT, text)
+        type = "text/plain"
+    }
+    val shareIntent = Intent.createChooser(sendIntent, null)
+    ContextCompat.startActivity(this, shareIntent, null)
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/extensions/CryptoCurrency.kt b/core/ui/src/main/java/com/tangem/core/ui/extensions/CryptoCurrency.kt
index 7c32f55014..cf0b07bbfe 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/extensions/CryptoCurrency.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/extensions/CryptoCurrency.kt
@@ -1,45 +1,52 @@
 package com.tangem.core.ui.extensions
 
 import androidx.annotation.DrawableRes
-import com.tangem.core.ui.R
-import com.tangem.domain.tokens.models.CryptoCurrency
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.luminance
+import androidx.core.graphics.toColorInt
+import com.tangem.core.ui.res.TangemColorPalette
+import com.tangem.domain.tokens.model.CryptoCurrency
+
+private const val LIGHT_LUMINANCE = 0.5f
+private const val COLOR_HEX_START_INDEX = 2
+private const val COLOR_HEX_END_INDEX = 7
 
 /**
- * Retrieves the resource ID for the network badge of a [CryptoCurrency].
+ * Retrieves the resource ID for the network of a [CryptoCurrency].
  *
- * This property provides a way to fetch the appropriate drawable resource ID
- * for the network badge of a given cryptocurrency. For coins, this will typically
- * return null as they do not have network badges, while tokens will fetch the icon
- * based on their associated network ID.
- *
- * @return Drawable resource ID for the network badge or null if the cryptocurrency is a coin.
+ * @return Drawable resource ID for the network.
  */
 @get:DrawableRes
-val CryptoCurrency.networkBadgeIconResId: Int?
-    get() = when (this) {
-        is CryptoCurrency.Coin -> null
-        is CryptoCurrency.Token -> getActiveIconRes(network.id.value)
+val CryptoCurrency.networkIconResId: Int
+    get() = getActiveIconRes(network.id.value)
+
+/**
+ * Tries to extract a background color from the contract address of a token.
+ *
+ * @param fallbackColor The color to use as a fallback.
+ * @return The extracted background color or the fallback color if extraction fails or if it is a test network token.
+ */
+fun CryptoCurrency.Token.tryGetBackgroundForTokenIcon(
+    isGrayscale: Boolean,
+    fallbackColor: Color = TangemColorPalette.Black,
+): Color {
+    if (isGrayscale) return TangemColorPalette.Dark2
+
+    return try {
+        val colorHex = "#" + contractAddress.substring(range = COLOR_HEX_START_INDEX..COLOR_HEX_END_INDEX)
+        Color(colorHex.toColorInt())
+    } catch (exception: Exception) {
+        fallbackColor
     }
+}
 
 /**
- * Retrieves the resource ID for the icon of a [CryptoCurrency].
+ * Determines the tint color to be used for a token icon based on its background color.
+ * If the icon's background color is light, a dark tint is chosen; otherwise, a light tint is chosen.
  *
- * This property provides a way to fetch the appropriate drawable resource ID
- * for the icon of a given cryptocurrency.
- *
- * @return Drawable resource ID for the cryptocurrency icon.
+ * @param iconBackground The background color of the custom token icon.
+ * @return The tint color to be used for the icon.
  */
-@get:DrawableRes
-val CryptoCurrency.iconResId: Int
-    get() = when (this) {
-        is CryptoCurrency.Coin -> {
-            val rawCoinId = id.rawCurrencyId
-
-            if (rawCoinId != null) {
-                getActiveIconResByCoinId(rawCoinId, network.id.value)
-            } else {
-                R.drawable.ic_alert_24
-            }
-        }
-        is CryptoCurrency.Token -> R.drawable.ic_alert_24
-    }
\ No newline at end of file
+fun getTintForTokenIcon(iconBackground: Color): Color {
+    return if (iconBackground.luminance() > LIGHT_LUMINANCE) TangemColorPalette.Black else TangemColorPalette.White
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/extensions/RememberExt.kt b/core/ui/src/main/java/com/tangem/core/ui/extensions/RememberExt.kt
new file mode 100644
index 0000000000..db2968926e
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/extensions/RememberExt.kt
@@ -0,0 +1,30 @@
+package com.tangem.core.ui.extensions
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.platform.LocalHapticFeedback
+
+private typealias Action = () -> Unit
+
+/**
+ * Returns action with Haptic Feedback
+ *
+ * @param state of the content
+ * @param hapticType haptic effect
+ * @param onAction action that needs haptic feedback
+ */
+@Composable
+fun rememberHapticFeedback(
+    state: Any,
+    onAction: () -> Unit,
+    hapticType: HapticFeedbackType = HapticFeedbackType.LongPress,
+): Action {
+    val hapticFeedback = LocalHapticFeedback.current
+    return remember(state) {
+        {
+            hapticFeedback.performHapticFeedback(hapticType)
+            onAction.invoke()
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/extensions/String.kt b/core/ui/src/main/java/com/tangem/core/ui/extensions/String.kt
new file mode 100644
index 0000000000..f5cc3cb971
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/extensions/String.kt
@@ -0,0 +1,32 @@
+package com.tangem.core.ui.extensions
+
+import android.graphics.Bitmap
+import android.graphics.Color
+import com.google.zxing.BarcodeFormat
+import com.google.zxing.EncodeHintType
+import com.google.zxing.qrcode.QRCodeWriter
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
+import java.util.Hashtable
+
+@Suppress("MagicNumber")
+fun String.toQrCode(sizePx: Int = 256, paddingPx: Int = 0): Bitmap {
+    val hintMap = Hashtable<EncodeHintType, Any>()
+    hintMap[EncodeHintType.ERROR_CORRECTION] = ErrorCorrectionLevel.M // H = 30% damage
+    hintMap[EncodeHintType.MARGIN] = paddingPx
+
+    val qrCodeWriter = QRCodeWriter()
+
+    val bitMatrix = qrCodeWriter.encode(this, BarcodeFormat.QR_CODE, sizePx, sizePx, hintMap)
+    val width = bitMatrix.width
+    val bmp = Bitmap.createBitmap(width, width, Bitmap.Config.RGB_565)
+    for (x in 0 until width) {
+        for (y in 0 until width) {
+            bmp.setPixel(
+                y,
+                x,
+                if (bitMatrix.get(x, y)) Color.BLACK else Color.WHITE,
+            )
+        }
+    }
+    return bmp
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/extensions/TextReference.kt b/core/ui/src/main/java/com/tangem/core/ui/extensions/TextReference.kt
index bc8107d5f5..d44b32ecdf 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/extensions/TextReference.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/extensions/TextReference.kt
@@ -1,5 +1,6 @@
 package com.tangem.core.ui.extensions
 
+import android.content.res.Resources
 import androidx.annotation.PluralsRes
 import androidx.annotation.StringRes
 import androidx.compose.runtime.Composable
@@ -48,6 +49,59 @@ sealed interface TextReference {
      * @see [TextReference.plus] method
      */
     data class Combined(val refs: WrappedList<TextReference>) : TextReference
+
+    companion object {
+
+        /** Empty string as [TextReference] */
+        val EMPTY: TextReference by lazy(mode = LazyThreadSafetyMode.NONE) { Str(value = "") }
+    }
+}
+
+/**
+ * Creates a [TextReference] using a string resource ID with optional format arguments.
+ *
+ * @param id The resource ID of the string.
+ * @param formatArgs A list of format arguments to be applied to the string resource.
+ * @return A [TextReference] representing the string resource with format arguments.
+ */
+fun resourceReference(@StringRes id: Int, formatArgs: WrappedList<Any> = WrappedList(emptyList())): TextReference {
+    return TextReference.Res(id, formatArgs)
+}
+
+/**
+ * Creates a [TextReference] using a plain string value.
+ *
+ * @param value The plain string value.
+ * @return A [TextReference] representing the provided string value.
+ */
+fun stringReference(value: String): TextReference {
+    return TextReference.Str(value)
+}
+
+/**
+ * Creates a [TextReference] using a plural string resource ID with count and optional format arguments.
+ *
+ * @param id The resource ID of the plural string.
+ * @param count The count value to determine the plural form.
+ * @param formatArgs A list of format arguments to be applied to the plural string resource.
+ * @return A [TextReference] representing the plural string resource with count and format arguments.
+ */
+fun pluralReference(
+    @PluralsRes id: Int,
+    count: Int,
+    formatArgs: WrappedList<Any> = WrappedList(emptyList()),
+): TextReference {
+    return TextReference.PluralRes(id, count, formatArgs)
+}
+
+/**
+ * Combines multiple [TextReference] instances into a single [TextReference].
+ *
+ * @param refs A list of [TextReference] instances to be combined.
+ * @return A [TextReference] representing the combined text references.
+ */
+fun combinedReference(refs: WrappedList<TextReference>): TextReference {
+    return TextReference.Combined(refs)
 }
 
 /** Resolve [TextReference] as [String] */
@@ -55,7 +109,13 @@ sealed interface TextReference {
 @ReadOnlyComposable
 fun TextReference.resolveReference(): String {
     return when (this) {
-        is TextReference.Res -> stringResource(id, *formatArgs.toTypedArray())
+        is TextReference.Res -> {
+            val args = formatArgs
+                .map { if (it is TextReference) it.resolveReference() else it }
+                .toTypedArray()
+
+            stringResource(id = id, *args)
+        }
         is TextReference.PluralRes -> pluralStringResource(id, count, *formatArgs.toTypedArray())
         is TextReference.Str -> value
         is TextReference.Combined -> {
@@ -68,6 +128,28 @@ fun TextReference.resolveReference(): String {
     }
 }
 
+/** Resolve [TextReference] as [String] using [resources] (non-composable context) */
+fun TextReference.resolveReference(resources: Resources): String {
+    return when (this) {
+        is TextReference.Res -> {
+            val args = formatArgs
+                .map { if (it is TextReference) it.resolveReference(resources) else it }
+                .toTypedArray()
+
+            resources.getString(id, *args)
+        }
+        is TextReference.PluralRes -> resources.getQuantityString(id, count, *formatArgs.toTypedArray())
+        is TextReference.Str -> value
+        is TextReference.Combined -> {
+            buildString {
+                refs.forEach {
+                    append(it.resolveReference(resources))
+                }
+            }
+        }
+    }
+}
+
 /** Concatenate [this] reference with [ref] */
 operator fun TextReference.plus(ref: TextReference): TextReference {
     return when (this) {
diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/IconColorType.kt b/core/ui/src/main/java/com/tangem/core/ui/res/IconColorType.kt
index f009843950..42b0e53057 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/res/IconColorType.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/IconColorType.kt
@@ -4,6 +4,7 @@ import androidx.compose.material.Colors
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import com.tangem.core.ui.res.TangemColorPalette.Amaranth
+import com.tangem.core.ui.res.TangemColorPalette.Azure
 import com.tangem.core.ui.res.TangemColorPalette.Black
 import com.tangem.core.ui.res.TangemColorPalette.Dark1
 import com.tangem.core.ui.res.TangemColorPalette.Dark2
@@ -11,7 +12,7 @@ import com.tangem.core.ui.res.TangemColorPalette.Dark4
 import com.tangem.core.ui.res.TangemColorPalette.Dark6
 import com.tangem.core.ui.res.TangemColorPalette.Light4
 import com.tangem.core.ui.res.TangemColorPalette.Light5
-import com.tangem.core.ui.res.TangemColorPalette.Meadow
+import com.tangem.core.ui.res.TangemColorPalette.Mustard
 import com.tangem.core.ui.res.TangemColorPalette.Tangerine
 import com.tangem.core.ui.res.TangemColorPalette.White
 
@@ -22,9 +23,9 @@ enum class IconColorType(val lightColor: Color, val darkColor: Color) {
     SECONDARY(lightColor = Dark2, darkColor = Dark1),
     INFORMATIVE(lightColor = Light5, darkColor = Dark2),
     INACTIVE(lightColor = Light4, darkColor = Dark4),
-    ACCENT(lightColor = Meadow, darkColor = Meadow),
+    ACCENT(lightColor = Azure, darkColor = Azure),
     WARNING(lightColor = Amaranth, darkColor = Amaranth),
-    ATTENTION(lightColor = Tangerine, darkColor = Tangerine),
+    ATTENTION(lightColor = Tangerine, darkColor = Mustard),
 }
 
 @Composable
diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TangemColorPalette.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TangemColorPalette.kt
index 5f9617639f..6c0bd9671f 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/res/TangemColorPalette.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemColorPalette.kt
@@ -33,16 +33,16 @@ object TangemColorPalette {
     // endregion Green
 
     // region Blue
-    val Cobalt = Color(0xFF0029FF)
-    val Azure = Color(0xFF007AFF)
+    val Azure = Color(0xFF0099FF)
     // endregion Blue
 
     // region Red
-    val Amaranth = Color(0xFFDE1010)
-    val Flamingo = Color(0xFFED7979)
+    val Amaranth = Color(0xFFFF3333)
+    val Flamingo = Color(0xFFFF5B5B)
     // endregion Red
 
     // region Yellow
     val Tangerine = Color(0xFFFFB71B)
+    val Mustard = Color(0xFFFDDE55)
     // endregion Yellow
 }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TangemColors.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TangemColors.kt
index 8dc45fd453..f8ad2530e8 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/res/TangemColors.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemColors.kt
@@ -39,9 +39,9 @@ class TangemColors internal constructor(
         secondary: Color,
         tertiary: Color,
         disabled: Color,
-        accent: Color = TangemColorPalette.Meadow,
-        warning: Color = TangemColorPalette.Amaranth,
-        attention: Color = TangemColorPalette.Tangerine,
+        warning: Color,
+        attention: Color,
+        accent: Color = TangemColorPalette.Azure,
         constantWhite: Color = TangemColorPalette.White,
     ) {
         var primary1 by mutableStateOf(primary1)
@@ -80,9 +80,9 @@ class TangemColors internal constructor(
         secondary: Color,
         informative: Color,
         inactive: Color,
-        accent: Color = TangemColorPalette.Meadow,
-        warning: Color = TangemColorPalette.Amaranth,
-        attention: Color = TangemColorPalette.Tangerine,
+        warning: Color,
+        attention: Color,
+        accent: Color = TangemColorPalette.Azure,
     ) {
         var primary1 by mutableStateOf(primary1)
             private set
diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TangemDimens.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TangemDimens.kt
index b4fd692f7e..c3998446fe 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/res/TangemDimens.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemDimens.kt
@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 
-@Suppress("ConstructorParameterNaming")
+@Suppress("ConstructorParameterNaming", "MagicNumber")
 @Immutable
 data class TangemDimens internal constructor(
     // region Elevation
@@ -81,11 +81,13 @@ data class TangemDimens internal constructor(
     val size158: Dp = 158.dp,
     val size164: Dp = 164.dp,
     val size200: Dp = 200.dp,
+    val size248: Dp = 248.dp,
     // endregion Size
     // region Spacing
     val spacing0: Dp = 0.dp,
     val spacing0_5: Dp = 0.5.dp,
     val spacing2: Dp = 2.dp,
+    val spacing3: Dp = 3.dp,
     val spacing4: Dp = 4.dp,
     val spacing6: Dp = 6.dp,
     val spacing8: Dp = 8.dp,
@@ -106,12 +108,15 @@ data class TangemDimens internal constructor(
     val spacing38: Dp = 38.dp,
     val spacing40: Dp = 40.dp,
     val spacing44: Dp = 44.dp,
+    val spacing46: Dp = 46.dp,
     val spacing48: Dp = 48.dp,
     val spacing50: Dp = 50.dp,
     val spacing52: Dp = 52.dp,
     val spacing54: Dp = 54.dp,
     val spacing56: Dp = 56.dp,
+    val spacing70: Dp = 70.dp,
     val spacing92: Dp = 92.dp,
+    val spacing94: Dp = 94.dp,
     val spacing96: Dp = 96.dp,
     val spacing154: Dp = 154.dp,
     // endregion Spacing
diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TangemShapes.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TangemShapes.kt
index a3802221fb..8bf99452ed 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/res/TangemShapes.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemShapes.kt
@@ -13,6 +13,7 @@ data class TangemShapes internal constructor(
     val roundedCornersXMedium: Shape,
     val roundedCornersLarge: Shape,
     val bottomSheet: Shape,
+    val bottomSheetLarge: Shape,
 ) {
     constructor(dimens: TangemDimens) : this(
         roundedCornersSmall = RoundedCornerShape(size = dimens.radius2),
@@ -25,5 +26,9 @@ data class TangemShapes internal constructor(
             topStart = dimens.radius16,
             topEnd = dimens.radius16,
         ),
+        bottomSheetLarge = RoundedCornerShape(
+            topStart = dimens.radius24,
+            topEnd = dimens.radius24,
+        ),
     )
 }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt
index 139dc810c6..a4f6721f5c 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt
@@ -3,7 +3,6 @@ package com.tangem.core.ui.res
 import androidx.compose.material.Colors
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.ProvideTextStyle
-import androidx.compose.material.Typography
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.ReadOnlyComposable
@@ -17,7 +16,7 @@ internal const val IS_SYSTEM_IN_DARK_THEME: Boolean = false
 @Composable
 fun TangemTheme(
     isDark: Boolean = false,
-    typography: Typography = TangemTheme.typography,
+    typography: TangemTypography = TangemTheme.typography,
     dimens: TangemDimens = TangemTheme.dimens,
     content: @Composable () -> Unit,
 ) {
@@ -26,16 +25,15 @@ fun TangemTheme(
         .also { it.update(themeColors) }
 
     val shapes = remember { TangemShapes(dimens) }
-
     MaterialTheme(
         colors = materialThemeColors(colors = themeColors, isDark = isDark),
-        typography = typography,
     ) {
         CompositionLocalProvider(
             LocalTangemColors provides rememberedColors,
             LocalTangemTypography provides typography,
             LocalTangemDimens provides dimens,
             LocalTangemShapes provides shapes,
+            LocalIsInDarkTheme provides isDark,
         ) {
             ProvideTextStyle(
                 value = TangemTheme.typography.body1,
@@ -51,7 +49,7 @@ object TangemTheme {
         @ReadOnlyComposable
         get() = LocalTangemColors.current
 
-    val typography: Typography
+    val typography: TangemTypography
         @Composable
         @ReadOnlyComposable
         get() = LocalTangemTypography.current
@@ -88,6 +86,7 @@ private fun materialThemeColors(colors: TangemColors, isDark: Boolean): Colors {
 }
 
 @Composable
+@ReadOnlyComposable
 private fun lightThemeColors(): TangemColors {
     return TangemColors(
         text = TangemColors.Text(
@@ -96,6 +95,8 @@ private fun lightThemeColors(): TangemColors {
             secondary = TangemColorPalette.Dark2,
             tertiary = TangemColorPalette.Dark1,
             disabled = TangemColorPalette.Light4,
+            warning = TangemColorPalette.Amaranth,
+            attention = TangemColorPalette.Tangerine,
         ),
         icon = TangemColors.Icon(
             primary1 = TangemColorPalette.Black,
@@ -103,6 +104,8 @@ private fun lightThemeColors(): TangemColors {
             secondary = TangemColorPalette.Dark2,
             informative = TangemColorPalette.Light5,
             inactive = TangemColorPalette.Light4,
+            warning = TangemColorPalette.Amaranth,
+            attention = TangemColorPalette.Tangerine,
         ),
         button = TangemColors.Button(
             primary = TangemColorPalette.Dark6,
@@ -135,6 +138,7 @@ private fun lightThemeColors(): TangemColors {
 }
 
 @Composable
+@ReadOnlyComposable
 private fun darkThemeColors(): TangemColors {
     return TangemColors(
         text = TangemColors.Text(
@@ -143,6 +147,8 @@ private fun darkThemeColors(): TangemColors {
             secondary = TangemColorPalette.Light5,
             tertiary = TangemColorPalette.Dark1,
             disabled = TangemColorPalette.Dark3,
+            warning = TangemColorPalette.Flamingo,
+            attention = TangemColorPalette.Mustard,
         ),
         icon = TangemColors.Icon(
             primary1 = TangemColorPalette.White,
@@ -150,11 +156,13 @@ private fun darkThemeColors(): TangemColors {
             secondary = TangemColorPalette.Dark1,
             informative = TangemColorPalette.Dark2,
             inactive = TangemColorPalette.Dark4,
+            warning = TangemColorPalette.Flamingo,
+            attention = TangemColorPalette.Mustard,
         ),
         button = TangemColors.Button(
             primary = TangemColorPalette.Light1,
             secondary = TangemColorPalette.Dark5,
-            disabled = TangemColorPalette.Dark6,
+            disabled = TangemColorPalette.Dark5,
             positiveDisabled = TangemColorPalette.DarkGreen,
         ),
         background = TangemColors.Background(
@@ -186,7 +194,7 @@ private val LocalTangemColors = staticCompositionLocalOf<TangemColors> {
 }
 
 private val LocalTangemTypography = staticCompositionLocalOf {
-    TangemTypography
+    TangemTypography()
 }
 
 private val LocalTangemDimens = staticCompositionLocalOf {
@@ -195,4 +203,6 @@ private val LocalTangemDimens = staticCompositionLocalOf {
 
 private val LocalTangemShapes = staticCompositionLocalOf<TangemShapes> {
     error("No TangemShapes provided")
-}
\ No newline at end of file
+}
+
+val LocalIsInDarkTheme = staticCompositionLocalOf { false }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TangemTypography.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TangemTypography.kt
index bdcd413dbd..0187255098 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/res/TangemTypography.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemTypography.kt
@@ -1,6 +1,6 @@
 package com.tangem.core.ui.res
 
-import androidx.compose.material.Typography
+import androidx.compose.runtime.Immutable
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
@@ -15,63 +15,87 @@ private val RobotoFamily = FontFamily(
     Font(R.font.roboto_medium, FontWeight.Medium),
 )
 
-val TangemTypography = Typography(
-    defaultFontFamily = RobotoFamily,
-    h1 = TextStyle(
+@Immutable
+data class TangemTypography internal constructor(
+    val head: TextStyle = TextStyle(
+        fontFamily = RobotoFamily,
+        fontSize = 34.sp,
+        fontWeight = FontWeight.SemiBold,
+        letterSpacing = TextUnit(value = 0f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 44f, type = TextUnitType.Sp),
+    ),
+    val h1: TextStyle = TextStyle(
+        fontFamily = RobotoFamily,
         fontSize = 34.sp,
         fontWeight = FontWeight.Normal,
         letterSpacing = TextUnit(value = 0f, type = TextUnitType.Sp),
         lineHeight = TextUnit(value = 44f, type = TextUnitType.Sp),
     ),
-    h2 = TextStyle(
+    val h2: TextStyle = TextStyle(
+        fontFamily = RobotoFamily,
         fontSize = 24.sp,
         fontWeight = FontWeight.Medium,
         letterSpacing = TextUnit(value = 0.18f, type = TextUnitType.Sp),
         lineHeight = TextUnit(value = 32f, type = TextUnitType.Sp),
     ),
-    h3 = TextStyle(
+    val h3: TextStyle = TextStyle(
+        fontFamily = RobotoFamily,
         fontSize = 20.sp,
         fontWeight = FontWeight.Medium,
         letterSpacing = TextUnit(value = 0.15f, type = TextUnitType.Sp),
         lineHeight = TextUnit(value = 24f, type = TextUnitType.Sp),
     ),
-    subtitle1 = TextStyle(
+    val subtitle1: TextStyle = TextStyle(
+        fontFamily = RobotoFamily,
         fontSize = 16.sp,
         fontWeight = FontWeight.Medium,
         letterSpacing = TextUnit(value = 0.15f, type = TextUnitType.Sp),
         lineHeight = TextUnit(value = 24f, type = TextUnitType.Sp),
     ),
-    subtitle2 = TextStyle(
+    val subtitle2: TextStyle = TextStyle(
+        fontFamily = RobotoFamily,
         fontSize = 14.sp,
         fontWeight = FontWeight.Medium,
         letterSpacing = TextUnit(value = 0.5f, type = TextUnitType.Sp),
         lineHeight = TextUnit(value = 24f, type = TextUnitType.Sp),
     ),
-    body1 = TextStyle(
+    val body1: TextStyle = TextStyle(
+        fontFamily = RobotoFamily,
         fontSize = 16.sp,
         fontWeight = FontWeight.Normal,
         letterSpacing = TextUnit(value = 0.5f, type = TextUnitType.Sp),
         lineHeight = TextUnit(value = 24f, type = TextUnitType.Sp),
     ),
-    body2 = TextStyle(
+    val body2: TextStyle = TextStyle(
+        fontFamily = RobotoFamily,
         fontSize = 14.sp,
         fontWeight = FontWeight.Normal,
         letterSpacing = TextUnit(value = 0.25f, type = TextUnitType.Sp),
         lineHeight = TextUnit(value = 20f, type = TextUnitType.Sp),
     ),
-    button = TextStyle(
+    val button: TextStyle = TextStyle(
+        fontFamily = RobotoFamily,
         fontSize = 14.sp,
         fontWeight = FontWeight.Medium,
         letterSpacing = TextUnit(value = 0.1f, type = TextUnitType.Sp),
         lineHeight = TextUnit(value = 16f, type = TextUnitType.Sp),
     ),
-    caption = TextStyle(
+    val caption1: TextStyle = TextStyle(
+        fontFamily = RobotoFamily,
+        fontSize = 12.sp,
+        fontWeight = FontWeight.Medium,
+        letterSpacing = TextUnit(value = 0.4f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 16f, type = TextUnitType.Sp),
+    ),
+    val caption2: TextStyle = TextStyle(
+        fontFamily = RobotoFamily,
         fontSize = 12.sp,
         fontWeight = FontWeight.Normal,
         letterSpacing = TextUnit(value = 0.4f, type = TextUnitType.Sp),
         lineHeight = TextUnit(value = 16f, type = TextUnitType.Sp),
     ),
-    overline = TextStyle(
+    val overline: TextStyle = TextStyle(
+        fontFamily = RobotoFamily,
         fontSize = 10.sp,
         fontWeight = FontWeight.Medium,
         letterSpacing = TextUnit(value = 1.5f, type = TextUnitType.Sp),
diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TextColorType.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TextColorType.kt
index 39f85b8fa1..b093f4f7af 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/res/TextColorType.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/TextColorType.kt
@@ -11,6 +11,7 @@ import com.tangem.core.ui.res.TangemColorPalette.Dark6
 import com.tangem.core.ui.res.TangemColorPalette.Light4
 import com.tangem.core.ui.res.TangemColorPalette.Light5
 import com.tangem.core.ui.res.TangemColorPalette.Meadow
+import com.tangem.core.ui.res.TangemColorPalette.Mustard
 import com.tangem.core.ui.res.TangemColorPalette.Tangerine
 import com.tangem.core.ui.res.TangemColorPalette.White
 
@@ -23,7 +24,7 @@ enum class TextColorType(val lightColor: Color, val darkColor: Color) {
     DISABLED(lightColor = Light4, darkColor = Dark3),
     ACCENT(lightColor = Meadow, darkColor = Meadow),
     WARNING(lightColor = Amaranth, darkColor = Amaranth),
-    ATTENTION(lightColor = Tangerine, darkColor = Tangerine),
+    ATTENTION(lightColor = Tangerine, darkColor = Mustard),
     CONSTANT_WHITE(lightColor = White, darkColor = White),
 }
 
diff --git a/core/ui/src/main/java/com/tangem/core/ui/screen/ComposeFragment.kt b/core/ui/src/main/java/com/tangem/core/ui/screen/ComposeFragment.kt
index 8167263503..fb811871af 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/screen/ComposeFragment.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/screen/ComposeFragment.kt
@@ -29,7 +29,7 @@ abstract class ComposeFragment : Fragment(), ComposeScreen {
      * @return `true` if transitions were inflated; `false` otherwise.
      */
     protected open fun TransitionInflater.inflateTransitions(): Boolean {
-        enterTransition = inflateTransition(R.transition.slide_right)
+        enterTransition = inflateTransition(R.transition.fade)
         exitTransition = inflateTransition(R.transition.fade)
 
         return true
diff --git a/core/ui/src/main/java/com/tangem/core/ui/utils/BigDecimalFormatter.kt b/core/ui/src/main/java/com/tangem/core/ui/utils/BigDecimalFormatter.kt
index db128105fb..2350350cd0 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/utils/BigDecimalFormatter.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/utils/BigDecimalFormatter.kt
@@ -40,10 +40,16 @@ object BigDecimalFormatter {
             .replace(formatterCurrency.getSymbol(locale), fiatCurrencySymbol)
     }
 
-    fun formatPercent(percent: BigDecimal, useAbsoluteValue: Boolean, locale: Locale = Locale.getDefault()): String {
+    fun formatPercent(
+        percent: BigDecimal,
+        useAbsoluteValue: Boolean,
+        locale: Locale = Locale.getDefault(),
+        maxFractionDigits: Int = 2,
+        minFractionDigits: Int = 2,
+    ): String {
         val formatter = NumberFormat.getPercentInstance(locale).apply {
-            maximumFractionDigits = 2
-            minimumFractionDigits = 2
+            maximumFractionDigits = maxFractionDigits
+            minimumFractionDigits = minFractionDigits
             roundingMode = RoundingMode.HALF_UP
         }
         val value = if (useAbsoluteValue) percent.abs() else percent
diff --git a/core/ui/src/main/java/com/tangem/core/ui/utils/DateTimeFormatters.kt b/core/ui/src/main/java/com/tangem/core/ui/utils/DateTimeFormatters.kt
new file mode 100644
index 0000000000..80e9488f0a
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/utils/DateTimeFormatters.kt
@@ -0,0 +1,56 @@
+package com.tangem.core.ui.utils
+
+import org.joda.time.DateTime
+import org.joda.time.format.DateTimeFormat
+import org.joda.time.format.DateTimeFormatter
+import org.joda.time.format.DateTimeFormatterBuilder
+import java.util.Locale
+
+@Suppress("MagicNumber")
+object DateTimeFormatters {
+
+    /**
+     * Two SS means, SHORT style for date and time.
+     * If pattern contains "a", it means time is in 12 hour format.
+     * [Documentation](https://www.joda.org/joda-time/apidocs/org/joda/time/format/DateTimeFormat.html)
+     */
+    val timeFormatter by lazy {
+        val is12HourFormat = DateTimeFormat.patternForStyle("SS", Locale.getDefault()).contains("a")
+        if (is12HourFormat) {
+            DateTimeFormatterBuilder()
+                .appendClockhourOfHalfday(1)
+                .appendLiteral(':')
+                .appendMinuteOfHour(2)
+                .appendLiteral(" ")
+                .appendHalfdayOfDayText()
+                .toFormatter()
+                .withLocale(Locale.getDefault())
+        } else {
+            DateTimeFormatterBuilder()
+                .appendHourOfDay(1)
+                .appendLiteral(':')
+                .appendMinuteOfHour(2)
+                .toFormatter()
+                .withLocale(Locale.getDefault())
+        }
+    }
+
+    val dateFormatter by lazy {
+        DateTimeFormatterBuilder()
+            .appendDayOfMonth(1)
+            .appendLiteral(' ')
+            .appendMonthOfYearShortText()
+            .appendLiteral(", ")
+            .appendYear(4, 4)
+            .toFormatter()
+            .withLocale(Locale.getDefault())
+    }
+
+    fun formatTime(formatter: DateTimeFormatter = timeFormatter, time: DateTime): String {
+        return formatter.print(time)
+    }
+
+    fun formatDate(formatter: DateTimeFormatter = dateFormatter, date: DateTime): String {
+        return formatter.print(date)
+    }
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/utils/ImageBackgroundContrastChecker.kt b/core/ui/src/main/java/com/tangem/core/ui/utils/ImageBackgroundContrastChecker.kt
new file mode 100644
index 0000000000..5fab6c4856
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/utils/ImageBackgroundContrastChecker.kt
@@ -0,0 +1,44 @@
+package com.tangem.core.ui.utils
+
+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import androidx.compose.ui.graphics.Color
+import androidx.core.graphics.ColorUtils
+import androidx.core.graphics.drawable.toBitmap
+import androidx.palette.graphics.Palette
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+class ImageBackgroundContrastChecker(
+    private val image: Bitmap,
+    private val backgroundColor: Int,
+) {
+    constructor(drawable: Drawable, backgroundColor: Int) : this(
+        image = drawable.toBitmap(),
+        backgroundColor = backgroundColor,
+    )
+
+    suspend fun getContrastColorIfNeeded(isDarkTheme: Boolean): Color {
+        return if (isLowContrast()) {
+            if (isDarkTheme) Color.White else Color.Black
+        } else {
+            Color.Transparent
+        }
+    }
+
+    suspend fun isLowContrast(): Boolean {
+        val palette = generatePaletteAsync(bitmap = image)
+        val color = palette.getDominantColor(backgroundColor)
+        val contrast = ColorUtils.calculateContrast(color, backgroundColor)
+        return contrast <= LOW_CONTRAST_RATIO
+    }
+
+    private suspend fun generatePaletteAsync(bitmap: Bitmap): Palette = withContext(Dispatchers.Default) {
+        return@withContext Palette.Builder(bitmap).generate()
+    }
+
+    private companion object {
+        // https://www.w3.org/TR/2008/REC-WCAG20-20081211/#contrast-ratiodef
+        private const val LOW_CONTRAST_RATIO = 1.5f
+    }
+}
\ No newline at end of file
diff --git a/core/ui/src/main/res/drawable-night/card_placeholder_black.webp b/core/ui/src/main/res/drawable-night/card_placeholder_black.webp
new file mode 100644
index 0000000000..376f120041
Binary files /dev/null and b/core/ui/src/main/res/drawable-night/card_placeholder_black.webp differ
diff --git a/core/ui/src/main/res/drawable/card_placeholder_black.webp b/core/ui/src/main/res/drawable/card_placeholder_black.webp
new file mode 100644
index 0000000000..b7077165a5
Binary files /dev/null and b/core/ui/src/main/res/drawable/card_placeholder_black.webp differ
diff --git a/core/ui/src/main/res/drawable/card_placeholder_black.xml b/core/ui/src/main/res/drawable/card_placeholder_black.xml
deleted file mode 100644
index 83fab8e0f7..0000000000
--- a/core/ui/src/main/res/drawable/card_placeholder_black.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="214dp"
-    android:height="130dp"
-    android:viewportWidth="214"
-    android:viewportHeight="130">
-    <path
-        android:fillColor="#1B1D1C"
-        android:pathData="M1.043,8.273C1.019,4.256 4.265,1 8.294,1H205.706C209.735,1 213.019,4.256 213.043,8.273L213.709,121.725C213.733,125.742 210.487,128.998 206.459,128.998H9.046C5.018,128.998 1.733,125.742 1.709,121.725L1.043,8.273Z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M1.043,8.273C1.019,4.256 4.265,1 8.294,1H205.706C209.735,1 213.019,4.256 213.043,8.273L213.709,121.725C213.733,125.742 210.487,128.998 206.459,128.998H9.046C5.018,128.998 1.733,125.742 1.709,121.725L1.043,8.273Z"
-        android:strokeWidth="0.5" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M25.274,26.4L25.274,32.64L28.079,32.64C28.188,32.639 28.292,32.596 28.369,32.522C28.446,32.447 28.49,32.346 28.491,32.241L28.491,26.4L25.274,26.4Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M19,32.241C19.001,32.346 19.045,32.447 19.122,32.522C19.199,32.596 19.303,32.639 19.412,32.64L22.217,32.64L22.217,26.4L19,26.4L19,32.241Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M28.491,23.2L28.491,20.409C28.491,20.301 28.448,20.197 28.372,20.12C28.296,20.043 28.194,20 28.086,20L19.405,20C19.297,20 19.195,20.043 19.119,20.12C19.043,20.197 19,20.301 19,20.409L19,23.2L28.491,23.2Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M43.503,24.163C42.922,23.921 42.292,23.812 41.661,23.846C40.827,23.844 39.996,23.934 39.183,24.113L39.183,25.532C39.832,25.455 40.483,25.412 41.136,25.4C41.486,25.385 41.836,25.418 42.177,25.5C42.286,25.532 42.385,25.59 42.465,25.669C42.546,25.748 42.605,25.846 42.637,25.953C42.74,26.334 42.783,26.728 42.766,27.122L42.766,27.539C41.997,27.498 41.385,27.476 40.965,27.476C40.519,27.454 40.073,27.539 39.667,27.725C39.347,27.903 39.109,28.195 38.999,28.54C38.847,29.044 38.779,29.569 38.796,30.094C38.74,30.771 38.901,31.448 39.257,32.029C39.445,32.243 39.683,32.409 39.95,32.513C40.216,32.618 40.505,32.659 40.791,32.632C41.127,32.632 42.172,32.605 42.633,32.007C42.709,31.912 42.774,31.808 42.826,31.698L42.877,32.496L44.572,32.496L44.572,27.222C44.596,26.539 44.52,25.857 44.346,25.196C44.284,24.977 44.178,24.772 44.033,24.594C43.888,24.417 43.708,24.27 43.503,24.163ZM42.748,29.256C42.796,29.736 42.713,30.219 42.508,30.656C42.409,30.782 42.272,30.876 42.117,30.924C41.942,30.972 41.76,30.995 41.578,30.992C41.294,31.028 41.006,30.953 40.777,30.783C40.623,30.523 40.558,30.221 40.592,29.922C40.582,29.681 40.607,29.44 40.666,29.206C40.684,29.139 40.716,29.075 40.761,29.021C40.805,28.966 40.861,28.921 40.924,28.889C41.098,28.821 41.285,28.791 41.472,28.803L42.748,28.803L42.748,29.256Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M58.169,24.645C58.133,24.584 58.095,24.526 58.053,24.471C57.494,23.736 56.162,23.846 56.162,23.846C55.722,23.831 55.29,23.964 54.929,24.222C54.564,24.573 54.329,25.042 54.263,25.55C54.001,27.328 54.001,29.136 54.263,30.914C54.326,31.417 54.555,31.882 54.911,32.233C55.299,32.52 55.774,32.659 56.251,32.623C56.251,32.623 56.278,32.623 56.296,32.623C56.296,32.623 57.498,32.72 58.084,32.104C58.095,32.607 58.062,33.11 57.985,33.606C57.966,33.738 57.915,33.864 57.837,33.971C57.759,34.078 57.656,34.164 57.539,34.222C57.166,34.351 56.773,34.406 56.381,34.382L54.535,34.35L54.535,35.788C54.876,35.853 55.219,35.9 55.563,35.93C55.988,35.972 56.39,35.99 56.774,35.99C57.49,36.044 58.205,35.884 58.834,35.53C59.055,35.374 59.242,35.174 59.386,34.943C59.529,34.71 59.626,34.451 59.67,34.18C59.813,33.297 59.875,32.402 59.853,31.507L59.853,23.979L58.209,23.979L58.169,24.645ZM57.963,30.221C57.936,30.452 57.824,30.664 57.65,30.813C57.447,30.94 57.212,30.999 56.975,30.983C56.711,31.006 56.446,30.95 56.211,30.823C56.028,30.636 55.923,30.385 55.916,30.12C55.815,28.876 55.815,27.625 55.916,26.381C55.923,26.125 56.025,25.882 56.202,25.701C56.442,25.579 56.709,25.526 56.975,25.55C57.227,25.529 57.479,25.599 57.686,25.747C57.87,25.947 57.981,26.207 57.999,26.482C58.066,27.072 58.093,27.666 58.079,28.26C58.101,28.916 58.062,29.573 57.963,30.221Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M66.713,24.124C66.131,23.787 65.461,23.636 64.793,23.691C64.098,23.642 63.404,23.802 62.799,24.152C62.358,24.473 62.062,24.959 61.975,25.502C61.831,26.388 61.77,27.286 61.793,28.184C61.769,29.083 61.833,29.983 61.984,30.87C62.031,31.139 62.131,31.395 62.278,31.623C62.425,31.851 62.616,32.046 62.84,32.197C63.478,32.531 64.194,32.681 64.911,32.631C65.367,32.63 65.823,32.603 66.276,32.552C66.653,32.517 67.025,32.453 67.392,32.359L67.392,30.916C66.554,31.004 65.867,31.05 65.33,31.05C64.933,31.074 64.535,31.025 64.155,30.907C64.038,30.857 63.936,30.778 63.856,30.677C63.777,30.577 63.723,30.458 63.7,30.331C63.618,29.823 63.585,29.307 63.6,28.792L67.574,28.792L67.574,28.165C67.596,27.241 67.548,26.317 67.433,25.4C67.368,24.896 67.109,24.438 66.713,24.124ZM65.849,27.428L63.6,27.428C63.6,26.95 63.632,26.473 63.696,26C63.704,25.887 63.736,25.777 63.79,25.678C63.843,25.579 63.917,25.492 64.005,25.424C64.473,25.233 64.994,25.233 65.462,25.424C65.548,25.494 65.619,25.583 65.671,25.683C65.723,25.782 65.754,25.892 65.762,26.004C65.833,26.475 65.862,26.952 65.849,27.428Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M78.824,25.12C78.747,24.744 78.542,24.406 78.243,24.161C77.886,23.928 77.46,23.817 77.032,23.844C77.032,23.844 76.991,23.844 76.963,23.844C76.963,23.844 75.581,23.767 75.01,24.464C74.948,24.542 74.892,24.625 74.844,24.712C74.752,24.478 74.592,24.275 74.383,24.129C74.024,23.923 73.61,23.826 73.195,23.848C73.195,23.848 71.813,23.767 71.242,24.468C71.178,24.545 71.122,24.629 71.076,24.717L71.03,23.984L69.349,23.984L69.349,32.48L71.191,32.48L71.191,28.051C71.182,27.52 71.201,26.988 71.251,26.459C71.263,26.198 71.362,25.949 71.532,25.749C71.736,25.584 71.997,25.506 72.26,25.531C72.493,25.513 72.727,25.557 72.937,25.658C73.015,25.731 73.076,25.819 73.119,25.916C73.162,26.013 73.185,26.118 73.186,26.223C73.234,26.747 73.254,27.272 73.245,27.798L73.245,32.48L75.088,32.48L75.088,28.051C75.088,27.314 75.088,26.785 75.143,26.459C75.156,26.197 75.258,25.946 75.434,25.749C75.642,25.586 75.906,25.508 76.171,25.531C76.405,25.513 76.641,25.557 76.852,25.658C76.929,25.732 76.99,25.82 77.032,25.917C77.074,26.014 77.096,26.118 77.096,26.223C77.147,26.747 77.167,27.272 77.156,27.798L77.156,32.48L78.999,32.48L78.999,26.884C79.009,26.291 78.951,25.699 78.824,25.12Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M51.691,24.171C51.307,23.928 50.851,23.814 50.394,23.845C50.394,23.845 50.356,23.845 50.338,23.845C50.338,23.845 48.938,23.773 48.364,24.465C48.323,24.514 48.286,24.565 48.252,24.619L48.21,23.981L46.507,23.981L46.507,32.48L48.373,32.48L48.373,28.049C48.363,27.521 48.384,26.992 48.434,26.465C48.448,26.203 48.553,25.952 48.733,25.755C48.958,25.584 49.242,25.503 49.526,25.528C49.774,25.511 50.023,25.555 50.249,25.655C50.333,25.728 50.401,25.816 50.448,25.915C50.496,26.014 50.521,26.121 50.524,26.23C50.578,26.75 50.6,27.273 50.59,27.796L50.59,32.48L52.456,32.48L52.456,26.963C52.471,26.356 52.419,25.749 52.302,25.153C52.226,24.765 52.009,24.417 51.691,24.171Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M36.543,21.44L34.653,21.44L34.653,23.877L33.477,23.877L33.477,25.434L34.653,25.434L34.653,32.48L36.543,32.48L36.543,25.434L37.981,25.434L37.981,23.877L36.543,23.877L36.543,21.44Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M23.463,105.118L21.826,104.112L21.904,106H21.024L21.087,104.112L19.441,105.125L19.02,104.335L20.707,103.493L19.016,102.645L19.428,101.882L21.08,102.875L21.001,101H21.874L21.818,102.882L23.451,101.882L23.885,102.645L22.184,103.5L23.895,104.342L23.463,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M32.161,105.118L30.524,104.112L30.602,106H29.722L29.785,104.112L28.139,105.125L27.718,104.335L29.405,103.493L27.715,102.645L28.126,101.882L29.778,102.875L29.699,101H30.573L30.517,102.882L32.149,101.882L32.583,102.645L30.883,103.5L32.593,104.342L32.161,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M40.86,105.118L39.222,104.112L39.3,106H38.42L38.483,104.112L36.837,105.125L36.416,104.335L38.104,103.493L36.413,102.645L36.825,101.882L38.476,102.875L38.398,101H39.271L39.215,102.882L40.847,101.882L41.282,102.645L39.581,103.5L41.292,104.342L40.86,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M49.558,105.118L47.92,104.112L47.998,106H47.119L47.181,104.112L45.535,105.125L45.114,104.335L46.802,103.493L45.111,102.645L45.523,101.882L47.174,102.875L47.096,101H47.969L47.913,102.882L49.546,101.882L49.98,102.645L48.279,103.5L49.99,104.342L49.558,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M63.14,105.118L61.502,104.112L61.58,106H60.701L60.763,104.112L59.117,105.125L58.696,104.335L60.384,103.493L58.693,102.645L59.105,101.882L60.756,102.875L60.678,101H61.551L61.495,102.882L63.128,101.882L63.562,102.645L61.861,103.5L63.572,104.342L63.14,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M71.838,105.118L70.2,104.112L70.279,106H69.399L69.462,104.112L67.815,105.125L67.394,104.335L69.082,103.493L67.391,102.645L67.803,101.882L69.454,102.875L69.376,101H70.249L70.193,102.882L71.826,101.882L72.26,102.645L70.559,103.5L72.27,104.342L71.838,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M80.536,105.118L78.898,104.112L78.977,106H78.097L78.16,104.112L76.514,105.125L76.093,104.335L77.78,103.493L76.089,102.645L76.501,101.882L78.152,102.875L78.074,101H78.947L78.891,102.882L80.524,101.882L80.958,102.645L79.257,103.5L80.968,104.342L80.536,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M89.234,105.118L87.597,104.112L87.675,106H86.795L86.858,104.112L85.212,105.125L84.791,104.335L86.478,103.493L84.788,102.645L85.2,101.882L86.851,102.875L86.772,101H87.646L87.59,102.882L89.222,101.882L89.657,102.645L87.956,103.5L89.666,104.342L89.234,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M102.816,105.118L101.179,104.112L101.257,106H100.377L100.44,104.112L98.794,105.125L98.373,104.335L100.06,103.493L98.369,102.645L98.781,101.882L100.433,102.875L100.354,101H101.227L101.171,102.882L102.804,101.882L103.238,102.645L101.538,103.5L103.248,104.342L102.816,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M111.515,105.118L109.877,104.112L109.955,106H109.075L109.138,104.112L107.492,105.125L107.071,104.335L108.758,103.493L107.068,102.645L107.48,101.882L109.131,102.875L109.053,101H109.926L109.87,102.882L111.502,101.882L111.937,102.645L110.236,103.5L111.947,104.342L111.515,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M120.213,105.118L118.575,104.112L118.653,106H117.774L117.836,104.112L116.19,105.125L115.769,104.335L117.457,103.493L115.766,102.645L116.178,101.882L117.829,102.875L117.751,101H118.624L118.568,102.882L120.201,101.882L120.635,102.645L118.934,103.5L120.645,104.342L120.213,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M128.911,105.118L127.273,104.112L127.352,106H126.472L126.535,104.112L124.888,105.125L124.467,104.335L126.155,103.493L124.464,102.645L124.876,101.882L126.527,102.875L126.449,101H127.322L127.266,102.882L128.899,101.882L129.333,102.645L127.632,103.5L129.343,104.342L128.911,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M142.493,105.118L140.855,104.112L140.933,106H140.054L140.116,104.112L138.47,105.125L138.049,104.335L139.737,103.493L138.046,102.645L138.458,101.882L140.109,102.875L140.031,101H140.904L140.848,102.882L142.481,101.882L142.915,102.645L141.214,103.5L142.925,104.342L142.493,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M151.191,105.118L149.553,104.112L149.632,106H148.752L148.815,104.112L147.169,105.125L146.748,104.335L148.435,103.493L146.744,102.645L147.156,101.882L148.807,102.875L148.729,101H149.602L149.546,102.882L151.179,101.882L151.613,102.645L149.912,103.5L151.623,104.342L151.191,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M159.889,105.118L158.252,104.112L158.33,106H157.45L157.513,104.112L155.867,105.125L155.446,104.335L157.133,103.493L155.443,102.645L155.854,101.882L157.506,102.875L157.427,101H158.3L158.244,102.882L159.877,101.882L160.311,102.645L158.611,103.5L160.321,104.342L159.889,105.118Z" />
-    <path
-        android:fillColor="#A5A5A5"
-        android:pathData="M168.588,105.118L166.95,104.112L167.028,106H166.148L166.211,104.112L164.565,105.125L164.144,104.335L165.831,103.493L164.141,102.645L164.553,101.882L166.204,102.875L166.126,101H166.999L166.943,102.882L168.575,101.882L169.01,102.645L167.309,103.5L169.02,104.342L168.588,105.118Z" />
-</vector>
diff --git a/core/ui/src/main/res/drawable/ic_arrow_down_8.xml b/core/ui/src/main/res/drawable/ic_arrow_down_8.xml
new file mode 100644
index 0000000000..94ff984c79
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_arrow_down_8.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="9dp"
+    android:height="8dp"
+    android:viewportWidth="9"
+    android:viewportHeight="8">
+  <path
+      android:fillColor="#000"
+      android:pathData="M4.6,6.9C4.8,7.2 5.2,7.2 5.4,6.9L8.9,1.7C9.1,1.3 8.9,0.9 8.5,0.9L1.4,0.9C1,0.9 0.8,1.4 1,1.7L4.6,6.9Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_arrow_up_8.xml b/core/ui/src/main/res/drawable/ic_arrow_up_8.xml
new file mode 100644
index 0000000000..0087a3703c
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_arrow_up_8.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="9dp"
+    android:height="8dp"
+    android:viewportWidth="9"
+    android:viewportHeight="8">
+  <path
+      android:fillColor="#000"
+      android:pathData="M4.6,1.1C4.8,0.8 5.2,0.8 5.4,1.1L8.9,6.3C9.1,6.7 8.9,7.1 8.5,7.1L1.4,7.1C1,7.1 0.8,6.7 1,6.3L4.6,1.1Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_currency_24.xml b/core/ui/src/main/res/drawable/ic_currency_24.xml
index bee87c2b68..1b8eb1b684 100644
--- a/core/ui/src/main/res/drawable/ic_currency_24.xml
+++ b/core/ui/src/main/res/drawable/ic_currency_24.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
     <path
         android:pathData="M7,15H9C9,16.08 10.37,17 12,17C13.63,17 15,16.08 15,15C15,13.9 13.96,13.5 11.76,12.97C9.64,12.44 7,11.78 7,9C7,7.21 8.47,5.69 10.5,5.18V3H13.5V5.18C15.53,5.69 17,7.21 17,9H15C15,7.92 13.63,7 12,7C10.37,7 9,7.92 9,9C9,10.1 10.04,10.5 12.24,11.03C14.36,11.56 17,12.22 17,15C17,16.79 15.53,18.31 13.5,18.82V21H10.5V18.82C8.47,18.31 7,16.79 7,15Z"
-        android:fillColor="#1E1E1E" />
+        android:fillColor="#000000" />
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_custom_token_44.xml b/core/ui/src/main/res/drawable/ic_custom_token_44.xml
new file mode 100644
index 0000000000..b1d31ab0bd
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_custom_token_44.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
+
+    <path
+        android:fillColor="#656565"
+        android:pathData="M22,34L22.69,29.327C23,27.23 23.155,26.182 23.648,25.352C24.065,24.651 24.651,24.065 25.352,23.648C26.182,23.155 27.23,23 29.327,22.69L34,22L29.327,21.31C27.23,21 26.182,20.845 25.352,20.352C24.651,19.935 24.065,19.349 23.648,18.648C23.155,17.818 23,16.77 22.69,14.673L22,10L21.31,14.673C21,16.77 20.845,17.818 20.352,18.648C19.935,19.349 19.349,19.935 18.648,20.352C17.818,20.845 16.77,21 14.673,21.31L10,22L14.673,22.69C16.77,23 17.818,23.155 18.648,23.648C19.349,24.065 19.935,24.651 20.352,25.352C20.845,26.182 21,27.23 21.31,29.327L22,34Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_empty_token_64.xml b/core/ui/src/main/res/drawable/ic_empty_token_64.xml
new file mode 100644
index 0000000000..51821ac760
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_empty_token_64.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+  <group>
+    <clip-path android:pathData="M0,0h64v64h-64z" />
+    <path
+        android:pathData="M37.84,55.346C50.625,52.278 58.482,39.342 55.389,26.453C52.296,13.564 39.424,5.603 26.639,8.671C20.067,10.248 14.797,14.433 11.647,19.879M11.647,19.879L22.5,19.879M11.647,19.879L11.647,8.001"
+        android:strokeWidth="2.5"
+        android:fillColor="#00000000"
+        android:strokeColor="#C9C9C9"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M9.945,22.612C10.593,22.85 10.926,23.568 10.688,24.216L10.651,24.317C10.416,24.966 9.699,25.302 9.05,25.067C8.401,24.832 8.065,24.115 8.3,23.466L8.341,23.354C8.579,22.706 9.297,22.374 9.945,22.612ZM8.025,31.53C8.715,31.509 9.291,32.051 9.312,32.742L9.314,32.795L9.315,32.84C9.339,33.53 8.799,34.108 8.109,34.132C7.419,34.156 6.84,33.616 6.816,32.926L6.815,32.877L6.813,32.817C6.792,32.127 7.335,31.551 8.025,31.53ZM9.036,38.993C9.686,38.759 10.401,39.097 10.634,39.747L10.665,39.83C10.9,40.479 10.565,41.196 9.917,41.432C9.268,41.667 8.551,41.333 8.315,40.684L8.282,40.591C8.048,39.942 8.386,39.226 9.036,38.993ZM12.309,45.763C12.854,45.34 13.639,45.439 14.062,45.984L14.116,46.054C14.542,46.598 14.446,47.383 13.902,47.808C13.358,48.234 12.572,48.138 12.147,47.594L12.087,47.516C11.664,46.971 11.763,46.186 12.309,45.763ZM17.512,51.191C17.901,50.621 18.679,50.474 19.249,50.863L19.322,50.912C19.894,51.299 20.044,52.076 19.658,52.648C19.271,53.22 18.494,53.37 17.922,52.983L17.841,52.928C17.271,52.539 17.124,51.762 17.512,51.191ZM24.135,54.753C24.328,54.09 25.022,53.709 25.685,53.902L25.769,53.927C26.433,54.117 26.817,54.81 26.626,55.473C26.436,56.137 25.743,56.52 25.08,56.33L24.986,56.303C24.323,56.11 23.942,55.416 24.135,54.753ZM31.537,56.082C31.516,55.392 32.058,54.815 32.748,54.794L32.792,54.792L32.837,54.791C33.527,54.767 34.105,55.307 34.129,55.997C34.153,56.687 33.613,57.266 32.923,57.29L32.874,57.291L32.825,57.293C32.134,57.314 31.558,56.772 31.537,56.082Z"
+        android:fillColor="#C9C9C9"
+        android:fillType="evenOdd" />
+    <path
+        android:pathData="M23.528,30.572L32.5,19.036L41.472,30.572L32.5,44.672L23.528,30.572Z"
+        android:strokeWidth="2.5"
+        android:fillColor="#00000000"
+        android:strokeColor="#C9C9C9" />
+  </group>
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_exchange_horizontal_24.xml b/core/ui/src/main/res/drawable/ic_exchange_horizontal_24.xml
new file mode 100644
index 0000000000..ab4c32c060
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_exchange_horizontal_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21,8L17,4V7H9V9H17V12L21,8ZM7,12L3,16L7,20V17H15V15H7V12Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_eye_off_24.xml b/core/ui/src/main/res/drawable/ic_eye_off_24.xml
deleted file mode 100644
index 7454717d84..0000000000
--- a/core/ui/src/main/res/drawable/ic_eye_off_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M2,5.27L3.28,4L20,20.72L18.73,22L15.65,18.92C14.5,19.3 13.28,19.5 12,19.5C7,19.5 2.73,16.39 1,12C1.69,10.24 2.79,8.69 4.19,7.46L2,5.27ZM12,9C12.796,9 13.559,9.316 14.121,9.879C14.684,10.441 15,11.204 15,12C15,12.35 14.94,12.69 14.83,13L11,9.17C11.31,9.06 11.65,9 12,9ZM12,4.5C17,4.5 21.27,7.61 23,12C22.18,14.08 20.79,15.88 19,17.19L17.58,15.76C18.94,14.82 20.06,13.54 20.82,12C19.17,8.64 15.76,6.5 12,6.5C10.91,6.5 9.84,6.68 8.84,7L7.3,5.47C8.74,4.85 10.33,4.5 12,4.5ZM3.18,12C4.83,15.36 8.24,17.5 12,17.5C12.69,17.5 13.37,17.43 14,17.29L11.72,15C10.29,14.85 9.15,13.71 9,12.28L5.6,8.87C4.61,9.72 3.78,10.78 3.18,12Z"
-      android:fillColor="#000000"/>
-</vector>
diff --git a/core/ui/src/main/res/drawable/ic_trash_24.xml b/core/ui/src/main/res/drawable/ic_trash_24.xml
new file mode 100644
index 0000000000..7e35d65875
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_trash_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,19C6,19.53 6.211,20.039 6.586,20.414C6.961,20.789 7.47,21 8,21H16C16.53,21 17.039,20.789 17.414,20.414C17.789,20.039 18,19.53 18,19V7H6V19ZM8,9H16V19H8V9ZM15.5,4L14.5,3H9.5L8.5,4H5V6H19V4H15.5Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_arrow_down_8.xml b/core/ui/src/main/res/drawable/img_arrow_down_8.xml
deleted file mode 100644
index 355357c8c3..0000000000
--- a/core/ui/src/main/res/drawable/img_arrow_down_8.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="9dp"
-    android:height="8dp"
-    android:viewportWidth="9"
-    android:viewportHeight="8">
-  <path
-      android:pathData="M4.6114,6.8903C4.8128,7.1793 5.2419,7.175 5.4375,6.8821L8.9151,1.6731C9.1369,1.3409 8.8988,0.8955 8.4993,0.8955L1.3921,0.8955C0.9881,0.8955 0.7509,1.3499 0.9819,1.6814L4.6114,6.8903Z"
-      android:fillColor="#FF3333"/>
-</vector>
diff --git a/core/ui/src/main/res/drawable/img_arrow_up_8.xml b/core/ui/src/main/res/drawable/img_arrow_up_8.xml
deleted file mode 100644
index 0d99c9d789..0000000000
--- a/core/ui/src/main/res/drawable/img_arrow_up_8.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="9dp"
-    android:height="8dp"
-    android:viewportWidth="9"
-    android:viewportHeight="8">
-  <path
-      android:pathData="M4.6114,1.1097C4.8128,0.8207 5.2419,0.825 5.4375,1.1179L8.9151,6.3269C9.1369,6.6591 8.8988,7.1045 8.4993,7.1045L1.3921,7.1045C0.9881,7.1045 0.7509,6.6501 0.9819,6.3186L4.6114,1.1097Z"
-      android:fillColor="#1ACE80"/>
-</vector>
diff --git a/core/ui/src/main/res/drawable/img_near_22.xml b/core/ui/src/main/res/drawable/img_near_22.xml
new file mode 100644
index 0000000000..6688dfd747
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_near_22.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <group>
+    <clip-path
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"/>
+    <path
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"
+        android:fillColor="#00EC97"/>
+    <path
+        android:pathData="M15.721,5C15.277,5 14.864,5.23 14.632,5.609L12.123,9.333C12.042,9.456 12.075,9.622 12.197,9.703C12.297,9.77 12.429,9.761 12.519,9.683L14.988,7.542C15.029,7.505 15.092,7.509 15.129,7.55C15.146,7.569 15.155,7.593 15.155,7.618V14.323C15.155,14.378 15.11,14.423 15.055,14.423C15.025,14.423 14.997,14.41 14.978,14.387L7.515,5.453C7.272,5.166 6.915,5 6.539,5H6.278C5.572,5 5,5.572 5,6.278V15.722C5,16.428 5.572,17 6.278,17C6.723,17 7.135,16.77 7.368,16.391L9.876,12.667C9.958,12.544 9.925,12.378 9.802,12.297C9.703,12.23 9.571,12.239 9.481,12.317L7.012,14.458C6.971,14.495 6.907,14.491 6.87,14.45C6.854,14.432 6.845,14.407 6.845,14.382V7.676C6.845,7.62 6.89,7.576 6.945,7.576C6.975,7.576 7.003,7.589 7.022,7.612L14.484,16.547C14.727,16.834 15.084,17 15.46,17H15.721C16.427,17 16.999,16.428 17,15.722V6.278C17,5.572 16.428,5 15.722,5H15.721Z"
+        android:fillColor="#000000"/>
+  </group>
+</vector>
diff --git a/core/ui/src/main/res/transition/slide_right.xml b/core/ui/src/main/res/transition/slide_right.xml
deleted file mode 100644
index 45e1e04870..0000000000
--- a/core/ui/src/main/res/transition/slide_right.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<slide xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@android:integer/config_mediumAnimTime"
-    android:slideEdge="right" />
\ No newline at end of file
diff --git a/core/utils/src/main/java/com/tangem/utils/Extensions.kt b/core/utils/src/main/java/com/tangem/utils/Extensions.kt
index de72e53d54..efeb15cdb9 100644
--- a/core/utils/src/main/java/com/tangem/utils/Extensions.kt
+++ b/core/utils/src/main/java/com/tangem/utils/Extensions.kt
@@ -1,9 +1,15 @@
 package com.tangem.utils
 
+import java.math.BigDecimal
+
 inline fun <reified T : Enum<T>> safeValueOf(type: String, default: T): T {
     return try {
         java.lang.Enum.valueOf(T::class.java, type)
     } catch (e: IllegalArgumentException) {
         default
     }
+}
+
+fun BigDecimal?.isNullOrZero(): Boolean {
+    return this == null || this.compareTo(BigDecimal.ZERO) == 0
 }
\ No newline at end of file
diff --git a/core/utils/src/main/java/com/tangem/utils/extensions/List.kt b/core/utils/src/main/java/com/tangem/utils/extensions/List.kt
index ee1c005d8c..6ecaef28b8 100644
--- a/core/utils/src/main/java/com/tangem/utils/extensions/List.kt
+++ b/core/utils/src/main/java/com/tangem/utils/extensions/List.kt
@@ -3,6 +3,8 @@ package com.tangem.utils.extensions
 /**
  * Removes an element from the collection based on the provided predicate.
  *
+ * !!!This function is not thread-safe!!!
+ *
  * @param predicate The condition to remove an element.
  * @return [Boolean] indicating whether an element was removed.
  */
@@ -33,7 +35,8 @@ inline fun <T> MutableList<T>.replaceBy(item: T, predicate: (T) -> Boolean): Boo
 
 /**
  * Adds the specified element to the list or replaces an existing element.
- * The predicate defines the condition to replace the existing element.
+ *
+ * !!!This function is not thread-safe!!!
  *
  * @param item The element to be added or replace the existing one.
  * @param predicate The condition to replace an existing element.
diff --git a/core/utils/src/main/java/com/tangem/utils/extensions/Set.kt b/core/utils/src/main/java/com/tangem/utils/extensions/Set.kt
new file mode 100644
index 0000000000..f5c0cf1eb7
--- /dev/null
+++ b/core/utils/src/main/java/com/tangem/utils/extensions/Set.kt
@@ -0,0 +1,39 @@
+package com.tangem.utils.extensions
+
+/**
+ * Replaces an element in the set with the provided item based on the predicate.
+ *
+ * !!!This function is not thread-safe!!!
+ *
+ * @param item The element to replace the existing one.
+ * @param predicate The condition to replace an existing element.
+ * @return [Boolean] indicating whether an element was replaced.
+ */
+inline fun <T> MutableSet<T>.replaceBy(item: T, predicate: (T) -> Boolean): Boolean {
+    val foundItem = firstOrNull(predicate) ?: return false
+
+    remove(foundItem)
+    add(item)
+
+    return true
+}
+
+/**
+ * Adds the specified element to the set or replaces an existing element.
+ *
+ * !!!This function is not thread-safe!!!
+ *
+ * @param item The element to be added or replace the existing one.
+ * @param predicate The condition to replace an existing element.
+ * @return The modified [Set] after adding or replacing the element.
+ */
+inline fun <T> Set<T>.addOrReplace(item: T, predicate: (T) -> Boolean): Set<T> {
+    val mutableList = this.toMutableSet()
+    val isReplaced = mutableList.replaceBy(item, predicate)
+
+    if (!isReplaced) {
+        mutableList.add(item)
+    }
+
+    return mutableList
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/WaitForMigration.kt b/core/utils/src/main/java/com/tangem/utils/extensions/WaitForMigration.kt
similarity index 65%
rename from app/src/main/java/com/tangem/tap/WaitForMigration.kt
rename to core/utils/src/main/java/com/tangem/utils/extensions/WaitForMigration.kt
index 59c14fb064..6661d3a2ac 100644
--- a/app/src/main/java/com/tangem/tap/WaitForMigration.kt
+++ b/core/utils/src/main/java/com/tangem/utils/extensions/WaitForMigration.kt
@@ -1,4 +1,4 @@
-package com.tangem.tap
+package com.tangem.utils.extensions
 
 /**
 [REDACTED_AUTHOR]
diff --git a/data/app-currency/src/main/kotlin/com/tangem/data/appcurrency/DefaultAppCurrencyRepository.kt b/data/app-currency/src/main/kotlin/com/tangem/data/appcurrency/DefaultAppCurrencyRepository.kt
index c2fe02a2b5..520be9c24d 100644
--- a/data/app-currency/src/main/kotlin/com/tangem/data/appcurrency/DefaultAppCurrencyRepository.kt
+++ b/data/app-currency/src/main/kotlin/com/tangem/data/appcurrency/DefaultAppCurrencyRepository.kt
@@ -1,6 +1,7 @@
 package com.tangem.data.appcurrency
 
 import com.tangem.data.appcurrency.utils.AppCurrencyConverter
+import com.tangem.data.common.api.safeApiCall
 import com.tangem.data.common.cache.CacheRegistry
 import com.tangem.datasource.api.tangemTech.TangemTechApi
 import com.tangem.datasource.api.tangemTech.models.CurrenciesResponse
@@ -15,7 +16,6 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.joda.time.Duration
-import timber.log.Timber
 
 internal class DefaultAppCurrencyRepository(
     private val tangemTechApi: TangemTechApi,
@@ -34,7 +34,7 @@ internal class DefaultAppCurrencyRepository(
                 .collect(::send)
         }
 
-        launch(dispatchers.io) {
+        withContext(dispatchers.io) {
             if (selectedAppCurrencyStore.isEmpty()) {
                 fetchDefaultAppCurrency()
             }
@@ -47,6 +47,7 @@ internal class DefaultAppCurrencyRepository(
 
             val currencies = availableAppCurrenciesStore.getAllSyncOrNull()
                 ?.map(appCurrencyConverter::convert)
+                ?.sortedBy(AppCurrency::name)
 
             requireNotNull(currencies) {
                 "No available currencies stored"
@@ -80,15 +81,15 @@ internal class DefaultAppCurrencyRepository(
     }
 
     private suspend fun fetchAvailableCurrencies() {
-        try {
-            val response = tangemTechApi.getCurrencyList()
+        val response = safeApiCall(
+            call = { tangemTechApi.getCurrencyList().bind() },
+            onError = {
+                cacheRegistry.invalidate(AVAILABLE_CURRENCIES_CACHE_KEY)
+                getDefaultCurrenciesResponse()
+            },
+        )
 
-            availableAppCurrenciesStore.store(response)
-        } catch (e: Throwable) {
-            Timber.e(e, "Unable to fetch available currencies")
-
-            availableAppCurrenciesStore.store(getDefaultCurrenciesResponse())
-        }
+        availableAppCurrenciesStore.store(response)
     }
 
     private fun getDefaultCurrenciesResponse(): CurrenciesResponse = CurrenciesResponse(
diff --git a/data/app-theme/build.gradle.kts b/data/app-theme/build.gradle.kts
index b0f1f17a6a..7996a21c65 100644
--- a/data/app-theme/build.gradle.kts
+++ b/data/app-theme/build.gradle.kts
@@ -12,13 +12,11 @@ android {
 dependencies {
 
     /** Project - Domain */
-    implementation(projects.domain.core)
     implementation(projects.domain.appTheme)
     implementation(projects.domain.appTheme.models)
 
     /** Project - Data */
     implementation(projects.core.datasource)
-    implementation(projects.data.common)
 
     /** Project - Utils */
     implementation(projects.core.utils)
@@ -29,6 +27,4 @@ dependencies {
 
     /** Other */
     implementation(deps.kotlin.coroutines)
-    implementation(deps.timber)
-    implementation(deps.jodatime)
 }
\ No newline at end of file
diff --git a/data/app-theme/src/main/kotlin/com/tangem/data/apptheme/DefaultAppThemeModeRepository.kt b/data/app-theme/src/main/kotlin/com/tangem/data/apptheme/DefaultAppThemeModeRepository.kt
new file mode 100644
index 0000000000..4d8ed9cf4c
--- /dev/null
+++ b/data/app-theme/src/main/kotlin/com/tangem/data/apptheme/DefaultAppThemeModeRepository.kt
@@ -0,0 +1,35 @@
+package com.tangem.data.apptheme
+
+import com.tangem.datasource.local.apptheme.AppThemeModeStore
+import com.tangem.domain.apptheme.model.AppThemeMode
+import com.tangem.domain.apptheme.repository.AppThemeModeRepository
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+internal class DefaultAppThemeModeRepository(
+    private val appThemeModeStore: AppThemeModeStore,
+    private val dispatchers: CoroutineDispatcherProvider,
+) : AppThemeModeRepository {
+
+    override fun getAppThemeMode(): Flow<AppThemeMode> {
+        return channelFlow {
+            launch(dispatchers.io) {
+                if (appThemeModeStore.isEmpty()) {
+                    appThemeModeStore.store(AppThemeMode.DEFAULT)
+                }
+            }
+
+            launch(dispatchers.io) {
+                appThemeModeStore.get().collect(::send)
+            }
+        }
+    }
+
+    override suspend fun changeAppThemeMode(mode: AppThemeMode) {
+        withContext(dispatchers.io) {
+            appThemeModeStore.store(mode)
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/app-theme/src/main/kotlin/com/tangem/data/apptheme/MockAppThemeModeRepository.kt b/data/app-theme/src/main/kotlin/com/tangem/data/apptheme/MockAppThemeModeRepository.kt
deleted file mode 100644
index a4a885aab2..0000000000
--- a/data/app-theme/src/main/kotlin/com/tangem/data/apptheme/MockAppThemeModeRepository.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.tangem.data.apptheme
-
-import com.tangem.domain.apptheme.model.AppThemeMode
-import com.tangem.domain.apptheme.repository.AppThemeModeRepository
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-
-internal class MockAppThemeModeRepository : AppThemeModeRepository {
-
-    private val appThemeModeFlow = MutableStateFlow(AppThemeMode.DEFAULT)
-
-    override fun getAppThemeMode(): Flow<AppThemeMode> {
-        return appThemeModeFlow
-    }
-
-    override suspend fun changeAppThemeMode(mode: AppThemeMode) {
-        appThemeModeFlow.value = mode
-    }
-}
\ No newline at end of file
diff --git a/data/app-theme/src/main/kotlin/com/tangem/data/apptheme/di/AppThemeModeDataModule.kt b/data/app-theme/src/main/kotlin/com/tangem/data/apptheme/di/AppThemeModeDataModule.kt
index 6847fad0b8..a360ba19b6 100644
--- a/data/app-theme/src/main/kotlin/com/tangem/data/apptheme/di/AppThemeModeDataModule.kt
+++ b/data/app-theme/src/main/kotlin/com/tangem/data/apptheme/di/AppThemeModeDataModule.kt
@@ -1,7 +1,9 @@
 package com.tangem.data.apptheme.di
 
-import com.tangem.data.apptheme.MockAppThemeModeRepository
+import com.tangem.data.apptheme.DefaultAppThemeModeRepository
+import com.tangem.datasource.local.apptheme.AppThemeModeStore
 import com.tangem.domain.apptheme.repository.AppThemeModeRepository
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -14,7 +16,10 @@ internal object AppThemeModeDataModule {
 
     @Provides
     @Singleton
-    fun provideAppThemeModeRepository(): AppThemeModeRepository {
-        return MockAppThemeModeRepository()
+    fun provideAppThemeModeRepository(
+        appThemeModeStore: AppThemeModeStore,
+        dispatchers: CoroutineDispatcherProvider,
+    ): AppThemeModeRepository {
+        return DefaultAppThemeModeRepository(appThemeModeStore, dispatchers)
     }
 }
\ No newline at end of file
diff --git a/data/balance-hiding/.gitignore b/data/balance-hiding/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/data/balance-hiding/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/data/balance-hiding/build.gradle.kts b/data/balance-hiding/build.gradle.kts
new file mode 100644
index 0000000000..434d3e0a34
--- /dev/null
+++ b/data/balance-hiding/build.gradle.kts
@@ -0,0 +1,27 @@
+plugins {
+    alias(deps.plugins.android.library)
+    alias(deps.plugins.kotlin.android)
+    alias(deps.plugins.kotlin.kapt)
+    alias(deps.plugins.hilt.android)
+    id("configuration")
+}
+
+android {
+    namespace = "com.tangem.data.balancehiding"
+}
+
+dependencies {
+
+    /** DI */
+    implementation(deps.hilt.android)
+
+    kapt(deps.hilt.kapt)
+
+    implementation(deps.kotlin.coroutines)
+
+    implementation(projects.core.utils)
+    implementation(projects.core.datasource)
+
+    implementation(projects.domain.balanceHiding)
+    implementation(projects.domain.balanceHiding.models)
+}
diff --git a/data/balance-hiding/src/main/java/com/tangem/data/balancehiding/DefaultBalanceHidingRepository.kt b/data/balance-hiding/src/main/java/com/tangem/data/balancehiding/DefaultBalanceHidingRepository.kt
new file mode 100644
index 0000000000..879bef5f17
--- /dev/null
+++ b/data/balance-hiding/src/main/java/com/tangem/data/balancehiding/DefaultBalanceHidingRepository.kt
@@ -0,0 +1,36 @@
+package com.tangem.data.balancehiding
+
+import com.tangem.datasource.local.appcurrency.BalanceHidingSettingsStore
+import com.tangem.domain.balancehiding.BalanceHidingSettings
+import com.tangem.domain.balancehiding.repositories.BalanceHidingRepository
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.withContext
+
+internal class DefaultBalanceHidingRepository(
+    private val balanceHidingSettingsStore: BalanceHidingSettingsStore,
+    private val dispatchers: CoroutineDispatcherProvider,
+) : BalanceHidingRepository {
+
+    override fun getBalanceHidingSettingsFlow(): Flow<BalanceHidingSettings> {
+        return balanceHidingSettingsStore.get()
+            .onStart { emit(getBalanceHidingSettings()) }
+            .flowOn(dispatchers.io)
+            .distinctUntilChanged()
+    }
+
+    override suspend fun storeBalanceHidingSettings(balanceHidingSettings: BalanceHidingSettings) {
+        withContext(dispatchers.io) {
+            balanceHidingSettingsStore.store(balanceHidingSettings)
+        }
+    }
+
+    override suspend fun getBalanceHidingSettings(): BalanceHidingSettings {
+        return withContext(dispatchers.io) {
+            balanceHidingSettingsStore.getSyncOrDefault()
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/balance-hiding/src/main/java/com/tangem/data/balancehiding/DefaultDeviceFlipDetector.kt b/data/balance-hiding/src/main/java/com/tangem/data/balancehiding/DefaultDeviceFlipDetector.kt
new file mode 100644
index 0000000000..30b2e97726
--- /dev/null
+++ b/data/balance-hiding/src/main/java/com/tangem/data/balancehiding/DefaultDeviceFlipDetector.kt
@@ -0,0 +1,25 @@
+package com.tangem.data.balancehiding
+
+import android.content.Context
+import android.hardware.Sensor
+import android.hardware.SensorManager
+import com.tangem.domain.balancehiding.DeviceFlipDetector
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+
+internal class DefaultDeviceFlipDetector(context: Context) : DeviceFlipDetector {
+
+    private val sensorManager = context.getSystemService(Context.SENSOR_SERVICE) as SensorManager
+    private var gravitySensor = sensorManager.getDefaultSensor(Sensor.TYPE_GRAVITY)
+
+    override fun getDeviceFlipFlow(): Flow<Unit> = callbackFlow {
+        val listener = FlipListener { trySend(Unit) }
+
+        gravitySensor?.let {
+            sensorManager.registerListener(listener, it, SensorManager.SENSOR_DELAY_NORMAL)
+        }
+
+        awaitClose { sensorManager.unregisterListener(listener) }
+    }
+}
\ No newline at end of file
diff --git a/data/balance-hiding/src/main/java/com/tangem/data/balancehiding/FlipListener.kt b/data/balance-hiding/src/main/java/com/tangem/data/balancehiding/FlipListener.kt
new file mode 100644
index 0000000000..b535797121
--- /dev/null
+++ b/data/balance-hiding/src/main/java/com/tangem/data/balancehiding/FlipListener.kt
@@ -0,0 +1,39 @@
+package com.tangem.data.balancehiding
+
+import android.hardware.Sensor
+import android.hardware.SensorEvent
+import android.hardware.SensorEventListener
+import android.os.SystemClock
+
+internal class FlipListener(private val action: () -> Unit) : SensorEventListener {
+
+    private val zAxisThreshold = -6
+    private val throttleTimeMs = 3000
+    private var lastTriggerTime = 0L
+    private var isScreenDown = false
+
+    override fun onAccuracyChanged(sensor: Sensor?, accuracy: Int) {
+        /* no-op */
+    }
+
+    override fun onSensorChanged(event: SensorEvent?) {
+        event?.let {
+            val currentTime = SystemClock.elapsedRealtime()
+            val zAxisValue = it.values[2]
+
+            if (zAxisValue < zAxisThreshold && !isScreenDown) {
+                isScreenDown = true
+                lastTriggerTime = currentTime
+                // TODO add module logging
+                // Timber.tag("onSensorChanged").d("screen down")
+            } else if (zAxisValue >= zAxisThreshold) {
+                if (isScreenDown && currentTime - lastTriggerTime <= throttleTimeMs) {
+                    // Timber.tag("onSensorChanged").d("screen up!")
+                    lastTriggerTime = currentTime
+                    action.invoke()
+                }
+                isScreenDown = false
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/balance-hiding/src/main/java/com/tangem/data/balancehiding/di/BalanceHidingModule.kt b/data/balance-hiding/src/main/java/com/tangem/data/balancehiding/di/BalanceHidingModule.kt
new file mode 100644
index 0000000000..86b293b9fe
--- /dev/null
+++ b/data/balance-hiding/src/main/java/com/tangem/data/balancehiding/di/BalanceHidingModule.kt
@@ -0,0 +1,38 @@
+package com.tangem.data.balancehiding.di
+
+import android.content.Context
+import com.tangem.data.balancehiding.DefaultBalanceHidingRepository
+import com.tangem.data.balancehiding.DefaultDeviceFlipDetector
+import com.tangem.datasource.local.appcurrency.BalanceHidingSettingsStore
+import com.tangem.domain.balancehiding.DeviceFlipDetector
+import com.tangem.domain.balancehiding.repositories.BalanceHidingRepository
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+import dagger.hilt.android.qualifiers.ApplicationContext
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object BalanceHidingModule {
+
+    @Provides
+    @Singleton
+    fun provideBalanceHidingRepository(
+        balanceHidingSettingsStore: BalanceHidingSettingsStore,
+        dispatchers: CoroutineDispatcherProvider,
+    ): BalanceHidingRepository {
+        return DefaultBalanceHidingRepository(
+            balanceHidingSettingsStore = balanceHidingSettingsStore,
+            dispatchers = dispatchers,
+        )
+    }
+
+    @Provides
+    @Singleton
+    fun provideFlipDetector(@ApplicationContext context: Context): DeviceFlipDetector {
+        return DefaultDeviceFlipDetector(context = context)
+    }
+}
\ No newline at end of file
diff --git a/data/card/build.gradle.kts b/data/card/build.gradle.kts
index 0999cc6959..c7a692bd7e 100644
--- a/data/card/build.gradle.kts
+++ b/data/card/build.gradle.kts
@@ -17,6 +17,7 @@ dependencies {
     implementation(deps.tangem.card.android)
     implementation(deps.tangem.card.core)
 
+    implementation(projects.core.datasource)
     implementation(projects.core.utils)
 
     implementation(projects.data.source.preferences)
diff --git a/data/card/src/main/java/com/tangem/data/card/DefaultCardRepository.kt b/data/card/src/main/java/com/tangem/data/card/DefaultCardRepository.kt
index b1bc033cb1..6f4a1fb553 100644
--- a/data/card/src/main/java/com/tangem/data/card/DefaultCardRepository.kt
+++ b/data/card/src/main/java/com/tangem/data/card/DefaultCardRepository.kt
@@ -1,16 +1,49 @@
 package com.tangem.data.card
 
-import com.tangem.data.source.preferences.PreferencesDataSource
+import com.tangem.datasource.local.card.UsedCardInfo
+import com.tangem.datasource.local.card.UsedCardsStore
 import com.tangem.domain.card.repository.CardRepository
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import com.tangem.utils.extensions.addOrReplace
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.channelFlow
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 internal class DefaultCardRepository(
-    private val preferencesDataSource: PreferencesDataSource,
+    private val usedCardsStore: UsedCardsStore,
     private val dispatchers: CoroutineDispatcherProvider,
 ) : CardRepository {
 
-    override suspend fun wasCardScanned(cardId: String): Boolean {
-        return withContext(dispatchers.io) { preferencesDataSource.usedCardsPrefStorage.wasScanned(cardId) }
+    override fun wasCardScanned(cardId: String): Flow<Boolean> {
+        return channelFlow {
+            launch(dispatchers.io) {
+                usedCardsStore.get()
+                    .collect { savedCards ->
+                        send(element = savedCards.any { it.cardId == cardId })
+                    }
+            }
+
+            withContext(dispatchers.io) {
+                if (usedCardsStore.getSyncOrNull() == null) {
+                    send(element = false)
+                }
+            }
+        }
+    }
+
+    override suspend fun setCardWasScanned(cardId: String) {
+        withContext(dispatchers.io) {
+            usedCardsStore.store(
+                item = usedCardsStore.getSyncOrNull()
+                    ?.updateCard(cardId)
+                    ?: listOf(UsedCardInfo(cardId = cardId, isScanned = true)),
+            )
+        }
+    }
+
+    private fun List<UsedCardInfo>.updateCard(cardId: String): List<UsedCardInfo> {
+        val card = find { it.cardId == cardId } ?: UsedCardInfo(cardId = cardId, isScanned = true)
+        return addOrReplace(item = card.copy(isScanned = true), predicate = { it.cardId == cardId })
     }
 }
\ No newline at end of file
diff --git a/data/card/src/main/java/com/tangem/data/card/di/CardDataModule.kt b/data/card/src/main/java/com/tangem/data/card/di/CardDataModule.kt
index b5edf95c45..0c2cfdecbf 100644
--- a/data/card/src/main/java/com/tangem/data/card/di/CardDataModule.kt
+++ b/data/card/src/main/java/com/tangem/data/card/di/CardDataModule.kt
@@ -4,6 +4,7 @@ import com.tangem.data.card.DefaultCardRepository
 import com.tangem.data.card.DefaultCardSdkConfigRepository
 import com.tangem.data.card.sdk.CardSdkProvider
 import com.tangem.data.source.preferences.PreferencesDataSource
+import com.tangem.datasource.local.card.UsedCardsStore
 import com.tangem.domain.card.repository.CardRepository
 import com.tangem.domain.card.repository.CardSdkConfigRepository
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
@@ -32,9 +33,9 @@ internal object CardDataModule {
     @Provides
     @Singleton
     fun provideCardRepository(
-        preferencesDataSource: PreferencesDataSource,
+        usedCardsStore: UsedCardsStore,
         dispatchers: CoroutineDispatcherProvider,
     ): CardRepository {
-        return DefaultCardRepository(preferencesDataSource = preferencesDataSource, dispatchers = dispatchers)
+        return DefaultCardRepository(usedCardsStore = usedCardsStore, dispatchers = dispatchers)
     }
 }
\ No newline at end of file
diff --git a/data/common/build.gradle.kts b/data/common/build.gradle.kts
index 7ddd807653..f1a67e77a3 100644
--- a/data/common/build.gradle.kts
+++ b/data/common/build.gradle.kts
@@ -5,11 +5,17 @@ plugins {
     id("configuration")
 }
 
+android {
+    namespace = "com.tangem.data.common"
+}
+
 dependencies {
     implementation(projects.core.datasource)
 
     implementation(deps.kotlin.coroutines)
     implementation(deps.jodatime)
+    implementation(deps.timber)
+    implementation(deps.arrow.core)
 
     implementation(deps.hilt.android)
     kapt(deps.hilt.kapt)
diff --git a/data/common/src/main/AndroidManifest.xml b/data/common/src/main/AndroidManifest.xml
deleted file mode 100644
index 5a762109a1..0000000000
--- a/data/common/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="com.tangem.data.common" />
diff --git a/data/common/src/main/kotlin/com/tangem/data/common/api/ApiResponseRaise.kt b/data/common/src/main/kotlin/com/tangem/data/common/api/ApiResponseRaise.kt
new file mode 100644
index 0000000000..2d29e30093
--- /dev/null
+++ b/data/common/src/main/kotlin/com/tangem/data/common/api/ApiResponseRaise.kt
@@ -0,0 +1,47 @@
+package com.tangem.data.common.api
+
+import arrow.core.raise.Raise
+import arrow.core.raise.recover
+import com.tangem.datasource.api.common.response.ApiResponse
+import com.tangem.datasource.api.common.response.ApiResponseError
+import timber.log.Timber
+
+/**
+ * A wrapper around the [Raise] interface specific for [ApiResponseError]. It provides utility functions to
+ * operate on [ApiResponse] instances.
+ *
+ * @property raise A [Raise] instance for raising [ApiResponseError].
+ */
+@JvmInline
+value class ApiResponseRaise(
+    private val raise: Raise<ApiResponseError>,
+) : Raise<ApiResponseError> by raise {
+
+    /**
+     * Binds the given [ApiResponse] to its underlying value or raises an error.
+     *
+     * @return The underlying data of the response if it's successful.
+     */
+    fun <T : Any> ApiResponse<T>.bind(): T = when (this) {
+        is ApiResponse.Success -> data
+        is ApiResponse.Error -> raise.raise(cause)
+    }
+}
+
+/**
+ * Attempts to execute an API call safely, providing error handling.
+ *
+ * @param call The API call block to execute.
+ * @param onError A function to handle errors and return a fallback value of type [T].
+ *
+ * @return The result of the API call or the fallback value provided by [onError] if an error occurs.
+ */
+inline fun <T> safeApiCall(call: ApiResponseRaise.() -> T, onError: (ApiResponseError) -> T): T {
+    return recover(
+        block = { call(ApiResponseRaise(raise = this)) },
+        recover = {
+            Timber.w(it, "Unable to perform safe API call")
+            onError(it)
+        },
+    )
+}
\ No newline at end of file
diff --git a/data/common/src/main/kotlin/com/tangem/data/common/cache/CacheRegistry.kt b/data/common/src/main/kotlin/com/tangem/data/common/cache/CacheRegistry.kt
index fb698486ad..1486cab448 100644
--- a/data/common/src/main/kotlin/com/tangem/data/common/cache/CacheRegistry.kt
+++ b/data/common/src/main/kotlin/com/tangem/data/common/cache/CacheRegistry.kt
@@ -24,6 +24,15 @@ interface CacheRegistry {
      */
     suspend fun invalidate(key: String)
 
+    /**
+     * Invalidates cache keys in registry.
+     *
+     * If the key doesn't exist, or it's already invalidated, this method doesn't have any effect.
+     *
+     * @param keys cache keys.
+     */
+    suspend fun invalidate(keys: Collection<String>)
+
     /**
      * Invalidates all cache keys in the registry.
      *
diff --git a/data/common/src/main/kotlin/com/tangem/data/common/cache/DefaultCacheRegistry.kt b/data/common/src/main/kotlin/com/tangem/data/common/cache/DefaultCacheRegistry.kt
index b8380debee..6d6f19cd0c 100644
--- a/data/common/src/main/kotlin/com/tangem/data/common/cache/DefaultCacheRegistry.kt
+++ b/data/common/src/main/kotlin/com/tangem/data/common/cache/DefaultCacheRegistry.kt
@@ -2,8 +2,11 @@ package com.tangem.data.common.cache
 
 import com.tangem.datasource.local.cache.CacheKeysStore
 import com.tangem.datasource.local.cache.model.CacheKey
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.withContext
 import org.joda.time.Duration
 import org.joda.time.LocalDateTime
+import timber.log.Timber
 
 internal class DefaultCacheRegistry(
     private val cacheKeysStore: CacheKeysStore,
@@ -18,11 +21,18 @@ internal class DefaultCacheRegistry(
     }
 
     override suspend fun invalidate(key: String) {
-        cacheKeysStore.remove(key)
+        Timber.d("Invalidate the cache key: $key")
+        withContext(NonCancellable) { cacheKeysStore.remove(key) }
+    }
+
+    override suspend fun invalidate(keys: Collection<String>) {
+        Timber.d("Invalidate cache keys: $keys")
+        withContext(NonCancellable) { cacheKeysStore.remove(keys) }
     }
 
     override suspend fun invalidateAll() {
-        cacheKeysStore.clear()
+        Timber.d("Invalidate all cache keys")
+        withContext(NonCancellable) { cacheKeysStore.clear() }
     }
 
     override suspend fun invokeOnExpire(
@@ -34,18 +44,23 @@ internal class DefaultCacheRegistry(
         val isExpired = isExpired(key) || skipCache
         if (!isExpired) return
 
-        cacheKeysStore.store(
-            key = CacheKey(
-                id = key,
-                updatedAt = LocalDateTime.now(),
-                expiresIn = expireIn,
-            ),
-        )
-
         try {
+            Timber.d("Invoke the action associated with the cache key: $key")
+
+            cacheKeysStore.store(
+                key = CacheKey(
+                    id = key,
+                    updatedAt = LocalDateTime.now(),
+                    expiresIn = expireIn,
+                ),
+            )
+
             block()
         } catch (e: Throwable) {
+            Timber.e(e, "The action related to the cache key has failed: $key")
+
             invalidate(key)
+
             throw e
         }
     }
diff --git a/data/settings/build.gradle.kts b/data/settings/build.gradle.kts
index 1413053d65..e59302acd9 100644
--- a/data/settings/build.gradle.kts
+++ b/data/settings/build.gradle.kts
@@ -14,13 +14,16 @@ dependencies {
 
     /** DI */
     implementation(deps.hilt.android)
+
     kapt(deps.hilt.kapt)
 
     implementation(deps.kotlin.coroutines)
 
     implementation(projects.core.utils)
+    implementation(projects.core.datasource)
 
     implementation(projects.domain.settings)
+    implementation(projects.domain.balanceHiding.models)
 
     implementation(projects.data.source.preferences)
 }
diff --git a/data/settings/src/main/java/com/tangem/data/settings/DefaultAppRatingRepository.kt b/data/settings/src/main/java/com/tangem/data/settings/DefaultAppRatingRepository.kt
new file mode 100644
index 0000000000..e7bc353372
--- /dev/null
+++ b/data/settings/src/main/java/com/tangem/data/settings/DefaultAppRatingRepository.kt
@@ -0,0 +1,103 @@
+package com.tangem.data.settings
+
+import com.tangem.datasource.local.settings.AppLaunchCountStore
+import com.tangem.datasource.local.settings.AppRatingShowingCountStore
+import com.tangem.datasource.local.settings.FundsFoundDateInMillisStore
+import com.tangem.datasource.local.settings.UserInteractingStatusStore
+import com.tangem.domain.settings.repositories.AppRatingRepository
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.withContext
+import java.util.Calendar
+
+internal class DefaultAppRatingRepository(
+    private val fundsFoundDateInMillisStore: FundsFoundDateInMillisStore,
+    private val appLaunchCountStore: AppLaunchCountStore,
+    private val appRatingShowingCountStore: AppRatingShowingCountStore,
+    private val userInteractingStatusStore: UserInteractingStatusStore,
+    private val dispatchers: CoroutineDispatcherProvider,
+) : AppRatingRepository {
+
+    override suspend fun initialize() {
+        fundsFoundDateInMillisStore.getSyncOrNull()
+            ?: fundsFoundDateInMillisStore.store(item = FUNDS_FOUND_DATE_UNDEFINED)
+
+        appLaunchCountStore.getSyncOrNull()
+            ?: appLaunchCountStore.store(item = DEFAULT_APP_LAUNCH_COUNT)
+
+        appRatingShowingCountStore.getSyncOrNull()
+            ?: appRatingShowingCountStore.store(item = FIRST_SHOWING_COUNT)
+
+        userInteractingStatusStore.getSyncOrNull()
+            ?: userInteractingStatusStore.store(item = false)
+    }
+
+    override suspend fun setWalletWithFundsFound() {
+        withContext(dispatchers.io) {
+            val foundDate = fundsFoundDateInMillisStore.getSyncOrNull()
+            if (foundDate != null && foundDate != FUNDS_FOUND_DATE_UNDEFINED) return@withContext
+
+            fundsFoundDateInMillisStore.store(item = Calendar.getInstance().timeInMillis)
+
+            val appLaunchCount = appLaunchCountStore.getSyncOrNull().let { count ->
+                if (count == null) {
+                    appLaunchCountStore.store(item = DEFAULT_APP_LAUNCH_COUNT)
+                    DEFAULT_APP_LAUNCH_COUNT
+                } else {
+                    count
+                }
+            }
+
+            appRatingShowingCountStore.store(item = appLaunchCount + FIRST_SHOWING_COUNT)
+
+            userInteractingStatusStore.getSyncOrNull()
+                ?: userInteractingStatusStore.store(item = false)
+        }
+    }
+
+    override fun isReadyToShow(): Flow<Boolean> {
+        // TODO: [REDACTED_JIRA]
+        return combine(
+            userInteractingStatusStore.get(),
+            appRatingShowingCountStore.get(),
+            appLaunchCountStore.get(),
+            fundsFoundDateInMillisStore.get(),
+        ) { isInteracting, ratingShowingCount, appLaunchCount, fundsFoundDate ->
+            if (!isInteracting) {
+                val diff = Calendar.getInstance().timeInMillis - fundsFoundDate
+                val diffInDays = diff / DAY_IN_MILLIS
+                val isFundsFound = fundsFoundDate != FUNDS_FOUND_DATE_UNDEFINED
+
+                appLaunchCount >= ratingShowingCount && diffInDays >= FIRST_SHOWING_COUNT && isFundsFound
+            } else {
+                appLaunchCount >= ratingShowingCount
+            }
+        }
+    }
+
+    override suspend fun remindLater() {
+        appLaunchCountStore.getSyncOrNull()?.let {
+            updateNextShowing(at = it + DEFER_SHOWING_COUNT)
+        }
+    }
+
+    override suspend fun setNeverToShow() {
+        updateNextShowing(at = Int.MAX_VALUE)
+    }
+
+    private suspend fun updateNextShowing(at: Int) {
+        withContext(dispatchers.io) {
+            appRatingShowingCountStore.store(item = at)
+            userInteractingStatusStore.store(item = true)
+        }
+    }
+
+    private companion object {
+        const val FUNDS_FOUND_DATE_UNDEFINED = -1L
+        const val DEFAULT_APP_LAUNCH_COUNT = 1
+        const val FIRST_SHOWING_COUNT = 3
+        const val DEFER_SHOWING_COUNT = 20
+        const val DAY_IN_MILLIS = 1000 * 60 * 60 * 24
+    }
+}
\ No newline at end of file
diff --git a/data/settings/src/main/java/com/tangem/data/settings/DefaultSettingsRepository.kt b/data/settings/src/main/java/com/tangem/data/settings/DefaultSettingsRepository.kt
index c4d0074263..0fed0929d9 100644
--- a/data/settings/src/main/java/com/tangem/data/settings/DefaultSettingsRepository.kt
+++ b/data/settings/src/main/java/com/tangem/data/settings/DefaultSettingsRepository.kt
@@ -10,12 +10,6 @@ internal class DefaultSettingsRepository(
     private val dispatchers: CoroutineDispatcherProvider,
 ) : SettingsRepository {
 
-    override suspend fun isUserAlreadyRateApp(): Boolean {
-        return withContext(dispatchers.io) {
-            preferencesDataSource.appRatingLaunchObserver.isReadyToShow()
-        }
-    }
-
     override suspend fun shouldShowSaveUserWalletScreen(): Boolean {
         return withContext(dispatchers.io) { preferencesDataSource.shouldShowSaveUserWalletScreen }
     }
diff --git a/data/settings/src/main/java/com/tangem/data/settings/di/SettingsDataModule.kt b/data/settings/src/main/java/com/tangem/data/settings/di/SettingsDataModule.kt
index 6ef7e9a280..68355c5d61 100644
--- a/data/settings/src/main/java/com/tangem/data/settings/di/SettingsDataModule.kt
+++ b/data/settings/src/main/java/com/tangem/data/settings/di/SettingsDataModule.kt
@@ -1,7 +1,13 @@
 package com.tangem.data.settings.di
 
+import com.tangem.data.settings.DefaultAppRatingRepository
 import com.tangem.data.settings.DefaultSettingsRepository
 import com.tangem.data.source.preferences.PreferencesDataSource
+import com.tangem.datasource.local.settings.AppLaunchCountStore
+import com.tangem.datasource.local.settings.AppRatingShowingCountStore
+import com.tangem.datasource.local.settings.FundsFoundDateInMillisStore
+import com.tangem.datasource.local.settings.UserInteractingStatusStore
+import com.tangem.domain.settings.repositories.AppRatingRepository
 import com.tangem.domain.settings.repositories.SettingsRepository
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.Module
@@ -20,6 +26,27 @@ internal object SettingsDataModule {
         preferencesDataSource: PreferencesDataSource,
         dispatchers: CoroutineDispatcherProvider,
     ): SettingsRepository {
-        return DefaultSettingsRepository(preferencesDataSource = preferencesDataSource, dispatchers = dispatchers)
+        return DefaultSettingsRepository(
+            preferencesDataSource = preferencesDataSource,
+            dispatchers = dispatchers,
+        )
+    }
+
+    @Provides
+    @Singleton
+    fun provideAppRatingRepository(
+        fundsFoundDateInMillisStore: FundsFoundDateInMillisStore,
+        appLaunchCountStore: AppLaunchCountStore,
+        appRatingShowingCountStore: AppRatingShowingCountStore,
+        userInteractingStatusStore: UserInteractingStatusStore,
+        dispatchers: CoroutineDispatcherProvider,
+    ): AppRatingRepository {
+        return DefaultAppRatingRepository(
+            fundsFoundDateInMillisStore = fundsFoundDateInMillisStore,
+            appLaunchCountStore = appLaunchCountStore,
+            appRatingShowingCountStore = appRatingShowingCountStore,
+            userInteractingStatusStore = userInteractingStatusStore,
+            dispatchers = dispatchers,
+        )
     }
 }
\ No newline at end of file
diff --git a/data/source/preferences/src/main/kotlin/com/tangem/data/source/preferences/PreferencesDataSource.kt b/data/source/preferences/src/main/kotlin/com/tangem/data/source/preferences/PreferencesDataSource.kt
index ec8b43876b..218863ac9a 100644
--- a/data/source/preferences/src/main/kotlin/com/tangem/data/source/preferences/PreferencesDataSource.kt
+++ b/data/source/preferences/src/main/kotlin/com/tangem/data/source/preferences/PreferencesDataSource.kt
@@ -56,12 +56,6 @@ class PreferencesDataSource @Inject internal constructor(applicationContext: Con
             putBoolean(SAVE_WALLET_DIALOG_SHOWN_KEY, value)
         }
 
-    var shouldSaveUserWallets: Boolean
-        get() = preferences.getBoolean(SAVE_USER_WALLETS_KEY, false)
-        set(value) = preferences.edit {
-            putBoolean(SAVE_USER_WALLETS_KEY, value)
-        }
-
     var shouldSaveAccessCodes: Boolean
         get() = preferences.getBoolean(SAVE_ACCESS_CODES_KEY, false)
         set(value) = preferences.edit {
@@ -102,7 +96,6 @@ class PreferencesDataSource @Inject internal constructor(applicationContext: Con
         private const val ZENDESK_FIRST_LAUNCH_KEY = "chatFirstLaunchKey"
         private const val SPRINKLR_FIRST_LAUNCH_KEY = "sprinklrFirstLaunch"
         private const val SAVE_WALLET_DIALOG_SHOWN_KEY = "saveUserWalletShown"
-        private const val SAVE_USER_WALLETS_KEY = "saveUserWallets"
         private const val SAVE_ACCESS_CODES_KEY = "saveAccessCodes"
         private const val APPLICATION_STOPPED_KEY = "applicationStopped"
         private const val OPEN_WELCOME_ON_RESUME_KEY = "openWelcomeOnResume"
diff --git a/data/tokens/build.gradle.kts b/data/tokens/build.gradle.kts
index a45be27508..d36f42d591 100644
--- a/data/tokens/build.gradle.kts
+++ b/data/tokens/build.gradle.kts
@@ -17,6 +17,7 @@ dependencies {
     implementation(projects.domain.models)
     implementation(projects.domain.tokens)
     implementation(projects.domain.tokens.models)
+    implementation(projects.domain.txhistory.models)
     implementation(projects.domain.wallets.models)
 
     /** Project - Data */
@@ -40,4 +41,5 @@ dependencies {
     implementation(deps.moshi.kotlin)
     implementation(deps.jodatime)
     implementation(deps.timber)
+    implementation(deps.retrofit) // For HttpException
 }
\ No newline at end of file
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/di/TokensDataModule.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/di/TokensDataModule.kt
index c1229cde5b..f8e33206dd 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/di/TokensDataModule.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/di/TokensDataModule.kt
@@ -2,14 +2,18 @@ package com.tangem.data.tokens.di
 
 import com.tangem.data.common.cache.CacheRegistry
 import com.tangem.data.tokens.repository.DefaultCurrenciesRepository
+import com.tangem.data.tokens.repository.DefaultMarketCryptoCurrencyRepository
 import com.tangem.data.tokens.repository.DefaultNetworksRepository
 import com.tangem.data.tokens.repository.DefaultQuotesRepository
 import com.tangem.datasource.api.tangemTech.TangemTechApi
 import com.tangem.datasource.local.appcurrency.SelectedAppCurrencyStore
+import com.tangem.datasource.local.network.NetworksStatusesStore
 import com.tangem.datasource.local.quote.QuotesStore
+import com.tangem.datasource.local.token.UserMarketCoinsStore
 import com.tangem.datasource.local.token.UserTokensStore
 import com.tangem.datasource.local.userwallet.UserWalletsStore
 import com.tangem.domain.tokens.repository.CurrenciesRepository
+import com.tangem.domain.tokens.repository.MarketCryptoCurrencyRepository
 import com.tangem.domain.tokens.repository.NetworksRepository
 import com.tangem.domain.tokens.repository.QuotesRepository
 import com.tangem.domain.walletmanager.WalletManagersFacade
@@ -30,10 +34,18 @@ internal object TokensDataModule {
         tangemTechApi: TangemTechApi,
         userTokensStore: UserTokensStore,
         userWalletsStore: UserWalletsStore,
+        userMarketCoinsStore: UserMarketCoinsStore,
         cacheRegistry: CacheRegistry,
         dispatchers: CoroutineDispatcherProvider,
     ): CurrenciesRepository {
-        return DefaultCurrenciesRepository(tangemTechApi, userTokensStore, userWalletsStore, cacheRegistry, dispatchers)
+        return DefaultCurrenciesRepository(
+            tangemTechApi = tangemTechApi,
+            userTokensStore = userTokensStore,
+            userWalletsStore = userWalletsStore,
+            userMarketCoinsStore = userMarketCoinsStore,
+            cacheRegistry = cacheRegistry,
+            dispatchers = dispatchers,
+        )
     }
 
     @Provides
@@ -46,17 +58,18 @@ internal object TokensDataModule {
         dispatchers: CoroutineDispatcherProvider,
     ): QuotesRepository {
         return DefaultQuotesRepository(
-            tangemTechApi,
-            quotesStore,
-            selectedAppCurrencyStore,
-            cacheRegistry,
-            dispatchers,
+            tangemTechApi = tangemTechApi,
+            quotesStore = quotesStore,
+            selectedAppCurrencyStore = selectedAppCurrencyStore,
+            cacheRegistry = cacheRegistry,
+            dispatchers = dispatchers,
         )
     }
 
     @Provides
     @Singleton
     fun provideNetworksRepository(
+        networksStatusesStore: NetworksStatusesStore,
         walletManagersFacade: WalletManagersFacade,
         userWalletsStore: UserWalletsStore,
         userTokensStore: UserTokensStore,
@@ -64,11 +77,20 @@ internal object TokensDataModule {
         dispatchers: CoroutineDispatcherProvider,
     ): NetworksRepository {
         return DefaultNetworksRepository(
-            walletManagersFacade,
-            userWalletsStore,
-            userTokensStore,
-            cacheRegistry,
-            dispatchers,
+            networksStatusesStore = networksStatusesStore,
+            walletManagersFacade = walletManagersFacade,
+            userWalletsStore = userWalletsStore,
+            userTokensStore = userTokensStore,
+            cacheRegistry = cacheRegistry,
+            dispatchers = dispatchers,
         )
     }
+
+    @Provides
+    @Singleton
+    fun provideDefaultMarketCoinsRepository(
+        userMarketCoinsStore: UserMarketCoinsStore,
+    ): MarketCryptoCurrencyRepository {
+        return DefaultMarketCryptoCurrencyRepository(userMarketCoinsStore)
+    }
 }
\ No newline at end of file
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt
index 0df288c0c0..d98c38a33a 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt
@@ -1,40 +1,47 @@
 package com.tangem.data.tokens.repository
 
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.data.common.api.safeApiCall
 import com.tangem.data.common.cache.CacheRegistry
-import com.tangem.data.tokens.utils.CardCurrenciesFactory
-import com.tangem.data.tokens.utils.ResponseCurrenciesFactory
-import com.tangem.data.tokens.utils.UserTokensResponseFactory
+import com.tangem.data.tokens.utils.*
+import com.tangem.datasource.api.common.response.ApiResponseError
 import com.tangem.datasource.api.tangemTech.TangemTechApi
 import com.tangem.datasource.api.tangemTech.models.UserTokensResponse
+import com.tangem.datasource.local.token.UserMarketCoinsStore
 import com.tangem.datasource.local.token.UserTokensStore
 import com.tangem.datasource.local.userwallet.UserWalletsStore
+import com.tangem.domain.common.extensions.toCoinId
+import com.tangem.domain.common.extensions.toNetworkId
 import com.tangem.domain.common.util.derivationStyleProvider
+import com.tangem.domain.common.util.hasDerivation
 import com.tangem.domain.core.error.DataError
 import com.tangem.domain.demo.DemoConfig
-import com.tangem.domain.tokens.models.CryptoCurrency
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.Network
 import com.tangem.domain.tokens.repository.CurrenciesRepository
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.channelFlow
-import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 
+@Suppress("LargeClass")
 internal class DefaultCurrenciesRepository(
     private val tangemTechApi: TangemTechApi,
     private val userTokensStore: UserTokensStore,
     private val userWalletsStore: UserWalletsStore,
+    private val userMarketCoinsStore: UserMarketCoinsStore,
     private val cacheRegistry: CacheRegistry,
     private val dispatchers: CoroutineDispatcherProvider,
 ) : CurrenciesRepository {
 
     private val demoConfig = DemoConfig()
-    private val responseCurrenciesFactory = ResponseCurrenciesFactory(demoConfig)
-    private val cardCurrenciesFactory = CardCurrenciesFactory(demoConfig)
+    private val responseCurrenciesFactory = ResponseCryptoCurrenciesFactory()
+    private val cardCurrenciesFactory = CardCryptoCurrenciesFactory(demoConfig)
     private val userTokensResponseFactory = UserTokensResponseFactory()
+    private val userTokensBackwardCompatibility = UserTokensBackwardCompatibility()
 
     override suspend fun saveTokens(
         userWalletId: UserWalletId,
@@ -53,6 +60,59 @@ internal class DefaultCurrenciesRepository(
         storeAndPushTokens(userWalletId, response)
     }
 
+    override suspend fun addCurrencies(userWalletId: UserWalletId, currencies: List<CryptoCurrency>) {
+        return withContext(dispatchers.io) {
+            val savedCurrencies = requireNotNull(
+                value = userTokensStore.getSyncOrNull(userWalletId),
+                lazyMessage = { "Saved tokens empty. Can not perform add currencies action" },
+            )
+
+            val filteredCurrencies = currencies.toMutableList()
+            filteredCurrencies.filterNot { currency ->
+                val blockchain = getBlockchain(networkId = currency.network.id)
+                val networkId = blockchain.toNetworkId()
+                val contractAddress = (currency as? CryptoCurrency.Token)?.contractAddress
+                savedCurrencies.tokens.firstOrNull { token ->
+                    token.contractAddress == contractAddress &&
+                        token.networkId == networkId &&
+                        token.derivationPath == currency.network.derivationPath.value
+                } != null
+            }
+
+            val newCoins = createCoinsForNewTokens(
+                userWalletId = userWalletId,
+                newTokens = filteredCurrencies.filterIsInstance<CryptoCurrency.Token>(),
+                savedCurrencies = savedCurrencies.tokens,
+            )
+
+            val newCurrencies = newCoins + filteredCurrencies
+
+            storeAndPushTokens(
+                userWalletId = userWalletId,
+                response = savedCurrencies.copy(
+                    tokens = savedCurrencies.tokens + newCurrencies.map(userTokensResponseFactory::createResponseToken),
+                ),
+            )
+        }
+    }
+
+    private suspend fun createCoinsForNewTokens(
+        userWalletId: UserWalletId,
+        newTokens: List<CryptoCurrency.Token>,
+        savedCurrencies: List<UserTokensResponse.Token>,
+    ): List<CryptoCurrency.Coin> {
+        return newTokens
+            .filterNot { savedCurrencies.hasCoinForToken(it) } // tokens without coins
+            .mapNotNull {
+                CryptoCurrencyFactory().createCoin(
+                    blockchain = getBlockchain(networkId = it.network.id),
+                    extraDerivationPath = it.network.derivationPath.value,
+                    derivationStyleProvider = getUserWallet(userWalletId).scanResponse.derivationStyleProvider,
+                )
+            }
+            .distinct()
+    }
+
     override suspend fun removeCurrency(userWalletId: UserWalletId, currency: CryptoCurrency) =
         withContext(dispatchers.io) {
             val savedCurrencies = requireNotNull(
@@ -69,6 +129,23 @@ internal class DefaultCurrenciesRepository(
             )
         }
 
+    override suspend fun removeCurrencies(userWalletId: UserWalletId, currencies: List<CryptoCurrency>) {
+        return withContext(dispatchers.io) {
+            val savedCurrencies = requireNotNull(
+                value = userTokensStore.getSyncOrNull(userWalletId),
+                lazyMessage = { "Saved tokens empty. Can not perform remove currencies action" },
+            )
+
+            val tokens = currencies.map(userTokensResponseFactory::createResponseToken)
+            storeAndPushTokens(
+                userWalletId = userWalletId,
+                response = savedCurrencies.copy(
+                    tokens = savedCurrencies.tokens.filterNot(tokens::contains),
+                ),
+            )
+        }
+    }
+
     override suspend fun getSingleCurrencyWalletPrimaryCurrency(userWalletId: UserWalletId): CryptoCurrency {
         return withContext(dispatchers.io) {
             val userWallet = getUserWallet(userWalletId)
@@ -78,19 +155,44 @@ internal class DefaultCurrenciesRepository(
         }
     }
 
+    override suspend fun getSingleCurrencyWalletWithCardCurrencies(userWalletId: UserWalletId): List<CryptoCurrency> {
+        return withContext(dispatchers.io) {
+            val userWallet = getUserWallet(userWalletId)
+            ensureIsCorrectUserWallet(userWallet, isMultiCurrencyWalletExpected = false)
+
+            cardCurrenciesFactory.createCurrenciesForSingleCurrencyCardWithToken(userWallet.scanResponse)
+        }
+    }
+
+    override suspend fun getSingleCurrencyWalletWithCardCurrency(
+        userWalletId: UserWalletId,
+        id: CryptoCurrency.ID,
+    ): CryptoCurrency {
+        return withContext(dispatchers.io) {
+            val userWallet = getUserWallet(userWalletId)
+            ensureIsCorrectUserWallet(userWallet, isMultiCurrencyWalletExpected = false)
+
+            val currency = cardCurrenciesFactory.createCurrenciesForSingleCurrencyCardWithToken(userWallet.scanResponse)
+                .find { it.id == id }
+            requireNotNull(currency) { "Unable to find currency with provided ID: $id" }
+        }
+    }
+
     override fun getMultiCurrencyWalletCurrenciesUpdates(userWalletId: UserWalletId): Flow<List<CryptoCurrency>> {
         return channelFlow {
             val userWallet = getUserWallet(userWalletId)
             ensureIsCorrectUserWallet(userWallet, isMultiCurrencyWalletExpected = true)
 
             launch(dispatchers.io) {
-                getMultiCurrencyWalletCurrencies(userWallet).collect(::send)
+                getMultiCurrencyWalletCurrencies(userWallet)
+                    .collectLatest(::send)
             }
 
-            launch(dispatchers.io) {
+            withContext(dispatchers.io) {
                 fetchTokensIfCacheExpired(userWallet, refresh = false)
             }
         }
+            .cancellable()
     }
 
     override suspend fun getMultiCurrencyWalletCurrenciesSync(
@@ -106,15 +208,13 @@ internal class DefaultCurrenciesRepository(
             "Unable to find tokens response for user wallet with provided ID: $userWalletId"
         }
 
-        return responseCurrenciesFactory.createCurrencies(
-            response = storedTokens,
-            card = userWallet.scanResponse.card,
-        )
+        return responseCurrenciesFactory.createCurrencies(storedTokens, userWallet.scanResponse)
     }
 
     override suspend fun getMultiCurrencyWalletCurrency(
         userWalletId: UserWalletId,
         id: CryptoCurrency.ID,
+        derivationPath: Network.DerivationPath,
     ): CryptoCurrency = withContext(dispatchers.io) {
         val userWallet = getUserWallet(userWalletId)
         ensureIsCorrectUserWallet(userWallet, isMultiCurrencyWalletExpected = true)
@@ -123,7 +223,34 @@ internal class DefaultCurrenciesRepository(
             "Unable to find tokens response for user wallet with provided ID: $userWalletId"
         }
 
-        responseCurrenciesFactory.createCurrency(id, response, userWallet.scanResponse.card)
+        responseCurrenciesFactory.createCurrency(id, response, userWallet.scanResponse, derivationPath.value)
+    }
+
+    override suspend fun getNetworkCoin(
+        userWalletId: UserWalletId,
+        networkId: Network.ID,
+        derivationPath: Network.DerivationPath,
+    ): CryptoCurrency.Coin {
+        val userWallet = getUserWallet(userWalletId)
+        ensureIsCorrectUserWallet(userWallet = userWallet, isMultiCurrencyWalletExpected = true)
+
+        fetchTokensIfCacheExpired(userWallet = userWallet, refresh = false)
+
+        val storedTokens = requireNotNull(userTokensStore.getSyncOrNull(userWallet.walletId)) {
+            "Unable to find tokens response for user wallet with provided ID: $userWalletId"
+        }
+        val blockchain = Blockchain.fromId(networkId.value)
+        val blockchainNetworkId = blockchain.toNetworkId()
+        val coinId = blockchain.toCoinId()
+
+        val storedCoin = storedTokens.tokens
+            .find {
+                it.networkId == blockchainNetworkId && it.id == coinId && it.derivationPath == derivationPath.value
+            } ?: error("Coin in this network $networkId not found")
+
+        val coin = responseCurrenciesFactory.createCurrency(storedCoin, userWallet.scanResponse)
+
+        return coin as? CryptoCurrency.Coin ?: error("Unable to create currency")
     }
 
     override fun isTokensGrouped(userWalletId: UserWalletId): Flow<Boolean> {
@@ -135,7 +262,7 @@ internal class DefaultCurrenciesRepository(
                     .map { it.group == UserTokensResponse.GroupType.NETWORK }
                     .collect(::send)
             }
-        }
+        }.cancellable()
     }
 
     override fun isTokensSortedByBalance(userWalletId: UserWalletId): Flow<Boolean> {
@@ -147,6 +274,24 @@ internal class DefaultCurrenciesRepository(
                     .map { it.sort == UserTokensResponse.SortType.BALANCE }
                     .collect(::send)
             }
+        }.cancellable()
+    }
+
+    override fun getMissedAddressesCryptoCurrencies(userWalletId: UserWalletId): Flow<List<CryptoCurrency>> {
+        return channelFlow {
+            ensureIsCorrectUserWallet(userWalletId, isMultiCurrencyWalletExpected = true)
+
+            val userWallet = getUserWallet(userWalletId = userWalletId)
+            getMultiCurrencyWalletCurrencies(userWallet = userWallet)
+                .map {
+                    it.filter { currency ->
+                        val blockchain = Blockchain.fromId(id = currency.network.id.value)
+                        val derivationPath = currency.network.derivationPath.value
+
+                        derivationPath != null && !userWallet.scanResponse.hasDerivation(blockchain, derivationPath)
+                    }
+                }
+                .collectLatest(::send)
         }
     }
 
@@ -154,7 +299,7 @@ internal class DefaultCurrenciesRepository(
         return userTokensStore.get(userWallet.walletId).map { storedTokens ->
             responseCurrenciesFactory.createCurrencies(
                 response = storedTokens,
-                card = userWallet.scanResponse.card,
+                scanResponse = userWallet.scanResponse,
             )
         }
     }
@@ -168,40 +313,80 @@ internal class DefaultCurrenciesRepository(
     }
 
     private suspend fun fetchTokens(userWallet: UserWallet) {
-        try {
-            val response = tangemTechApi.getUserTokens(userWallet.walletId.stringValue)
+        val userWalletId = userWallet.walletId
 
-            userTokensStore.store(userWallet.walletId, response)
-        } catch (e: Throwable) {
-            handleFetchTokensErrorOrThrow(userWallet, e)
+        if (demoConfig.isDemoCardId(userWallet.cardId) && userTokensStore.getSyncOrNull(key = userWalletId) == null) {
+            userTokensStore.store(
+                key = userWalletId,
+                value = userTokensResponseFactory.createUserTokensResponse(
+                    currencies = cardCurrenciesFactory.createDefaultCoinsForMultiCurrencyCard(userWallet.scanResponse),
+                    isGroupedByNetwork = false,
+                    isSortedByBalance = false,
+                ),
+            )
+            return
         }
+
+        val response = safeApiCall(
+            call = {
+                tangemTechApi.getUserTokens(userWalletId.stringValue).bind().let {
+                    it.copy(tokens = it.tokens.distinct())
+                }
+            },
+            onError = { handleFetchTokensError(userWallet, it) },
+        )
+
+        val compatibleUserTokensResponse = userTokensBackwardCompatibility.applyCompatibilityAndGetUpdated(response)
+        userTokensStore.store(userWallet.walletId, compatibleUserTokensResponse)
+        fetchExchangeableUserMarketCoinsByIds(userWalletId, compatibleUserTokensResponse)
     }
 
     private suspend fun storeAndPushTokens(userWalletId: UserWalletId, response: UserTokensResponse) {
-        userTokensStore.store(userWalletId, response)
-        tangemTechApi.saveUserTokens(userWalletId.stringValue, response)
+        val compatibleUserTokensResponse = userTokensBackwardCompatibility.applyCompatibilityAndGetUpdated(response)
+        userTokensStore.store(userWalletId, compatibleUserTokensResponse)
+        try {
+            tangemTechApi.saveUserTokens(userWalletId.stringValue, response)
+        } catch (e: Throwable) {
+            Timber.e("Unable to save user tokens for: ${userWalletId.stringValue}")
+        }
     }
 
-    private suspend fun handleFetchTokensErrorOrThrow(userWallet: UserWallet, error: Throwable) {
-        val errorMessage = error.message ?: throw error
+    private suspend fun fetchExchangeableUserMarketCoinsByIds(
+        userWalletId: UserWalletId,
+        userTokens: UserTokensResponse,
+    ) {
+        try {
+            val networkIds = userTokens.tokens
+                .distinctBy { it.networkId }
+                .joinToString(separator = ",") { it.networkId }
+            val response = tangemTechApi.getCoins(networkIds = networkIds, exchangeable = true)
 
-        if (NOT_FOUND_HTTP_CODE in errorMessage) {
-            val response = userTokensStore.getSyncOrNull(userWallet.walletId)
-                ?: userTokensResponseFactory.createUserTokensResponse(
-                    currencies = cardCurrenciesFactory.createDefaultCoinsForMultiCurrencyCard(
-                        card = userWallet.scanResponse.card,
-                        derivationStyleProvider = userWallet.scanResponse.derivationStyleProvider,
-                    ),
-                    isGroupedByNetwork = false,
-                    isSortedByBalance = false,
-                )
-
-            tangemTechApi.saveUserTokens(userWallet.walletId.stringValue, response)
-        } else {
-            Timber.e(error, "Unable to fetch currencies for: ${userWallet.walletId}")
+            userMarketCoinsStore.store(userWalletId, response)
+        } catch (e: Throwable) {
+            Timber.e(e, "Unable to fetch user market coins for: ${userWalletId.stringValue}")
         }
     }
 
+    private suspend fun handleFetchTokensError(userWallet: UserWallet, e: ApiResponseError): UserTokensResponse {
+        val userWalletId = userWallet.walletId
+        val response = userTokensStore.getSyncOrNull(userWalletId)
+            ?: userTokensResponseFactory.createUserTokensResponse(
+                currencies = cardCurrenciesFactory.createDefaultCoinsForMultiCurrencyCard(userWallet.scanResponse),
+                isGroupedByNetwork = false,
+                isSortedByBalance = false,
+            )
+
+        if (e is ApiResponseError.HttpException && e.code == ApiResponseError.HttpException.Code.NOT_FOUND) {
+            Timber.w(e, "Requested currencies could not be found in the remote store for: $userWalletId")
+
+            tangemTechApi.saveUserTokens(userWalletId.stringValue, response)
+        } else {
+            cacheRegistry.invalidate(getTokensCacheKey(userWalletId))
+        }
+
+        return response
+    }
+
     private suspend fun getUserWallet(userWalletId: UserWalletId): UserWallet {
         return requireNotNull(userWalletsStore.getSyncOrNull(userWalletId)) {
             "Unable to find a user wallet with provided ID: $userWalletId"
@@ -236,8 +421,4 @@ internal class DefaultCurrenciesRepository(
     }
 
     private fun getTokensCacheKey(userWalletId: UserWalletId): String = "tokens_cache_key_${userWalletId.stringValue}"
-
-    private companion object {
-        const val NOT_FOUND_HTTP_CODE = "404"
-    }
 }
\ No newline at end of file
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultMarketCryptoCurrencyRepository.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultMarketCryptoCurrencyRepository.kt
new file mode 100644
index 0000000000..441f3f97d2
--- /dev/null
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultMarketCryptoCurrencyRepository.kt
@@ -0,0 +1,22 @@
+package com.tangem.data.tokens.repository
+
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.datasource.local.token.UserMarketCoinsStore
+import com.tangem.domain.common.extensions.toNetworkId
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.repository.MarketCryptoCurrencyRepository
+import com.tangem.domain.wallets.models.UserWalletId
+
+class DefaultMarketCryptoCurrencyRepository(
+    private val userMarketCoinsStore: UserMarketCoinsStore,
+) : MarketCryptoCurrencyRepository {
+
+    override suspend fun isExchangeable(userWalletId: UserWalletId, cryptoCurrencyId: CryptoCurrency.ID): Boolean {
+        val blockchain = Blockchain.fromId(cryptoCurrencyId.rawNetworkId)
+        val apiNetworkId = blockchain.toNetworkId()
+        return userMarketCoinsStore.getSyncOrNull(userWalletId)?.coins
+            ?.firstOrNull { it.id == cryptoCurrencyId.rawCurrencyId }
+            ?.networks
+            ?.firstOrNull { it.networkId == apiNetworkId }?.exchangeable ?: false
+    }
+}
\ No newline at end of file
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultNetworksRepository.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultNetworksRepository.kt
index 5ac3840c7f..fa7d68bd98 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultNetworksRepository.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultNetworksRepository.kt
@@ -1,25 +1,31 @@
 package com.tangem.data.tokens.repository
 
 import com.tangem.data.common.cache.CacheRegistry
-import com.tangem.data.tokens.utils.CardCurrenciesFactory
-import com.tangem.data.tokens.utils.NetworkConverter
+import com.tangem.data.tokens.utils.CardCryptoCurrenciesFactory
 import com.tangem.data.tokens.utils.NetworkStatusFactory
-import com.tangem.data.tokens.utils.ResponseCurrenciesFactory
+import com.tangem.data.tokens.utils.ResponseCryptoCurrenciesFactory
+import com.tangem.datasource.local.network.NetworksStatusesStore
 import com.tangem.datasource.local.token.UserTokensStore
 import com.tangem.datasource.local.userwallet.UserWalletsStore
+import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.demo.DemoConfig
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.Network
 import com.tangem.domain.tokens.model.NetworkStatus
-import com.tangem.domain.tokens.models.CryptoCurrency
-import com.tangem.domain.tokens.models.Network
 import com.tangem.domain.tokens.repository.NetworksRepository
 import com.tangem.domain.walletmanager.WalletManagersFacade
+import com.tangem.domain.walletmanager.model.UpdateWalletManagerResult
 import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
-import com.tangem.utils.extensions.addOrReplace
 import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.cancellable
+import kotlinx.coroutines.flow.channelFlow
+import kotlinx.coroutines.flow.collectLatest
+import timber.log.Timber
 
 internal class DefaultNetworksRepository(
+    private val networksStatusesStore: NetworksStatusesStore,
     private val walletManagersFacade: WalletManagersFacade,
     private val userWalletsStore: UserWalletsStore,
     private val userTokensStore: UserTokensStore,
@@ -28,103 +34,174 @@ internal class DefaultNetworksRepository(
 ) : NetworksRepository {
 
     private val demoConfig by lazy { DemoConfig() }
-    private val networkConverter by lazy { NetworkConverter() }
-    private val cardCurrenciesFactory by lazy { CardCurrenciesFactory(demoConfig) }
-    private val responseCurrenciesFactory by lazy { ResponseCurrenciesFactory(demoConfig) }
+    private val cardCurrenciesFactory by lazy { CardCryptoCurrenciesFactory(demoConfig) }
+    private val responseCurrenciesFactory by lazy { ResponseCryptoCurrenciesFactory() }
     private val networkStatusFactory by lazy { NetworkStatusFactory() }
 
-    private val networksStatuses: MutableStateFlow<List<NetworkStatus>> = MutableStateFlow(emptyList())
-
-    override fun getNetworks(networksIds: Set<Network.ID>): Set<Network> {
-        return networkConverter.convertSet(networksIds)
-    }
-
     override fun getNetworkStatusesUpdates(
         userWalletId: UserWalletId,
-        networks: Set<Network.ID>,
+        networks: Set<Network>,
     ): Flow<Set<NetworkStatus>> = channelFlow {
         launch(dispatchers.io) {
-            networksStatuses.collect {
-                send(it.toSet())
-            }
+            networksStatusesStore.get(userWalletId)
+                .collectLatest(::send)
         }
 
-        launch(dispatchers.io) {
-            fetchNetworksStatusesIfCacheExpired(userWalletId, networks, refresh = false)
+        withContext(dispatchers.io) {
+            fetchNetworksStatusesIfCacheExpired(userWalletId, networks, false)
+        }
+    }
+        .cancellable()
+
+    override suspend fun fetchNetworkPendingTransactions(userWalletId: UserWalletId, networks: Set<Network>) {
+        withContext(dispatchers.io) {
+            fetchNetworksPendingTransactions(userWalletId, networks)
         }
     }
 
     override suspend fun getNetworkStatusesSync(
         userWalletId: UserWalletId,
-        networks: Set<Network.ID>,
+        networks: Set<Network>,
         refresh: Boolean,
     ): Set<NetworkStatus> = withContext(dispatchers.io) {
         fetchNetworksStatusesIfCacheExpired(userWalletId, networks, refresh)
-        networksStatuses.first().toSet()
+        networksStatusesStore.getSyncOrNull(userWalletId).orEmpty()
     }
 
     private suspend fun fetchNetworksStatusesIfCacheExpired(
         userWalletId: UserWalletId,
-        networks: Set<Network.ID>,
+        networks: Set<Network>,
         refresh: Boolean,
     ) {
-        cacheRegistry.invokeOnExpire(
-            key = getNetworksStatusesCacheKey(userWalletId),
-            skipCache = refresh,
-            block = { fetchNetworksStatuses(userWalletId, networks) },
-        )
-    }
-
-    private suspend fun fetchNetworksStatuses(userWalletId: UserWalletId, networks: Set<Network.ID>) {
         coroutineScope {
             networks
-                .map { networkId ->
+                .map { network ->
                     async {
-                        fetchNetworkStatus(userWalletId, networkId)
+                        fetchNetworkStatusIfCacheExpired(userWalletId, network, refresh)
                     }
                 }
                 .awaitAll()
         }
     }
 
-    private suspend fun fetchNetworkStatus(userWalletId: UserWalletId, networkId: Network.ID) {
-        val currencies = getCurrencies(userWalletId)
-            .asSequence()
-            .filter { it.network.id == networkId }
+    private suspend fun fetchNetworksPendingTransactions(userWalletId: UserWalletId, networks: Set<Network>) {
+        coroutineScope {
+            networks
+                .map { network ->
+                    async {
+                        fetchNetworkPendingTransactions(userWalletId, network)
+                    }
+                }
+                .awaitAll()
+        }
+    }
+
+    private suspend fun fetchNetworkStatusIfCacheExpired(
+        userWalletId: UserWalletId,
+        network: Network,
+        refresh: Boolean,
+    ) {
+        cacheRegistry.invokeOnExpire(
+            key = getNetworksStatusesCacheKey(userWalletId, network),
+            skipCache = refresh,
+            block = { fetchNetworkStatus(userWalletId, network) },
+        )
+    }
+
+    private suspend fun fetchNetworkStatus(userWalletId: UserWalletId, network: Network) {
+        val currencies = getCurrencies(userWalletId, network)
 
         val result = walletManagersFacade.update(
             userWalletId = userWalletId,
-            networkId = networkId,
+            network = network,
             extraTokens = currencies.filterIsInstance<CryptoCurrency.Token>().toSet(),
         )
+
+        withContext(NonCancellable) {
+            invalidateCacheKeyIfNeeded(userWalletId, network, result)
+        }
+
         val networkStatus = networkStatusFactory.createNetworkStatus(
-            networkId = networkId,
+            network = network,
             result = result,
             currencies = currencies.toSet(),
         )
 
-        networksStatuses.update { statuses ->
-            statuses.addOrReplace(networkStatus) { it.networkId == networkStatus.networkId }
-        }
+        networksStatusesStore.store(userWalletId, networkStatus)
     }
 
-    private suspend fun getCurrencies(userWalletId: UserWalletId): List<CryptoCurrency> {
+    private suspend fun fetchNetworkPendingTransactions(userWalletId: UserWalletId, network: Network) {
+        val currencies = getCurrencies(userWalletId, network)
+
+        val result = walletManagersFacade.updatePendingTransactions(
+            userWalletId = userWalletId,
+            network = network,
+        )
+
+        withContext(NonCancellable) {
+            invalidateCacheKeyIfNeeded(userWalletId, network, result)
+        }
+
+        val networkStatus = networkStatusFactory.createNetworkStatus(
+            network = network,
+            result = result,
+            currencies = currencies.toSet(),
+        )
+
+        networksStatusesStore.store(userWalletId, networkStatus)
+    }
+
+    private suspend fun getCurrencies(userWalletId: UserWalletId, network: Network): Sequence<CryptoCurrency> {
         val userWallet = requireNotNull(userWalletsStore.getSyncOrNull(userWalletId)) {
             "Unable to find user wallet with provided ID: $userWalletId"
         }
 
-        return if (userWallet.isMultiCurrency) {
+        val currencies = if (userWallet.isMultiCurrency) {
             val response = requireNotNull(userTokensStore.getSyncOrNull(userWalletId)) {
                 "Unable to find tokens response for user wallet with provided ID: $userWalletId"
             }
 
-            responseCurrenciesFactory.createCurrencies(response, userWallet.scanResponse.card)
+            responseCurrenciesFactory.createCurrencies(response, userWallet.scanResponse).asSequence()
         } else {
-            val currency = cardCurrenciesFactory.createPrimaryCurrencyForSingleCurrencyCard(userWallet.scanResponse)
+            if (userWallet.scanResponse.cardTypesResolver.isSingleWalletWithToken()) {
+                cardCurrenciesFactory.createCurrenciesForSingleCurrencyCardWithToken(userWallet.scanResponse)
+                    .asSequence()
+            } else {
+                val currency = cardCurrenciesFactory.createPrimaryCurrencyForSingleCurrencyCard(userWallet.scanResponse)
 
-            listOf(currency)
+                sequenceOf(currency)
+            }
+        }
+
+        return currencies.filter { it.network == network }
+    }
+
+    private suspend fun invalidateCacheKeyIfNeeded(
+        userWalletId: UserWalletId,
+        network: Network,
+        result: UpdateWalletManagerResult,
+    ) {
+        when (result) {
+            is UpdateWalletManagerResult.Verified,
+            is UpdateWalletManagerResult.NoAccount,
+            -> Unit
+            is UpdateWalletManagerResult.Unreachable,
+            is UpdateWalletManagerResult.MissedDerivation,
+            -> {
+                Timber.w(
+                    """
+                        Invalidate network cache key
+                        |- User wallet ID: $userWalletId
+                        |- Network: ${network.id}
+                    """.trimIndent(),
+                )
+
+                cacheRegistry.invalidate(getNetworksStatusesCacheKey(userWalletId, network))
+            }
         }
     }
 
-    private fun getNetworksStatusesCacheKey(userWalletId: UserWalletId): String = "network_status_$userWalletId"
+    private fun getNetworksStatusesCacheKey(userWalletId: UserWalletId, network: Network): String {
+        return "network_status_${userWalletId}_${network.id.value}_${network.derivationPath.value}"
+    }
 }
\ No newline at end of file
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultQuotesRepository.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultQuotesRepository.kt
index a288240656..37a89fafd0 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultQuotesRepository.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultQuotesRepository.kt
@@ -1,18 +1,19 @@
 package com.tangem.data.tokens.repository
 
+import com.tangem.data.common.api.safeApiCall
 import com.tangem.data.common.cache.CacheRegistry
 import com.tangem.data.tokens.utils.QuotesConverter
+import com.tangem.data.tokens.utils.QuotesUnsupportedCurrenciesIdAdapter
 import com.tangem.datasource.api.tangemTech.TangemTechApi
 import com.tangem.datasource.local.appcurrency.SelectedAppCurrencyStore
 import com.tangem.datasource.local.quote.QuotesStore
-import com.tangem.domain.tokens.models.CryptoCurrency
-import com.tangem.domain.tokens.models.Quote
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.Quote
 import com.tangem.domain.tokens.repository.QuotesRepository
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import timber.log.Timber
 
 internal class DefaultQuotesRepository(
     private val tangemTechApi: TangemTechApi,
@@ -23,23 +24,22 @@ internal class DefaultQuotesRepository(
 ) : QuotesRepository {
 
     private val quotesConverter = QuotesConverter()
+    private val quotesUnsupportedCurrenciesAdapter = QuotesUnsupportedCurrenciesIdAdapter()
 
+    @Volatile
     private var quotesFetchedForAppCurrency: String? = null
 
+    @OptIn(ExperimentalCoroutinesApi::class)
     override fun getQuotesUpdates(currenciesIds: Set<CryptoCurrency.ID>): Flow<Set<Quote>> {
-        return channelFlow {
-            launch(dispatchers.io) {
-                quotesStore.get(currenciesIds)
-                    .map(quotesConverter::convertSet)
-                    .collect(::send)
-            }
+        return selectedAppCurrencyStore.get()
+            .distinctUntilChanged()
+            .flatMapLatest { appCurrency ->
+                fetchExpiredQuotes(currenciesIds, appCurrency.id, refresh = false)
 
-            launch(dispatchers.io) {
-                selectedAppCurrencyStore.get().collectLatest { appCurrency ->
-                    fetchExpiredQuotes(currenciesIds, appCurrency.id, refresh = false)
-                }
+                quotesStore.get(currenciesIds).map(quotesConverter::convertSet)
             }
-        }
+            .cancellable()
+            .flowOn(dispatchers.io)
     }
 
     override suspend fun getQuotesSync(currenciesIds: Set<CryptoCurrency.ID>, refresh: Boolean): Set<Quote> {
@@ -73,16 +73,24 @@ internal class DefaultQuotesRepository(
     }
 
     private suspend fun fetchQuotes(rawCurrenciesIds: Set<String>, appCurrencyId: String) {
-        try {
-            val response = tangemTechApi.getQuotes(
-                currencyId = appCurrencyId,
-                coinIds = rawCurrenciesIds.joinToString(separator = ","),
-            )
+        val replacementIdsResult = quotesUnsupportedCurrenciesAdapter.replaceUnsupportedCurrencies(rawCurrenciesIds)
+        val response = safeApiCall(
+            call = {
+                val coinIds = replacementIdsResult.idsForRequest.joinToString(separator = ",")
+                tangemTechApi.getQuotes(appCurrencyId, coinIds).bind()
+            },
+            onError = {
+                cacheRegistry.invalidate(rawCurrenciesIds.map(::getQuoteCacheKey))
+                null
+            },
+        )
 
-            quotesStore.store(response)
-        } catch (e: Throwable) {
-            Timber.e(e, "Unable to fetch quotes for: $rawCurrenciesIds")
-            throw e
+        if (response != null) {
+            val updatedResponse = quotesUnsupportedCurrenciesAdapter.getResponseWithUnsupportedCurrencies(
+                response,
+                replacementIdsResult.idsFiltered,
+            )
+            quotesStore.store(updatedResponse)
         }
     }
 
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/CardCryptoCurrenciesFactory.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/CardCryptoCurrenciesFactory.kt
new file mode 100644
index 0000000000..a2993452d9
--- /dev/null
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/CardCryptoCurrenciesFactory.kt
@@ -0,0 +1,85 @@
+package com.tangem.data.tokens.utils
+
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.domain.common.TapWorkarounds.isTestCard
+import com.tangem.domain.common.util.cardTypesResolver
+import com.tangem.domain.common.util.derivationStyleProvider
+import com.tangem.domain.demo.DemoConfig
+import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.domain.tokens.model.CryptoCurrency
+
+internal class CardCryptoCurrenciesFactory(private val demoConfig: DemoConfig) {
+
+    private val cryptoCurrencyFactory = CryptoCurrencyFactory()
+
+    fun createDefaultCoinsForMultiCurrencyCard(scanResponse: ScanResponse): List<CryptoCurrency.Coin> {
+        val cardDerivationStyleProvider = scanResponse.derivationStyleProvider
+        val card = scanResponse.card
+
+        var blockchains = if (demoConfig.isDemoCardId(card.cardId)) {
+            demoConfig.demoBlockchains
+        } else {
+            listOf(Blockchain.Bitcoin, Blockchain.Ethereum)
+        }
+
+        if (card.isTestCard) {
+            blockchains = blockchains.mapNotNull { it.getTestnetVersion() }
+        }
+
+        return blockchains.mapNotNull {
+            cryptoCurrencyFactory.createCoin(
+                blockchain = it,
+                extraDerivationPath = null,
+                derivationStyleProvider = cardDerivationStyleProvider,
+            )
+        }
+    }
+
+    fun createPrimaryCurrencyForSingleCurrencyCard(scanResponse: ScanResponse): CryptoCurrency {
+        val cardDerivationStyleProvider = scanResponse.derivationStyleProvider
+        val resolver = scanResponse.cardTypesResolver
+        val blockchain = resolver.getBlockchain()
+
+        val coin = cryptoCurrencyFactory.createCoin(
+            blockchain = blockchain,
+            extraDerivationPath = null,
+            derivationStyleProvider = cardDerivationStyleProvider,
+        )
+        requireNotNull(coin) { "Coin for the single currency card cannot be null" }
+
+        val primaryToken = resolver.getPrimaryToken()?.let { token ->
+            cryptoCurrencyFactory.createToken(
+                sdkToken = token,
+                blockchain = blockchain,
+                extraDerivationPath = null,
+                derivationStyleProvider = cardDerivationStyleProvider,
+            )
+        }
+
+        return primaryToken ?: coin
+    }
+
+    fun createCurrenciesForSingleCurrencyCardWithToken(scanResponse: ScanResponse): List<CryptoCurrency> {
+        val cardDerivationStyleProvider = scanResponse.derivationStyleProvider
+        val resolver = scanResponse.cardTypesResolver
+        val blockchain = resolver.getBlockchain()
+
+        val coin = cryptoCurrencyFactory.createCoin(
+            blockchain = blockchain,
+            extraDerivationPath = null,
+            derivationStyleProvider = cardDerivationStyleProvider,
+        )
+        requireNotNull(coin) { "Coin for the single currency card cannot be null" }
+
+        val primaryToken = resolver.getPrimaryToken()?.let { token ->
+            cryptoCurrencyFactory.createToken(
+                sdkToken = token,
+                blockchain = blockchain,
+                extraDerivationPath = null,
+                derivationStyleProvider = cardDerivationStyleProvider,
+            )
+        }
+
+        return listOfNotNull(coin, primaryToken)
+    }
+}
\ No newline at end of file
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/CardCurrenciesFactory.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/CardCurrenciesFactory.kt
deleted file mode 100644
index 269c65e9f7..0000000000
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/CardCurrenciesFactory.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.tangem.data.tokens.utils
-
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.domain.common.DerivationStyleProvider
-import com.tangem.domain.common.TapWorkarounds.isTestCard
-import com.tangem.domain.common.util.cardTypesResolver
-import com.tangem.domain.common.util.derivationStyleProvider
-import com.tangem.domain.demo.DemoConfig
-import com.tangem.domain.models.scan.CardDTO
-import com.tangem.domain.models.scan.ScanResponse
-import com.tangem.domain.tokens.models.CryptoCurrency
-
-internal class CardCurrenciesFactory(private val demoConfig: DemoConfig) {
-
-    private val cryptoCurrencyFactory by lazy { CryptoCurrencyFactory() }
-
-    fun createDefaultCoinsForMultiCurrencyCard(
-        card: CardDTO,
-        derivationStyleProvider: DerivationStyleProvider,
-    ): List<CryptoCurrency.Coin> {
-        var blockchains = if (demoConfig.isDemoCardId(card.cardId)) {
-            demoConfig.demoBlockchains
-        } else {
-            listOf(Blockchain.Bitcoin, Blockchain.Ethereum)
-        }
-
-        if (card.isTestCard) {
-            blockchains = blockchains.mapNotNull { it.getTestnetVersion() }
-        }
-
-        return blockchains.mapNotNull { cryptoCurrencyFactory.createCoin(it, derivationStyleProvider) }
-    }
-
-    fun createPrimaryCurrencyForSingleCurrencyCard(scanResponse: ScanResponse): CryptoCurrency {
-        val derivationStyleProvider = scanResponse.derivationStyleProvider
-        val resolver = scanResponse.cardTypesResolver
-        val blockchain = resolver.getBlockchain()
-
-        val coin = requireNotNull(cryptoCurrencyFactory.createCoin(blockchain, derivationStyleProvider)) {
-            "Coin for the single currency card cannot be null"
-        }
-        val primaryToken = resolver.getPrimaryToken()?.let { token ->
-            cryptoCurrencyFactory.createToken(token, blockchain, derivationStyleProvider)
-        }
-
-        return primaryToken ?: coin
-    }
-}
\ No newline at end of file
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/CryptoCurrencyFactory.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/CryptoCurrencyFactory.kt
index e6fff3176f..f102b2b7fa 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/CryptoCurrencyFactory.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/CryptoCurrencyFactory.kt
@@ -2,7 +2,8 @@ package com.tangem.data.tokens.utils
 
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.domain.common.DerivationStyleProvider
-import com.tangem.domain.tokens.models.CryptoCurrency
+import com.tangem.domain.common.extensions.toCoinId
+import com.tangem.domain.tokens.model.CryptoCurrency
 import timber.log.Timber
 import com.tangem.blockchain.common.Token as SdkToken
 
@@ -12,6 +13,7 @@ class CryptoCurrencyFactory {
     fun createToken(
         sdkToken: SdkToken,
         blockchain: Blockchain,
+        extraDerivationPath: String?,
         derivationStyleProvider: DerivationStyleProvider,
     ): CryptoCurrency.Token? {
         if (blockchain == Blockchain.Unknown) {
@@ -19,35 +21,40 @@ class CryptoCurrencyFactory {
             return null
         }
 
-        val id = getTokenId(blockchain, sdkToken)
+        val network = getNetwork(blockchain, extraDerivationPath, derivationStyleProvider) ?: return null
+        val id = getTokenId(network, sdkToken)
 
         return CryptoCurrency.Token(
             id = id,
-            network = getNetwork(blockchain) ?: return null,
+            network = network,
             name = sdkToken.name,
             symbol = sdkToken.symbol,
             iconUrl = getTokenIconUrl(blockchain, sdkToken),
             decimals = sdkToken.decimals,
-            isCustom = isCustomToken(id),
+            isCustom = isCustomToken(id, network),
             contractAddress = sdkToken.contractAddress,
-            derivationPath = getDerivationPath(blockchain, derivationStyleProvider),
         )
     }
 
-    fun createCoin(blockchain: Blockchain, derivationStyleProvider: DerivationStyleProvider): CryptoCurrency.Coin? {
+    fun createCoin(
+        blockchain: Blockchain,
+        extraDerivationPath: String?,
+        derivationStyleProvider: DerivationStyleProvider,
+    ): CryptoCurrency.Coin? {
         if (blockchain == Blockchain.Unknown) {
             Timber.e("Unable to map the SDK token to the domain token with Unknown blockchain")
             return null
         }
+        val network = getNetwork(blockchain, extraDerivationPath, derivationStyleProvider) ?: return null
 
         return CryptoCurrency.Coin(
-            id = getCoinId(blockchain),
-            network = getNetwork(blockchain) ?: return null,
+            id = getCoinId(network, blockchain.toCoinId()),
+            network = network,
             name = blockchain.fullName,
             symbol = blockchain.currency,
             iconUrl = getCoinIconUrl(blockchain),
             decimals = blockchain.decimals(),
-            derivationPath = getDerivationPath(blockchain, derivationStyleProvider),
+            isCustom = isCustomCoin(network),
         )
     }
 }
\ No newline at end of file
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/NetworkConverter.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/NetworkConverter.kt
deleted file mode 100644
index 6c57906a38..0000000000
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/NetworkConverter.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.tangem.data.tokens.utils
-
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.domain.tokens.models.Network
-import com.tangem.utils.converter.Converter
-
-internal class NetworkConverter : Converter<Network.ID, Network?> {
-
-    override fun convert(value: Network.ID): Network? {
-        val blockchain = Blockchain.fromId(value.value)
-
-        return getNetwork(blockchain)
-    }
-
-    override fun convertList(input: Collection<Network.ID>): List<Network> {
-        return input.mapNotNull(::convert)
-    }
-
-    override fun convertSet(input: Collection<Network.ID>): Set<Network> {
-        return input.mapNotNullTo(hashSetOf(), ::convert)
-    }
-}
\ No newline at end of file
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/NetworkOperations.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/NetworkOperations.kt
index 3a536a46ed..5e87555133 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/NetworkOperations.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/NetworkOperations.kt
@@ -1,10 +1,19 @@
 package com.tangem.data.tokens.utils
 
 import com.tangem.blockchain.common.Blockchain
-import com.tangem.domain.tokens.models.Network
+import com.tangem.domain.common.DerivationStyleProvider
+import com.tangem.domain.tokens.model.Network
 import timber.log.Timber
 
-internal fun getNetwork(blockchain: Blockchain): Network? {
+internal fun getBlockchain(networkId: Network.ID): Blockchain {
+    return Blockchain.fromId(networkId.value)
+}
+
+internal fun getNetwork(
+    blockchain: Blockchain,
+    extraDerivationPath: String?,
+    derivationStyleProvider: DerivationStyleProvider,
+): Network? {
     if (blockchain == Blockchain.Unknown) {
         Timber.e("Unable to convert Unknown blockchain to the domain network model")
         return null
@@ -14,10 +23,33 @@ internal fun getNetwork(blockchain: Blockchain): Network? {
         id = Network.ID(blockchain.id),
         name = blockchain.fullName,
         isTestnet = blockchain.isTestnet(),
+        derivationPath = getNetworkDerivationPath(blockchain, extraDerivationPath, derivationStyleProvider),
         standardType = getNetworkStandardType(blockchain),
     )
 }
 
+private fun getNetworkDerivationPath(
+    blockchain: Blockchain,
+    extraDerivationPath: String?,
+    cardDerivationStyleProvider: DerivationStyleProvider,
+): Network.DerivationPath {
+    val defaultDerivationPath = getDefaultDerivationPath(blockchain, cardDerivationStyleProvider)
+
+    return if (extraDerivationPath.isNullOrBlank()) {
+        if (defaultDerivationPath.isNullOrBlank()) {
+            Network.DerivationPath.None
+        } else {
+            Network.DerivationPath.Card(defaultDerivationPath)
+        }
+    } else {
+        if (extraDerivationPath == defaultDerivationPath) {
+            Network.DerivationPath.Card(defaultDerivationPath)
+        } else {
+            Network.DerivationPath.Custom(extraDerivationPath)
+        }
+    }
+}
+
 private fun getNetworkStandardType(blockchain: Blockchain): Network.StandardType {
     return when (blockchain) {
         Blockchain.Ethereum, Blockchain.EthereumTestnet -> Network.StandardType.ERC20
@@ -26,4 +58,11 @@ private fun getNetworkStandardType(blockchain: Blockchain): Network.StandardType
         Blockchain.Tron, Blockchain.TronTestnet -> Network.StandardType.TRC20
         else -> Network.StandardType.Unspecified(blockchain.name)
     }
+}
+
+private fun getDefaultDerivationPath(
+    blockchain: Blockchain,
+    derivationStyleProvider: DerivationStyleProvider,
+): String? {
+    return blockchain.derivationPath(derivationStyleProvider.getDerivationStyle())?.rawPath
 }
\ No newline at end of file
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/NetworkStatusFactory.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/NetworkStatusFactory.kt
index 0127ed7330..3f0be2bd6f 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/NetworkStatusFactory.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/NetworkStatusFactory.kt
@@ -1,37 +1,36 @@
 package com.tangem.data.tokens.utils
 
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.Network
 import com.tangem.domain.tokens.model.NetworkAddress
 import com.tangem.domain.tokens.model.NetworkStatus
-import com.tangem.domain.tokens.model.PendingTransaction
-import com.tangem.domain.tokens.models.CryptoCurrency
-import com.tangem.domain.tokens.models.Network
+import com.tangem.domain.txhistory.models.TxHistoryItem
 import com.tangem.domain.walletmanager.model.CryptoCurrencyAmount
 import com.tangem.domain.walletmanager.model.CryptoCurrencyTransaction
 import com.tangem.domain.walletmanager.model.UpdateWalletManagerResult
 import timber.log.Timber
-import java.math.BigDecimal
 
 internal class NetworkStatusFactory {
 
     fun createNetworkStatus(
-        networkId: Network.ID,
+        network: Network,
         result: UpdateWalletManagerResult,
         currencies: Set<CryptoCurrency>,
     ): NetworkStatus {
         return NetworkStatus(
-            networkId = networkId,
+            network = network,
             value = when (result) {
                 is UpdateWalletManagerResult.MissedDerivation -> NetworkStatus.MissedDerivation
                 is UpdateWalletManagerResult.Unreachable -> NetworkStatus.Unreachable
                 is UpdateWalletManagerResult.NoAccount -> NetworkStatus.NoAccount(
                     address = getNetworkAddress(result.defaultAddress, result.addresses),
                     amountToCreateAccount = result.amountToCreateAccount,
+                    errorMessage = result.errorMessage,
                 )
                 is UpdateWalletManagerResult.Verified -> NetworkStatus.Verified(
                     address = getNetworkAddress(result.defaultAddress, result.addresses),
                     amounts = formatAmounts(result.currenciesAmounts, currencies),
                     pendingTransactions = formatTransactions(
-                        networksAddresses = result.addresses,
                         transactions = result.currentTransactions,
                         currencies = currencies,
                     ),
@@ -43,34 +42,33 @@ internal class NetworkStatusFactory {
     private fun formatAmounts(
         amounts: Set<CryptoCurrencyAmount>,
         currencies: Set<CryptoCurrency>,
-    ): Map<CryptoCurrency.ID, BigDecimal> {
-        return amounts
-            .asSequence()
-            .mapNotNull { amount ->
-                val currency = when (amount) {
-                    is CryptoCurrencyAmount.Coin -> currencies.singleOrNull { it is CryptoCurrency.Coin }
-                    is CryptoCurrencyAmount.Token -> currencies.firstOrNull {
-                        it is CryptoCurrency.Token &&
-                            it.id.rawCurrencyId == amount.tokenId &&
-                            it.contractAddress == amount.tokenContractAddress
+    ): Map<CryptoCurrency.ID, NetworkStatus.AmountStatus> {
+        return currencies.associate { currency ->
+            val amount = when (currency) {
+                is CryptoCurrency.Coin -> {
+                    amounts.singleOrNull { it is CryptoCurrencyAmount.Coin }
+                }
+                is CryptoCurrency.Token -> {
+                    amounts.firstOrNull { amount ->
+                        amount is CryptoCurrencyAmount.Token &&
+                            currency.id.rawCurrencyId == amount.tokenId &&
+                            currency.contractAddress == amount.tokenContractAddress
                     }
                 }
-
-                if (currency == null) {
-                    Timber.e("Unable to find cryptocurrency for amount: $amount")
-                    null
-                } else {
-                    currency.id to amount.value
-                }
             }
-            .toMap()
+            if (amount == null) {
+                Timber.e("Unable to find amount for cryptoCurrency: $currency")
+                currency.id to NetworkStatus.UnreachableAmount
+            } else {
+                currency.id to NetworkStatus.LoadedAmount(amount.value)
+            }
+        }
     }
 
     private fun formatTransactions(
-        networksAddresses: Set<String>,
         transactions: Set<CryptoCurrencyTransaction>,
         currencies: Set<CryptoCurrency>,
-    ): Map<CryptoCurrency.ID, Set<PendingTransaction>> {
+    ): Map<CryptoCurrency.ID, Set<TxHistoryItem>> {
         if (transactions.isEmpty()) return emptyMap()
 
         return currencies
@@ -87,48 +85,13 @@ internal class NetworkStatusFactory {
                     }
                 }
 
-                currency.id to createCurrentTransactions(networksAddresses, currencyTransactions)
+                currency.id to createCurrentTransactions(currencyTransactions)
             }
             .toMap()
     }
 
-    private fun createCurrentTransactions(
-        networksAddresses: Set<String>,
-        transactions: Set<CryptoCurrencyTransaction>,
-    ): Set<PendingTransaction> {
-        return transactions.mapNotNullTo(hashSetOf()) { createCurrentTransaction(networksAddresses, it) }
-    }
-
-    private fun createCurrentTransaction(
-        networksAddresses: Set<String>,
-        transaction: CryptoCurrencyTransaction,
-    ): PendingTransaction? {
-        val direction = when {
-            transaction.toAddress in networksAddresses -> PendingTransaction.Direction.Incoming(
-                fromAddress = transaction.fromAddress,
-            )
-            transaction.fromAddress in networksAddresses -> PendingTransaction.Direction.Outgoing(
-                toAddress = transaction.toAddress,
-            )
-            else -> {
-                Timber.e(
-                    """
-                    Unable to find transaction direction
-                    |- To address: ${transaction.toAddress}
-                    |- From address: ${transaction.fromAddress}
-                    |- Network addresses: $networksAddresses
-                    """.trimIndent(),
-                )
-
-                return null
-            }
-        }
-
-        return PendingTransaction(
-            amount = transaction.amount,
-            direction = direction,
-            sentAt = transaction.sentAt,
-        )
+    private fun createCurrentTransactions(transactions: Set<CryptoCurrencyTransaction>): Set<TxHistoryItem> {
+        return transactions.mapTo(hashSetOf()) { it.txHistoryItem }
     }
 
     private fun getNetworkAddress(defaultAddress: String, availableAddresses: Set<String>): NetworkAddress {
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/QuotesConverter.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/QuotesConverter.kt
index b771150c67..d76681efa4 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/QuotesConverter.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/QuotesConverter.kt
@@ -1,8 +1,9 @@
 package com.tangem.data.tokens.utils
 
 import com.tangem.datasource.local.quote.model.StoredQuote
-import com.tangem.domain.tokens.models.Quote
+import com.tangem.domain.tokens.model.Quote
 import com.tangem.utils.converter.Converter
+import java.math.BigDecimal
 
 internal class QuotesConverter : Converter<StoredQuote, Quote> {
 
@@ -11,8 +12,8 @@ internal class QuotesConverter : Converter<StoredQuote, Quote> {
 
         return Quote(
             rawCurrencyId = rawCurrencyId,
-            fiatRate = responseQuote.price,
-            priceChange = responseQuote.priceChange.movePointLeft(2),
+            fiatRate = responseQuote.price ?: BigDecimal.ZERO,
+            priceChange = (responseQuote.priceChange ?: BigDecimal.ZERO).movePointLeft(2),
         )
     }
 }
\ No newline at end of file
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/QuotesUnsupportedCurrenciesIdAdapter.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/QuotesUnsupportedCurrenciesIdAdapter.kt
new file mode 100644
index 0000000000..a038b0be78
--- /dev/null
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/QuotesUnsupportedCurrenciesIdAdapter.kt
@@ -0,0 +1,56 @@
+package com.tangem.data.tokens.utils
+
+import com.tangem.datasource.api.tangemTech.models.QuotesResponse
+
+/**
+ * Adapter to replace unsupported currencies for quotes request if it necessary
+ */
+internal class QuotesUnsupportedCurrenciesIdAdapter {
+
+    /**
+     * Replaces unsupported currencies id to it replacements for request
+     */
+    fun replaceUnsupportedCurrencies(currenciesIds: Set<String>): ReplacementResult {
+        val idsForRequest = mutableSetOf<String>()
+        val idsFiltered = mutableSetOf<String>()
+        currenciesIds.forEach { currencyId ->
+            val replacementId = UNSUPPORTED_IDS_WITH_REPLACEMENTS[currencyId]
+            if (replacementId != null) {
+                idsFiltered.add(currencyId)
+                idsForRequest.add(replacementId)
+            } else {
+                idsForRequest.add(currencyId)
+            }
+        }
+        return ReplacementResult(idsForRequest = idsForRequest, idsFiltered = idsFiltered)
+    }
+
+    /**
+     * Recover previously replaced currencies to response that uses in application
+     */
+    fun getResponseWithUnsupportedCurrencies(response: QuotesResponse, filteredIds: Set<String>): QuotesResponse {
+        val updatedQuotes = mutableMapOf<String, QuotesResponse.Quote>()
+        filteredIds.forEach { filteredId ->
+            val replacementId = UNSUPPORTED_IDS_WITH_REPLACEMENTS[filteredId]
+            if (replacementId != null) {
+                val quoteReplacement = response.quotes[replacementId]
+                if (quoteReplacement != null) {
+                    updatedQuotes[filteredId] = quoteReplacement
+                }
+            }
+        }
+        return response.copy(quotes = updatedQuotes + response.quotes)
+    }
+
+    data class ReplacementResult(val idsForRequest: Set<String>, val idsFiltered: Set<String>)
+
+    companion object {
+        /**
+         * Map that contains unsupported currencies and their replacement for request
+         */
+        private val UNSUPPORTED_IDS_WITH_REPLACEMENTS = mapOf(
+            "optimistic-ethereum" to "ethereum",
+            "arbitrum-one" to "ethereum",
+        )
+    }
+}
\ No newline at end of file
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/ResponseCryptoCurrenciesFactory.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/ResponseCryptoCurrenciesFactory.kt
new file mode 100644
index 0000000000..8f29419fc8
--- /dev/null
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/ResponseCryptoCurrenciesFactory.kt
@@ -0,0 +1,120 @@
+package com.tangem.data.tokens.utils
+
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchain.common.Token
+import com.tangem.datasource.api.tangemTech.models.UserTokensResponse
+import com.tangem.domain.common.DerivationStyleProvider
+import com.tangem.domain.common.TapWorkarounds.isTestCard
+import com.tangem.domain.common.extensions.fromNetworkId
+import com.tangem.domain.common.extensions.toCoinId
+import com.tangem.domain.common.extensions.toNetworkId
+import com.tangem.domain.common.util.derivationStyleProvider
+import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.domain.tokens.model.CryptoCurrency
+import timber.log.Timber
+import com.tangem.blockchain.common.Token as SdkToken
+
+internal class ResponseCryptoCurrenciesFactory {
+
+    fun createCurrency(
+        currencyId: CryptoCurrency.ID,
+        response: UserTokensResponse,
+        scanResponse: ScanResponse,
+        derivationPath: String?,
+    ): CryptoCurrency {
+        val responseTokenId = currencyId.rawCurrencyId
+        val networkId = Blockchain.fromId(currencyId.rawNetworkId).toNetworkId()
+
+        val token = requireNotNull(
+            value = response.tokens
+                .find { it.id == responseTokenId && it.networkId == networkId && it.derivationPath == derivationPath },
+            lazyMessage = { "Unable find a token with provided TokenID($responseTokenId) and NetworkID($networkId)" },
+        )
+
+        return requireNotNull(createCurrency(token, scanResponse)) {
+            "Unable to create a currency with provided ID: $currencyId"
+        }
+    }
+
+    fun createCurrencies(response: UserTokensResponse, scanResponse: ScanResponse): List<CryptoCurrency> {
+        return response.tokens
+            .asSequence()
+            .mapNotNull { createCurrency(it, scanResponse) }
+            .distinctBy { it.id }
+            .toList()
+    }
+
+    fun createCurrency(responseToken: UserTokensResponse.Token, scanResponse: ScanResponse): CryptoCurrency? {
+        var blockchain = Blockchain.fromNetworkId(responseToken.networkId)
+        if (blockchain == null || blockchain == Blockchain.Unknown) {
+            Timber.e("Unable to find a blockchain with the network ID: ${responseToken.networkId}")
+            return null
+        }
+
+        val cardDerivationStyleProvider = scanResponse.derivationStyleProvider
+        val card = scanResponse.card
+
+        if (card.isTestCard) {
+            blockchain = blockchain.getTestnetVersion() ?: blockchain
+        }
+
+        val sdkToken = createSdkToken(responseToken)
+        return if (sdkToken == null) {
+            createCoin(blockchain, responseToken, cardDerivationStyleProvider)
+        } else {
+            createToken(blockchain, sdkToken, responseToken.derivationPath, cardDerivationStyleProvider)
+        }
+    }
+
+    private fun createSdkToken(token: UserTokensResponse.Token): SdkToken? {
+        return token.contractAddress?.let { contractAddress ->
+            SdkToken(
+                name = token.name,
+                symbol = token.symbol,
+                contractAddress = contractAddress,
+                decimals = token.decimals,
+                id = token.id,
+            )
+        }
+    }
+
+    private fun createCoin(
+        blockchain: Blockchain,
+        responseToken: UserTokensResponse.Token,
+        derivationStyleProvider: DerivationStyleProvider,
+    ): CryptoCurrency.Coin? {
+        val network = getNetwork(blockchain, responseToken.derivationPath, derivationStyleProvider) ?: return null
+
+        return CryptoCurrency.Coin(
+            id = getCoinId(network, blockchain.toCoinId()),
+            network = network,
+            name = responseToken.name,
+            symbol = responseToken.symbol,
+            decimals = responseToken.decimals,
+            iconUrl = getCoinIconUrl(blockchain),
+            isCustom = isCustomCoin(network),
+        )
+    }
+
+    private fun createToken(
+        blockchain: Blockchain,
+        sdkToken: Token,
+        responseDerivationPath: String?,
+        derivationStyleProvider: DerivationStyleProvider,
+    ): CryptoCurrency.Token? {
+        val network = getNetwork(blockchain, responseDerivationPath, derivationStyleProvider)
+            ?: return null
+        val id = getTokenId(network, sdkToken)
+
+        return CryptoCurrency.Token(
+            id = id,
+            network = network,
+            name = sdkToken.name,
+            symbol = sdkToken.symbol,
+            decimals = sdkToken.decimals,
+            iconUrl = getTokenIconUrl(blockchain, sdkToken),
+            contractAddress = sdkToken.contractAddress,
+            isCustom = isCustomToken(id, network),
+        )
+    }
+}
\ No newline at end of file
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/ResponseCurrenciesFactory.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/ResponseCurrenciesFactory.kt
deleted file mode 100644
index f3e7832865..0000000000
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/ResponseCurrenciesFactory.kt
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.tangem.data.tokens.utils
-
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.blockchain.common.Token
-import com.tangem.datasource.api.tangemTech.models.UserTokensResponse
-import com.tangem.domain.common.extensions.fromNetworkId
-import com.tangem.domain.demo.DemoConfig
-import com.tangem.domain.models.scan.CardDTO
-import com.tangem.domain.tokens.models.CryptoCurrency
-import timber.log.Timber
-import com.tangem.blockchain.common.Token as SdkToken
-
-internal class ResponseCurrenciesFactory(private val demoConfig: DemoConfig) {
-
-    fun createCurrency(currencyId: CryptoCurrency.ID, response: UserTokensResponse, card: CardDTO): CryptoCurrency {
-        val responseTokenId = currencyId.rawCurrencyId
-
-        val token = requireNotNull(response.tokens.firstOrNull { it.id == responseTokenId }) {
-            "Unable find a token with provided ID: $responseTokenId"
-        }
-
-        return requireNotNull(createCurrency(token, card)) {
-            "Unable to create a currency with provided ID: $currencyId"
-        }
-    }
-
-    fun createCurrencies(response: UserTokensResponse, card: CardDTO): List<CryptoCurrency> {
-        return response.tokens.mapNotNull { createCurrency(it, card) }
-    }
-
-    private fun createCurrency(responseToken: UserTokensResponse.Token, card: CardDTO): CryptoCurrency? {
-        var blockchain = Blockchain.fromNetworkId(responseToken.networkId)
-        if (blockchain == null || blockchain == Blockchain.Unknown) {
-            Timber.e("Unable to find a blockchain with the network ID: ${responseToken.networkId}")
-            return null
-        }
-
-        if (demoConfig.isDemoCardId(card.cardId)) {
-            blockchain = blockchain.getTestnetVersion() ?: blockchain
-        }
-
-        val sdkToken = createSdkToken(responseToken)
-        return if (sdkToken == null) {
-            createCoin(blockchain, responseToken)
-        } else {
-            createToken(blockchain, sdkToken, responseToken.derivationPath)
-        }
-    }
-
-    private fun createSdkToken(token: UserTokensResponse.Token): SdkToken? {
-        return token.contractAddress?.let { contractAddress ->
-            SdkToken(
-                name = token.name,
-                symbol = token.symbol,
-                contractAddress = contractAddress,
-                decimals = token.decimals,
-                id = token.id,
-            )
-        }
-    }
-
-    private fun createCoin(blockchain: Blockchain, responseToken: UserTokensResponse.Token): CryptoCurrency.Coin? {
-        return CryptoCurrency.Coin(
-            id = getCoinId(blockchain),
-            network = getNetwork(blockchain) ?: return null,
-            name = responseToken.name,
-            symbol = responseToken.symbol,
-            decimals = responseToken.decimals,
-            derivationPath = responseToken.derivationPath,
-            iconUrl = getCoinIconUrl(blockchain),
-        )
-    }
-
-    private fun createToken(blockchain: Blockchain, sdkToken: Token, derivationPath: String?): CryptoCurrency.Token? {
-        val id = getTokenId(blockchain, sdkToken)
-
-        return CryptoCurrency.Token(
-            id = id,
-            network = getNetwork(blockchain) ?: return null,
-            name = sdkToken.name,
-            symbol = sdkToken.symbol,
-            decimals = sdkToken.decimals,
-            derivationPath = derivationPath,
-            iconUrl = getTokenIconUrl(blockchain, sdkToken),
-            contractAddress = sdkToken.contractAddress,
-            isCustom = isCustomToken(id),
-        )
-    }
-}
\ No newline at end of file
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/TokensOperations.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/TokensOperations.kt
index a95d6efa08..13dcd79a67 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/TokensOperations.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/TokensOperations.kt
@@ -2,40 +2,44 @@ package com.tangem.data.tokens.utils
 
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.IconsUtil
-import com.tangem.domain.common.DerivationStyleProvider
+import com.tangem.datasource.api.tangemTech.models.UserTokensResponse
 import com.tangem.domain.common.extensions.toCoinId
 import com.tangem.domain.common.extensions.toNetworkId
-import com.tangem.domain.tokens.models.CryptoCurrency.ID
-import com.tangem.domain.tokens.models.Network
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.CryptoCurrency.ID
+import com.tangem.domain.tokens.model.Network
 import com.tangem.blockchain.common.Token as SdkToken
-import com.tangem.domain.tokens.models.CryptoCurrency.ID.Prefix.COIN_PREFIX as COIN_ID_PREFIX
-import com.tangem.domain.tokens.models.CryptoCurrency.ID.Prefix.CUSTOM_TOKEN_PREFIX as CUSTOM_TOKEN_ID_PREFIX
-import com.tangem.domain.tokens.models.CryptoCurrency.ID.Prefix.TOKEN_PREFIX as TOKEN_ID_PREFIX
-import com.tangem.domain.tokens.models.CryptoCurrency.ID.Suffix.ContractAddress as CustomCurrencyIdSuffix
-import com.tangem.domain.tokens.models.CryptoCurrency.ID.Suffix.RawID as CurrencyIdSuffix
+import com.tangem.domain.tokens.model.CryptoCurrency.ID.Body as CurrencyIdBody
+import com.tangem.domain.tokens.model.CryptoCurrency.ID.Prefix.COIN_PREFIX as COIN_ID_PREFIX
+import com.tangem.domain.tokens.model.CryptoCurrency.ID.Prefix.TOKEN_PREFIX as TOKEN_ID_PREFIX
+import com.tangem.domain.tokens.model.CryptoCurrency.ID.Suffix.ContractAddress as CustomCurrencyIdSuffix
+import com.tangem.domain.tokens.model.CryptoCurrency.ID.Suffix.RawID as CurrencyIdSuffix
 
 private const val DEFAULT_TOKENS_ICONS_HOST = "https://s3.eu-central-1.amazonaws.com/tangem.api/coins"
 private const val TOKEN_ICON_SIZE = "large"
 private const val TOKEN_ICON_EXT = "png"
 
-internal fun isCustomToken(tokenId: ID): Boolean {
-    return tokenId.rawCurrencyId == null
+internal fun isCustomToken(tokenId: ID, network: Network): Boolean {
+    return network.derivationPath is Network.DerivationPath.Custom || tokenId.rawCurrencyId == null
 }
 
-internal fun getDerivationPath(blockchain: Blockchain, derivationStyleProvider: DerivationStyleProvider): String? {
-    return blockchain.derivationPath(derivationStyleProvider.getDerivationStyle())?.rawPath
+internal fun isCustomCoin(network: Network): Boolean {
+    return network.derivationPath is Network.DerivationPath.Custom
 }
 
-internal fun getBlockchain(networkId: Network.ID): Blockchain {
-    return Blockchain.fromId(networkId.value)
+internal fun getCoinId(network: Network, coinId: String): ID {
+    return ID(COIN_ID_PREFIX, getCurrencyIdBody(network), CurrencyIdSuffix(rawId = coinId))
 }
 
-internal fun getCoinId(blockchain: Blockchain): ID {
-    return getTokenOrCoinId(blockchain, token = null)
-}
+internal fun getTokenId(network: Network, sdkToken: SdkToken): ID {
+    val sdkTokenId = sdkToken.id
+    val suffix = if (sdkTokenId == null) {
+        CustomCurrencyIdSuffix(contractAddress = sdkToken.contractAddress)
+    } else {
+        CurrencyIdSuffix(rawId = sdkTokenId, contractAddress = sdkToken.contractAddress)
+    }
 
-internal fun getTokenId(blockchain: Blockchain, token: SdkToken): ID {
-    return getTokenOrCoinId(blockchain, token)
+    return ID(TOKEN_ID_PREFIX, getCurrencyIdBody(network), suffix)
 }
 
 internal fun getTokenIconUrl(blockchain: Blockchain, token: SdkToken): String? {
@@ -51,22 +55,31 @@ internal fun getTokenIconUrl(blockchain: Blockchain, token: SdkToken): String? {
 internal fun getCoinIconUrl(blockchain: Blockchain): String? {
     val coinId = when (blockchain) {
         Blockchain.Unknown -> null
-        Blockchain.TerraV1, Blockchain.TerraV2 -> blockchain.toCoinId()
+        Blockchain.TerraV1, Blockchain.TerraV2, Blockchain.Near -> blockchain.toCoinId()
         else -> blockchain.toNetworkId()
     }
 
     return coinId?.let(::getTokenIconUrlFromDefaultHost)
 }
 
-private fun getTokenOrCoinId(blockchain: Blockchain, token: SdkToken?): ID {
-    val sdkTokenId = token?.id
-    val (prefix, suffix) = when {
-        token == null -> COIN_ID_PREFIX to CurrencyIdSuffix(rawId = blockchain.toCoinId())
-        sdkTokenId == null -> CUSTOM_TOKEN_ID_PREFIX to CustomCurrencyIdSuffix(contractAddress = token.contractAddress)
-        else -> TOKEN_ID_PREFIX to CurrencyIdSuffix(rawId = sdkTokenId)
+internal fun List<UserTokensResponse.Token>.hasCoinForToken(token: CryptoCurrency.Token): Boolean {
+    return any {
+        val blockchain = getBlockchain(networkId = token.network.id)
+        val tokenDerivation = token.network.derivationPath.value
+        it.id == blockchain.toCoinId() && it.derivationPath == tokenDerivation
     }
+}
 
-    return ID(prefix, Network.ID(blockchain.id), suffix)
+private fun getCurrencyIdBody(network: Network): CurrencyIdBody {
+    return when (val path = network.derivationPath) {
+        is Network.DerivationPath.Custom -> CurrencyIdBody.NetworkIdWithDerivationPath(
+            rawId = network.id.value,
+            derivationPath = path.value,
+        )
+        is Network.DerivationPath.Card,
+        is Network.DerivationPath.None,
+        -> CurrencyIdBody.NetworkId(network.id.value)
+    }
 }
 
 private fun getTokenIconUrlFromDefaultHost(tokenId: String): String {
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/UserTokensBackwardCompatibility.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/UserTokensBackwardCompatibility.kt
new file mode 100644
index 0000000000..db1650880f
--- /dev/null
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/UserTokensBackwardCompatibility.kt
@@ -0,0 +1,37 @@
+package com.tangem.data.tokens.utils
+
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.datasource.api.tangemTech.models.UserTokensResponse
+import com.tangem.domain.common.extensions.fromNetworkId
+import com.tangem.domain.common.extensions.toCoinId
+
+/**
+ * Helper to apply compatibility changes for [UserTokensResponse] to support old saved tokens
+ * in new application with new IDs
+ */
+internal class UserTokensBackwardCompatibility {
+
+    fun applyCompatibilityAndGetUpdated(userTokensResponse: UserTokensResponse): UserTokensResponse {
+        return userTokensResponse.copy(
+            tokens = userTokensResponse.tokens.map { token ->
+                val oldSavedId = NETWORKS_TO_OLD_SAVED_IDS[token.networkId]
+                if (oldSavedId != null && token.id == oldSavedId) {
+                    Blockchain.fromNetworkId(token.networkId)?.let { blockchain ->
+                        token.copy(
+                            id = blockchain.toCoinId(),
+                        )
+                    } ?: token
+                } else {
+                    token
+                }
+            },
+        )
+    }
+
+    companion object {
+        private val NETWORKS_TO_OLD_SAVED_IDS = mapOf(
+            "optimistic-ethereum" to "ethereum",
+            "arbitrum-one" to "ethereum",
+        )
+    }
+}
\ No newline at end of file
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/UserTokensResponseFactory.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/UserTokensResponseFactory.kt
index c6cbc7f858..6f752af1a6 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/UserTokensResponseFactory.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/UserTokensResponseFactory.kt
@@ -2,7 +2,7 @@ package com.tangem.data.tokens.utils
 
 import com.tangem.datasource.api.tangemTech.models.UserTokensResponse
 import com.tangem.domain.common.extensions.toNetworkId
-import com.tangem.domain.tokens.models.CryptoCurrency
+import com.tangem.domain.tokens.model.CryptoCurrency
 
 internal class UserTokensResponseFactory {
 
@@ -32,7 +32,7 @@ internal class UserTokensResponseFactory {
         return UserTokensResponse.Token(
             id = currency.id.rawCurrencyId,
             networkId = blockchain.toNetworkId(),
-            derivationPath = currency.derivationPath,
+            derivationPath = currency.network.derivationPath.value,
             name = currency.name,
             symbol = currency.symbol,
             decimals = currency.decimals,
diff --git a/data/txhistory/build.gradle.kts b/data/txhistory/build.gradle.kts
index 7ffda888cc..2b5b2f8165 100644
--- a/data/txhistory/build.gradle.kts
+++ b/data/txhistory/build.gradle.kts
@@ -10,6 +10,8 @@ android {
 }
 
 dependencies {
+    implementation(projects.data.common)
+
     implementation(projects.core.utils)
     implementation(projects.core.datasource)
     implementation(projects.domain.legacy)
@@ -20,7 +22,9 @@ dependencies {
 
     implementation(deps.kotlin.coroutines)
     implementation(deps.androidx.paging.runtime)
-    implementation(deps.arrow.core)
+    implementation(deps.timber)
+    implementation(deps.jodatime)
+    implementation(deps.tangem.blockchain)
 
     implementation(deps.hilt.core)
     kapt(deps.hilt.kapt)
diff --git a/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/di/TxHistoryDataModule.kt b/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/di/TxHistoryDataModule.kt
index da8b08603c..27f3b8e7bb 100644
--- a/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/di/TxHistoryDataModule.kt
+++ b/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/di/TxHistoryDataModule.kt
@@ -1,6 +1,8 @@
 package com.tangem.data.txhistory.di
 
+import com.tangem.data.common.cache.CacheRegistry
 import com.tangem.data.txhistory.repository.DefaultTxHistoryRepository
+import com.tangem.datasource.local.txhistory.TxHistoryItemsStore
 import com.tangem.datasource.local.userwallet.UserWalletsStore
 import com.tangem.domain.txhistory.repository.TxHistoryRepository
 import com.tangem.domain.walletmanager.WalletManagersFacade
@@ -17,10 +19,14 @@ internal object TxHistoryDataModule {
     @Provides
     @Singleton
     fun provideTxHistoryRepository(
+        cacheRegistry: CacheRegistry,
         walletManagersFacade: WalletManagersFacade,
         userWalletsStore: UserWalletsStore,
+        txHistoryItemsStore: TxHistoryItemsStore,
     ): TxHistoryRepository = DefaultTxHistoryRepository(
-        walletManagersFacade = walletManagersFacade,
-        userWalletsStore = userWalletsStore,
+        cacheRegistry,
+        walletManagersFacade,
+        userWalletsStore,
+        txHistoryItemsStore,
     )
 }
\ No newline at end of file
diff --git a/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/DefaultTxHistoryRepository.kt b/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/DefaultTxHistoryRepository.kt
index a042400894..0e2cd53343 100644
--- a/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/DefaultTxHistoryRepository.kt
+++ b/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/DefaultTxHistoryRepository.kt
@@ -3,64 +3,75 @@ package com.tangem.data.txhistory.repository
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.data.common.cache.CacheRegistry
 import com.tangem.data.txhistory.repository.paging.TxHistoryPagingSource
+import com.tangem.datasource.local.txhistory.TxHistoryItemsStore
 import com.tangem.datasource.local.userwallet.UserWalletsStore
-import com.tangem.domain.tokens.models.Network
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.Network
 import com.tangem.domain.txhistory.models.TxHistoryItem
 import com.tangem.domain.txhistory.models.TxHistoryState
 import com.tangem.domain.txhistory.models.TxHistoryStateError
 import com.tangem.domain.txhistory.repository.TxHistoryRepository
 import com.tangem.domain.walletmanager.WalletManagersFacade
 import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.wallets.models.UserWalletId
 import kotlinx.coroutines.flow.Flow
 
 class DefaultTxHistoryRepository(
+    private val cacheRegistry: CacheRegistry,
     private val walletManagersFacade: WalletManagersFacade,
     private val userWalletsStore: UserWalletsStore,
+    private val txHistoryItemsStore: TxHistoryItemsStore,
 ) : TxHistoryRepository {
 
-    override suspend fun getTxHistoryItemsCount(networkId: Network.ID, derivationPath: String?): Int {
-        val userWallet = getUserWallet()
+    override suspend fun getTxHistoryItemsCount(userWalletId: UserWalletId, network: Network): Int {
+        val userWallet = getUserWallet(userWalletId)
         val state = walletManagersFacade.getTxHistoryState(
             userWalletId = userWallet.walletId,
-            networkId = networkId,
-            rawDerivationPath = derivationPath,
+            network = network,
         )
         return when (state) {
             is TxHistoryState.Failed.FetchError -> throw TxHistoryStateError.DataError(state.exception)
-            TxHistoryState.NotImplemented -> throw TxHistoryStateError.TxHistoryNotImplemented
-            TxHistoryState.Success.Empty -> throw TxHistoryStateError.EmptyTxHistories
+            is TxHistoryState.NotImplemented -> throw TxHistoryStateError.TxHistoryNotImplemented
+            is TxHistoryState.Success.Empty -> throw TxHistoryStateError.EmptyTxHistories
             is TxHistoryState.Success.HasTransactions -> state.txCount
         }
     }
 
     override fun getTxHistoryItems(
-        networkId: Network.ID,
-        derivationPath: String?,
+        userWalletId: UserWalletId,
+        currency: CryptoCurrency,
         pageSize: Int,
+        refresh: Boolean,
     ): Flow<PagingData<TxHistoryItem>> {
-        val userWallet = getUserWallet()
-        return Pager(
+        val pager = Pager(
             config = PagingConfig(
                 pageSize = pageSize,
+                initialLoadSize = pageSize,
             ),
             pagingSourceFactory = {
                 TxHistoryPagingSource(
-                    loadPage = { page: Int, pageSize: Int ->
-                        walletManagersFacade.getTxHistoryItems(
-                            userWalletId = userWallet.walletId,
-                            networkId = networkId,
-                            rawDerivationPath = derivationPath,
-                            page = page,
-                            pageSize = pageSize,
-                        )
-                    },
+                    sourceParams = TxHistoryPagingSource.Params(userWalletId, currency, pageSize, refresh),
+                    txHistoryItemsStore = txHistoryItemsStore,
+                    walletManagersFacade = walletManagersFacade,
+                    cacheRegistry = cacheRegistry,
                 )
             },
-        ).flow
+        )
+
+        return pager.flow
     }
 
-    private fun getUserWallet(): UserWallet = requireNotNull(userWalletsStore.selectedUserWalletOrNull) {
-        "Selected wallet must not be null"
+    override fun getTxExploreUrl(txHash: String, networkId: Network.ID): String {
+        val blockchain = Blockchain.fromId(networkId.value)
+        return blockchain.getExploreTxUrl(txHash)
+    }
+
+    private suspend fun getUserWallet(userWalletId: UserWalletId): UserWallet {
+        return requireNotNull(userWalletsStore.getSyncOrNull(userWalletId)) {
+            "Unable to find user wallet with provided ID: $userWalletId"
+        }
     }
 }
\ No newline at end of file
diff --git a/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/paging/TxHistoryPagingSource.kt b/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/paging/TxHistoryPagingSource.kt
index a3ebb06194..f195b173f7 100644
--- a/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/paging/TxHistoryPagingSource.kt
+++ b/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/paging/TxHistoryPagingSource.kt
@@ -2,34 +2,96 @@ package com.tangem.data.txhistory.repository.paging
 
 import androidx.paging.PagingSource
 import androidx.paging.PagingState
+import com.tangem.data.common.cache.CacheRegistry
+import com.tangem.datasource.local.txhistory.TxHistoryItemsStore
+import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.txhistory.models.PaginationWrapper
 import com.tangem.domain.txhistory.models.TxHistoryItem
-
-private const val INITIAL_PAGE = 1
+import com.tangem.domain.walletmanager.WalletManagersFacade
+import com.tangem.domain.wallets.models.UserWalletId
+import timber.log.Timber
 
 internal class TxHistoryPagingSource(
-    private val loadPage: suspend (page: Int, pageSize: Int) -> PaginationWrapper<TxHistoryItem>,
+    private val sourceParams: Params,
+    private val txHistoryItemsStore: TxHistoryItemsStore,
+    private val walletManagersFacade: WalletManagersFacade,
+    private val cacheRegistry: CacheRegistry,
 ) : PagingSource<Int, TxHistoryItem>() {
 
+    private val storeKey = TxHistoryItemsStore.Key(sourceParams.userWalletId, sourceParams.currency)
+
     override fun getRefreshKey(state: PagingState<Int, TxHistoryItem>): Int? {
         return state.anchorPosition?.let { anchorPosition ->
-            state.closestPageToPosition(anchorPosition)?.prevKey?.plus(other = 1)
-                ?: state.closestPageToPosition(anchorPosition)?.nextKey?.minus(other = 1)
+            val anchorPage = state.closestPageToPosition(anchorPosition)
+            anchorPage?.prevKey?.inc() ?: anchorPage?.nextKey?.dec()
         }
     }
 
     override suspend fun load(params: LoadParams<Int>): LoadResult<Int, TxHistoryItem> {
-        val currentPage = params.key ?: INITIAL_PAGE
-        return try {
-            val result = loadPage(currentPage, params.loadSize)
+        val pageToLoad = params.key ?: INITIAL_PAGE
 
-            LoadResult.Page(
-                data = result.items,
-                prevKey = if (currentPage > INITIAL_PAGE) currentPage.minus(1) else null,
-                nextKey = if (result.page < result.totalPages) currentPage.plus(1) else null,
+        return try {
+            val wrappedItems = loadItems(
+                pageToLoad = pageToLoad,
+                pageSize = sourceParams.pageSize,
+                refresh = sourceParams.refresh && params is LoadParams.Refresh,
             )
-        } catch (e: Exception) {
+
+            val items = wrappedItems.items
+            val prevPage = when {
+                items.isEmpty() -> null
+                pageToLoad > INITIAL_PAGE -> pageToLoad.dec()
+                else -> null
+            }
+            val nextPage = when {
+                items.isEmpty() -> INITIAL_PAGE
+                pageToLoad < wrappedItems.totalPages -> pageToLoad.inc()
+                else -> null
+            }
+
+            LoadResult.Page(items, prevKey = prevPage, nextKey = nextPage)
+        } catch (e: Throwable) {
+            Timber.e(e, "Unable to load the transaction history for the requested page: $pageToLoad")
+
             LoadResult.Error(e)
         }
     }
+
+    private suspend fun loadItems(pageToLoad: Int, pageSize: Int, refresh: Boolean): PaginationWrapper<TxHistoryItem> {
+        cacheRegistry.invokeOnExpire(
+            key = getTxHistoryPageKey(pageToLoad),
+            skipCache = refresh,
+            block = { fetch(pageToLoad, pageSize) },
+        )
+
+        return requireNotNull(txHistoryItemsStore.getSyncOrNull(storeKey, pageToLoad)) {
+            "The transaction history page #$pageToLoad could not be retrieved"
+        }
+    }
+
+    private suspend fun fetch(pageToLoad: Int, pageSize: Int) {
+        val wrappedItems = walletManagersFacade.getTxHistoryItems(
+            userWalletId = sourceParams.userWalletId,
+            currency = sourceParams.currency,
+            page = pageToLoad,
+            pageSize = pageSize,
+        )
+
+        txHistoryItemsStore.store(storeKey, wrappedItems)
+    }
+
+    private fun getTxHistoryPageKey(page: Int): String {
+        return "tx_history_page_${sourceParams.currency}_${sourceParams.userWalletId}_$page"
+    }
+
+    data class Params(
+        val userWalletId: UserWalletId,
+        val currency: CryptoCurrency,
+        val pageSize: Int,
+        val refresh: Boolean,
+    )
+
+    private companion object {
+        private const val INITIAL_PAGE = 1
+    }
 }
\ No newline at end of file
diff --git a/data/wallets/build.gradle.kts b/data/wallets/build.gradle.kts
index 7bc383e45b..f39f9b3c1e 100644
--- a/data/wallets/build.gradle.kts
+++ b/data/wallets/build.gradle.kts
@@ -11,6 +11,7 @@ android {
 }
 
 dependencies {
+    implementation(projects.core.datasource)
     implementation(projects.core.utils)
     implementation(projects.data.source.preferences)
     implementation(projects.domain.wallets)
diff --git a/data/wallets/src/main/java/com/tangem/data/wallets/DefaultWalletsRepository.kt b/data/wallets/src/main/java/com/tangem/data/wallets/DefaultWalletsRepository.kt
index 848735ca16..af326a1a45 100644
--- a/data/wallets/src/main/java/com/tangem/data/wallets/DefaultWalletsRepository.kt
+++ b/data/wallets/src/main/java/com/tangem/data/wallets/DefaultWalletsRepository.kt
@@ -1,16 +1,29 @@
 package com.tangem.data.wallets
 
-import com.tangem.data.source.preferences.PreferencesDataSource
+import com.tangem.datasource.local.userwallet.ShouldSaveUserWalletStore
 import com.tangem.domain.wallets.repository.WalletsRepository
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.withContext
 
 internal class DefaultWalletsRepository(
-    private val preferencesDataSource: PreferencesDataSource,
+    private val shouldSaveUserWalletStore: ShouldSaveUserWalletStore,
     private val dispatchers: CoroutineDispatcherProvider,
 ) : WalletsRepository {
 
-    override suspend fun shouldSaveUserWallets(): Boolean {
-        return withContext(dispatchers.io) { preferencesDataSource.shouldSaveUserWallets }
+    override suspend fun initialize() {
+        withContext(dispatchers.io) {
+            shouldSaveUserWalletStore.getSyncOrNull() ?: shouldSaveUserWalletStore.store(item = false)
+        }
+    }
+
+    override suspend fun shouldSaveUserWalletsSync(): Boolean {
+        return withContext(dispatchers.io) { shouldSaveUserWalletStore.getSyncOrNull() ?: false }
+    }
+
+    override fun shouldSaveUserWallets(): Flow<Boolean> = shouldSaveUserWalletStore.get()
+
+    override suspend fun saveShouldSaveUserWallets(item: Boolean) {
+        withContext(dispatchers.io) { shouldSaveUserWalletStore.store(item = item) }
     }
 }
\ No newline at end of file
diff --git a/data/wallets/src/main/java/com/tangem/data/wallets/di/WalletsDataModule.kt b/data/wallets/src/main/java/com/tangem/data/wallets/di/WalletsDataModule.kt
index 3f418202cb..80ff2c2567 100644
--- a/data/wallets/src/main/java/com/tangem/data/wallets/di/WalletsDataModule.kt
+++ b/data/wallets/src/main/java/com/tangem/data/wallets/di/WalletsDataModule.kt
@@ -1,7 +1,7 @@
 package com.tangem.data.wallets.di
 
-import com.tangem.data.source.preferences.PreferencesDataSource
 import com.tangem.data.wallets.DefaultWalletsRepository
+import com.tangem.datasource.local.userwallet.ShouldSaveUserWalletStore
 import com.tangem.domain.wallets.repository.WalletsRepository
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.Module
@@ -17,11 +17,11 @@ object WalletsDataModule {
     @Provides
     @Singleton
     fun providesWalletsRepository(
-        preferencesDataSource: PreferencesDataSource,
+        shouldSaveUserWalletStore: ShouldSaveUserWalletStore,
         coroutineDispatcherProvider: CoroutineDispatcherProvider,
     ): WalletsRepository {
         return DefaultWalletsRepository(
-            preferencesDataSource = preferencesDataSource,
+            shouldSaveUserWalletStore = shouldSaveUserWalletStore,
             dispatchers = coroutineDispatcherProvider,
         )
     }
diff --git a/domain/app-currency/src/main/kotlin/com/tangem/domain/appcurrency/GetAvailableCurrenciesUseCase.kt b/domain/app-currency/src/main/kotlin/com/tangem/domain/appcurrency/GetAvailableCurrenciesUseCase.kt
new file mode 100644
index 0000000000..90670a27da
--- /dev/null
+++ b/domain/app-currency/src/main/kotlin/com/tangem/domain/appcurrency/GetAvailableCurrenciesUseCase.kt
@@ -0,0 +1,27 @@
+package com.tangem.domain.appcurrency
+
+import arrow.core.Either
+import arrow.core.NonEmptyList
+import arrow.core.raise.catch
+import arrow.core.raise.either
+import arrow.core.raise.ensureNotNull
+import arrow.core.toNonEmptyListOrNull
+import com.tangem.domain.appcurrency.error.AvailableCurrenciesError
+import com.tangem.domain.appcurrency.model.AppCurrency
+import com.tangem.domain.appcurrency.repository.AppCurrencyRepository
+
+// TODO: Add tests
+class GetAvailableCurrenciesUseCase(
+    private val appCurrencyRepository: AppCurrencyRepository,
+) {
+
+    suspend operator fun invoke(): Either<AvailableCurrenciesError, NonEmptyList<AppCurrency>> = either {
+        val currencies = catch({ appCurrencyRepository.getAvailableAppCurrencies() }) {
+            raise(AvailableCurrenciesError.DataError(it))
+        }
+
+        ensureNotNull(currencies.toNonEmptyListOrNull()) {
+            AvailableCurrenciesError.CurrenciesIsEmpty
+        }
+    }
+}
\ No newline at end of file
diff --git a/domain/app-currency/src/main/kotlin/com/tangem/domain/appcurrency/SelectAppCurrencyUseCase.kt b/domain/app-currency/src/main/kotlin/com/tangem/domain/appcurrency/SelectAppCurrencyUseCase.kt
new file mode 100644
index 0000000000..25d7c9c739
--- /dev/null
+++ b/domain/app-currency/src/main/kotlin/com/tangem/domain/appcurrency/SelectAppCurrencyUseCase.kt
@@ -0,0 +1,14 @@
+package com.tangem.domain.appcurrency
+
+import arrow.core.Either
+import com.tangem.domain.appcurrency.repository.AppCurrencyRepository
+
+// TODO: Add tests
+class SelectAppCurrencyUseCase(
+    private val appCurrencyRepository: AppCurrencyRepository,
+) {
+
+    suspend operator fun invoke(currencyCode: String): Either<Throwable, Unit> {
+        return Either.catch { appCurrencyRepository.changeAppCurrency(currencyCode) }
+    }
+}
\ No newline at end of file
diff --git a/domain/app-currency/src/main/kotlin/com/tangem/domain/appcurrency/error/AvailableCurrenciesError.kt b/domain/app-currency/src/main/kotlin/com/tangem/domain/appcurrency/error/AvailableCurrenciesError.kt
new file mode 100644
index 0000000000..a80e0bc920
--- /dev/null
+++ b/domain/app-currency/src/main/kotlin/com/tangem/domain/appcurrency/error/AvailableCurrenciesError.kt
@@ -0,0 +1,8 @@
+package com.tangem.domain.appcurrency.error
+
+sealed class AvailableCurrenciesError {
+
+    object CurrenciesIsEmpty : AvailableCurrenciesError()
+
+    data class DataError(val cause: Throwable) : AvailableCurrenciesError()
+}
\ No newline at end of file
diff --git a/domain/app-theme/models/src/main/kotlin/com/tangem/domain/apptheme/model/AppThemeMode.kt b/domain/app-theme/models/src/main/kotlin/com/tangem/domain/apptheme/model/AppThemeMode.kt
index f6ff6269f7..dd24287e13 100644
--- a/domain/app-theme/models/src/main/kotlin/com/tangem/domain/apptheme/model/AppThemeMode.kt
+++ b/domain/app-theme/models/src/main/kotlin/com/tangem/domain/apptheme/model/AppThemeMode.kt
@@ -25,6 +25,11 @@ enum class AppThemeMode {
         /**
          * The default [AppThemeMode].
          */
-        val DEFAULT: AppThemeMode = FORCE_LIGHT
+        val DEFAULT: AppThemeMode = FOLLOW_SYSTEM
+
+        /**
+         * List of available [AppThemeMode]s.
+         * */
+        val available: List<AppThemeMode> = values().toList()
     }
 }
\ No newline at end of file
diff --git a/domain/balance-hiding/.gitignore b/domain/balance-hiding/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/domain/balance-hiding/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/domain/balance-hiding/build.gradle.kts b/domain/balance-hiding/build.gradle.kts
new file mode 100644
index 0000000000..d9554a9615
--- /dev/null
+++ b/domain/balance-hiding/build.gradle.kts
@@ -0,0 +1,10 @@
+plugins {
+    alias(deps.plugins.kotlin.jvm)
+    id("configuration")
+}
+
+dependencies {
+    implementation(deps.kotlin.coroutines)
+    implementation(projects.domain.settings)
+    implementation(projects.domain.balanceHiding.models)
+}
\ No newline at end of file
diff --git a/domain/balance-hiding/models/.gitignore b/domain/balance-hiding/models/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/domain/balance-hiding/models/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/domain/balance-hiding/models/build.gradle.kts b/domain/balance-hiding/models/build.gradle.kts
new file mode 100644
index 0000000000..7ff7fb7522
--- /dev/null
+++ b/domain/balance-hiding/models/build.gradle.kts
@@ -0,0 +1,4 @@
+plugins {
+    alias(deps.plugins.kotlin.jvm)
+    id("configuration")
+}
\ No newline at end of file
diff --git a/domain/balance-hiding/models/src/main/kotlin/com/tangem/domain/balancehiding/BalanceHidingSettings.kt b/domain/balance-hiding/models/src/main/kotlin/com/tangem/domain/balancehiding/BalanceHidingSettings.kt
new file mode 100644
index 0000000000..4aac92cad2
--- /dev/null
+++ b/domain/balance-hiding/models/src/main/kotlin/com/tangem/domain/balancehiding/BalanceHidingSettings.kt
@@ -0,0 +1,6 @@
+package com.tangem.domain.balancehiding
+
+data class BalanceHidingSettings(
+    val isHidingEnabledInSettings: Boolean,
+    val isBalanceHidden: Boolean,
+)
\ No newline at end of file
diff --git a/domain/balance-hiding/src/main/kotlin/com/tangem/domain/balancehiding/DeviceFlipDetector.kt b/domain/balance-hiding/src/main/kotlin/com/tangem/domain/balancehiding/DeviceFlipDetector.kt
new file mode 100644
index 0000000000..588e4a06e3
--- /dev/null
+++ b/domain/balance-hiding/src/main/kotlin/com/tangem/domain/balancehiding/DeviceFlipDetector.kt
@@ -0,0 +1,8 @@
+package com.tangem.domain.balancehiding
+
+import kotlinx.coroutines.flow.Flow
+
+interface DeviceFlipDetector {
+
+    fun getDeviceFlipFlow(): Flow<Unit>
+}
\ No newline at end of file
diff --git a/domain/balance-hiding/src/main/kotlin/com/tangem/domain/balancehiding/IsBalanceHiddenUseCase.kt b/domain/balance-hiding/src/main/kotlin/com/tangem/domain/balancehiding/IsBalanceHiddenUseCase.kt
new file mode 100644
index 0000000000..9d22b8d762
--- /dev/null
+++ b/domain/balance-hiding/src/main/kotlin/com/tangem/domain/balancehiding/IsBalanceHiddenUseCase.kt
@@ -0,0 +1,16 @@
+package com.tangem.domain.balancehiding
+
+import com.tangem.domain.balancehiding.repositories.BalanceHidingRepository
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+
+class IsBalanceHiddenUseCase(
+    private val balanceHidingRepository: BalanceHidingRepository,
+) {
+
+    operator fun invoke(): Flow<Boolean> {
+        return balanceHidingRepository.getBalanceHidingSettingsFlow().map {
+            it.isBalanceHidden
+        }
+    }
+}
\ No newline at end of file
diff --git a/domain/balance-hiding/src/main/kotlin/com/tangem/domain/balancehiding/ListenToFlipsUseCase.kt b/domain/balance-hiding/src/main/kotlin/com/tangem/domain/balancehiding/ListenToFlipsUseCase.kt
new file mode 100644
index 0000000000..f4c4eb1562
--- /dev/null
+++ b/domain/balance-hiding/src/main/kotlin/com/tangem/domain/balancehiding/ListenToFlipsUseCase.kt
@@ -0,0 +1,28 @@
+package com.tangem.domain.balancehiding
+
+import com.tangem.domain.balancehiding.repositories.BalanceHidingRepository
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.onEach
+
+class ListenToFlipsUseCase(
+    private val flipDetector: DeviceFlipDetector,
+    private val balanceHidingRepository: BalanceHidingRepository,
+) {
+
+    suspend operator fun invoke(): Flow<Unit> {
+        return if (balanceHidingRepository.getBalanceHidingSettings().isHidingEnabledInSettings) {
+            flipDetector.getDeviceFlipFlow().onEach {
+                val balanceHidingSettings = balanceHidingRepository.getBalanceHidingSettings()
+
+                balanceHidingRepository.storeBalanceHidingSettings(
+                    balanceHidingSettings.copy(
+                        isBalanceHidden = !balanceHidingSettings.isBalanceHidden,
+                    ),
+                )
+            }
+        } else {
+            emptyFlow()
+        }
+    }
+}
\ No newline at end of file
diff --git a/domain/balance-hiding/src/main/kotlin/com/tangem/domain/balancehiding/repositories/BalanceHidingRepository.kt b/domain/balance-hiding/src/main/kotlin/com/tangem/domain/balancehiding/repositories/BalanceHidingRepository.kt
new file mode 100644
index 0000000000..84161a07d9
--- /dev/null
+++ b/domain/balance-hiding/src/main/kotlin/com/tangem/domain/balancehiding/repositories/BalanceHidingRepository.kt
@@ -0,0 +1,13 @@
+package com.tangem.domain.balancehiding.repositories
+
+import com.tangem.domain.balancehiding.BalanceHidingSettings
+import kotlinx.coroutines.flow.Flow
+
+interface BalanceHidingRepository {
+
+    fun getBalanceHidingSettingsFlow(): Flow<BalanceHidingSettings>
+
+    suspend fun storeBalanceHidingSettings(isBalanceHidden: BalanceHidingSettings)
+
+    suspend fun getBalanceHidingSettings(): BalanceHidingSettings
+}
\ No newline at end of file
diff --git a/domain/card/src/main/kotlin/com/tangem/domain/card/DerivePublicKeysUseCase.kt b/domain/card/src/main/kotlin/com/tangem/domain/card/DerivePublicKeysUseCase.kt
new file mode 100644
index 0000000000..8a82c6b79d
--- /dev/null
+++ b/domain/card/src/main/kotlin/com/tangem/domain/card/DerivePublicKeysUseCase.kt
@@ -0,0 +1,14 @@
+package com.tangem.domain.card
+
+import arrow.core.Either
+import com.tangem.common.extensions.ByteArrayKey
+import com.tangem.crypto.hdWallet.DerivationPath
+import com.tangem.operations.derivation.DerivationTaskResponse
+
+interface DerivePublicKeysUseCase {
+
+    suspend operator fun invoke(
+        cardId: String? = null,
+        derivations: Map<ByteArrayKey, List<DerivationPath>>,
+    ): Either<Unit, DerivationTaskResponse>
+}
\ No newline at end of file
diff --git a/domain/card/src/main/kotlin/com/tangem/domain/card/GetCardWasScannedUseCase.kt b/domain/card/src/main/kotlin/com/tangem/domain/card/GetCardWasScannedUseCase.kt
deleted file mode 100644
index 91c077997d..0000000000
--- a/domain/card/src/main/kotlin/com/tangem/domain/card/GetCardWasScannedUseCase.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.tangem.domain.card
-
-import com.tangem.domain.card.repository.CardRepository
-
-class GetCardWasScannedUseCase(private val cardRepository: CardRepository) {
-
-    suspend operator fun invoke(cardId: String): Boolean = cardRepository.wasCardScanned(cardId)
-}
\ No newline at end of file
diff --git a/domain/card/src/main/kotlin/com/tangem/domain/card/SetCardWasScannedUseCase.kt b/domain/card/src/main/kotlin/com/tangem/domain/card/SetCardWasScannedUseCase.kt
new file mode 100644
index 0000000000..9cd5449cb0
--- /dev/null
+++ b/domain/card/src/main/kotlin/com/tangem/domain/card/SetCardWasScannedUseCase.kt
@@ -0,0 +1,8 @@
+package com.tangem.domain.card
+
+import com.tangem.domain.card.repository.CardRepository
+
+class SetCardWasScannedUseCase(private val cardRepository: CardRepository) {
+
+    suspend operator fun invoke(cardId: String) = cardRepository.setCardWasScanned(cardId)
+}
\ No newline at end of file
diff --git a/domain/card/src/main/kotlin/com/tangem/domain/card/WasCardScannedUseCase.kt b/domain/card/src/main/kotlin/com/tangem/domain/card/WasCardScannedUseCase.kt
new file mode 100644
index 0000000000..5d8e288f3c
--- /dev/null
+++ b/domain/card/src/main/kotlin/com/tangem/domain/card/WasCardScannedUseCase.kt
@@ -0,0 +1,9 @@
+package com.tangem.domain.card
+
+import com.tangem.domain.card.repository.CardRepository
+import kotlinx.coroutines.flow.Flow
+
+class WasCardScannedUseCase(private val cardRepository: CardRepository) {
+
+    operator fun invoke(cardId: String): Flow<Boolean> = cardRepository.wasCardScanned(cardId)
+}
\ No newline at end of file
diff --git a/domain/card/src/main/kotlin/com/tangem/domain/card/repository/CardRepository.kt b/domain/card/src/main/kotlin/com/tangem/domain/card/repository/CardRepository.kt
index 40ac6ec968..27bb1657ab 100644
--- a/domain/card/src/main/kotlin/com/tangem/domain/card/repository/CardRepository.kt
+++ b/domain/card/src/main/kotlin/com/tangem/domain/card/repository/CardRepository.kt
@@ -1,6 +1,10 @@
 package com.tangem.domain.card.repository
 
+import kotlinx.coroutines.flow.Flow
+
 interface CardRepository {
 
-    suspend fun wasCardScanned(cardId: String): Boolean
+    fun wasCardScanned(cardId: String): Flow<Boolean>
+
+    suspend fun setCardWasScanned(cardId: String)
 }
\ No newline at end of file
diff --git a/domain/demo/src/main/java/com/tangem/domain/demo/DemoConfig.kt b/domain/demo/src/main/java/com/tangem/domain/demo/DemoConfig.kt
index 864ed232f9..304c70af48 100644
--- a/domain/demo/src/main/java/com/tangem/domain/demo/DemoConfig.kt
+++ b/domain/demo/src/main/java/com/tangem/domain/demo/DemoConfig.kt
@@ -9,7 +9,7 @@ import java.math.BigDecimal
 @Suppress("LargeClass")
 class DemoConfig {
 
-    val demoBlockchains = listOf(
+    val demoBlockchains = setOf(
         Blockchain.Bitcoin,
         Blockchain.Ethereum,
         Blockchain.Dogecoin,
diff --git a/domain/legacy/src/main/java/com/tangem/domain/DomainDialog.kt b/domain/legacy/src/main/java/com/tangem/domain/DomainDialog.kt
deleted file mode 100644
index c1f72a19de..0000000000
--- a/domain/legacy/src/main/java/com/tangem/domain/DomainDialog.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.tangem.domain
-
-import com.tangem.common.extensions.VoidCallback
-import com.tangem.datasource.api.tangemTech.models.CoinsResponse
-
-/**
-[REDACTED_AUTHOR]
- */
-sealed interface DomainDialog {
-
-    data class DialogError(val error: DomainModuleError) : DomainDialog
-
-    data class SelectTokenDialog(
-        val items: List<CoinsResponse.Coin.Network>,
-        val networkIdConverter: (String) -> String,
-        val onSelect: (CoinsResponse.Coin.Network) -> Unit,
-        val onClose: VoidCallback = {},
-    ) : DomainDialog
-}
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/DomainLayer.kt b/domain/legacy/src/main/java/com/tangem/domain/DomainLayer.kt
deleted file mode 100644
index a8a52c2d4e..0000000000
--- a/domain/legacy/src/main/java/com/tangem/domain/DomainLayer.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.tangem.domain
-
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenState
-import com.tangem.domain.redux.state.ActionStateLoggerImpl
-
-/**
-[REDACTED_AUTHOR]
- */
-object DomainLayer {
-    internal val actionStateLogger = ActionStateLoggerImpl()
-
-    var onInitComplete: ((DomainModuleError?) -> Unit)? = null
-
-    fun init() {
-        initActionStateLogger()
-
-        onInitComplete?.invoke(null)
-    }
-
-    private fun initActionStateLogger() {
-        val factory = actionStateLogger.actionStateConvertersFactory
-
-        factory.addConverter(AddCustomTokenAction::class.java, AddCustomTokenState.Converter())
-    }
-}
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/DomainModuleMessage.kt b/domain/legacy/src/main/java/com/tangem/domain/DomainModuleMessage.kt
index 27d7606e7f..d762e94382 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/DomainModuleMessage.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/DomainModuleMessage.kt
@@ -1,6 +1,5 @@
 package com.tangem.domain
 
-import com.tangem.common.module.FbConsumeException
 import com.tangem.common.module.ModuleError
 import com.tangem.common.module.ModuleErrorCode
 import com.tangem.common.module.ModuleMessage
@@ -36,32 +35,14 @@ sealed class AddCustomTokenError(
 ) {
 
     object FieldIsEmpty : AddCustomTokenError()
-    object FieldIsNotEmpty : AddCustomTokenError()
     object InvalidContractAddress : AddCustomTokenError()
     object NetworkIsNotSelected : AddCustomTokenError()
     object InvalidDecimalsCount : AddCustomTokenError()
     object InvalidDerivationPath : AddCustomTokenError()
 
-    sealed class Network : AddCustomTokenError() {
-        object CheckAddressRequestError : Network()
-    }
-
     sealed class Warning : AddCustomTokenError() {
         object PotentialScamToken : Warning()
         object TokenAlreadyAdded : Warning()
         object UnsupportedSolanaToken : Warning()
     }
-
-    data class SelectTokeNetworkError(val networkId: String) :
-        AddCustomTokenError(
-            message = "Unknown network [$networkId] should not be included in the network selection dialog.",
-        ),
-        FbConsumeException
-
-    data class UnAppropriateInitialization(
-        val of: String,
-        val info: String? = null,
-    ) : AddCustomTokenError(
-        message = "The [$of], must be properly initialized. Info [$info]",
-    )
 }
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/DomainWrapped.kt b/domain/legacy/src/main/java/com/tangem/domain/DomainWrapped.kt
deleted file mode 100644
index 902244560d..0000000000
--- a/domain/legacy/src/main/java/com/tangem/domain/DomainWrapped.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.tangem.domain
-
-/**
-[REDACTED_AUTHOR]
- * Provides a temporary copies of the app module classes, data structures, etc.
- */
-// TODO: refactoring: : after refactoring they should be unwrapped and moved
-// to appropriate parts of module
-@Deprecated("After refactoring they should be unwrapped and moved to appropriate parts of module")
-sealed interface DomainWrapped {
-
-    // Mirror reflection ot the com.tangem.tap.features.wallet.redux.Currency
-    sealed interface Currency {
-        val blockchain: com.tangem.blockchain.common.Blockchain
-        val currencySymbol: String
-        val derivationPath: String?
-
-        data class Token(
-            val token: com.tangem.blockchain.common.Token,
-            override val blockchain: com.tangem.blockchain.common.Blockchain,
-            override val derivationPath: String?,
-        ) : Currency {
-            override val currencySymbol = token.symbol
-        }
-
-        data class Blockchain(
-            override val blockchain: com.tangem.blockchain.common.Blockchain,
-            override val derivationPath: String?,
-        ) : Currency {
-            override val currencySymbol: String = blockchain.currency
-        }
-    }
-}
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/analytics/ChangeCardAnalyticsContextUseCase.kt b/domain/legacy/src/main/java/com/tangem/domain/analytics/ChangeCardAnalyticsContextUseCase.kt
new file mode 100644
index 0000000000..3aa5e994c9
--- /dev/null
+++ b/domain/legacy/src/main/java/com/tangem/domain/analytics/ChangeCardAnalyticsContextUseCase.kt
@@ -0,0 +1,8 @@
+package com.tangem.domain.analytics
+
+import com.tangem.domain.models.scan.ScanResponse
+
+interface ChangeCardAnalyticsContextUseCase {
+
+    operator fun invoke(scanResponse: ScanResponse)
+}
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/CardTypesResolver.kt b/domain/legacy/src/main/java/com/tangem/domain/common/CardTypesResolver.kt
index 660a5c13dd..4afc2621f7 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/common/CardTypesResolver.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/common/CardTypesResolver.kt
@@ -10,6 +10,14 @@ interface CardTypesResolver {
 
     fun isTangemWallet(): Boolean
 
+    fun isShibaWallet(): Boolean
+
+    fun isTronWallet(): Boolean
+
+    fun isKaspaWallet(): Boolean
+
+    fun isBadWallet(): Boolean
+
     fun isWhiteWallet(): Boolean
 
     fun isWallet2(): Boolean
@@ -20,7 +28,9 @@ interface CardTypesResolver {
 
     fun isStart2Coin(): Boolean
 
-    fun isDev(): Boolean
+    fun isDevKit(): Boolean
+
+    fun isSingleWalletWithToken(): Boolean
 
     fun isMultiwalletAllowed(): Boolean
 
@@ -28,8 +38,6 @@ interface CardTypesResolver {
 
     fun getPrimaryToken(): Token?
 
-    fun getBackupCardsCount(): Int
-
     fun isReleaseFirmwareType(): Boolean
 
     fun getRemainingSignatures(): Int?
@@ -41,8 +49,4 @@ interface CardTypesResolver {
     fun isAttestationFailed(): Boolean
 
     fun hasWalletSignedHashes(): Boolean
-
-    fun hasBackup(): Boolean
-
-    fun isBackupForbidden(): Boolean
 }
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/TangemCardTypesResolver.kt b/domain/legacy/src/main/java/com/tangem/domain/common/TangemCardTypesResolver.kt
index b40ad29612..e6914d7e16 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/common/TangemCardTypesResolver.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/common/TangemCardTypesResolver.kt
@@ -26,12 +26,22 @@ internal class TangemCardTypesResolver(
             card.firmwareVersion >= FirmwareVersion.MultiWalletAvailable
     }
 
+    override fun isShibaWallet(): Boolean {
+        return card.firmwareVersion.compareTo(FirmwareVersion.KeysImportAvailable) == 0
+    }
+
+    override fun isTronWallet(): Boolean = card.batchId == TRON_WALLET_BATCH_ID
+
+    override fun isKaspaWallet(): Boolean = card.batchId == KASPA_WALLET_BATCH_ID
+
+    override fun isBadWallet(): Boolean = card.batchId == BAD_WALLET_BATCH_ID
+
     override fun isWhiteWallet(): Boolean {
-        return walletData == null && card.firmwareVersion >= FirmwareVersion.HDWalletAvailable
+        return walletData == null && card.firmwareVersion <= FirmwareVersion.HDWalletAvailable
     }
 
     override fun isWallet2(): Boolean {
-        return card.firmwareVersion >= FirmwareVersion.Ed25519Slip0010Available && card.settings.isKeysImportAllowed
+        return productType == ProductType.Wallet2
     }
 
     override fun isRing(): Boolean {
@@ -42,7 +52,9 @@ internal class TangemCardTypesResolver(
 
     override fun isStart2Coin(): Boolean = card.isStart2Coin
 
-    override fun isDev(): Boolean = card.isTestCard
+    override fun isDevKit(): Boolean = card.batchId == DEV_KIT_CARD_BATCH_ID
+
+    override fun isSingleWalletWithToken(): Boolean = walletData?.token != null && !isMultiwalletAllowed()
 
     override fun isMultiwalletAllowed(): Boolean {
         return !isTangemTwins() && !card.isStart2Coin && !isTangemNote() &&
@@ -76,8 +88,6 @@ internal class TangemCardTypesResolver(
         )
     }
 
-    override fun getBackupCardsCount(): Int = card.wallets.size
-
     override fun isReleaseFirmwareType(): Boolean = card.firmwareVersion.type == FirmwareVersion.FirmwareType.Release
 
     override fun getRemainingSignatures(): Int? = card.wallets.firstOrNull()?.remainingSignatures
@@ -95,10 +105,6 @@ internal class TangemCardTypesResolver(
         }
     }
 
-    override fun hasBackup(): Boolean = card.backupStatus != CardDTO.BackupStatus.NoBackup
-
-    override fun isBackupForbidden(): Boolean = !(card.settings.isBackupAllowed || card.settings.isHDWalletAllowed)
-
     private fun Blockchain.Companion.fromBlockchainName(blockchainName: String): Blockchain {
         // workaround for BSC (BNB) notes cards
         return when (blockchainName) {
@@ -116,4 +122,12 @@ internal class TangemCardTypesResolver(
             }
         }
     }
+
+    private companion object {
+
+        const val DEV_KIT_CARD_BATCH_ID = "CB83"
+        const val TRON_WALLET_BATCH_ID = "AF07"
+        const val KASPA_WALLET_BATCH_ID = "AF08"
+        const val BAD_WALLET_BATCH_ID = "AF09"
+    }
 }
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/TapWorkarounds.kt b/domain/legacy/src/main/java/com/tangem/domain/common/TapWorkarounds.kt
index c8f7e9fe0d..b8583c123d 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/common/TapWorkarounds.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/common/TapWorkarounds.kt
@@ -1,7 +1,6 @@
 package com.tangem.domain.common
 
 import com.tangem.blockchain.common.Blockchain
-import com.tangem.common.card.Card
 import com.tangem.common.card.FirmwareVersion
 import com.tangem.domain.demo.DemoConfig
 import com.tangem.domain.models.scan.CardDTO
@@ -71,6 +70,4 @@ object TapWorkarounds {
     fun isStart2CoinIssuer(cardIssuer: String?): Boolean {
         return cardIssuer?.lowercase(Locale.US) == START_2_COIN_ISSUER
     }
-
-    fun Card.getTangemNoteBlockchain(): Blockchain? = tangemNoteBatches[batchId] ?: null
 }
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt
index 3d315d3d8e..7be8c9e812 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt
@@ -4,7 +4,7 @@ import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.Token
 import java.math.BigDecimal
 
-@Suppress("ComplexMethod")
+@Suppress("ComplexMethod", "LongMethod")
 fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? {
     return when (networkId) {
         "arbitrum-one" -> Blockchain.Arbitrum
@@ -70,11 +70,13 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? {
         "octaspace/test" -> Blockchain.OctaSpaceTestnet
         "chia" -> Blockchain.Chia
         "chia/test" -> Blockchain.ChiaTestnet
+        "near-protocol" -> Blockchain.Near
+        "near-protocol/test" -> Blockchain.NearTestnet
         else -> null
     }
 }
 
-@Suppress("ComplexMethod")
+@Suppress("ComplexMethod", "LongMethod")
 fun Blockchain.toNetworkId(): String {
     return when (this) {
         Blockchain.Unknown -> "unknown"
@@ -141,10 +143,12 @@ fun Blockchain.toNetworkId(): String {
         Blockchain.OctaSpaceTestnet -> "octaspace/test"
         Blockchain.Chia -> "chia"
         Blockchain.ChiaTestnet -> "chia/test"
+        Blockchain.Near -> "near-protocol"
+        Blockchain.NearTestnet -> "near-protocol/test"
     }
 }
 
-@Suppress("ComplexMethod")
+@Suppress("ComplexMethod", "LongMethod")
 fun Blockchain.toCoinId(): String {
     return when (this) {
         Blockchain.Binance, Blockchain.BinanceTestnet, Blockchain.BSC, Blockchain.BSCTestnet -> "binancecoin"
@@ -155,7 +159,7 @@ fun Blockchain.toCoinId(): String {
         Blockchain.Stellar, Blockchain.StellarTestnet -> "stellar"
         Blockchain.Cardano -> "cardano"
         Blockchain.Polygon, Blockchain.PolygonTestnet -> "matic-network"
-        Blockchain.Arbitrum, Blockchain.ArbitrumTestnet -> "ethereum"
+        Blockchain.Arbitrum, Blockchain.ArbitrumTestnet -> "arbitrum-one"
         Blockchain.Avalanche, Blockchain.AvalancheTestnet -> "avalanche-2"
         Blockchain.Solana, Blockchain.SolanaTestnet -> "solana"
         Blockchain.Fantom, Blockchain.FantomTestnet -> "fantom"
@@ -171,7 +175,7 @@ fun Blockchain.toCoinId(): String {
         Blockchain.EthereumPow, Blockchain.EthereumPowTestnet -> "ethereum-pow-iou"
         Blockchain.EthereumFair -> "ethereumfair"
         Blockchain.Kusama -> "kusama"
-        Blockchain.Optimism, Blockchain.OptimismTestnet -> "ethereum"
+        Blockchain.Optimism, Blockchain.OptimismTestnet -> "optimistic-ethereum"
         Blockchain.Dash -> "dash"
         Blockchain.Kaspa -> "kaspa"
         Blockchain.TON, Blockchain.TONTestnet -> "the-open-network"
@@ -184,7 +188,10 @@ fun Blockchain.toCoinId(): String {
         Blockchain.Telos, Blockchain.TelosTestnet -> "telos"
         Blockchain.AlephZero, Blockchain.AlephZeroTestnet -> "aleph-zero"
         Blockchain.OctaSpace, Blockchain.OctaSpaceTestnet -> "octaspace"
-        Blockchain.Chia, Blockchain.ChiaTestnet -> "chia"
+        Blockchain.Chia -> "chia"
+        Blockchain.ChiaTestnet -> "chia/test"
+        Blockchain.Near -> "near"
+        Blockchain.NearTestnet -> "near/test"
         Blockchain.Unknown -> "unknown"
     }
 }
@@ -197,6 +204,7 @@ fun Blockchain.amountToCreateAccount(token: Token? = null): BigDecimal? {
     return when (this) {
         Blockchain.Stellar -> if (token?.symbol == NODL) BigDecimal(NODL_AMOUNT_TO_CREATE_ACCOUNT) else BigDecimal.ONE
         Blockchain.XRP -> BigDecimal.TEN
+        Blockchain.Near, Blockchain.NearTestnet -> 0.00182.toBigDecimal()
         else -> null
     }
 }
@@ -211,6 +219,4 @@ private const val NODL_AMOUNT_TO_CREATE_ACCOUNT = 1.5
 private val excludedBlockchains = listOf(
     Blockchain.Unknown,
     Blockchain.Ducatus,
-    Blockchain.Telos, // disable in 4.9
-    Blockchain.TelosTestnet, // disable in 4.9
 )
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/form/FieldDataConverters.kt b/domain/legacy/src/main/java/com/tangem/domain/common/form/FieldDataConverters.kt
deleted file mode 100644
index b406d02f7c..0000000000
--- a/domain/legacy/src/main/java/com/tangem/domain/common/form/FieldDataConverters.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.tangem.domain.common.form
-
-import com.tangem.common.json.MoshiJsonConverter
-
-/**
-[REDACTED_AUTHOR]
- */
-interface DataConverterVisitor<Data, Result> {
-    fun visit(data: Data?)
-    fun getConvertedData(): Result
-}
-
-interface FieldDataConverter<Result> : DataConverterVisitor<FieldData, Result>
-
-abstract class BaseFieldDataConverter<Result> : FieldDataConverter<Result> {
-    private val collectIds: List<FieldId>
-        get() = getIdToCollect()
-
-    protected val collectedData: MutableMap<FieldId, Any?> = mutableMapOf()
-
-    override fun visit(data: Pair<FieldId, Field.Data<*>>?) {
-        val id = data?.first ?: return
-
-        if (collectIds.contains(id)) {
-            collectedData[id] = data.second.value
-        }
-    }
-
-    abstract fun getIdToCollect(): List<FieldId>
-}
-
-class FieldToJsonConverter(
-    private val fieldsToConvert: List<FieldId> = listOf(),
-    private val jsonConverter: MoshiJsonConverter,
-) : BaseFieldDataConverter<String>() {
-
-    override fun getConvertedData(): String = jsonConverter.toJson(collectedData, "  ")
-
-    override fun getIdToCollect(): List<FieldId> = fieldsToConvert
-}
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/form/FieldsValidators.kt b/domain/legacy/src/main/java/com/tangem/domain/common/form/FieldsValidators.kt
deleted file mode 100644
index 067feb900f..0000000000
--- a/domain/legacy/src/main/java/com/tangem/domain/common/form/FieldsValidators.kt
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.tangem.domain.common.form
-
-import com.tangem.blockchain.blockchains.ethereum.EthereumAddressService
-import com.tangem.blockchain.blockchains.solana.SolanaAddressService
-import com.tangem.blockchain.blockchains.tron.TronAddressService
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.blockchain.common.address.AddressService
-import com.tangem.common.Validator
-import com.tangem.common.card.EllipticCurve
-import com.tangem.domain.AddCustomTokenError
-import timber.log.Timber
-
-/**
-[REDACTED_AUTHOR]
- */
-interface CustomTokenValidator<T> : Validator<T, AddCustomTokenError>
-
-class StringIsEmptyValidator : CustomTokenValidator<String> {
-    override fun validate(data: String?): AddCustomTokenError? {
-        return if (data.isNullOrEmpty()) null else AddCustomTokenError.FieldIsNotEmpty
-    }
-}
-
-class StringIsNotEmptyValidator : CustomTokenValidator<String> {
-    override fun validate(data: String?): AddCustomTokenError? {
-        return if (data.isNullOrEmpty()) AddCustomTokenError.FieldIsEmpty else null
-    }
-}
-
-class TokenContractAddressValidator : CustomTokenValidator<String> {
-
-    private var blockchain: Blockchain = Blockchain.Unknown
-
-    private val successAddressValidator = object : AddressService() {
-        override fun makeAddress(walletPublicKey: ByteArray, curve: EllipticCurve?): String {
-            throw UnsupportedOperationException()
-        }
-
-        override fun validate(address: String): Boolean = true
-    }
-
-    fun nextValidationFor(blockchain: Blockchain) {
-        this.blockchain = blockchain
-    }
-
-    override fun validate(data: String?): AddCustomTokenError? {
-        return when {
-            data.isNullOrEmpty() -> AddCustomTokenError.FieldIsEmpty
-            getAddressService().validate(data) -> null
-            else -> AddCustomTokenError.InvalidContractAddress
-        }
-    }
-
-    private fun getAddressService(): AddressService {
-        return when (blockchain) {
-            Blockchain.Unknown -> successAddressValidator
-            Blockchain.Binance, Blockchain.BinanceTestnet -> successAddressValidator
-            Blockchain.Solana, Blockchain.SolanaTestnet -> SolanaAddressService()
-            Blockchain.Tron, Blockchain.TronTestnet -> TronAddressService()
-            else -> {
-                if (blockchain.isEvm()) {
-                    EthereumAddressService()
-                } else {
-                    Timber.e("Throw for blockchain: ${blockchain.fullName}")
-                    throw UnsupportedOperationException()
-                }
-            }
-        }
-    }
-}
-
-class TokenNetworkValidator : CustomTokenValidator<Blockchain> {
-    override fun validate(data: Blockchain?): AddCustomTokenError? {
-        return when (data) {
-            null, Blockchain.Unknown -> AddCustomTokenError.NetworkIsNotSelected
-            else -> null
-        }
-    }
-}
-
-class TokenNameValidator : CustomTokenValidator<String> {
-    override fun validate(data: String?): AddCustomTokenError? = StringIsNotEmptyValidator().validate(data)
-}
-
-class TokenSymbolValidator : CustomTokenValidator<String> {
-    override fun validate(data: String?): AddCustomTokenError? = StringIsNotEmptyValidator().validate(data)
-}
-
-class TokenDecimalsValidator : CustomTokenValidator<String> {
-    override fun validate(data: String?): AddCustomTokenError? {
-        val decimal = data?.toIntOrNull() ?: return AddCustomTokenError.FieldIsEmpty
-
-        return if (decimal > INVALID_DECIMALS_COUNT) AddCustomTokenError.InvalidDecimalsCount else null
-    }
-
-    private companion object {
-        const val INVALID_DECIMALS_COUNT = 30
-    }
-}
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/form/Form.kt b/domain/legacy/src/main/java/com/tangem/domain/common/form/Form.kt
deleted file mode 100644
index cca8b72a5f..0000000000
--- a/domain/legacy/src/main/java/com/tangem/domain/common/form/Form.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.tangem.domain.common.form
-
-/**
-[REDACTED_AUTHOR]
- */
-class Form(
-    fieldList: List<DataField<*>>,
-) {
-    private val _fieldList: MutableList<DataField<*>> = fieldList.toMutableList()
-
-    val fieldList: List<DataField<*>>
-        get() = _fieldList.toList()
-
-    fun getField(id: FieldId): DataField<*>? = fieldList.firstOrNull { it.id == id }
-
-    fun getData(id: FieldId): Pair<FieldId, *>? = getField(id)?.getData()
-
-    fun setField(field: DataField<*>) {
-        val oldField = getField(field.id) ?: return
-        val oldIndexOfField = _fieldList.indexOf(oldField)
-        if (oldIndexOfField == -1) return
-
-        _fieldList.removeAt(oldIndexOfField)
-        _fieldList.add(oldIndexOfField, field)
-    }
-
-    // convert this form data whatever you want
-    fun visitDataConverter(converter: FieldDataConverter<*>) {
-        fieldList.forEach { it.visitDataConverter(converter) }
-    }
-}
-
-interface FieldId
-
-interface Field<T> {
-    val id: FieldId
-    var data: Data<T>
-
-    data class Data<Data>(
-        val value: Data,
-        val isUserInput: Boolean,
-    )
-}
-
-typealias FieldData = Pair<FieldId, Field.Data<*>>
-
-interface DataField<T> : Field<T> {
-    fun getData(): Pair<FieldId, Field.Data<T>>
-    fun visitDataConverter(dataConverter: FieldDataConverter<*>)
-}
-
-abstract class BaseDataField<T>(
-    override val id: FieldId,
-    override var data: Field.Data<T>,
-) : DataField<T> {
-
-    override fun getData(): Pair<FieldId, Field.Data<T>> = id to data
-
-    override fun visitDataConverter(dataConverter: FieldDataConverter<*>) {
-        dataConverter.visit(getData())
-    }
-}
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/exchange/RampStateManager.kt b/domain/legacy/src/main/java/com/tangem/domain/exchange/RampStateManager.kt
new file mode 100644
index 0000000000..29712ab27c
--- /dev/null
+++ b/domain/legacy/src/main/java/com/tangem/domain/exchange/RampStateManager.kt
@@ -0,0 +1,11 @@
+package com.tangem.domain.exchange
+
+import com.tangem.domain.tokens.model.CryptoCurrency
+
+/**
+ * Manager that holds info about available actions as Sell and Buy
+ */
+interface RampStateManager {
+    fun availableForBuy(cryptoCurrency: CryptoCurrency): Boolean
+    fun availableForSell(cryptoCurrency: CryptoCurrency): Boolean
+}
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/features/addCustomToken/AddCustomTokenService.kt b/domain/legacy/src/main/java/com/tangem/domain/features/addCustomToken/AddCustomTokenService.kt
deleted file mode 100644
index 1a5fc65e8c..0000000000
--- a/domain/legacy/src/main/java/com/tangem/domain/features/addCustomToken/AddCustomTokenService.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.tangem.domain.features.addCustomToken
-
-import com.tangem.datasource.api.tangemTech.TangemTechApi
-import com.tangem.datasource.api.tangemTech.models.CoinsResponse
-import com.tangem.utils.coroutines.CoroutineDispatcherProvider
-import kotlinx.coroutines.withContext
-
-/**
-[REDACTED_AUTHOR]
- */
-class AddCustomTokenService(
-    private val tangemTechApi: TangemTechApi,
-    private val dispatchers: CoroutineDispatcherProvider,
-    private val supportedTokenNetworkIds: List<String>,
-) {
-
-    suspend fun findToken(contractAddress: String, networkId: String?): List<CoinsResponse.Coin> {
-        return withContext(dispatchers.io) {
-            runCatching {
-                tangemTechApi.getCoins(
-                    contractAddress = contractAddress,
-                    networkIds = selectNetworksForSearch(networkId),
-                )
-            }
-                .fold(
-                    onSuccess = { response ->
-                        var coinsList = mutableListOf<CoinsResponse.Coin>()
-                        response.coins.forEach { coin ->
-                            val networksWithTheSameAddress = coin.networks
-                                .filter { it.contractAddress != null || it.decimalCount != null }
-                                .filter { it.contractAddress?.equals(contractAddress, ignoreCase = true) == true }
-                                .filter { supportedTokenNetworkIds.contains(it.networkId) }
-                            if (networksWithTheSameAddress.isNotEmpty()) {
-                                val newToken = coin.copy(networks = networksWithTheSameAddress)
-                                coinsList.add(newToken)
-                            }
-                        }
-                        if (coinsList.size > 1) {
-                            // https://tangem.slack.com/archives/GMXC6PP71/p1649672562078679
-                            coinsList = mutableListOf(coinsList[0])
-                        }
-                        coinsList
-                    },
-                    onFailure = { emptyList() },
-                )
-        }
-    }
-
-    private fun selectNetworksForSearch(networkId: String?): String {
-        return networkId ?: supportedTokenNetworkIds.joinToString(",")
-    }
-}
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/features/addCustomToken/CustomCurrency.kt b/domain/legacy/src/main/java/com/tangem/domain/features/addCustomToken/CustomCurrency.kt
index 78ff46be86..15debdd88f 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/features/addCustomToken/CustomCurrency.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/features/addCustomToken/CustomCurrency.kt
@@ -2,11 +2,7 @@ package com.tangem.domain.features.addCustomToken
 
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.Token
-import com.tangem.blockchain.common.derivation.DerivationStyle
 import com.tangem.crypto.hdWallet.DerivationPath
-import com.tangem.domain.common.form.BaseFieldDataConverter
-import com.tangem.domain.common.form.FieldId
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenState
 
 /**
 [REDACTED_AUTHOR]
@@ -16,65 +12,16 @@ sealed class CustomCurrency(
     val derivationPath: DerivationPath?,
 ) {
 
+    @Deprecated("It will be removed in next releases")
     class CustomBlockchain(
         network: Blockchain,
         derivationPath: DerivationPath?,
-    ) : CustomCurrency(network, derivationPath) {
-
-        class Converter(
-            private val derivationStyle: DerivationStyle?,
-        ) : BaseFieldDataConverter<CustomBlockchain>() {
-            override fun getConvertedData(): CustomBlockchain {
-                val mainNetwork = collectedData[CustomTokenFieldId.Network] as Blockchain
-                val derivationPathNetwork = collectedData[CustomTokenFieldId.DerivationPath] as Blockchain
-                val derivationPath = AddCustomTokenState.getDerivationPath(
-                    mainNetwork,
-                    derivationPathNetwork,
-                    derivationStyle,
-                )
-                return CustomBlockchain(mainNetwork, derivationPath)
-            }
-
-            override fun getIdToCollect(): List<FieldId> =
-                listOf(CustomTokenFieldId.Network, CustomTokenFieldId.DerivationPath)
-        }
-    }
+    ) : CustomCurrency(network, derivationPath)
 
+    @Deprecated("It will be removed in next releases")
     class CustomToken(
         val token: Token,
         network: Blockchain,
         derivationPath: DerivationPath?,
-    ) : CustomCurrency(network, derivationPath) {
-
-        class Converter(
-            private val tokenId: String?,
-            private val derivationStyle: DerivationStyle?,
-        ) : BaseFieldDataConverter<CustomToken>() {
-
-            override fun getConvertedData(): CustomToken {
-                val mainNetwork = collectedData[CustomTokenFieldId.Network] as Blockchain
-                val derivationPathNetwork = collectedData[CustomTokenFieldId.DerivationPath] as Blockchain
-                val derivationPath = AddCustomTokenState.getDerivationPath(
-                    mainNetwork,
-                    derivationPathNetwork,
-                    derivationStyle,
-                )
-
-                val token = Token(
-                    name = collectedData[CustomTokenFieldId.Name] as String,
-                    symbol = collectedData[CustomTokenFieldId.Symbol] as String,
-                    contractAddress = collectedData[CustomTokenFieldId.ContractAddress] as String,
-                    decimals = (collectedData[CustomTokenFieldId.Decimals] as String).toInt(),
-                    id = tokenId,
-                )
-                return CustomToken(
-                    token,
-                    collectedData[CustomTokenFieldId.Network] as Blockchain,
-                    derivationPath,
-                )
-            }
-
-            override fun getIdToCollect(): List<FieldId> = CustomTokenFieldId.values().toList()
-        }
-    }
+    ) : CustomCurrency(network, derivationPath)
 }
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/features/addCustomToken/FormFields.kt b/domain/legacy/src/main/java/com/tangem/domain/features/addCustomToken/FormFields.kt
deleted file mode 100644
index e9ec16b2a1..0000000000
--- a/domain/legacy/src/main/java/com/tangem/domain/features/addCustomToken/FormFields.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.tangem.domain.features.addCustomToken
-
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.domain.common.form.BaseDataField
-import com.tangem.domain.common.form.Field
-import com.tangem.domain.common.form.FieldId
-
-/**
-[REDACTED_AUTHOR]
- */
-enum class CustomTokenFieldId : FieldId {
-    ContractAddress,
-    Network,
-    Name,
-    Symbol,
-    Decimals,
-    DerivationPath,
-}
-
-data class TokenField(
-    override val id: FieldId,
-) : BaseDataField<String>(id, Field.Data("", false))
-
-data class TokenBlockchainField(
-    override val id: FieldId,
-    val itemList: List<Blockchain>,
-) : BaseDataField<Blockchain>(id, Field.Data(Blockchain.Unknown, false))
-
-data class TokenDerivationPathField(
-    override val id: FieldId,
-    val itemList: List<Blockchain>,
-) : BaseDataField<Blockchain>(id, Field.Data(Blockchain.Unknown, false))
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenAction.kt b/domain/legacy/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenAction.kt
deleted file mode 100644
index c178c4a610..0000000000
--- a/domain/legacy/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenAction.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.tangem.domain.features.addCustomToken.redux
-
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.datasource.api.tangemTech.models.CoinsResponse
-import com.tangem.domain.AddCustomTokenError
-import com.tangem.domain.DomainWrapped
-import com.tangem.domain.common.form.Field
-import com.tangem.domain.common.form.FieldId
-import com.tangem.domain.features.addCustomToken.CustomCurrency
-import com.tangem.domain.features.addCustomToken.CustomTokenFieldId
-import org.rekotlin.Action
-
-/**
-[REDACTED_AUTHOR]
- */
-sealed class AddCustomTokenAction : Action {
-    sealed class Init : AddCustomTokenAction() {
-        data class SetAddedCurrencies(val addedCurrencies: List<DomainWrapped.Currency>) : AddCustomTokenAction()
-        data class SetOnAddTokenCallback(val callback: (CustomCurrency) -> Unit) : AddCustomTokenAction()
-    }
-
-    object OnCreate : AddCustomTokenAction()
-
-    object OnDestroy : AddCustomTokenAction()
-
-    // from user, ui
-    data class OnTokenContractAddressChanged(val contractAddress: Field.Data<String>) : AddCustomTokenAction()
-    data class OnTokenNetworkChanged(val blockchainNetwork: Field.Data<Blockchain>) : AddCustomTokenAction()
-    data class OnTokenNameChanged(val tokenName: Field.Data<String>) : AddCustomTokenAction()
-    data class OnTokenSymbolChanged(val tokenSymbol: Field.Data<String>) : AddCustomTokenAction()
-    data class OnTokenDerivationPathChanged(
-        val blockchainDerivationPath: Field.Data<Blockchain>,
-    ) : AddCustomTokenAction()
-
-    data class OnTokenDecimalsChanged(val tokenDecimals: Field.Data<String>) : AddCustomTokenAction()
-    object OnAddCustomTokenClicked : AddCustomTokenAction()
-
-    data class SetFoundTokenInfo(val foundToken: CoinsResponse.Coin?) : AddCustomTokenAction()
-
-    // form fields
-    data class UpdateForm(val state: AddCustomTokenState) : AddCustomTokenAction()
-
-    sealed class FieldError : AddCustomTokenAction() {
-        data class Add(val id: CustomTokenFieldId, val error: AddCustomTokenError) : FieldError()
-        data class Remove(val id: CustomTokenFieldId) : FieldError()
-    }
-
-    // warnings
-    sealed class Warning : AddCustomTokenAction() {
-        data class Add(val warnings: Set<AddCustomTokenError.Warning>) : Warning()
-        data class Remove(val warnings: Set<AddCustomTokenError.Warning>) : Warning()
-        data class Replace(
-            val remove: Set<AddCustomTokenError.Warning>,
-            val add: Set<AddCustomTokenError.Warning>,
-        ) : Warning()
-    }
-
-    // To change the screenState
-    sealed class Screen : AddCustomTokenAction() {
-        data class UpdateTokenFields(val pairs: List<Pair<FieldId, ViewStates.TokenField>>) : Screen()
-        data class UpdateAddButton(val addButton: ViewStates.AddButton) : Screen()
-    }
-}
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenHub.kt b/domain/legacy/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenHub.kt
deleted file mode 100644
index aa12f86b00..0000000000
--- a/domain/legacy/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenHub.kt
+++ /dev/null
@@ -1,720 +0,0 @@
-package com.tangem.domain.features.addCustomToken.redux
-
-import android.webkit.ValueCallback
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.common.extensions.guard
-import com.tangem.datasource.api.tangemTech.models.CoinsResponse
-import com.tangem.domain.AddCustomTokenError
-import com.tangem.domain.AddCustomTokenError.Warning.*
-import com.tangem.domain.DomainDialog
-import com.tangem.domain.DomainWrapped
-import com.tangem.domain.common.extensions.canHandleToken
-import com.tangem.domain.common.extensions.fromNetworkId
-import com.tangem.domain.common.extensions.supportedBlockchains
-import com.tangem.domain.common.extensions.toNetworkId
-import com.tangem.domain.common.form.*
-import com.tangem.domain.common.util.cardTypesResolver
-import com.tangem.domain.common.util.derivationStyleProvider
-import com.tangem.domain.features.addCustomToken.*
-import com.tangem.domain.features.addCustomToken.CustomTokenFieldId.*
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.*
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenState.Companion.createInitialScreenState
-import com.tangem.domain.redux.BaseStoreHub
-import com.tangem.domain.redux.DomainState
-import com.tangem.domain.redux.ReStoreReducer
-import com.tangem.domain.redux.domainStore
-import com.tangem.domain.redux.extensions.dispatchOnMain
-import com.tangem.domain.redux.global.DomainGlobalAction
-import com.tangem.domain.redux.global.DomainGlobalState
-import com.tangem.utils.coroutines.AppCoroutineDispatcherProvider
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import org.rekotlin.Action
-import timber.log.Timber
-
-/**
-[REDACTED_AUTHOR]
- */
-@Suppress("LargeClass")
-internal class AddCustomTokenHub : BaseStoreHub<AddCustomTokenState>("AddCustomTokenHub") {
-
-    private val hubState: AddCustomTokenState
-        get() = domainStore.state.addCustomTokensState
-
-    override fun getReducer(): ReStoreReducer<AddCustomTokenState> = AddCustomTokenReducer(globalState)
-
-    override fun getHubState(storeState: DomainState): AddCustomTokenState = hubState
-
-    override fun updateStoreState(storeState: DomainState, newHubState: AddCustomTokenState): DomainState {
-        return storeState.copy(addCustomTokensState = newHubState)
-    }
-
-    @Suppress("ComplexMethod")
-    override suspend fun handleAction(action: Action, storeState: DomainState, cancel: ValueCallback<Action>) {
-        if (action !is AddCustomTokenAction) return
-
-        when (action) {
-            is OnCreate -> {
-                hubState.appSavedCurrencies.guard {
-                    return throwUnAppropriateInitialization("addedTokens")
-                }
-            }
-            is OnDestroy -> cancelAll()
-            is OnTokenContractAddressChanged -> {
-                validateContractAddressAndNotify(action.contractAddress.value)
-            }
-            is OnTokenNetworkChanged -> {
-                if (!action.blockchainNetwork.isUserInput) return
-
-                validateContractAddressAndNotify(ContractAddress.getFieldValue())
-            }
-            is OnTokenDerivationPathChanged -> {
-                updateAddButton()
-            }
-            is OnTokenNameChanged, is OnTokenSymbolChanged, is OnTokenDecimalsChanged -> {
-                updateAddButton()
-            }
-            is OnAddCustomTokenClicked -> {
-                val state = hubState
-                val completeData = when {
-                    state.getCustomTokenType() == CustomTokenType.Token && state.networkIsSelected() -> {
-                        state.gatherUserToken()
-                    }
-                    state.getCustomTokenType() == CustomTokenType.Blockchain && state.networkIsSelected() -> {
-                        state.gatherBlockchain()
-                    }
-                    else -> null
-                }
-
-                if (completeData == null) {
-                    // normally it can't be, because the AddButton must be blocked
-                } else {
-                    hubScope.launch(Dispatchers.Main) {
-                        state.onTokenAddCallback?.invoke(completeData)
-                    }
-                }
-            }
-            else -> Unit
-        }
-    }
-
-    private suspend fun validateContractAddressAndNotify(contractAddress: String) {
-        val error = ContractAddress.validateValue(contractAddress)
-        if (Network.isFilled()) {
-            when (error) {
-                null -> {
-                    // valid contract address
-                    ContractAddress.removeError()
-                    findTokenAndUpdateFields(contractAddress)
-                }
-                AddCustomTokenError.InvalidContractAddress -> {
-                    ContractAddress.addError(error)
-                    enableDisableTokenDetailFields(hubState.tokensAnyFieldsIsFilled())
-                }
-                AddCustomTokenError.FieldIsEmpty -> {
-                    ContractAddress.removeError()
-                    clearTokenDetailsFields()
-                    disableTokenDetailFields()
-                }
-                else -> {}
-            }
-        } else {
-            // is default selection (Blockchain.Unknown)
-            when (error) {
-                null -> {
-                    // Blockchain.Unknown has always valid contract address
-                    ContractAddress.removeError()
-                    findTokenAndUpdateFields(contractAddress)
-                }
-                else -> {
-                    ContractAddress.removeError()
-                    clearTokenDetailsFields()
-                    disableTokenDetailFields()
-                }
-            }
-        }
-        updateDerivationPath(Network.getFieldValue())
-        updateWarnings()
-        updateAddButton()
-    }
-
-    private suspend fun findTokenAndUpdateFields(contractAddress: String) {
-        val foundTokens = requestInfoAboutToken(contractAddress)
-        if (foundTokens.isEmpty()) {
-            // token not found - it's completely custom
-            dispatchOnMain(SetFoundTokenInfo(null))
-            enableTokenDetailFields()
-            return
-        }
-
-        // foundToken - contains all info about the token
-        val foundToken = foundTokens[0]
-        dispatchOnMain(SetFoundTokenInfo(foundToken))
-        when {
-            foundToken.networks.isEmpty() -> {
-                Timber.e("Unexpected state -> throw to FB")
-            }
-            foundToken.networks.size == 1 -> {
-                // token with single contract address
-                val singleTokenContract = foundToken.networks[0]
-                fillTokenFields(foundToken, singleTokenContract)
-                disableTokenDetailFields()
-            }
-            else -> {
-                val dialog = DomainDialog.SelectTokenDialog(
-                    items = foundToken.networks,
-                    networkIdConverter = { networkId ->
-                        val blockchain = Blockchain.fromNetworkId(networkId)
-                        if (blockchain == null || blockchain == Blockchain.Unknown) {
-                            throw AddCustomTokenError.SelectTokeNetworkError(networkId)
-                        }
-                        hubState.blockchainToName(blockchain) ?: ""
-                    },
-                    onSelect = { selectedContract ->
-                        hubScope.launch {
-                            // find how to connect to the upper coroutineContext and dispatch through them
-                            fillTokenFields(foundToken, selectedContract)
-                            disableTokenDetailFields()
-                        }
-                    },
-                )
-                dispatchOnMain(DomainGlobalAction.ShowDialog(dialog))
-            }
-        }
-    }
-
-    private suspend fun updateDerivationPath(blockchainNetwork: Blockchain) {
-        val state = hubState
-        val derivationIsSupportedByNetwork = blockchainNetwork.isEvm() || blockchainNetwork == Blockchain.Unknown
-
-        if (DerivationPath.isFilled() && !derivationIsSupportedByNetwork) {
-            // reset to default
-            val derivationField = DerivationPath.getField<TokenDerivationPathField>()
-            derivationField.data = derivationField.data.copy(
-                value = Blockchain.Unknown,
-                isUserInput = false,
-            )
-            state.setField(derivationField)
-            dispatchOnMain(UpdateForm(hubState))
-        }
-
-        if (state.screenState.derivationPath.isEnabled != derivationIsSupportedByNetwork) {
-            val action = Screen.UpdateTokenFields(
-                listOf(
-                    DerivationPath to state.screenState.derivationPath.copy(
-                        isEnabled = derivationIsSupportedByNetwork,
-                    ),
-                ),
-            )
-            dispatchOnMain(action)
-        }
-    }
-
-    private suspend fun updateWarnings() {
-        val state = hubState
-        val warningsAdd = mutableSetOf<AddCustomTokenError.Warning>()
-        val warningsRemove = mutableSetOf<AddCustomTokenError.Warning>()
-
-        val tokenIsSupported = tokenIsSupported(Network.getFieldValue())
-        val alreadyAdded = isPersistIntoAppSavedTokensList()
-        when (state.getCustomTokenType()) {
-            CustomTokenType.Blockchain -> {
-                warningsRemove.add(UnsupportedSolanaToken)
-
-                if (alreadyAdded) warningsAdd.add(TokenAlreadyAdded) else warningsRemove.add(TokenAlreadyAdded)
-
-                if (state.derivationPathIsSelected()) {
-                    warningsAdd.add(PotentialScamToken)
-                } else {
-                    warningsRemove.add(PotentialScamToken)
-                }
-            }
-            CustomTokenType.Token -> {
-                if (tokenIsSupported) {
-                    warningsRemove.add(UnsupportedSolanaToken)
-                } else {
-                    val validationResult = ContractAddress.validateValue(ContractAddress.getFieldValue())
-                    if (validationResult == AddCustomTokenError.FieldIsEmpty) {
-                        warningsRemove.add(UnsupportedSolanaToken)
-                    } else {
-                        warningsAdd.add(UnsupportedSolanaToken)
-                    }
-                }
-
-                if (isPersistIntoAppSavedTokensList()) {
-                    warningsAdd.add(TokenAlreadyAdded)
-                } else {
-                    warningsRemove.add(TokenAlreadyAdded)
-                }
-
-                if (state.foundToken == null) {
-                    if (state.tokensAnyFieldsIsFilled()) {
-                        warningsAdd.add(PotentialScamToken)
-                    } else {
-                        warningsRemove.add(PotentialScamToken)
-                    }
-                } else {
-                    if (state.foundToken.active) {
-                        warningsRemove.add(PotentialScamToken)
-                    } else {
-                        warningsAdd.add(PotentialScamToken)
-                    }
-                }
-            }
-        }
-
-        dispatchOnMain(
-            Warning.Replace(
-                remove = warningsRemove,
-                add = warningsAdd,
-            ),
-        )
-    }
-
-    private suspend fun updateAddButton() {
-        if (isPersistIntoAppSavedTokensList()) {
-            TokenAlreadyAdded.add()
-            disableAddButton()
-            return
-        } else {
-            TokenAlreadyAdded.remove()
-        }
-
-        val state = hubState
-        when {
-            // token
-            state.tokensFieldsIsFilled() && state.networkIsSelected() -> {
-                val error = ContractAddress.validateValue(ContractAddress.getFieldValue<String>())
-                val tokenIsSupported = tokenIsSupported(Network.getFieldValue())
-                enableDisableAddButton(tokenIsSupported && error == null)
-            }
-            // token
-            state.tokensAnyFieldsIsFilled() -> {
-                disableAddButton()
-            }
-            // blockchain
-            else -> {
-                if (state.networkIsSelected()) {
-                    if (isBlockchainPersistIntoAppSavedTokensList()) disableAddButton() else enableAddButton()
-                } else {
-                    disableAddButton()
-                }
-            }
-        }
-    }
-
-    private suspend fun requestInfoAboutToken(contractAddress: String): List<CoinsResponse.Coin> {
-        val tangemTechServiceManager = requireNotNull(hubState.tangemTechServiceManager)
-        dispatchOnMain(Screen.UpdateTokenFields(listOf(ContractAddress to ViewStates.TokenField(isLoading = true))))
-
-        val field = hubState.getField<TokenBlockchainField>(Network)
-        val selectedNetworkId: String? = field.data.value.let {
-            if (it == Blockchain.Unknown) null else it
-        }?.toNetworkId()
-
-        // simulate loading effect. It would be better if the delay would only run if tokenManager.checkAddress()
-        // got the result faster than 500ms and the delay would only be the difference between them.
-        delay(timeMillis = 500)
-
-        val result = tangemTechServiceManager.findToken(contractAddress, selectedNetworkId)
-
-        dispatchOnMain(Screen.UpdateTokenFields(listOf(ContractAddress to ViewStates.TokenField(isLoading = false))))
-        return result
-    }
-
-    /**
-     * These are helper functions.
-     */
-    private fun isPersistIntoAppSavedTokensList(): Boolean = when (hubState.getCustomTokenType()) {
-        CustomTokenType.Blockchain -> isBlockchainPersistIntoAppSavedTokensList()
-        CustomTokenType.Token -> isTokenPersistIntoAppSavedTokensList()
-    }
-
-    private fun isTokenPersistIntoAppSavedTokensList(): Boolean {
-        val savedCurrencies = hubState.appSavedCurrencies ?: return false
-
-        val tokenId = hubState.foundToken?.id
-        val tokenContractAddress = ContractAddress.getFieldValue<String>()
-        val tokenNetworkId = Network.getFieldValue<Blockchain>().toNetworkId()
-        val selectedDerivation = DerivationPath.getFieldValue<Blockchain>()
-
-        val derivationPath = getDerivationPathFromSelectedBlockchain(selectedDerivation)
-        savedCurrencies.forEach { wrappedCurrency ->
-            when (wrappedCurrency) {
-                is DomainWrapped.Currency.Blockchain -> Unit
-                is DomainWrapped.Currency.Token -> {
-                    val sameId = tokenId == wrappedCurrency.token.id
-                    val sameAddress = tokenContractAddress == wrappedCurrency.token.contractAddress
-                    val sameBlockchain = Blockchain.fromNetworkId(tokenNetworkId) == wrappedCurrency.blockchain
-                    val sameDerivationPath = derivationPath?.rawPath == wrappedCurrency.derivationPath
-                    @Suppress("ComplexCondition")
-                    if (sameId && sameAddress && sameBlockchain && sameDerivationPath) {
-                        return true
-                    }
-                }
-            }
-        }
-        return false
-    }
-
-    private fun isBlockchainPersistIntoAppSavedTokensList(): Boolean {
-        val savedCurrencies = hubState.appSavedCurrencies ?: return false
-        val selectedNetwork = Network.getFieldValue<Blockchain>()
-        val selectedDerivation = DerivationPath.getFieldValue<Blockchain>()
-        val derivationPath = getDerivationPathFromSelectedBlockchain(selectedDerivation)
-
-        savedCurrencies.forEach { wrappedCurrency ->
-            when (wrappedCurrency) {
-                is DomainWrapped.Currency.Blockchain -> {
-                    val isSameBlockchain = selectedNetwork == wrappedCurrency.blockchain
-                    val isSameDerivationPath = derivationPath?.rawPath == wrappedCurrency.derivationPath
-                    if (isSameBlockchain && isSameDerivationPath) return true
-                }
-
-                is DomainWrapped.Currency.Token -> Unit
-            }
-        }
-        return false
-    }
-
-    private fun getDerivationPathFromSelectedBlockchain(
-        selectedDerivationBlockchain: Blockchain,
-    ): com.tangem.crypto.hdWallet.DerivationPath? = AddCustomTokenState.getDerivationPath(
-        mainNetwork = Network.getFieldValue(),
-        derivationNetwork = selectedDerivationBlockchain,
-        derivationStyle = hubState.cardDerivationStyle,
-    )
-
-    private suspend fun fillTokenFields(token: CoinsResponse.Coin, coinNetwork: CoinsResponse.Coin.Network) {
-        val blockchain = Blockchain.fromNetworkId(coinNetwork.networkId) ?: Blockchain.Unknown
-        Network.setFieldValue(Field.Data(blockchain, false))
-        Name.setFieldValue(Field.Data(token.name, false))
-        Symbol.setFieldValue(Field.Data(token.symbol, false))
-        Decimals.setFieldValue(Field.Data(coinNetwork.decimalCount.toString(), false))
-        dispatchOnMain(UpdateForm(hubState))
-    }
-
-    private suspend fun clearTokenDetailsFields() {
-        Name.setFieldValue(Field.Data("", false))
-        Symbol.setFieldValue(Field.Data("", false))
-        Decimals.setFieldValue(Field.Data("", false))
-        dispatchOnMain(UpdateForm(hubState))
-    }
-
-    private suspend fun enableTokenDetailFields() {
-        enableDisableTokenDetailFields(true)
-    }
-
-    private suspend fun disableTokenDetailFields() {
-        enableDisableTokenDetailFields(false)
-    }
-
-    private suspend fun enableDisableTokenDetailFields(isEnabled: Boolean) {
-        val state = hubState
-        val action = Screen.UpdateTokenFields(
-            listOf(
-                Name to state.screenState.name.copy(isEnabled = isEnabled),
-                Symbol to state.screenState.symbol.copy(isEnabled = isEnabled),
-                Decimals to state.screenState.decimals.copy(isEnabled = isEnabled),
-            ),
-        )
-        dispatchOnMain(action)
-    }
-
-    private suspend fun enableAddButton() {
-        enableDisableAddButton(true)
-    }
-
-    private suspend fun disableAddButton() {
-        enableDisableAddButton(false)
-    }
-
-    private suspend fun enableDisableAddButton(isEnabled: Boolean) {
-        dispatchOnMain(Screen.UpdateAddButton(ViewStates.AddButton(isEnabled)))
-    }
-
-    private fun tokenIsSupported(blockchain: Blockchain): Boolean = when (blockchain) {
-        Blockchain.Unknown -> true
-        else -> {
-            val scanResponse = globalState.scanResponse
-            scanResponse?.card?.canHandleToken(
-                blockchain = blockchain,
-                cardTypesResolver = scanResponse.cardTypesResolver,
-            ) ?: false
-        }
-    }
-
-    @Throws
-    private fun throwUnAppropriateInitialization(objName: String) {
-        throw AddCustomTokenError.UnAppropriateInitialization(
-            "AddCustomTokenHub",
-            "$objName must be not NULL",
-        )
-    }
-
-    private suspend fun CustomTokenFieldId.addError(error: AddCustomTokenError) {
-        dispatchOnMain(FieldError.Add(this, error))
-    }
-
-    private suspend fun CustomTokenFieldId.removeError() {
-        dispatchOnMain(FieldError.Remove(this))
-    }
-
-    private inline fun <reified T> CustomTokenFieldId.getField(): T {
-        val state = hubState
-        val value = when (this) {
-            ContractAddress -> state.getField<TokenField>(this)
-            Network -> state.getField<TokenBlockchainField>(this)
-            Name -> state.getField<TokenField>(this)
-            Symbol -> state.getField<TokenField>(this)
-            Decimals -> state.getField<TokenField>(this)
-            DerivationPath -> state.getField<TokenDerivationPathField>(this)
-        }
-        return value as T
-    }
-
-    private inline fun <reified T> CustomTokenFieldId.getFieldValue(): T {
-        val value = when (this) {
-            ContractAddress -> getField<TokenField>().data.value
-            Network -> getField<TokenBlockchainField>().data.value
-            Name -> getField<TokenField>().data.value
-            Symbol -> getField<TokenField>().data.value
-            Decimals -> getField<TokenField>().data.value
-            DerivationPath -> getField<TokenDerivationPathField>().data.value
-        }
-        return value as T
-    }
-
-    private fun CustomTokenFieldId.setFieldValue(fieldData: Field.Data<*>) {
-        when (this) {
-            ContractAddress -> getField<TokenField>().data = fieldData as Field.Data<String>
-            Network -> getField<TokenBlockchainField>().data = fieldData as Field.Data<Blockchain>
-            Name -> getField<TokenField>().data = fieldData as Field.Data<String>
-            Symbol -> getField<TokenField>().data = fieldData as Field.Data<String>
-            Decimals -> getField<TokenField>().data = fieldData as Field.Data<String>
-            DerivationPath -> getField<TokenDerivationPathField>().data = fieldData as Field.Data<Blockchain>
-        }
-    }
-
-    private fun CustomTokenFieldId.validateValue(value: Any): AddCustomTokenError? {
-        return when (this) {
-            ContractAddress -> {
-                val contractAddressValidator: TokenContractAddressValidator = hubState.getValidator(ContractAddress)
-                contractAddressValidator.nextValidationFor(Network.getFieldValue())
-                contractAddressValidator.validate(value as String)
-            }
-            Network, DerivationPath -> {
-                hubState.getValidator<TokenNetworkValidator>(Network).validate(value as Blockchain)
-            }
-            Name -> {
-                hubState.getValidator<TokenNameValidator>(Name).validate(value as String)
-            }
-            Symbol -> {
-                hubState.getValidator<TokenSymbolValidator>(Symbol).validate(value as String)
-            }
-            Decimals -> {
-                hubState.getValidator<TokenDecimalsValidator>(Decimals).validate(value as String)
-            }
-        }
-    }
-
-    private fun CustomTokenFieldId.isFilled(): Boolean {
-        return when (this) {
-            ContractAddress -> getFieldValue<String>().isNotEmpty()
-            Network -> getFieldValue<Blockchain>() != Blockchain.Unknown
-            Name -> getFieldValue<String>().isNotEmpty()
-            Symbol -> getFieldValue<String>().isNotEmpty()
-            Decimals -> getFieldValue<String>().isNotEmpty()
-            DerivationPath -> getFieldValue<Blockchain>() != Blockchain.Unknown
-        }
-    }
-
-    private suspend fun AddCustomTokenError.Warning.add() {
-        dispatchOnMain(Warning.Add(setOf(this)))
-    }
-
-    private suspend fun AddCustomTokenError.Warning.remove() {
-        dispatchOnMain(Warning.Remove(setOf(this)))
-    }
-}
-
-@Suppress("ComplexMethod")
-private class AddCustomTokenReducer(
-    private val globalState: DomainGlobalState,
-) : ReStoreReducer<AddCustomTokenState> {
-
-    @Suppress("LongMethod")
-    override fun reduceAction(action: Action, state: AddCustomTokenState): AddCustomTokenState {
-        return when (action) {
-            is Init.SetAddedCurrencies -> {
-                state.copy(appSavedCurrencies = action.addedCurrencies)
-            }
-            is Init.SetOnAddTokenCallback -> {
-                state.copy(onTokenAddCallback = action.callback)
-            }
-            is OnCreate -> {
-                val scanResponse = requireNotNull(globalState.scanResponse)
-                val card = globalState.scanResponse.card
-                val supportedTokenNetworkIds = card.supportedBlockchains(scanResponse.cardTypesResolver)
-                    .filter(Blockchain::canHandleTokens)
-                    .map(Blockchain::toNetworkId)
-
-                val tangemTechServiceManager = AddCustomTokenService(
-                    tangemTechApi = globalState.networkServices.tangemTechService.api,
-                    dispatchers = AppCoroutineDispatcherProvider(),
-                    supportedTokenNetworkIds = supportedTokenNetworkIds,
-                )
-
-                state.copy(
-                    cardDerivationStyle = globalState.scanResponse.derivationStyleProvider.getDerivationStyle(),
-                    form = Form(
-                        AddCustomTokenState.createFormFields(
-                            cardTypesResolver = globalState.scanResponse.cardTypesResolver,
-                            card = card,
-                            type = CustomTokenType.Blockchain,
-                        ),
-                    ),
-                    tangemTechServiceManager = tangemTechServiceManager,
-                    screenState = createInitialScreenState(card.settings.isHDWalletAllowed),
-                )
-            }
-            is OnDestroy -> {
-                val scanResponse = requireNotNull(globalState.scanResponse)
-                val card = scanResponse.card
-                state.reset(scanResponse.cardTypesResolver, card)
-            }
-            is UpdateForm -> {
-                updateFormState(action.state)
-            }
-            is OnTokenContractAddressChanged -> {
-                val field: TokenField = state.getField(ContractAddress)
-                field.data = action.contractAddress
-                updateFormState(state)
-            }
-            is OnTokenNetworkChanged -> {
-                val field: TokenBlockchainField = state.getField(Network)
-                field.data = action.blockchainNetwork
-                updateFormState(state)
-            }
-            is OnTokenNameChanged -> {
-                val field: TokenField = state.getField(Name)
-                field.data = action.tokenName
-                updateFormState(state)
-            }
-            is OnTokenSymbolChanged -> {
-                val field: TokenField = state.getField(Symbol)
-                field.data = action.tokenSymbol
-                updateFormState(state)
-            }
-            is OnTokenDecimalsChanged -> {
-                val field: TokenField = state.getField(Decimals)
-                field.data = action.tokenDecimals
-                updateFormState(state)
-            }
-            is OnTokenDerivationPathChanged -> {
-                val field: TokenDerivationPathField = state.getField(DerivationPath)
-                field.data = action.blockchainDerivationPath
-                updateFormState(state)
-            }
-            is FieldError.Add -> {
-                val newMap = state.formErrors.toMutableMap().apply { this[action.id] = action.error }
-                state.copy(formErrors = newMap)
-            }
-            is FieldError.Remove -> {
-                val newMap = state.formErrors.toMutableMap().apply { remove(action.id) }
-                state.copy(formErrors = newMap)
-            }
-            is SetFoundTokenInfo -> {
-                state.copy(foundToken = action.foundToken)
-            }
-            is Warning.Add -> {
-                val newList = state.warnings.toMutableSet().apply { addAll(action.warnings) }
-                state.copy(warnings = newList.toSet())
-            }
-            is Warning.Remove -> {
-                val newList = state.warnings.toMutableSet().apply { removeAll(action.warnings) }
-                state.copy(warnings = newList.toSet())
-            }
-            is Warning.Replace -> {
-                val newList = state.warnings.toMutableSet().apply {
-                    removeAll(action.remove)
-                    addAll(action.add)
-                }
-                state.copy(warnings = newList.toSet())
-            }
-            is Screen.UpdateTokenFields -> {
-                var newScreenState = state.screenState
-                action.pairs.forEach {
-                    newScreenState = when (it.first) {
-                        ContractAddress -> {
-                            if (state.screenState.contractAddressField == it.second) {
-                                newScreenState
-                            } else {
-                                newScreenState.copy(contractAddressField = it.second)
-                            }
-                        }
-                        Network -> {
-                            if (state.screenState.network == it.second) {
-                                newScreenState
-                            } else {
-                                newScreenState.copy(network = it.second)
-                            }
-                        }
-                        Name -> {
-                            if (state.screenState.name == it.second) {
-                                newScreenState
-                            } else {
-                                newScreenState.copy(name = it.second)
-                            }
-                        }
-                        Symbol -> {
-                            if (state.screenState.symbol == it.second) {
-                                newScreenState
-                            } else {
-                                newScreenState.copy(symbol = it.second)
-                            }
-                        }
-                        Decimals -> {
-                            if (state.screenState.decimals == it.second) {
-                                newScreenState
-                            } else {
-                                newScreenState.copy(decimals = it.second)
-                            }
-                        }
-                        DerivationPath -> {
-                            if (state.screenState.derivationPath == it.second) {
-                                newScreenState
-                            } else {
-                                newScreenState.copy(derivationPath = it.second)
-                            }
-                        }
-                        else -> newScreenState
-                    }
-                }
-                if (state.screenState == newScreenState) {
-                    state
-                } else {
-                    state.copy(screenState = newScreenState)
-                }
-            }
-            is Screen.UpdateAddButton -> {
-                val newScreenState = if (state.screenState.addButton == action.addButton) {
-                    state.screenState
-                } else {
-                    state.screenState.copy(addButton = action.addButton)
-                }
-                if (newScreenState == state.screenState) {
-                    state
-                } else {
-                    state.copy(screenState = newScreenState)
-                }
-            }
-            else -> state
-        }
-    }
-
-    private fun updateFormState(state: AddCustomTokenState): AddCustomTokenState {
-        return state.copy(form = Form(state.form.fieldList))
-    }
-}
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenState.kt b/domain/legacy/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenState.kt
deleted file mode 100644
index 6d1b3fd2b0..0000000000
--- a/domain/legacy/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenState.kt
+++ /dev/null
@@ -1,311 +0,0 @@
-package com.tangem.domain.features.addCustomToken.redux
-
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.blockchain.common.derivation.DerivationStyle
-import com.tangem.common.json.MoshiJsonConverter
-import com.tangem.datasource.api.tangemTech.models.CoinsResponse
-import com.tangem.domain.AddCustomTokenError
-import com.tangem.domain.DomainWrapped
-import com.tangem.domain.common.CardTypesResolver
-import com.tangem.domain.common.TapWorkarounds.isTestCard
-import com.tangem.domain.common.extensions.isSupportedInApp
-import com.tangem.domain.common.extensions.supportedBlockchains
-import com.tangem.domain.common.extensions.supportedTokens
-import com.tangem.domain.common.form.*
-import com.tangem.domain.features.addCustomToken.*
-import com.tangem.domain.features.addCustomToken.CustomTokenFieldId.*
-import com.tangem.domain.models.scan.CardDTO
-import com.tangem.domain.redux.DomainState
-import com.tangem.domain.redux.state.StringActionStateConverter
-import org.rekotlin.Action
-import org.rekotlin.StateType
-
-data class AddCustomTokenState(
-    val appSavedCurrencies: List<DomainWrapped.Currency>? = null,
-    val onTokenAddCallback: ((CustomCurrency) -> Unit)? = null,
-    val cardDerivationStyle: DerivationStyle? = null,
-    val form: Form = Form(listOf()),
-    val formValidators: Map<CustomTokenFieldId, CustomTokenValidator<out Any>> = createFormValidators(),
-    val formErrors: Map<CustomTokenFieldId, AddCustomTokenError> = emptyMap(),
-    val foundToken: CoinsResponse.Coin? = null,
-    val warnings: Set<AddCustomTokenError.Warning> = emptySet(),
-    val screenState: ScreenState = createInitialScreenState(),
-    val tangemTechServiceManager: AddCustomTokenService? = null,
-) : StateType {
-
-    inline fun <reified T> getField(id: FieldId): T = form.getField(id) as T
-
-    fun setField(field: DataField<*>) {
-        form.setField(field)
-    }
-
-    inline fun <reified T> getValidator(id: FieldId): T = formValidators[id] as T
-
-    fun getError(id: FieldId): AddCustomTokenError? = formErrors[id]
-
-    inline fun <reified T> visitDataConverter(converter: FieldDataConverter<T>): T {
-        form.visitDataConverter(converter)
-        return converter.getConvertedData()
-    }
-
-    fun blockchainToName(blockchain: Blockchain, isDerivationPath: Boolean = false): String? {
-        return when {
-            isDerivationPath -> blockchain.derivationPath(DerivationStyle.LEGACY)?.rawPath
-            else -> {
-                when (blockchain) {
-                    Blockchain.Unknown -> null
-                    else -> blockchain.fullName
-                }
-            }
-        }
-    }
-
-    // except network
-    fun tokensFieldsIsFilled(): Boolean {
-        val idsToCheck = listOf(ContractAddress, Name, Symbol, Decimals)
-        val fieldsToCheck = form.fieldList.filter { idsToCheck.contains(it.id) }
-        val validator = StringIsNotEmptyValidator()
-        fieldsToCheck.forEach { field ->
-            val error = validator.validate(field.data.value?.toString())
-            if (error != null) return false
-        }
-        return true
-    }
-
-    // except network
-    fun tokensAnyFieldsIsFilled(): Boolean {
-        val idsToCheck = listOf(ContractAddress, Name, Symbol, Decimals)
-        val fieldsToCheck = form.fieldList.filter { idsToCheck.contains(it.id) }
-        val validator = StringIsEmptyValidator()
-        val errorsList = fieldsToCheck.mapNotNull { field ->
-            validator.validate(field.data.value?.toString())
-        }
-        return errorsList.isNotEmpty()
-    }
-
-    fun networkIsSelected(): Boolean {
-        val network = getField<TokenBlockchainField>(Network)
-        return network.data.value != Blockchain.Unknown
-    }
-
-    fun derivationPathIsSelected(): Boolean {
-        val network = getField<TokenDerivationPathField>(DerivationPath)
-        return network.data.value != Blockchain.Unknown
-    }
-
-    fun getCustomTokenType(): CustomTokenType {
-        return if (tokensAnyFieldsIsFilled() || tokensFieldsIsFilled()) {
-            CustomTokenType.Token
-        } else {
-            CustomTokenType.Blockchain
-        }
-    }
-
-    fun gatherUserToken(): CustomCurrency.CustomToken? = try {
-        getToken()
-    } catch (ex: Exception) {
-        null
-    }
-
-    fun gatherBlockchain(): CustomCurrency.CustomBlockchain? = try {
-        getBlockchain()
-    } catch (ex: Exception) {
-        null
-    }
-
-    fun reset(cardTypesResolver: CardTypesResolver, card: CardDTO): AddCustomTokenState {
-        return this.copy(
-            appSavedCurrencies = null,
-            onTokenAddCallback = null,
-            cardDerivationStyle = null,
-            form = Form(createFormFields(cardTypesResolver, card, CustomTokenType.Blockchain)),
-            formErrors = emptyMap(),
-            foundToken = null,
-            warnings = emptySet(),
-            screenState = createInitialScreenState(card.settings.isHDWalletAllowed),
-            tangemTechServiceManager = null,
-        )
-    }
-
-    private fun getToken(): CustomCurrency.CustomToken {
-        return CustomCurrency.CustomToken.Converter(foundToken?.id, cardDerivationStyle)
-            .apply { visitDataConverter(this) }
-            .getConvertedData()
-    }
-
-    private fun getBlockchain(): CustomCurrency.CustomBlockchain {
-        return CustomCurrency.CustomBlockchain.Converter(cardDerivationStyle)
-            .apply { visitDataConverter(this) }
-            .getConvertedData()
-    }
-
-    companion object {
-
-        /**
-         * If an user select derivation path (derivationNetwork) as Blockchain.Unknown,
-         * then we should use a blockchain from the mainNetwork to determine a DerivationPath
-         */
-        internal fun getDerivationPath(
-            mainNetwork: Blockchain,
-            derivationNetwork: Blockchain,
-            derivationStyle: DerivationStyle?,
-        ): com.tangem.crypto.hdWallet.DerivationPath? {
-            // If we allow user to select derivations, we need to provide different derivations
-            // (Legacy style derivations).
-            // But the mainNetwork derivation depends on whether a user has a card
-            // with legacy derivations or new style derivations.
-            val derivationStyleToUse = if (derivationNetwork == Blockchain.Unknown) {
-                derivationStyle
-            } else {
-                DerivationStyle.LEGACY
-            }
-            return when (derivationNetwork) {
-                Blockchain.Unknown -> mainNetwork
-                else -> derivationNetwork
-            }.derivationPath(derivationStyleToUse)
-        }
-
-        internal fun createFormFields(
-            cardTypesResolver: CardTypesResolver,
-            card: CardDTO,
-            type: CustomTokenType,
-        ): List<DataField<*>> {
-            return listOf(
-                TokenField(ContractAddress),
-                TokenBlockchainField(Network, getNetworksList(cardTypesResolver, card, type)),
-                TokenField(Name),
-                TokenField(Symbol),
-                TokenField(Decimals),
-                TokenDerivationPathField(DerivationPath, getSupportedDerivations(card)),
-            )
-        }
-
-        /**
-         * Serves to determine the networks (blockchains & tokens) that can be selected by Form.Networks.
-         * Blockchain.Unknown - is the default selection
-         */
-        private fun getNetworksList(
-            cardTypesResolver: CardTypesResolver,
-            card: CardDTO,
-            type: CustomTokenType,
-        ): List<Blockchain> {
-            val evmBlockchains = Blockchain.values()
-                .filter { it.isEvm() }
-                .filter { card.isTestCard == it.isTestnet() }
-
-            val additionalBlockchains = listOf(
-                Blockchain.Binance,
-                Blockchain.BinanceTestnet,
-                Blockchain.Solana,
-                Blockchain.SolanaTestnet,
-                Blockchain.Tron,
-                Blockchain.TronTestnet,
-            )
-
-            val supportedByCard = when (type) {
-                CustomTokenType.Blockchain -> card.supportedBlockchains(cardTypesResolver)
-                CustomTokenType.Token -> card.supportedTokens(cardTypesResolver)
-            }
-            val typedNetworksList = (evmBlockchains + additionalBlockchains)
-                .filter { supportedByCard.contains(it) }
-                .toMutableList()
-
-            val default = Blockchain.Unknown
-            typedNetworksList.add(0, default)
-
-            return typedNetworksList.sortByName()
-        }
-
-        private fun createFormValidators(): Map<CustomTokenFieldId, CustomTokenValidator<out Any>> {
-            return mapOf(
-                ContractAddress to TokenContractAddressValidator(),
-                Network to TokenNetworkValidator(),
-                Name to TokenNameValidator(),
-                Symbol to TokenSymbolValidator(),
-                Decimals to TokenDecimalsValidator(),
-            )
-        }
-
-        private fun getSupportedDerivations(card: CardDTO): List<Blockchain> {
-            val evmBlockchains = Blockchain.values()
-                .filter { card.isTestCard == it.isTestnet() && it.isEvm() }
-                .filter { it.isSupportedInApp() }
-
-            return (listOf(Blockchain.Unknown) + evmBlockchains).sortByName()
-        }
-
-        internal fun createInitialScreenState(showDerivationPathField: Boolean = false): ScreenState {
-            return ScreenState(
-                contractAddressField = ViewStates.TokenField(),
-                network = ViewStates.TokenField(),
-                name = ViewStates.TokenField(isEnabled = false),
-                symbol = ViewStates.TokenField(isEnabled = false),
-                decimals = ViewStates.TokenField(isEnabled = false),
-                derivationPath = ViewStates.TokenField(isVisible = showDerivationPathField),
-                addButton = ViewStates.AddButton(isEnabled = false),
-            )
-        }
-    }
-
-    class Converter : StringActionStateConverter<DomainState> {
-        private val jsonConverter: MoshiJsonConverter = MoshiJsonConverter.INSTANCE
-        private var builder: StringBuilder = StringBuilder()
-
-        override fun convert(action: Action, stateHolder: DomainState): String? {
-            if (action !is AddCustomTokenAction) return null
-
-            val state = stateHolder.addCustomTokensState
-            val fieldConverter =
-                FieldToJsonConverter(
-                    listOf(
-                        ContractAddress,
-                        Network,
-                        Name,
-                        Symbol,
-                        Decimals,
-                        DerivationPath,
-                    ),
-                    jsonConverter,
-                )
-            state.visitDataConverter(fieldConverter)
-            val errors = state.formErrors.map {
-                "${it.key}: ${it.value::class.java.simpleName}"
-            }
-            val warnings = state.warnings.map { it::class.java.simpleName }
-
-            printAction(action, state)
-            printStateValue("fields", fieldConverter.getConvertedData())
-            printStateValue("fieldErrors", toJson(errors))
-            printStateValue("warnings", toJson(warnings))
-            printStateValue("screenState", toJson(state.screenState))
-            printMessage("------------------------------------------------------")
-
-            val printed = builder.toString()
-            builder = StringBuilder()
-
-            return printed
-        }
-
-        private fun printStateValue(name: String, value: String) {
-            printMessage("$name: $value")
-        }
-
-        private fun printAction(action: AddCustomTokenAction, state: AddCustomTokenState) {
-            printMessage("action: $action, state: ${state::class.java.simpleName}")
-        }
-
-        private fun toJson(value: Any): String {
-            return jsonConverter.prettyPrint(value)
-        }
-
-        private fun printMessage(message: String) {
-            builder.append("$message\n")
-        }
-    }
-}
-
-private fun List<Blockchain>.sortByName(): List<Blockchain> = this.sortedBy { it.fullName }
-
-enum class CustomTokenType {
-    Token, Blockchain
-}
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/features/addCustomToken/redux/Models.kt b/domain/legacy/src/main/java/com/tangem/domain/features/addCustomToken/redux/Models.kt
deleted file mode 100644
index 444255ef7f..0000000000
--- a/domain/legacy/src/main/java/com/tangem/domain/features/addCustomToken/redux/Models.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.tangem.domain.features.addCustomToken.redux
-
-/**
-[REDACTED_AUTHOR]
- */
-// describes state the screen, except the form fields
-data class ScreenState(
-    val contractAddressField: ViewStates.TokenField,
-    val network: ViewStates.TokenField,
-    val name: ViewStates.TokenField,
-    val symbol: ViewStates.TokenField,
-    val decimals: ViewStates.TokenField,
-    val derivationPath: ViewStates.TokenField,
-    val addButton: ViewStates.AddButton,
-)
-
-sealed class ViewStates {
-    data class TokenField(
-        val isLoading: Boolean = false,
-        val isEnabled: Boolean = true,
-        val isVisible: Boolean = true,
-    ) : ViewStates()
-
-    data class AddButton(
-        val isEnabled: Boolean = true,
-    ) : ViewStates()
-}
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/redux/DomainState.kt b/domain/legacy/src/main/java/com/tangem/domain/redux/DomainState.kt
index 49cc235412..67be91d2dd 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/redux/DomainState.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/redux/DomainState.kt
@@ -1,13 +1,9 @@
 package com.tangem.domain.redux
 
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenState
 import com.tangem.domain.redux.global.DomainGlobalState
 import org.rekotlin.StateType
 
 /**
 [REDACTED_AUTHOR]
  */
-data class DomainState(
-    val globalState: DomainGlobalState = DomainGlobalState(),
-    val addCustomTokensState: AddCustomTokenState = AddCustomTokenState(),
-) : StateType
\ No newline at end of file
+data class DomainState(val globalState: DomainGlobalState = DomainGlobalState()) : StateType
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/redux/DomainStore.kt b/domain/legacy/src/main/java/com/tangem/domain/redux/DomainStore.kt
index fbd4fe3735..a141cd5f9a 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/redux/DomainStore.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/redux/DomainStore.kt
@@ -1,7 +1,5 @@
 package com.tangem.domain.redux
 
-import com.tangem.domain.DomainLayer
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenHub
 import com.tangem.domain.redux.global.DomainGlobalHub
 import org.rekotlin.Action
 import org.rekotlin.Store
@@ -9,10 +7,7 @@ import org.rekotlin.Store
 /**
 [REDACTED_AUTHOR]
  */
-private val RE_STORE_HUBS: List<ReStoreHub<DomainState, *>> = listOf(
-    DomainGlobalHub(),
-    AddCustomTokenHub(),
-)
+private val RE_STORE_HUBS: List<ReStoreHub<DomainState, *>> = listOf(DomainGlobalHub())
 
 val domainStore = Store(
     state = DomainState(),
@@ -37,7 +32,6 @@ private fun reduce(action: Action, domainState: DomainState?): DomainState {
             assembleReducedDomainState
         }
     }
-    DomainLayer.actionStateLogger.log(reducedStatesByAction)
 
     return assembleReducedDomainState
 }
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/redux/LegacyAction.kt b/domain/legacy/src/main/java/com/tangem/domain/redux/LegacyAction.kt
new file mode 100644
index 0000000000..2565d2f226
--- /dev/null
+++ b/domain/legacy/src/main/java/com/tangem/domain/redux/LegacyAction.kt
@@ -0,0 +1,8 @@
+package com.tangem.domain.redux
+
+import org.rekotlin.Action
+
+sealed interface LegacyAction : Action {
+
+    object SendEmailRateCanBeBetter : LegacyAction
+}
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/redux/global/DomainGlobalAction.kt b/domain/legacy/src/main/java/com/tangem/domain/redux/global/DomainGlobalAction.kt
index 2c9edb34a5..90bf41578e 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/redux/global/DomainGlobalAction.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/redux/global/DomainGlobalAction.kt
@@ -1,6 +1,5 @@
 package com.tangem.domain.redux.global
 
-import com.tangem.domain.DomainDialog
 import com.tangem.domain.models.scan.ScanResponse
 import org.rekotlin.Action
 
@@ -10,5 +9,4 @@ import org.rekotlin.Action
 // TODO: refactoring: is alias for the GlobalAction
 sealed class DomainGlobalAction : Action {
     data class SaveScanNoteResponse(val scanResponse: ScanResponse) : DomainGlobalAction()
-    data class ShowDialog(val stateDialog: DomainDialog?) : DomainGlobalAction()
 }
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/redux/global/DomainGlobalHub.kt b/domain/legacy/src/main/java/com/tangem/domain/redux/global/DomainGlobalHub.kt
index f22a14aa64..e552550257 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/redux/global/DomainGlobalHub.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/redux/global/DomainGlobalHub.kt
@@ -47,9 +47,6 @@ private class DomainGlobalReducer : ReStoreReducer<DomainGlobalState> {
                 )
                 state.copy(scanResponse = action.scanResponse)
             }
-            is DomainGlobalAction.ShowDialog -> {
-                state.copy(dialog = action.stateDialog)
-            }
             else -> state
         }
     }
diff --git a/domain/legacy/src/main/java/com/tangem/domain/redux/global/DomainGlobalState.kt b/domain/legacy/src/main/java/com/tangem/domain/redux/global/DomainGlobalState.kt
index 36a97859c9..a424fbb683 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/redux/global/DomainGlobalState.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/redux/global/DomainGlobalState.kt
@@ -2,7 +2,6 @@ package com.tangem.domain.redux.global
 
 import com.tangem.datasource.api.paymentology.PaymentologyApiService
 import com.tangem.datasource.api.tangemTech.TangemTechService
-import com.tangem.domain.DomainDialog
 import com.tangem.domain.models.scan.ScanResponse
 
 /**
@@ -14,7 +13,6 @@ data class DomainGlobalState(
     val scanResponse: ScanResponse? = null,
     //
     val networkServices: NetworkServices = NetworkServices(),
-    val dialog: DomainDialog? = null,
 )
 
 data class NetworkServices(
diff --git a/domain/legacy/src/main/java/com/tangem/domain/redux/state/StateConverter.kt b/domain/legacy/src/main/java/com/tangem/domain/redux/state/StateConverter.kt
deleted file mode 100644
index 8e99e0f538..0000000000
--- a/domain/legacy/src/main/java/com/tangem/domain/redux/state/StateConverter.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.tangem.domain.redux.state
-
-import com.tangem.domain.redux.DomainState
-import org.rekotlin.Action
-
-/**
-[REDACTED_AUTHOR]
- */
-interface StringStateConverter<StateHolder> {
-    fun convert(stateHolder: StateHolder): String
-}
-
-interface StringActionStateConverter<StateHolder> {
-    fun convert(action: Action, stateHolder: StateHolder): String?
-}
-
-class ActionStateConvertersFactory {
-    private val stateConverters = mutableMapOf<Class<out Action>, StringActionStateConverter<DomainState>>()
-
-    fun addConverter(classOfAction: Class<out Action>, converter: StringActionStateConverter<DomainState>) {
-        stateConverters[classOfAction] = converter
-    }
-
-    fun getConverter(action: Action): StringActionStateConverter<DomainState>? {
-        val converter = stateConverters.firstNotNullOfOrNull { (classOfAction, converter) ->
-            if (classOfAction.isAssignableFrom(action::class.java)) {
-                converter
-            } else {
-                null
-            }
-        } ?: return null
-
-        return converter
-    }
-}
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/redux/state/StateLogger.kt b/domain/legacy/src/main/java/com/tangem/domain/redux/state/StateLogger.kt
deleted file mode 100644
index 576d398ea8..0000000000
--- a/domain/legacy/src/main/java/com/tangem/domain/redux/state/StateLogger.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.tangem.domain.redux.state
-
-import com.tangem.domain.features.BuildConfig
-import com.tangem.domain.redux.DomainState
-import org.rekotlin.Action
-import timber.log.Timber
-
-/**
-[REDACTED_AUTHOR]
- * Use it only in debug mode!
- */
-internal interface ActionStateLogger {
-    fun log(reducedSates: List<Pair<Action, DomainState>>)
-}
-
-internal class ActionStateLoggerImpl : ActionStateLogger {
-
-    val actionStateConvertersFactory = ActionStateConvertersFactory()
-
-    override fun log(reducedSates: List<Pair<Action, DomainState>>) {
-        if (!BuildConfig.LOG_ENABLED) return
-
-        logStates(reducedSates)
-    }
-
-    private fun logStates(reducedSates: List<Pair<Action, DomainState>>) {
-        reducedSates.forEach { (action, domainState) ->
-            val messageToPrint = actionStateConvertersFactory.getConverter(action)
-                ?.convert(action, domainState)
-                ?: return@forEach
-
-            Timber.d(messageToPrint)
-        }
-    }
-}
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/redux/state/StringStateConverter.kt b/domain/legacy/src/main/java/com/tangem/domain/redux/state/StringStateConverter.kt
new file mode 100644
index 0000000000..f0660f284f
--- /dev/null
+++ b/domain/legacy/src/main/java/com/tangem/domain/redux/state/StringStateConverter.kt
@@ -0,0 +1,8 @@
+package com.tangem.domain.redux.state
+
+/**
+[REDACTED_AUTHOR]
+ */
+interface StringStateConverter<StateHolder> {
+    fun convert(stateHolder: StateHolder): String
+}
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/tokens/TokensAction.kt b/domain/legacy/src/main/java/com/tangem/domain/tokens/TokensAction.kt
new file mode 100644
index 0000000000..3cfbe08917
--- /dev/null
+++ b/domain/legacy/src/main/java/com/tangem/domain/tokens/TokensAction.kt
@@ -0,0 +1,36 @@
+package com.tangem.domain.tokens
+
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchain.common.Token
+import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.wallets.models.UserWallet
+import org.rekotlin.Action
+
+sealed interface TokensAction : Action {
+
+    /** Single way to pass data to the screen */
+    sealed interface SetArgs : TokensAction {
+        object ManageAccess : SetArgs
+        object ReadAccess : SetArgs
+    }
+
+    @Deprecated("Action is used for saving data by old way. It will be removed after deleting of legacy wallet screen")
+    data class LegacySaveChanges(
+        val currentTokens: List<TokenWithBlockchain>,
+        val currentBlockchains: List<Blockchain>,
+        val changedTokens: List<TokenWithBlockchain>,
+        val changedBlockchains: List<Blockchain>,
+        val scanResponse: ScanResponse,
+    ) : TokensAction
+
+    data class NewSaveChanges(
+        val currentTokens: List<CryptoCurrency.Token>,
+        val currentCoins: List<CryptoCurrency.Coin>,
+        val changedTokens: List<CryptoCurrency.Token>,
+        val changedCoins: List<CryptoCurrency.Coin>,
+        val userWallet: UserWallet,
+    ) : TokensAction
+}
+
+data class TokenWithBlockchain(val token: Token, val blockchain: Blockchain)
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/userwallets/UserWalletBuilder.kt b/domain/legacy/src/main/java/com/tangem/domain/userwallets/UserWalletBuilder.kt
index c3ee686578..72d4684786 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/userwallets/UserWalletBuilder.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/userwallets/UserWalletBuilder.kt
@@ -28,8 +28,13 @@ class UserWalletBuilder(
                 cardTypesResolver.isStart2Coin() -> "Start2Coin"
                 else -> "Wallet"
             }
+            ProductType.Wallet2 -> "Wallet"
         }
 
+    /**
+     * DANGEROUS!!!
+     * [backupCardsIds] will be non-empty list if card is backed up on current device.
+     */
     fun backupCardsIds(backupCardsIds: Set<String>?) = this.apply {
         if (backupCardsIds != null) {
             this.backupCardsIds = backupCardsIds
diff --git a/domain/legacy/src/main/java/com/tangem/domain/walletconnect/WalletConnectActions.kt b/domain/legacy/src/main/java/com/tangem/domain/walletconnect/WalletConnectActions.kt
new file mode 100644
index 0000000000..afb7d26d9f
--- /dev/null
+++ b/domain/legacy/src/main/java/com/tangem/domain/walletconnect/WalletConnectActions.kt
@@ -0,0 +1,12 @@
+package com.tangem.domain.walletconnect
+
+import com.tangem.domain.wallets.models.UserWallet
+import org.rekotlin.Action
+
+sealed class WalletConnectActions : Action {
+    sealed class New {
+        data class Initialize(val userWallet: UserWallet) : WalletConnectActions()
+
+        data class SetupUserChains(val userWallet: UserWallet) : WalletConnectActions()
+    }
+}
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/DefaultWalletManagersFacade.kt b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/DefaultWalletManagersFacade.kt
index deb238337d..1f4caa5690 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/DefaultWalletManagersFacade.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/DefaultWalletManagersFacade.kt
@@ -1,18 +1,24 @@
 package com.tangem.domain.walletmanager
 
+import com.tangem.blockchain.blockchains.polkadot.ExistentialDepositProvider
+import com.tangem.blockchain.blockchains.solana.RentProvider
+import com.tangem.blockchain.common.AmountType
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.BlockchainSdkError
 import com.tangem.blockchain.common.WalletManager
+import com.tangem.blockchain.common.address.Address
+import com.tangem.blockchain.common.address.AddressType
+import com.tangem.blockchain.common.txhistory.TransactionHistoryRequest
 import com.tangem.blockchain.extensions.Result
 import com.tangem.crypto.hdWallet.DerivationPath
 import com.tangem.datasource.config.ConfigManager
 import com.tangem.datasource.local.userwallet.UserWalletsStore
 import com.tangem.datasource.local.walletmanager.WalletManagersStore
-import com.tangem.domain.common.util.derivationStyleProvider
 import com.tangem.domain.common.util.hasDerivation
 import com.tangem.domain.demo.DemoConfig
-import com.tangem.domain.tokens.models.CryptoCurrency
-import com.tangem.domain.tokens.models.Network
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.Network
+import com.tangem.domain.tokens.model.warnings.CryptoCurrencyWarning
 import com.tangem.domain.txhistory.models.PaginationWrapper
 import com.tangem.domain.txhistory.models.TxHistoryItem
 import com.tangem.domain.txhistory.models.TxHistoryState
@@ -20,7 +26,9 @@ import com.tangem.domain.walletmanager.model.UpdateWalletManagerResult
 import com.tangem.domain.walletmanager.utils.*
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.domain.wallets.models.UserWalletId
+import kotlinx.coroutines.flow.Flow
 import timber.log.Timber
+import java.math.BigDecimal
 
 // FIXME: Move to its own module and make internal
 @Deprecated("Inject the WalletManagerFacade interface using DI instead")
@@ -39,42 +47,71 @@ class DefaultWalletManagersFacade(
 
     override suspend fun update(
         userWalletId: UserWalletId,
-        networkId: Network.ID,
+        network: Network,
         extraTokens: Set<CryptoCurrency.Token>,
     ): UpdateWalletManagerResult {
         val userWallet = getUserWallet(userWalletId)
-        val blockchain = Blockchain.fromId(networkId.value)
+        val blockchain = Blockchain.fromId(network.id.value)
+        val derivationPath = network.derivationPath.value
 
-        return getAndUpdateWalletManager(userWallet, blockchain, extraTokens)
+        return getAndUpdateWalletManager(userWallet, blockchain, derivationPath, extraTokens)
     }
 
-    override suspend fun getExploreUrl(userWalletId: UserWalletId, networkId: Network.ID): String {
-        val userWallet = getUserWallet(userWalletId)
-
-        val blockchain = Blockchain.fromId(networkId.value)
-
-        return getOrCreateWalletManager(
-            userWallet = userWallet,
-            blockchain = blockchain,
-            derivationPath = blockchain
-                .derivationPath(userWallet.scanResponse.derivationStyleProvider.getDerivationStyle()),
-        )
-            ?.wallet
-            ?.getExploreUrl()
-            .orEmpty()
-    }
-
-    override suspend fun getTxHistoryState(
+    override suspend fun updatePendingTransactions(
         userWalletId: UserWalletId,
-        networkId: Network.ID,
-        rawDerivationPath: String?,
-    ): TxHistoryState {
+        network: Network,
+    ): UpdateWalletManagerResult {
         val userWallet = getUserWallet(userWalletId)
-        val blockchain = Blockchain.fromId(networkId.value)
-        val derivationPath = rawDerivationPath?.let(::DerivationPath)
-        val walletManager = requireNotNull(getOrCreateWalletManager(userWallet, blockchain, derivationPath)) {
+        val blockchain = Blockchain.fromId(network.id.value)
+        val derivationPath = network.derivationPath.value
+
+        if (derivationPath != null && !userWallet.scanResponse.hasDerivation(blockchain, derivationPath)) {
+            Timber.w("Derivation missed for: $blockchain")
+            return UpdateWalletManagerResult.MissedDerivation
+        }
+
+        val walletManager = getOrCreateWalletManager(userWalletId, blockchain, derivationPath)
+        if (walletManager == null || blockchain == Blockchain.Unknown) {
+            Timber.w("Unable to get a wallet manager for blockchain: $blockchain")
+            return UpdateWalletManagerResult.Unreachable
+        }
+
+        return getLastWalletManagerResult(walletManager)
+    }
+
+    override suspend fun getExploreUrl(
+        userWalletId: UserWalletId,
+        network: Network,
+        addressType: AddressType,
+    ): String {
+        val blockchain = Blockchain.fromId(network.id.value)
+
+        val walletManager = getOrCreateWalletManager(
+            userWalletId = userWalletId,
+            blockchain = blockchain,
+            derivationPath = network.derivationPath.value,
+        )
+
+        requireNotNull(walletManager) {
             "Unable to get a wallet manager for blockchain: $blockchain"
         }
+
+        val address = walletManager.wallet.addresses.find { it.type == addressType }?.value
+        return walletManager.wallet.getExploreUrl(address)
+    }
+
+    override suspend fun getTxHistoryState(userWalletId: UserWalletId, network: Network): TxHistoryState {
+        val blockchain = Blockchain.fromId(network.id.value)
+        val walletManager = getOrCreateWalletManager(
+            userWalletId = userWalletId,
+            blockchain = blockchain,
+            derivationPath = network.derivationPath.value,
+        )
+
+        requireNotNull(walletManager) {
+            "Unable to get a wallet manager for blockchain: $blockchain"
+        }
+
         return walletManager
             .getTransactionHistoryState(walletManager.wallet.address)
             .let(txHistoryStateConverter::convert)
@@ -82,21 +119,30 @@ class DefaultWalletManagersFacade(
 
     override suspend fun getTxHistoryItems(
         userWalletId: UserWalletId,
-        networkId: Network.ID,
-        rawDerivationPath: String?,
+        currency: CryptoCurrency,
         page: Int,
         pageSize: Int,
     ): PaginationWrapper<TxHistoryItem> {
-        val userWallet = getUserWallet(userWalletId)
-        val blockchain = Blockchain.fromId(networkId.value)
-        val derivationPath = rawDerivationPath?.let(::DerivationPath)
-        val walletManager = requireNotNull(getOrCreateWalletManager(userWallet, blockchain, derivationPath)) {
+        val blockchain = Blockchain.fromId(currency.network.id.value)
+        val walletManager = getOrCreateWalletManager(
+            userWalletId = userWalletId,
+            blockchain = blockchain,
+            derivationPath = currency.network.derivationPath.value,
+        )
+
+        requireNotNull(walletManager) {
             "Unable to get a wallet manager for blockchain: $blockchain"
         }
+
         val itemsResult = walletManager.getTransactionsHistory(
-            address = walletManager.wallet.address,
-            page = page,
-            pageSize = pageSize,
+            request = TransactionHistoryRequest(
+                address = walletManager.wallet.address,
+                page = TransactionHistoryRequest.Page(number = page, size = pageSize),
+                filterType = when (currency) {
+                    is CryptoCurrency.Coin -> TransactionHistoryRequest.FilterType.Coin
+                    is CryptoCurrency.Token -> TransactionHistoryRequest.FilterType.Contract(currency.contractAddress)
+                },
+            ),
         )
 
         return when (itemsResult) {
@@ -118,19 +164,23 @@ class DefaultWalletManagersFacade(
     private suspend fun getAndUpdateWalletManager(
         userWallet: UserWallet,
         blockchain: Blockchain,
+        derivationPath: String?,
         extraTokens: Set<CryptoCurrency.Token>,
     ): UpdateWalletManagerResult {
         val scanResponse = userWallet.scanResponse
-        val derivationPath = blockchain.derivationPath(scanResponse.derivationStyleProvider.getDerivationStyle())
 
-        if (derivationPath != null && !scanResponse.hasDerivation(blockchain, derivationPath.rawPath)) {
-            Timber.e("Derivation missed for: $blockchain")
+        if (derivationPath != null && !scanResponse.hasDerivation(blockchain, derivationPath)) {
+            Timber.w("Derivation missed for: $blockchain")
             return UpdateWalletManagerResult.MissedDerivation
         }
 
-        val walletManager = getOrCreateWalletManager(userWallet, blockchain, derivationPath)
+        val walletManager = getOrCreateWalletManager(
+            userWalletId = userWallet.walletId,
+            blockchain = blockchain,
+            derivationPath = derivationPath,
+        )
         if (walletManager == null || blockchain == Blockchain.Unknown) {
-            Timber.e("Unable to get a wallet manager for blockchain: $blockchain")
+            Timber.w("Unable to get a wallet manager for blockchain: $blockchain")
             return UpdateWalletManagerResult.Unreachable
         }
 
@@ -160,32 +210,43 @@ class DefaultWalletManagersFacade(
 
             resultFactory.getResult(walletManager)
         } catch (e: BlockchainSdkError.AccountNotFound) {
-            resultFactory.getNoAccountResult(walletManager)
+            resultFactory.getNoAccountResult(walletManager = walletManager, customMessage = e.customMessage)
         } catch (e: Throwable) {
-            Timber.e(e, "Unable to update a wallet manager for: ${walletManager.wallet.blockchain}")
+            Timber.w(e, "Unable to update a wallet manager for: ${walletManager.wallet.blockchain}")
+
+            UpdateWalletManagerResult.Unreachable
+        }
+    }
+
+    private fun getLastWalletManagerResult(walletManager: WalletManager): UpdateWalletManagerResult {
+        return try {
+            resultFactory.getResult(walletManager)
+        } catch (e: BlockchainSdkError.AccountNotFound) {
+            resultFactory.getNoAccountResult(walletManager = walletManager, customMessage = e.customMessage)
+        } catch (e: Throwable) {
+            Timber.w(e, "Unable to update a wallet manager for: ${walletManager.wallet.blockchain}")
 
             UpdateWalletManagerResult.Unreachable
         }
     }
 
     override suspend fun getOrCreateWalletManager(
-        userWallet: UserWallet,
+        userWalletId: UserWalletId,
         blockchain: Blockchain,
-        derivationPath: DerivationPath?,
+        derivationPath: String?,
     ): WalletManager? {
-        val userWalletId = userWallet.walletId
-
+        val userWallet = getUserWallet(userWalletId)
         var walletManager = walletManagersStore.getSyncOrNull(
             userWalletId = userWalletId,
             blockchain = blockchain,
-            derivationPath = derivationPath?.rawPath,
+            derivationPath = derivationPath,
         )
 
         if (walletManager == null) {
             walletManager = walletManagerFactory.createWalletManager(
                 scanResponse = userWallet.scanResponse,
                 blockchain = blockchain,
-                derivationPath = derivationPath,
+                derivationPath = derivationPath?.let { DerivationPath(rawPath = it) },
             ) ?: return null
 
             walletManagersStore.store(userWalletId, walletManager)
@@ -194,6 +255,69 @@ class DefaultWalletManagersFacade(
         return walletManager
     }
 
+    override suspend fun getStoredWalletManagers(userWalletId: UserWalletId): List<WalletManager> {
+        return walletManagersStore.getAllSync(userWalletId)
+    }
+
+    override suspend fun getAddress(userWalletId: UserWalletId, network: Network): List<Address> {
+        val blockchain = Blockchain.fromId(network.id.value)
+
+        return getOrCreateWalletManager(
+            userWalletId = userWalletId,
+            blockchain = blockchain,
+            derivationPath = network.derivationPath.value,
+        )
+            ?.wallet
+            ?.addresses
+            ?.sortedBy { it.type }
+            .orEmpty()
+    }
+
+    override suspend fun getRentInfo(userWalletId: UserWalletId, network: Network): CryptoCurrencyWarning.Rent? {
+        val blockchain = Blockchain.fromId(network.id.value)
+        val manager = getOrCreateWalletManager(
+            userWalletId = userWalletId,
+            blockchain = blockchain,
+            derivationPath = network.derivationPath.value,
+        )
+        if (manager !is RentProvider) return null
+
+        return when (val result = manager.minimalBalanceForRentExemption()) {
+            is Result.Success -> {
+                val balance = manager.wallet.fundsAvailable(AmountType.Coin)
+                val outgoingTxs = manager.wallet.recentTransactions
+                    .filter { it.sourceAddress == manager.wallet.address && it.amount.type == AmountType.Coin }
+
+                val rentExempt = result.data
+                val setRent = if (outgoingTxs.isEmpty()) {
+                    balance < rentExempt
+                } else {
+                    val outgoingAmount = outgoingTxs.sumOf { it.amount.value ?: BigDecimal.ZERO }
+                    val rest = balance.minus(outgoingAmount)
+                    balance < rest
+                }
+
+                if (setRent) CryptoCurrencyWarning.Rent(manager.rentAmount(), rentExempt) else null
+            }
+            is Result.Failure -> null
+        }
+    }
+
+    override suspend fun getExistentialDeposit(userWalletId: UserWalletId, network: Network): BigDecimal? {
+        val blockchain = Blockchain.fromId(network.id.value)
+        val manager = getOrCreateWalletManager(
+            userWalletId = userWalletId,
+            blockchain = blockchain,
+            derivationPath = network.derivationPath.value,
+        )
+
+        return if (manager is ExistentialDepositProvider) manager.getExistentialDeposit() else null
+    }
+
+    override fun getAll(userWalletId: UserWalletId): Flow<List<WalletManager>> {
+        return walletManagersStore.getAll(userWalletId)
+    }
+
     private fun updateWalletManagerTokensIfNeeded(walletManager: WalletManager, tokens: Set<CryptoCurrency.Token>) {
         if (tokens.isEmpty()) return
 
diff --git a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/WalletManagersFacade.kt b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/WalletManagersFacade.kt
index 4c296b01e4..19e400b067 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/WalletManagersFacade.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/WalletManagersFacade.kt
@@ -1,16 +1,20 @@
 package com.tangem.domain.walletmanager
 
+import com.tangem.blockchain.blockchains.solana.RentProvider
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.WalletManager
-import com.tangem.crypto.hdWallet.DerivationPath
-import com.tangem.domain.tokens.models.CryptoCurrency
-import com.tangem.domain.tokens.models.Network
+import com.tangem.blockchain.common.address.Address
+import com.tangem.blockchain.common.address.AddressType
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.Network
+import com.tangem.domain.tokens.model.warnings.CryptoCurrencyWarning
 import com.tangem.domain.txhistory.models.PaginationWrapper
 import com.tangem.domain.txhistory.models.TxHistoryItem
 import com.tangem.domain.txhistory.models.TxHistoryState
 import com.tangem.domain.walletmanager.model.UpdateWalletManagerResult
-import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.domain.wallets.models.UserWalletId
+import kotlinx.coroutines.flow.Flow
+import java.math.BigDecimal
 
 // TODO: Move to its own module
 /**
@@ -22,52 +26,90 @@ interface WalletManagersFacade {
      * Updates the wallet manager associated with a user's wallet and network.
      *
      * @param userWalletId The ID of the user's wallet.
-     * @param networkId The network ID.
+     * @param network The network.
      * @param extraTokens Additional tokens.
      * @return The result of updating the wallet manager.
      */
     suspend fun update(
         userWalletId: UserWalletId,
-        networkId: Network.ID,
+        network: Network,
         extraTokens: Set<CryptoCurrency.Token>,
     ): UpdateWalletManagerResult
 
-    suspend fun getExploreUrl(userWalletId: UserWalletId, networkId: Network.ID): String
+    /**
+     * Returns [UpdateWalletManagerResult] with last pending transactions
+     *
+     * @param userWalletId The ID of the user's wallet.
+     * @param network The network.
+     * @return The result of updating the wallet manager.
+     */
+    suspend fun updatePendingTransactions(userWalletId: UserWalletId, network: Network): UpdateWalletManagerResult
+
+    /**
+     * Returns network explorer URL of the wallet manager associated with a user's wallet and network.
+     *
+     * @param userWalletId The ID of the user's wallet.
+     * @param network The network.
+     * @param addressType Address type.
+     *
+     * @return The network explorer URL, maybe empty if the wallet manager was not found.
+     * */
+    suspend fun getExploreUrl(userWalletId: UserWalletId, network: Network, addressType: AddressType): String
 
     /**
      * Returns transactions count
      *
      * @param userWalletId The ID of the user's wallet.
-     * @param networkId The network ID.
-     * @param rawDerivationPath Derivation path in raw form.
-
+     * @param network The network.
      */
-    suspend fun getTxHistoryState(
-        userWalletId: UserWalletId,
-        networkId: Network.ID,
-        rawDerivationPath: String?,
-    ): TxHistoryState
+    suspend fun getTxHistoryState(userWalletId: UserWalletId, network: Network): TxHistoryState
 
     /**
      * Returns transaction history items wrapped to pagination
      *
      * @param userWalletId The ID of the user's wallet.
-     * @param networkId The network ID.
-     * @param rawDerivationPath Derivation path in raw form.
+     * @param currency currency.
      * @param page Pagination page.
      * @param pageSize Pagination size.
      */
     suspend fun getTxHistoryItems(
         userWalletId: UserWalletId,
-        networkId: Network.ID,
-        rawDerivationPath: String?,
+        currency: CryptoCurrency,
         page: Int,
         pageSize: Int,
     ): PaginationWrapper<TxHistoryItem>
 
+    // TODO: Remove after refactoring
     suspend fun getOrCreateWalletManager(
-        userWallet: UserWallet,
+        userWalletId: UserWalletId,
         blockchain: Blockchain,
-        derivationPath: DerivationPath?,
+        derivationPath: String?,
     ): WalletManager?
+
+    @Deprecated("Will be removed in future")
+    suspend fun getStoredWalletManagers(userWalletId: UserWalletId): List<WalletManager>
+
+    /**
+     * Returns ordered list of addresses for selected wallet for given currency
+     *
+     * @param userWalletId selected wallet id
+     * @param network network of currency
+     */
+    suspend fun getAddress(userWalletId: UserWalletId, network: Network): List<Address>
+
+    /**
+     * Returns info about rent if wallet manager implemented [RentProvider], otherwise null
+     *
+     * @param userWalletId selected wallet id
+     * @param network network of currency
+     */
+    suspend fun getRentInfo(userWalletId: UserWalletId, network: Network): CryptoCurrencyWarning.Rent?
+
+    /**
+     * Returns value which indicates if the account balance drops below the existential deposit value, it will be
+     * deactivated and any remaining funds will be destroyed.
+     */
+    suspend fun getExistentialDeposit(userWalletId: UserWalletId, network: Network): BigDecimal?
+
+    fun getAll(userWalletId: UserWalletId): Flow<List<WalletManager>>
 }
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/model/CryptoCurrencyTransaction.kt b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/model/CryptoCurrencyTransaction.kt
index c0b69b941f..94c3bba81b 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/model/CryptoCurrencyTransaction.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/model/CryptoCurrencyTransaction.kt
@@ -1,28 +1,17 @@
 package com.tangem.domain.walletmanager.model
 
-import org.joda.time.DateTime
-import java.math.BigDecimal
+import com.tangem.domain.txhistory.models.TxHistoryItem
 
+// TODO: [REDACTED_JIRA] move to txhistory module
 sealed class CryptoCurrencyTransaction {
 
-    abstract val amount: BigDecimal
-    abstract val fromAddress: String?
-    abstract val toAddress: String?
-    abstract val sentAt: DateTime
+    abstract val txHistoryItem: TxHistoryItem
 
-    data class Coin(
-        override val amount: BigDecimal,
-        override val fromAddress: String?,
-        override val toAddress: String?,
-        override val sentAt: DateTime,
-    ) : CryptoCurrencyTransaction()
+    data class Coin(override val txHistoryItem: TxHistoryItem) : CryptoCurrencyTransaction()
 
     data class Token(
         val tokenId: String?,
         val tokenContractAddress: String,
-        override val amount: BigDecimal,
-        override val fromAddress: String?,
-        override val toAddress: String?,
-        override val sentAt: DateTime,
+        override val txHistoryItem: TxHistoryItem,
     ) : CryptoCurrencyTransaction()
 }
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/model/UpdateWalletManagerResult.kt b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/model/UpdateWalletManagerResult.kt
index 4ad842a7dd..ae14d752e1 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/model/UpdateWalletManagerResult.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/model/UpdateWalletManagerResult.kt
@@ -19,5 +19,6 @@ sealed class UpdateWalletManagerResult {
         val defaultAddress: String,
         val addresses: Set<String>,
         val amountToCreateAccount: BigDecimal,
+        val errorMessage: String,
     ) : UpdateWalletManagerResult()
 }
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/SdkTokenConverter.kt b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/SdkTokenConverter.kt
index a6ceecff07..0071195b1b 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/SdkTokenConverter.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/SdkTokenConverter.kt
@@ -1,6 +1,6 @@
 package com.tangem.domain.walletmanager.utils
 
-import com.tangem.domain.tokens.models.CryptoCurrency
+import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.utils.converter.Converter
 import com.tangem.blockchain.common.Token as SdkToken
 
diff --git a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/SdkTransactionHistoryItemConverter.kt b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/SdkTransactionHistoryItemConverter.kt
index df57ff2349..d0f0ef7d65 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/SdkTransactionHistoryItemConverter.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/SdkTransactionHistoryItemConverter.kt
@@ -1,6 +1,5 @@
 package com.tangem.domain.walletmanager.utils
 
-import com.tangem.blockchain.common.TransactionStatus
 import com.tangem.blockchain.common.txhistory.TransactionHistoryItem
 import com.tangem.domain.txhistory.models.TxHistoryItem
 import com.tangem.utils.converter.Converter
@@ -13,11 +12,20 @@ internal class SdkTransactionHistoryItemConverter : Converter<SdkTransactionHist
         timestampInMillis = value.timestamp,
         direction = value.direction.toDomain(),
         status = when (value.status) {
-            TransactionStatus.Confirmed -> TxHistoryItem.TxStatus.Confirmed
-            TransactionStatus.Unconfirmed -> TxHistoryItem.TxStatus.Unconfirmed
+            TransactionHistoryItem.TransactionStatus.Confirmed -> TxHistoryItem.TransactionStatus.Confirmed
+            TransactionHistoryItem.TransactionStatus.Failed -> TxHistoryItem.TransactionStatus.Failed
+            TransactionHistoryItem.TransactionStatus.Unconfirmed -> TxHistoryItem.TransactionStatus.Unconfirmed
         },
-        type = when (value.type) {
+        type = when (val type = value.type) {
             TransactionHistoryItem.TransactionType.Transfer -> TxHistoryItem.TransactionType.Transfer
+            TransactionHistoryItem.TransactionType.Approve -> TxHistoryItem.TransactionType.Approve
+            is TransactionHistoryItem.TransactionType.Custom -> TxHistoryItem.TransactionType.Custom(type.id)
+            TransactionHistoryItem.TransactionType.Deposit -> TxHistoryItem.TransactionType.Deposit
+            TransactionHistoryItem.TransactionType.Submit -> TxHistoryItem.TransactionType.Submit
+            TransactionHistoryItem.TransactionType.Supply -> TxHistoryItem.TransactionType.Supply
+            TransactionHistoryItem.TransactionType.Swap -> TxHistoryItem.TransactionType.Swap
+            TransactionHistoryItem.TransactionType.Unoswap -> TxHistoryItem.TransactionType.Unoswap
+            TransactionHistoryItem.TransactionType.Withdraw -> TxHistoryItem.TransactionType.Withdraw
         },
         amount = requireNotNull(value.amount.value) { "Transaction amount value must not be null" },
     )
diff --git a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/UpdateWalletManagerResultFactory.kt b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/UpdateWalletManagerResultFactory.kt
index 4d644e4b7c..3cd76649cd 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/UpdateWalletManagerResultFactory.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/UpdateWalletManagerResultFactory.kt
@@ -3,56 +3,57 @@ package com.tangem.domain.walletmanager.utils
 import com.tangem.blockchain.common.*
 import com.tangem.blockchain.common.address.Address
 import com.tangem.domain.common.extensions.amountToCreateAccount
+import com.tangem.domain.txhistory.models.TxHistoryItem
 import com.tangem.domain.walletmanager.model.CryptoCurrencyAmount
 import com.tangem.domain.walletmanager.model.CryptoCurrencyTransaction
 import com.tangem.domain.walletmanager.model.UpdateWalletManagerResult
-import org.joda.time.DateTime
-import org.joda.time.DateTimeZone
-import org.joda.time.Instant
 import timber.log.Timber
 import java.math.BigDecimal
-import java.util.Calendar
+import java.util.concurrent.TimeUnit
 
 internal class UpdateWalletManagerResultFactory {
 
     fun getResult(walletManager: WalletManager): UpdateWalletManagerResult.Verified {
         val wallet = walletManager.wallet
+        val addresses = getAvailableAddresses(wallet.addresses)
 
         return UpdateWalletManagerResult.Verified(
             defaultAddress = wallet.address,
-            addresses = getAvailableAddresses(wallet.addresses),
+            addresses = addresses,
             currenciesAmounts = getTokensAmounts(wallet.amounts.values.toSet()),
-            currentTransactions = getCurrentTransactions(wallet.recentTransactions.toSet()),
+            currentTransactions = getCurrentTransactions(addresses, wallet.recentTransactions.toSet()),
         )
     }
 
     fun getDemoResult(walletManager: WalletManager, demoAmount: Amount): UpdateWalletManagerResult.Verified {
         val wallet = walletManager.wallet
+        val addresses = getAvailableAddresses(wallet.addresses)
 
         return UpdateWalletManagerResult.Verified(
             defaultAddress = wallet.address,
-            addresses = getAvailableAddresses(wallet.addresses),
+            addresses = addresses,
             currenciesAmounts = getDemoTokensAmounts(demoAmount, walletManager.cardTokens),
-            currentTransactions = getCurrentTransactions(wallet.recentTransactions.toSet()),
+            currentTransactions = getCurrentTransactions(addresses, wallet.recentTransactions.toSet()),
         )
     }
 
-    fun getNoAccountResult(walletManager: WalletManager): UpdateWalletManagerResult.NoAccount {
+    fun getNoAccountResult(walletManager: WalletManager, customMessage: String): UpdateWalletManagerResult {
         val wallet = walletManager.wallet
         val blockchain = wallet.blockchain
-        val amountToCreateAccount = blockchain.amountToCreateAccount(
-            token = wallet.getTokens().firstOrNull(),
-        )
+        val firstWalletToken = wallet.getTokens().firstOrNull()
+        val amountToCreateAccount = blockchain.amountToCreateAccount(firstWalletToken)
 
-        requireNotNull(amountToCreateAccount) {
-            "Unable to get required amount to create account for: $blockchain"
+        return if (amountToCreateAccount == null) {
+            Timber.w("Unable to get required amount to create account for: $blockchain")
+            UpdateWalletManagerResult.Unreachable
+        } else {
+            UpdateWalletManagerResult.NoAccount(
+                defaultAddress = wallet.address,
+                addresses = getAvailableAddresses(wallet.addresses),
+                amountToCreateAccount = amountToCreateAccount,
+                errorMessage = customMessage,
+            )
         }
-
-        return UpdateWalletManagerResult.NoAccount(
-            defaultAddress = wallet.address,
-            addresses = getAvailableAddresses(wallet.addresses),
-            amountToCreateAccount = amountToCreateAccount,
-        )
     }
 
     private fun getTokensAmounts(amounts: Set<Amount>): Set<CryptoCurrencyAmount> {
@@ -70,12 +71,15 @@ internal class UpdateWalletManagerResultFactory {
         }
     }
 
-    private fun getCurrentTransactions(recentTransactions: Set<TransactionData>): Set<CryptoCurrencyTransaction> {
+    private fun getCurrentTransactions(
+        walletAddresses: Set<String>,
+        recentTransactions: Set<TransactionData>,
+    ): Set<CryptoCurrencyTransaction> {
         val unconfirmedTransactions = recentTransactions.filter {
             it.status == TransactionStatus.Unconfirmed
         }
 
-        return unconfirmedTransactions.mapNotNullTo(hashSetOf(), ::createCurrencyTransaction)
+        return unconfirmedTransactions.mapNotNullTo(hashSetOf()) { createCurrencyTransaction(walletAddresses, it) }
     }
 
     private fun createCurrencyAmount(amount: Amount): CryptoCurrencyAmount? {
@@ -92,31 +96,78 @@ internal class UpdateWalletManagerResultFactory {
         }
     }
 
-    private fun createCurrencyTransaction(data: TransactionData): CryptoCurrencyTransaction? {
-        val fromAddress = takeAddressIfNotUnknown(data.sourceAddress)
-        val toAddress = takeAddressIfNotUnknown(data.destinationAddress)
-        val amount = getTransactionAmountValue(data.amount) ?: return null
-        val sentAt = getTransactionSentTime(data.date) ?: return null
-
+    private fun createCurrencyTransaction(
+        walletAddresses: Set<String>,
+        data: TransactionData,
+    ): CryptoCurrencyTransaction? {
         return when (val type = data.amount.type) {
-            is AmountType.Coin -> CryptoCurrencyTransaction.Coin(
-                amount = amount,
-                fromAddress = fromAddress,
-                toAddress = toAddress,
-                sentAt = sentAt,
-            )
-            is AmountType.Token -> CryptoCurrencyTransaction.Token(
-                tokenId = type.token.id,
-                tokenContractAddress = type.token.contractAddress,
-                amount = amount,
-                fromAddress = fromAddress,
-                toAddress = toAddress,
-                sentAt = sentAt,
-            )
+            is AmountType.Coin -> {
+                val txHistoryItem = createTxHistoryItem(walletAddresses, data) ?: return null
+                CryptoCurrencyTransaction.Coin(txHistoryItem)
+            }
+            is AmountType.Token -> {
+                val txHistoryItem = createTxHistoryItem(walletAddresses, data) ?: return null
+                CryptoCurrencyTransaction.Token(
+                    tokenId = type.token.id,
+                    tokenContractAddress = type.token.contractAddress,
+                    txHistoryItem = txHistoryItem,
+                )
+            }
             is AmountType.Reserve -> null
         }
     }
 
+    private fun createTxHistoryItem(walletAddresses: Set<String>, data: TransactionData): TxHistoryItem? {
+        val direction = extractDirection(walletAddresses, data) ?: run {
+            Timber.w("Can not determine address for $data")
+            return null
+        }
+        val hash = data.hash ?: return null
+        val millis = data.date?.timeInMillis ?: return null
+        val amount = getTransactionAmountValue(data.amount) ?: return null
+
+        return TxHistoryItem(
+            txHash = hash,
+            timestampInMillis = TimeUnit.SECONDS.toMillis(millis),
+            direction = direction,
+            status = when (data.status) {
+                TransactionStatus.Confirmed -> TxHistoryItem.TransactionStatus.Confirmed
+                TransactionStatus.Unconfirmed -> TxHistoryItem.TransactionStatus.Unconfirmed
+            },
+            type = TxHistoryItem.TransactionType.Transfer,
+            amount = amount,
+        )
+    }
+
+    private fun extractDirection(
+        walletAddresses: Set<String>,
+        data: TransactionData,
+    ): TxHistoryItem.TransactionDirection? {
+        val fromAddress = data.sourceAddress
+        val toAddress = data.destinationAddress
+
+        return when {
+            toAddress in walletAddresses -> {
+                TxHistoryItem.TransactionDirection.Incoming(TxHistoryItem.Address.Single(fromAddress))
+            }
+            fromAddress in walletAddresses -> {
+                TxHistoryItem.TransactionDirection.Outgoing(TxHistoryItem.Address.Single(toAddress))
+            }
+            else -> {
+                Timber.w(
+                    """
+                    Unable to find transaction direction
+                    |- To address: ${data.destinationAddress}
+                    |- From address: ${data.sourceAddress}
+                    |- Network addresses: $walletAddresses
+                    """.trimIndent(),
+                )
+
+                return null
+            }
+        }
+    }
+
     private fun getAvailableAddresses(addresses: Set<Address>): Set<String> {
         return addresses.mapTo(hashSetOf()) { it.value }
     }
@@ -125,7 +176,7 @@ internal class UpdateWalletManagerResultFactory {
         val value = amount.value
 
         if (value == null) {
-            Timber.e("Currency amount must not be null: ${amount.currencySymbol}")
+            Timber.w("Currency amount must not be null: ${amount.currencySymbol}")
         }
 
         return value
@@ -135,29 +186,9 @@ internal class UpdateWalletManagerResultFactory {
         val value = amount.value
 
         if (value == null) {
-            Timber.e("Transaction amount must not be null: ${amount.currencySymbol}")
+            Timber.w("Transaction amount must not be null: ${amount.currencySymbol}")
         }
 
         return value
     }
-
-    private fun getTransactionSentTime(date: Calendar?): DateTime? {
-        if (date == null) {
-            Timber.e("Transaction date must not be null")
-            return null
-        }
-
-        val instant = Instant.ofEpochMilli(date.timeInMillis)
-        val timeZone = DateTimeZone.forTimeZone(date.timeZone)
-
-        return instant.toDateTime(timeZone)
-    }
-
-    private fun takeAddressIfNotUnknown(address: String): String? {
-        return address.takeIf { it.isNotBlank() && it != UNKNOWN_TRANSACTION_ADDRESS }
-    }
-
-    private companion object {
-        const val UNKNOWN_TRANSACTION_ADDRESS = "unknown"
-    }
 }
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/WalletManagerFactory.kt b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/WalletManagerFactory.kt
index 770721f3f7..cd0b2a670b 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/WalletManagerFactory.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/utils/WalletManagerFactory.kt
@@ -1,13 +1,14 @@
 package com.tangem.domain.walletmanager.utils
 
-import com.tangem.blockchain.common.*
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchain.common.DerivationParams
+import com.tangem.blockchain.common.WalletManager
 import com.tangem.blockchain.common.WalletManagerFactory
-import com.tangem.blockchain.common.derivation.DerivationStyle
 import com.tangem.crypto.hdWallet.DerivationPath
 import com.tangem.datasource.config.ConfigManager
-import com.tangem.domain.common.TapWorkarounds.useOldStyleDerivation
+import com.tangem.domain.common.DerivationStyleProvider
 import com.tangem.domain.common.extensions.makeWalletManagerForApp
-import com.tangem.domain.models.scan.CardDTO
+import com.tangem.domain.common.util.derivationStyleProvider
 import com.tangem.domain.models.scan.ScanResponse
 
 internal class WalletManagerFactory(
@@ -23,7 +24,7 @@ internal class WalletManagerFactory(
         blockchain: Blockchain,
         derivationPath: DerivationPath?,
     ): WalletManager? {
-        val derivationParams = getDerivationParams(derivationPath, scanResponse.card)
+        val derivationParams = getDerivationParams(derivationPath, scanResponse.derivationStyleProvider)
 
         return sdkWalletManagerFactory.makeWalletManagerForApp(
             scanResponse = scanResponse,
@@ -32,12 +33,11 @@ internal class WalletManagerFactory(
         )
     }
 
-    private fun getDerivationParams(derivationPath: DerivationPath?, card: CardDTO): DerivationParams? {
-        val derivationStyle = when {
-            !card.settings.isHDWalletAllowed -> return null
-            card.useOldStyleDerivation -> DerivationStyle.LEGACY
-            else -> DerivationStyle.NEW
-        }
+    private fun getDerivationParams(
+        derivationPath: DerivationPath?,
+        derivationStyleProvider: DerivationStyleProvider,
+    ): DerivationParams? {
+        val derivationStyle = derivationStyleProvider.getDerivationStyle() ?: return null
 
         return if (derivationPath == null) {
             DerivationParams.Default(derivationStyle)
diff --git a/domain/models/src/main/kotlin/com/tangem/domain/models/scan/CardDTO.kt b/domain/models/src/main/kotlin/com/tangem/domain/models/scan/CardDTO.kt
index 70d822c8cc..c59c926791 100644
--- a/domain/models/src/main/kotlin/com/tangem/domain/models/scan/CardDTO.kt
+++ b/domain/models/src/main/kotlin/com/tangem/domain/models/scan/CardDTO.kt
@@ -46,7 +46,7 @@ data class CardDTO(
         isAccessCodeSet = card.isAccessCodeSet,
         isPasscodeSet = card.isPasscodeSet,
         supportedCurves = card.supportedCurves,
-        wallets = card.wallets.map { Wallet(it) },
+        wallets = card.wallets.map(::Wallet),
         attestation = card.attestation,
         backupStatus = BackupStatus.fromSdkStatus(card.backupStatus),
     )
@@ -234,6 +234,7 @@ data class CardDTO(
         val hasBackup: Boolean,
         val derivedKeys: Map<DerivationPath, ExtendedPublicKey>,
         val extendedPublicKey: ExtendedPublicKey?,
+        val isImported: Boolean,
     ) {
         constructor(wallet: CardWallet) : this(
             publicKey = wallet.publicKey,
@@ -246,8 +247,10 @@ data class CardDTO(
             hasBackup = wallet.hasBackup,
             derivedKeys = wallet.derivedKeys,
             extendedPublicKey = wallet.extendedPublicKey,
+            isImported = wallet.isImported,
         )
 
+        @Suppress("CyclomaticComplexMethod")
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (other !is Wallet) return false
@@ -256,13 +259,16 @@ data class CardDTO(
             if (chainCode != null) {
                 if (other.chainCode == null) return false
                 if (!chainCode.contentEquals(other.chainCode)) return false
-            } else if (other.chainCode != null) return false
+            } else {
+                if (other.chainCode != null) return false
+            }
             if (curve != other.curve) return false
             if (settings != other.settings) return false
             if (totalSignedHashes != other.totalSignedHashes) return false
             if (remainingSignatures != other.remainingSignatures) return false
             if (index != other.index) return false
             if (hasBackup != other.hasBackup) return false
+            if (isImported != other.isImported) return false
 
             return true
         }
@@ -276,6 +282,7 @@ data class CardDTO(
             result = 31 * result + (remainingSignatures ?: 0)
             result = 31 * result + index
             result = 31 * result + hasBackup.hashCode()
+            result = 31 * result + isImported.hashCode()
             return result
         }
     }
diff --git a/domain/settings/build.gradle.kts b/domain/settings/build.gradle.kts
index 7ff7fb7522..00cd0a439e 100644
--- a/domain/settings/build.gradle.kts
+++ b/domain/settings/build.gradle.kts
@@ -1,4 +1,9 @@
 plugins {
     alias(deps.plugins.kotlin.jvm)
     id("configuration")
+}
+
+dependencies {
+    implementation(deps.kotlin.coroutines)
+    implementation(projects.domain.balanceHiding.models)
 }
\ No newline at end of file
diff --git a/domain/settings/src/main/java/com/tangem/domain/settings/IsReadyToShowRateAppUseCase.kt b/domain/settings/src/main/java/com/tangem/domain/settings/IsReadyToShowRateAppUseCase.kt
new file mode 100644
index 0000000000..0a7ecd2473
--- /dev/null
+++ b/domain/settings/src/main/java/com/tangem/domain/settings/IsReadyToShowRateAppUseCase.kt
@@ -0,0 +1,9 @@
+package com.tangem.domain.settings
+
+import com.tangem.domain.settings.repositories.AppRatingRepository
+import kotlinx.coroutines.flow.Flow
+
+class IsReadyToShowRateAppUseCase(private val appRatingRepository: AppRatingRepository) {
+
+    operator fun invoke(): Flow<Boolean> = appRatingRepository.isReadyToShow()
+}
\ No newline at end of file
diff --git a/domain/settings/src/main/java/com/tangem/domain/settings/IsUserAlreadyRateAppUseCase.kt b/domain/settings/src/main/java/com/tangem/domain/settings/IsUserAlreadyRateAppUseCase.kt
deleted file mode 100644
index fa71e80df8..0000000000
--- a/domain/settings/src/main/java/com/tangem/domain/settings/IsUserAlreadyRateAppUseCase.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.tangem.domain.settings
-
-import com.tangem.domain.settings.repositories.SettingsRepository
-
-class IsUserAlreadyRateAppUseCase(private val settingsRepository: SettingsRepository) {
-
-    suspend operator fun invoke(): Boolean = settingsRepository.isUserAlreadyRateApp()
-}
\ No newline at end of file
diff --git a/domain/settings/src/main/java/com/tangem/domain/settings/NeverToSuggestRateAppUseCase.kt b/domain/settings/src/main/java/com/tangem/domain/settings/NeverToSuggestRateAppUseCase.kt
new file mode 100644
index 0000000000..282dd05a54
--- /dev/null
+++ b/domain/settings/src/main/java/com/tangem/domain/settings/NeverToSuggestRateAppUseCase.kt
@@ -0,0 +1,10 @@
+package com.tangem.domain.settings
+
+import com.tangem.domain.settings.repositories.AppRatingRepository
+
+class NeverToSuggestRateAppUseCase(private val appRatingRepository: AppRatingRepository) {
+
+    suspend operator fun invoke() {
+        appRatingRepository.setNeverToShow()
+    }
+}
\ No newline at end of file
diff --git a/domain/settings/src/main/java/com/tangem/domain/settings/RemindToRateAppLaterUseCase.kt b/domain/settings/src/main/java/com/tangem/domain/settings/RemindToRateAppLaterUseCase.kt
new file mode 100644
index 0000000000..94f46f9512
--- /dev/null
+++ b/domain/settings/src/main/java/com/tangem/domain/settings/RemindToRateAppLaterUseCase.kt
@@ -0,0 +1,10 @@
+package com.tangem.domain.settings
+
+import com.tangem.domain.settings.repositories.AppRatingRepository
+
+class RemindToRateAppLaterUseCase(private val appRatingRepository: AppRatingRepository) {
+
+    suspend operator fun invoke() {
+        appRatingRepository.remindLater()
+    }
+}
\ No newline at end of file
diff --git a/domain/settings/src/main/java/com/tangem/domain/settings/SetWalletWithFundsFoundUseCase.kt b/domain/settings/src/main/java/com/tangem/domain/settings/SetWalletWithFundsFoundUseCase.kt
new file mode 100644
index 0000000000..3653df521a
--- /dev/null
+++ b/domain/settings/src/main/java/com/tangem/domain/settings/SetWalletWithFundsFoundUseCase.kt
@@ -0,0 +1,8 @@
+package com.tangem.domain.settings
+
+import com.tangem.domain.settings.repositories.AppRatingRepository
+
+class SetWalletWithFundsFoundUseCase(private val appRatingRepository: AppRatingRepository) {
+
+    suspend operator fun invoke() = appRatingRepository.setWalletWithFundsFound()
+}
\ No newline at end of file
diff --git a/domain/settings/src/main/java/com/tangem/domain/settings/repositories/AppRatingRepository.kt b/domain/settings/src/main/java/com/tangem/domain/settings/repositories/AppRatingRepository.kt
new file mode 100644
index 0000000000..e10dc94046
--- /dev/null
+++ b/domain/settings/src/main/java/com/tangem/domain/settings/repositories/AppRatingRepository.kt
@@ -0,0 +1,17 @@
+package com.tangem.domain.settings.repositories
+
+import kotlinx.coroutines.flow.Flow
+
+interface AppRatingRepository {
+
+    // FIXME: We must to initialize all stores before calling [isReadyToShow], otherwise flow will not emit data
+    suspend fun initialize()
+
+    suspend fun setWalletWithFundsFound()
+
+    fun isReadyToShow(): Flow<Boolean>
+
+    suspend fun remindLater()
+
+    suspend fun setNeverToShow()
+}
\ No newline at end of file
diff --git a/domain/settings/src/main/java/com/tangem/domain/settings/repositories/SettingsRepository.kt b/domain/settings/src/main/java/com/tangem/domain/settings/repositories/SettingsRepository.kt
index 4b6810e2d4..cdfe2702da 100644
--- a/domain/settings/src/main/java/com/tangem/domain/settings/repositories/SettingsRepository.kt
+++ b/domain/settings/src/main/java/com/tangem/domain/settings/repositories/SettingsRepository.kt
@@ -2,7 +2,5 @@ package com.tangem.domain.settings.repositories
 
 interface SettingsRepository {
 
-    suspend fun isUserAlreadyRateApp(): Boolean
-
     suspend fun shouldShowSaveUserWalletScreen(): Boolean
 }
\ No newline at end of file
diff --git a/domain/tokens/build.gradle.kts b/domain/tokens/build.gradle.kts
index 6fae380259..c146658684 100644
--- a/domain/tokens/build.gradle.kts
+++ b/domain/tokens/build.gradle.kts
@@ -1,14 +1,21 @@
 plugins {
-    alias(deps.plugins.kotlin.jvm)
+    alias(deps.plugins.android.library)
+    alias(deps.plugins.kotlin.android)
     id("configuration")
 }
 
+android {
+    namespace = "com.tangem.domain.tokens"
+}
+
 dependencies {
 
     /** Project - Domain */
     implementation(projects.domain.core)
     implementation(projects.domain.models)
+    implementation(projects.domain.legacy)
     implementation(projects.domain.tokens.models)
+    implementation(projects.domain.txhistory.models)
     implementation(projects.domain.wallets.models)
     implementation(projects.domain.appCurrency.models)
 
diff --git a/domain/tokens/models/build.gradle.kts b/domain/tokens/models/build.gradle.kts
index 7ff7fb7522..e9075cefa0 100644
--- a/domain/tokens/models/build.gradle.kts
+++ b/domain/tokens/models/build.gradle.kts
@@ -1,4 +1,15 @@
 plugins {
-    alias(deps.plugins.kotlin.jvm)
+    alias(deps.plugins.android.library)
+    alias(deps.plugins.kotlin.android)
+    id("kotlin-parcelize")
     id("configuration")
+}
+
+android {
+    namespace = "com.tangem.domain.tokens.model"
+}
+
+dependencies {
+    implementation(projects.domain.txhistory.models)
+    implementation(projects.core.analytics.models)
 }
\ No newline at end of file
diff --git a/domain/tokens/models/src/main/java/com/tangem/domain/tokens/models/CryptoCurrency.kt b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/CryptoCurrency.kt
similarity index 53%
rename from domain/tokens/models/src/main/java/com/tangem/domain/tokens/models/CryptoCurrency.kt
rename to domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/CryptoCurrency.kt
index c4346df385..e360bda6e4 100644
--- a/domain/tokens/models/src/main/java/com/tangem/domain/tokens/models/CryptoCurrency.kt
+++ b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/CryptoCurrency.kt
@@ -1,6 +1,7 @@
-package com.tangem.domain.tokens.models
+package com.tangem.domain.tokens.model
 
-import java.io.Serializable
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
 
 /**
  * Represents a generic cryptocurrency.
@@ -11,11 +12,10 @@ import java.io.Serializable
  * @property symbol Symbol of the cryptocurrency.
  * @property decimals Number of decimal places used by the cryptocurrency.
  * @property iconUrl Optional URL of the cryptocurrency icon. `null` if not found.
- * @property derivationPath Optional path used for key derivation. `null` if the wallet does not support the
- * [HD Wallet](https://coinsutra.com/hd-wallets-deterministic-wallet/) feature.
+ * @property isCustom Indicates whether the currency is a custom user-added currency or not.
  */
-// FIXME: Remove serialization [REDACTED_JIRA]
-sealed class CryptoCurrency : Serializable {
+@Parcelize
+sealed class CryptoCurrency : Parcelable {
 
     abstract val id: ID
     abstract val network: Network
@@ -23,7 +23,7 @@ sealed class CryptoCurrency : Serializable {
     abstract val symbol: String
     abstract val decimals: Int
     abstract val iconUrl: String?
-    abstract val derivationPath: String?
+    abstract val isCustom: Boolean
 
     /**
      * Represents a native coin in the blockchain network.
@@ -35,7 +35,7 @@ sealed class CryptoCurrency : Serializable {
         override val symbol: String,
         override val decimals: Int,
         override val iconUrl: String?,
-        override val derivationPath: String?,
+        override val isCustom: Boolean,
     ) : CryptoCurrency() {
 
         init {
@@ -47,7 +47,6 @@ sealed class CryptoCurrency : Serializable {
      * Represents a token in the blockchain network, typically a non-native asset.
      *
      * @property contractAddress Address of the contract managing the token.
-     * @property isCustom Indicates whether the token is a custom user-added token or not.
      */
     data class Token(
         override val id: ID,
@@ -56,9 +55,8 @@ sealed class CryptoCurrency : Serializable {
         override val symbol: String,
         override val decimals: Int,
         override val iconUrl: String?,
-        override val derivationPath: String?,
+        override val isCustom: Boolean,
         val contractAddress: String,
-        val isCustom: Boolean,
     ) : CryptoCurrency() {
 
         init {
@@ -77,35 +75,77 @@ sealed class CryptoCurrency : Serializable {
      * @property rawCurrencyId Represents not unique currency ID from the blockchain network. `null` if
      * its ID of the custom token.
      */
-    // FIXME: Remove serialization [REDACTED_JIRA]
+    @Parcelize
     data class ID(
         private val prefix: Prefix,
-        private val networkId: Network.ID,
+        private val body: Body,
         private val suffix: Suffix,
-    ) : Serializable {
+    ) : Parcelable {
 
-        val value: String = buildString {
-            append(prefix.value)
-            append(networkId.value)
-            append(DELIMITER)
-            append(suffix.value)
-        }
+        val value: String
+            get() = buildString {
+                append(prefix.value)
+                append(PREFIX_DELIMITER)
+                append(body.value)
+                append(SUFFIX_DELIMITER)
+                append(suffix.value)
+            }
 
-        val rawCurrencyId: String? = (suffix as? Suffix.RawID)?.rawId
+        /** Represents a raw cryptocurrency ID. If it is a custom token, the value will be `null`. */
+        val rawCurrencyId: String? get() = (suffix as? Suffix.RawID)?.rawId
+
+        /** Represents a raw cryptocurrency's network ID. */
+        val rawNetworkId: String
+            get() = when (body) {
+                is Body.NetworkId -> body.rawId
+                is Body.NetworkIdWithDerivationPath -> body.rawId
+            }
 
         /**
          * Represents the different types of prefixes that can be associated with a cryptocurrency ID.
+         *
          * These prefixes can help in quickly categorizing the type of cryptocurrency.
          */
         enum class Prefix(val value: String) {
             /** Prefix for standard coins. */
-            COIN_PREFIX(value = "coin_"),
+            COIN_PREFIX(value = "coin"),
 
             /** Prefix for standard tokens. */
-            TOKEN_PREFIX(value = "token_"),
+            TOKEN_PREFIX(value = "token"),
+        }
 
-            /** Prefix for custom tokens. */
-            CUSTOM_TOKEN_PREFIX(value = "custom_"),
+        /**
+         * Represents the body part of the cryptocurrency ID.
+         *
+         * The body can be either a raw network ID or a raw network ID with a network derivation path.
+         */
+        @Parcelize
+        sealed class Body : Parcelable {
+
+            /** The value of the body. */
+            abstract val value: String
+
+            /** Represents a raw network ID. */
+            data class NetworkId(val rawId: String) : Body() {
+                override val value: String get() = rawId
+            }
+
+            /**
+             * Represents a raw network ID with a network derivation path.
+             *
+             * Should be used for a cryptocurrencies with custom derivation path.
+             * */
+            data class NetworkIdWithDerivationPath(
+                val rawId: String,
+                val derivationPath: String,
+            ) : Body() {
+                override val value: String
+                    get() = buildString {
+                        append(rawId)
+                        append(DERIVATION_PATH_DELIMITER)
+                        append(derivationPath.hashCode())
+                    }
+            }
         }
 
         /**
@@ -113,25 +153,38 @@ sealed class CryptoCurrency : Serializable {
          *
          * The suffix can either be a raw ID or a contract address.
          */
-        // FIXME: Remove serialization [REDACTED_JIRA]
-        sealed class Suffix : Serializable {
+        @Parcelize
+        sealed class Suffix : Parcelable {
 
             /** The value of the suffix, which could be either a raw ID or a contract address. */
             abstract val value: String
 
             /** Represents a raw ID suffix. */
-            data class RawID(val rawId: String) : Suffix() {
-                override val value: String = rawId
+            data class RawID(val rawId: String, val contractAddress: String? = null) : Suffix() {
+                override val value: String
+                    get() = buildString {
+                        append(rawId)
+                        if (contractAddress != null) {
+                            append(SUFFIX_DELIMITER)
+                            append(contractAddress)
+                        }
+                    }
             }
 
             /** Represents a contract address suffix. */
             data class ContractAddress(val contractAddress: String) : Suffix() {
-                override val value: String = contractAddress
+                override val value: String get() = contractAddress
             }
         }
 
+        override fun toString(): String {
+            return "ID(value='$value')"
+        }
+
         private companion object {
-            const val DELIMITER = '#'
+            const val PREFIX_DELIMITER = '_'
+            const val SUFFIX_DELIMITER = '#'
+            const val DERIVATION_PATH_DELIMITER = 'd'
         }
     }
 
@@ -140,6 +193,5 @@ sealed class CryptoCurrency : Serializable {
         require(symbol.isNotBlank()) { "Crypto currency symbol must not be blank" }
         require(iconUrl?.isNotBlank() ?: true) { "Crypto currency icon URL must not be blank" }
         require(decimals >= 0) { "Crypto currency decimal must not be less then zero, but it is: $decimals" }
-        require(derivationPath?.isNotBlank() ?: true) { "Crypto currency derivation path must not be blank" }
     }
 }
\ No newline at end of file
diff --git a/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/CryptoCurrencyStatus.kt b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/CryptoCurrencyStatus.kt
new file mode 100644
index 0000000000..8f49493cc5
--- /dev/null
+++ b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/CryptoCurrencyStatus.kt
@@ -0,0 +1,142 @@
+package com.tangem.domain.tokens.model
+
+import com.tangem.domain.txhistory.models.TxHistoryItem
+import java.math.BigDecimal
+
+/**
+ * Represents the status of a cryptocurrency asset within a network.
+ *
+ * This class encapsulates the details of a specific cryptocurrency, either a coin or cryptocurrency,
+ * along with its current status within the blockchain network. The status can include various states
+ * like Loading, Unreachable, Loaded, etc.
+ *
+ * @property currency The details of the cryptocurrency asset, including its type, name, symbol, and other properties.
+ * @property value The current status of the cryptocurrency, reflecting its state within the network.
+ */
+data class CryptoCurrencyStatus(
+    val currency: CryptoCurrency,
+    val value: Status,
+) {
+
+    /**
+     * Represents the various states a cryptocurrency can have, encapsulating different information based on the state.
+     *
+     * @property isError Indicates whether this status represents an error status.
+     */
+    sealed class Status(val isError: Boolean) {
+
+        /** The amount of the cryptocurrency. */
+        open val amount: BigDecimal? = null
+
+        /** The fiat equivalent of the cryptocurrency's amount. */
+        open val fiatAmount: BigDecimal? = null
+
+        /** The exchange rate used for converting the cryptocurrency amount to fiat. */
+        open val fiatRate: BigDecimal? = null
+
+        /** The change in price of the cryptocurrency. */
+        open val priceChange: BigDecimal? = null
+
+        /** Indicates if there are any transactions in progress related to the cryptocurrency network. */
+        open val hasCurrentNetworkTransactions: Boolean = false
+
+        /** The pending cryptocurrency transactions. */
+        open val pendingTransactions: Set<TxHistoryItem> = emptySet()
+
+        /** The network address */
+        open val networkAddress: NetworkAddress? = null
+    }
+
+    /** Represents the Loading state of a cryptocurrency, typically while fetching its details. */
+    object Loading : Status(isError = false)
+
+    /** Represents a state where the cryptocurrency is not reachable. */
+    data class Unreachable(
+        override val priceChange: BigDecimal?,
+        override val fiatRate: BigDecimal?,
+    ) : Status(isError = true)
+
+    /** Represents a state where the cryptocurrency's network amount not found. */
+    data class NoAmount(
+        override val priceChange: BigDecimal?,
+        override val fiatRate: BigDecimal?,
+    ) : Status(isError = true)
+
+    /** Represents a state where the cryptocurrency's derivation is missed. */
+    data class MissedDerivation(
+        override val priceChange: BigDecimal?,
+        override val fiatRate: BigDecimal?,
+    ) : Status(isError = true)
+
+    /**
+     * Represents a state where there is no account associated with the cryptocurrency
+     *
+     * @property amountToCreateAccount base reserve amount for account creation
+     */
+    data class NoAccount(
+        val amountToCreateAccount: BigDecimal,
+        override val priceChange: BigDecimal?,
+        override val fiatRate: BigDecimal?,
+    ) : Status(isError = false) {
+
+        override val amount: BigDecimal = BigDecimal.ZERO
+        override val fiatAmount: BigDecimal = BigDecimal.ZERO
+    }
+
+    /**
+     * Represents a Loaded state of a cryptocurrency with complete information.
+     *
+     * @property amount The amount of the cryptocurrency.
+     * @property fiatAmount The fiat equivalent of the cryptocurrency's amount.
+     * @property fiatRate The exchange rate used for converting the cryptocurrency amount to fiat.
+     * @property priceChange The change in price of the cryptocurrency.
+     * @property hasCurrentNetworkTransactions Indicates if there are any transactions in progress related to the
+     * cryptocurrency network.
+     * @property pendingTransactions The current cryptocurrency transactions.
+     */
+    data class Loaded(
+        override val amount: BigDecimal,
+        override val fiatAmount: BigDecimal,
+        override val fiatRate: BigDecimal,
+        override val priceChange: BigDecimal,
+        override val hasCurrentNetworkTransactions: Boolean,
+        override val pendingTransactions: Set<TxHistoryItem>,
+        override val networkAddress: NetworkAddress?,
+    ) : Status(isError = false)
+
+    /**
+     * Represents a Custom state of a cryptocurrency, typically used for user-defined tokens.
+     *
+     * @property amount The amount of the cryptocurrency.
+     * @property fiatAmount The fiat equivalent of the cryptocurrency's amount (optional).
+     * @property fiatRate The exchange rate used for converting the cryptocurrency amount to fiat (optional).
+     * @property priceChange The change in price of the cryptocurrency (optional).
+     * @property hasCurrentNetworkTransactions Indicates if there are any transactions in progress related to the
+     * cryptocurrency network.
+     * @property pendingTransactions The current cryptocurrency transactions.
+     */
+    data class Custom(
+        override val amount: BigDecimal,
+        override val fiatAmount: BigDecimal?,
+        override val fiatRate: BigDecimal?,
+        override val priceChange: BigDecimal?,
+        override val hasCurrentNetworkTransactions: Boolean,
+        override val pendingTransactions: Set<TxHistoryItem>,
+        override val networkAddress: NetworkAddress?,
+    ) : Status(isError = false)
+
+    /**
+     * Represents a state where the cryptocurrency is available, but there is no current quote available for it.
+     *
+     * @property amount The amount of the cryptocurrency.
+     * @property hasCurrentNetworkTransactions Indicates if there are any transactions in progress related to the
+     * cryptocurrency network.
+     * @property pendingTransactions The current cryptocurrency transactions.
+     */
+    data class NoQuote(
+        override val amount: BigDecimal,
+        override val hasCurrentNetworkTransactions: Boolean,
+        override val pendingTransactions: Set<TxHistoryItem>,
+        override val networkAddress: NetworkAddress?,
+    ) : Status(isError = false)
+}
\ No newline at end of file
diff --git a/domain/tokens/models/src/main/java/com/tangem/domain/tokens/models/Network.kt b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/Network.kt
similarity index 58%
rename from domain/tokens/models/src/main/java/com/tangem/domain/tokens/models/Network.kt
rename to domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/Network.kt
index aaa1cb39d8..2bc545ba77 100644
--- a/domain/tokens/models/src/main/java/com/tangem/domain/tokens/models/Network.kt
+++ b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/Network.kt
@@ -1,6 +1,7 @@
-package com.tangem.domain.tokens.models
+package com.tangem.domain.tokens.model
 
-import java.io.Serializable
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
 
 /**
  * Represents a blockchain network, identified by a unique ID, a human-readable name, and its standard type.
@@ -11,16 +12,18 @@ import java.io.Serializable
  *
  * @property id The unique identifier of the network.
  * @property name The human-readable name of the network, such as "Ethereum" or "Bitcoin".
+ * @property derivationPath The path used to derive keys for this network.
  * @property isTestnet Indicates whether the network is a test network or a main network.
  * @property standardType The type of blockchain standard the network adheres to.
  */
-// FIXME: Remove serialization [REDACTED_JIRA]
+@Parcelize
 data class Network(
     val id: ID,
     val name: String,
+    val derivationPath: DerivationPath,
     val isTestnet: Boolean,
     val standardType: StandardType,
-) : Serializable {
+) : Parcelable {
 
     init {
         require(name.isNotBlank()) { "Network name must not be blank" }
@@ -32,13 +35,48 @@ data class Network(
      * @property value The string representation of the network ID.
      */
     @JvmInline
-    value class ID(val value: String) {
+    @Parcelize
+    value class ID(val value: String) : Parcelable {
 
         init {
             require(value.isNotBlank()) { "Network ID must not be blank" }
         }
     }
 
+    /**
+     * Represents a path used to derive cryptographic keys for a blockchain network.
+     *
+     * This class represents such paths in a generic manner, allowing for predefined card-based paths,
+     * custom paths, or even no derivation path at all.
+     */
+    @Parcelize
+    sealed class DerivationPath : Parcelable {
+
+        /** The actual derivation path value, if any. */
+        abstract val value: String?
+
+        /**
+         * Represents a predefined card-based derivation path.
+         *
+         * @property value The derivation path string.
+         */
+        data class Card(override val value: String) : DerivationPath()
+
+        /**
+         * Represents a custom derivation path specified by the user.
+         *
+         * @property value The derivation path string.
+         */
+        data class Custom(override val value: String) : DerivationPath()
+
+        /**
+         * Represents a lack of derivation path.
+         */
+        object None : DerivationPath() {
+            override val value: String? get() = null
+        }
+    }
+
     /**
      * Represents the type of blockchain standard that a network adheres to.
      *
@@ -48,28 +86,28 @@ data class Network(
      *
      * @property name The human-readable name of the standard type.
      */
-    // FIXME: Remove serialization [REDACTED_JIRA]
-    sealed class StandardType : Serializable {
+    @Parcelize
+    sealed class StandardType : Parcelable {
         abstract val name: String
 
         /** Represents the ERC20 token standard, common on the Ethereum network. */
         object ERC20 : StandardType() {
-            override val name: String = "ERC20"
+            override val name: String get() = "ERC20"
         }
 
         /** Represents the TRC20 token standard, common on the TRON network. */
         object TRC20 : StandardType() {
-            override val name: String = "TRC20"
+            override val name: String get() = "TRC20"
         }
 
         /** Represents the BEP20 token standard, common on the Binance Smart Chain network. */
         object BEP20 : StandardType() {
-            override val name: String = "BEP20"
+            override val name: String get() = "BEP20"
         }
 
         /** Represents the BEP2 token standard, common on the Binance Chain network. */
         object BEP2 : StandardType() {
-            override val name: String = "BEP2"
+            override val name: String get() = "BEP2"
         }
 
         /** Represents a network that does not adhere to a predefined standard type. */
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/NetworkAddress.kt b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/NetworkAddress.kt
similarity index 100%
rename from domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/NetworkAddress.kt
rename to domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/NetworkAddress.kt
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/NetworkStatus.kt b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/NetworkStatus.kt
similarity index 72%
rename from domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/NetworkStatus.kt
rename to domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/NetworkStatus.kt
index e9d5ec7405..df811a8f51 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/NetworkStatus.kt
+++ b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/NetworkStatus.kt
@@ -1,17 +1,16 @@
 package com.tangem.domain.tokens.model
 
-import com.tangem.domain.tokens.models.CryptoCurrency
-import com.tangem.domain.tokens.models.Network
+import com.tangem.domain.txhistory.models.TxHistoryItem
 import java.math.BigDecimal
 
 /**
  * Represents the status of a specific blockchain network.
  *
- * @property networkId The unique identifier of the network for which the status is provided.
+ * @property network The network for which the status is provided.
  * @property value The specific status value, represented as a sealed class to encapsulate the various possible states of the network.
  */
 data class NetworkStatus(
-    val networkId: Network.ID,
+    val network: Network,
     val value: Status,
 ) {
 
@@ -43,8 +42,8 @@ data class NetworkStatus(
      */
     data class Verified(
         val address: NetworkAddress,
-        val amounts: Map<CryptoCurrency.ID, BigDecimal>,
-        val pendingTransactions: Map<CryptoCurrency.ID, Set<PendingTransaction>>,
+        val amounts: Map<CryptoCurrency.ID, AmountStatus>,
+        val pendingTransactions: Map<CryptoCurrency.ID, Set<TxHistoryItem>>,
     ) : Status()
 
     /**
@@ -52,9 +51,21 @@ data class NetworkStatus(
      *
      * @property address Network addresses.
      * @property amountToCreateAccount The amount required to create an account within the network.
+     * @property errorMessage error message
      */
     data class NoAccount(
         val address: NetworkAddress,
         val amountToCreateAccount: BigDecimal,
+        val errorMessage: String,
     ) : Status()
+
+    /**
+     * Represents possible statuses of amount.
+     *
+     * This sealed class includes states as LoadedAmount, UnreachableAmount.
+     */
+    sealed class AmountStatus
+
+    data class LoadedAmount(val value: BigDecimal) : AmountStatus()
+    object UnreachableAmount : AmountStatus()
 }
\ No newline at end of file
diff --git a/domain/tokens/models/src/main/java/com/tangem/domain/tokens/models/Quote.kt b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/Quote.kt
similarity index 92%
rename from domain/tokens/models/src/main/java/com/tangem/domain/tokens/models/Quote.kt
rename to domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/Quote.kt
index 835e84fe4f..899574d5e4 100644
--- a/domain/tokens/models/src/main/java/com/tangem/domain/tokens/models/Quote.kt
+++ b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/Quote.kt
@@ -1,4 +1,4 @@
-package com.tangem.domain.tokens.models
+package com.tangem.domain.tokens.model
 
 import java.math.BigDecimal
 
diff --git a/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/remove/RemoveCurrencyError.kt b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/remove/RemoveCurrencyError.kt
new file mode 100644
index 0000000000..475a90e2a8
--- /dev/null
+++ b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/remove/RemoveCurrencyError.kt
@@ -0,0 +1,5 @@
+package com.tangem.domain.tokens.model.remove
+
+sealed class RemoveCurrencyError : Throwable() {
+    data class DataError(override val cause: Throwable) : RemoveCurrencyError()
+}
\ No newline at end of file
diff --git a/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/warnings/CryptoCurrencyWarning.kt b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/warnings/CryptoCurrencyWarning.kt
new file mode 100644
index 0000000000..2149361962
--- /dev/null
+++ b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/warnings/CryptoCurrencyWarning.kt
@@ -0,0 +1,35 @@
+package com.tangem.domain.tokens.model.warnings
+
+import com.tangem.domain.tokens.model.CryptoCurrency
+import java.math.BigDecimal
+
+sealed class CryptoCurrencyWarning {
+
+    data class ExistentialDeposit(
+        val currencyName: String,
+        val edStringValueWithSymbol: String,
+    ) : CryptoCurrencyWarning()
+
+    data class BalanceNotEnoughForFee(
+        val currency: CryptoCurrency,
+        val blockchainFullName: String,
+        val blockchainSymbol: String,
+    ) : CryptoCurrencyWarning()
+
+    object SomeNetworksUnreachable : CryptoCurrencyWarning()
+
+    data class SomeNetworksNoAccount(
+        val amountToCreateAccount: BigDecimal,
+        val amountCurrency: CryptoCurrency,
+    ) : CryptoCurrencyWarning()
+
+    /**
+     * Represents wallet blockchain rent
+     * @param rent Amount that will be charged in overtime if the blockchain does not have an amount greater than
+     * the [exemptionAmount]
+     * @param exemptionAmount Amount that should be on the blockchain balance not to pay rent
+     */
+    data class Rent(val rent: BigDecimal, val exemptionAmount: BigDecimal) : CryptoCurrencyWarning()
+
+    data class HasPendingTransactions(val blockchainSymbol: String) : CryptoCurrencyWarning()
+}
\ No newline at end of file
diff --git a/domain/tokens/models/src/main/java/com/tangem/domain/tokens/models/analytics/TokenReceiveAnalyticsEvent.kt b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/models/analytics/TokenReceiveAnalyticsEvent.kt
new file mode 100644
index 0000000000..e5c1668624
--- /dev/null
+++ b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/models/analytics/TokenReceiveAnalyticsEvent.kt
@@ -0,0 +1,21 @@
+package com.tangem.domain.tokens.models.analytics
+
+import com.tangem.core.analytics.models.AnalyticsEvent
+
+sealed class TokenReceiveAnalyticsEvent(
+    event: String,
+    params: Map<String, String> = mapOf(),
+) : AnalyticsEvent("Token / Receive", event, params, null) {
+
+    object ReceiveScreenOpened : TokenReceiveAnalyticsEvent(event = "Receive Screen Opened")
+
+    class ButtonCopyAddress(token: String) : TokenReceiveAnalyticsEvent(
+        event = "Button - Copy Address",
+        params = mapOf("Token" to token),
+    )
+
+    class ButtonShareAddress(token: String) : TokenReceiveAnalyticsEvent(
+        event = "Button - Share Address",
+        params = mapOf("Token" to token),
+    )
+}
\ No newline at end of file
diff --git a/domain/tokens/models/src/main/java/com/tangem/domain/tokens/models/analytics/TokenScreenAnalyticsEvent.kt b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/models/analytics/TokenScreenAnalyticsEvent.kt
new file mode 100644
index 0000000000..ed01f84f51
--- /dev/null
+++ b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/models/analytics/TokenScreenAnalyticsEvent.kt
@@ -0,0 +1,75 @@
+package com.tangem.domain.tokens.models.analytics
+
+import com.tangem.core.analytics.models.AnalyticsEvent
+
+/**
+[REDACTED_AUTHOR]
+ */
+sealed class TokenScreenAnalyticsEvent(
+    event: String,
+    params: Map<String, String> = mapOf(),
+    error: Throwable? = null,
+) : AnalyticsEvent("Token", event, params, error) {
+
+    /** Legacy event. It has a unique category, but it also is sent on TokenScreen */
+    class DetailsScreenOpened(token: String) : AnalyticsEvent(
+        category = "Details Screen",
+        event = "Details Screen Opened",
+        params = mapOf("Token" to token),
+    )
+
+    class Refreshed(token: String) : TokenScreenAnalyticsEvent(
+        event = "Refreshed",
+        params = mapOf("Token" to token),
+    )
+
+    class ButtonRemoveToken(token: String) : TokenScreenAnalyticsEvent(
+        "Button - Remove Token",
+        params = mapOf("Token" to token),
+    )
+
+    class ButtonExplore(token: String) : TokenScreenAnalyticsEvent(
+        event = "Button - Explore",
+        params = mapOf("Token" to token),
+    )
+
+    class ButtonReload(token: String) : TokenScreenAnalyticsEvent(
+        event = "Button - Reload",
+        params = mapOf("Token" to token),
+    )
+
+    class ButtonBuy(token: String) : TokenScreenAnalyticsEvent(
+        event = "Button - Buy",
+        params = mapOf("Token" to token),
+    )
+
+    class ButtonSell(token: String) : TokenScreenAnalyticsEvent(
+        event = "Button - Sell",
+        params = mapOf("Token" to token),
+    )
+
+    class ButtonExchange(token: String) : TokenScreenAnalyticsEvent(
+        event = "Button - Exchange",
+        params = mapOf("Token" to token),
+    )
+
+    class ButtonSend(token: String) : TokenScreenAnalyticsEvent(
+        event = "Button - Send",
+        params = mapOf("Token" to token),
+    )
+
+    class ButtonReceive(token: String) : TokenScreenAnalyticsEvent(
+        event = "Button - Receive",
+        params = mapOf("Token" to token),
+    )
+
+    class ButtonCopyAddress(token: String) : TokenScreenAnalyticsEvent(
+        event = "Button - Copy Address",
+        params = mapOf("Token" to token),
+    )
+
+    class Bought(token: String) : TokenScreenAnalyticsEvent(
+        event = "Token Bought",
+        params = mapOf("Token" to token),
+    )
+}
\ No newline at end of file
diff --git a/domain/tokens/models/src/main/java/com/tangem/domain/tokens/models/remove/RemoveCurrencyError.kt b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/models/remove/RemoveCurrencyError.kt
deleted file mode 100644
index 906f30f1fd..0000000000
--- a/domain/tokens/models/src/main/java/com/tangem/domain/tokens/models/remove/RemoveCurrencyError.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.tangem.domain.tokens.models.remove
-
-import com.tangem.domain.tokens.models.CryptoCurrency
-
-sealed class RemoveCurrencyError : Throwable() {
-    data class HasLinkedTokens(val currency: CryptoCurrency) : RemoveCurrencyError()
-    data class DataError(override val cause: Throwable) : RemoveCurrencyError()
-}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/ApplyTokenListSortingUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/ApplyTokenListSortingUseCase.kt
index 39e2ea82db..82059ca4fd 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/ApplyTokenListSortingUseCase.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/ApplyTokenListSortingUseCase.kt
@@ -8,11 +8,10 @@ import arrow.core.raise.ensureNotNull
 import arrow.core.toNonEmptyListOrNull
 import arrow.core.toNonEmptySetOrNull
 import com.tangem.domain.tokens.error.TokenListSortingError
-import com.tangem.domain.tokens.models.CryptoCurrency
+import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.tokens.repository.CurrenciesRepository
 import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
-import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.withContext
 
 class ApplyTokenListSortingUseCase(
@@ -68,12 +67,12 @@ class ApplyTokenListSortingUseCase(
     private suspend fun Raise<TokenListSortingError>.getCurrencies(userWalletId: UserWalletId): List<CryptoCurrency> {
         val tokens = catch(
             block = {
-                currenciesRepository.getMultiCurrencyWalletCurrenciesUpdates(userWalletId).firstOrNull()
+                currenciesRepository.getMultiCurrencyWalletCurrenciesSync(userWalletId, refresh = false)
             },
             catch = { raise(TokenListSortingError.DataError(it)) },
         )
 
-        return ensureNotNull(tokens?.toNonEmptyListOrNull()) {
+        return ensureNotNull(tokens.toNonEmptyListOrNull()) {
             TokenListSortingError.TokenListIsEmpty
         }
     }
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/FetchCardTokenListUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/FetchCardTokenListUseCase.kt
new file mode 100644
index 0000000000..7448714472
--- /dev/null
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/FetchCardTokenListUseCase.kt
@@ -0,0 +1,72 @@
+package com.tangem.domain.tokens
+
+import arrow.core.Either
+import arrow.core.raise.Raise
+import arrow.core.raise.catch
+import arrow.core.raise.either
+import com.tangem.domain.tokens.error.TokenListError
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.Network
+import com.tangem.domain.tokens.repository.CurrenciesRepository
+import com.tangem.domain.tokens.repository.NetworksRepository
+import com.tangem.domain.tokens.repository.QuotesRepository
+import com.tangem.domain.wallets.models.UserWalletId
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+
+class FetchCardTokenListUseCase(
+    private val currenciesRepository: CurrenciesRepository,
+    private val networksRepository: NetworksRepository,
+    private val quotesRepository: QuotesRepository,
+) {
+
+    suspend operator fun invoke(userWalletId: UserWalletId, refresh: Boolean = false): Either<TokenListError, Unit> {
+        return either {
+            val currencies = fetchCurrencies(userWalletId = userWalletId)
+
+            coroutineScope {
+                val fetchStatuses = async {
+                    fetchNetworksStatuses(
+                        userWalletId = userWalletId,
+                        networks = currencies.mapTo(destination = hashSetOf(), transform = CryptoCurrency::network),
+                        refresh = refresh,
+                    )
+                }
+                val fetchQuotes = async {
+                    fetchQuotes(
+                        currenciesIds = currencies.mapTo(destination = hashSetOf(), transform = CryptoCurrency::id),
+                        refresh = refresh,
+                    )
+                }
+
+                awaitAll(fetchStatuses, fetchQuotes)
+            }
+        }
+    }
+
+    private suspend fun Raise<TokenListError>.fetchCurrencies(userWalletId: UserWalletId): List<CryptoCurrency> {
+        return catch(
+            block = { currenciesRepository.getSingleCurrencyWalletWithCardCurrencies(userWalletId = userWalletId) },
+            catch = { raise(TokenListError.DataError(it)) },
+        )
+    }
+
+    private suspend fun Raise<TokenListError>.fetchNetworksStatuses(
+        userWalletId: UserWalletId,
+        networks: Set<Network>,
+        refresh: Boolean,
+    ) {
+        catch(
+            block = { networksRepository.getNetworkStatusesSync(userWalletId, networks, refresh) },
+            catch = { raise(TokenListError.DataError(it)) },
+        )
+    }
+
+    private suspend fun fetchQuotes(currenciesIds: Set<CryptoCurrency.ID>, refresh: Boolean) {
+        catch(
+            block = { quotesRepository.getQuotesSync(currenciesIds, refresh) },
+            catch = { /* Ignore error */ },
+        )
+    }
+}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/FetchCurrencyStatusUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/FetchCurrencyStatusUseCase.kt
index b10e3633c9..7b5c4de6fb 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/FetchCurrencyStatusUseCase.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/FetchCurrencyStatusUseCase.kt
@@ -5,8 +5,8 @@ import arrow.core.raise.Raise
 import arrow.core.raise.catch
 import arrow.core.raise.either
 import com.tangem.domain.tokens.error.CurrencyStatusError
-import com.tangem.domain.tokens.models.CryptoCurrency
-import com.tangem.domain.tokens.models.Network
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.Network
 import com.tangem.domain.tokens.repository.CurrenciesRepository
 import com.tangem.domain.tokens.repository.NetworksRepository
 import com.tangem.domain.tokens.repository.QuotesRepository
@@ -36,16 +36,18 @@ class FetchCurrencyStatusUseCase(
      *
      * @param userWalletId The ID of the user's wallet.
      * @param id The ID of the cryptocurrency.
+     * @param derivationPath currency derivation path.
      * @param refresh Indicates whether to force a refresh of the status data.
      * @return An [Either] representing success (Right) or an error (Left) in fetching the status.
      */
     suspend operator fun invoke(
         userWalletId: UserWalletId,
         id: CryptoCurrency.ID,
+        derivationPath: Network.DerivationPath,
         refresh: Boolean = false,
     ): Either<CurrencyStatusError, Unit> {
         return either {
-            val currency = getCurrency(userWalletId, id)
+            val currency = getCurrency(userWalletId, id, derivationPath)
 
             fetchCurrencyStatus(userWalletId, currency, refresh)
         }
@@ -75,7 +77,7 @@ class FetchCurrencyStatusUseCase(
         refresh: Boolean,
     ) = coroutineScope {
         val fetchStatus = async {
-            fetchNetworkStatus(userWalletId, currency.network.id, refresh)
+            fetchNetworkStatus(userWalletId, currency.network, refresh)
         }
         val fetchQuote = async {
             fetchQuote(currency.id, refresh)
@@ -87,8 +89,9 @@ class FetchCurrencyStatusUseCase(
     private suspend fun Raise<CurrencyStatusError>.getCurrency(
         userWalletId: UserWalletId,
         id: CryptoCurrency.ID,
+        derivationPath: Network.DerivationPath,
     ): CryptoCurrency {
-        return catch({ currenciesRepository.getMultiCurrencyWalletCurrency(userWalletId, id) }) {
+        return catch({ currenciesRepository.getMultiCurrencyWalletCurrency(userWalletId, id, derivationPath) }) {
             raise(CurrencyStatusError.DataError(it))
         }
     }
@@ -101,11 +104,11 @@ class FetchCurrencyStatusUseCase(
 
     private suspend fun Raise<CurrencyStatusError>.fetchNetworkStatus(
         userWalletId: UserWalletId,
-        networkId: Network.ID,
+        network: Network,
         refresh: Boolean,
     ) {
         catch(
-            block = { networksRepository.getNetworkStatusesSync(userWalletId, setOf(networkId), refresh) },
+            block = { networksRepository.getNetworkStatusesSync(userWalletId, setOf(network), refresh) },
         ) {
             raise(CurrencyStatusError.DataError(it))
         }
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/FetchPendingTransactionsUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/FetchPendingTransactionsUseCase.kt
new file mode 100644
index 0000000000..aeda66d1f9
--- /dev/null
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/FetchPendingTransactionsUseCase.kt
@@ -0,0 +1,22 @@
+package com.tangem.domain.tokens
+
+import com.tangem.domain.tokens.model.Network
+import com.tangem.domain.tokens.repository.NetworksRepository
+import com.tangem.domain.wallets.models.UserWalletId
+import kotlinx.coroutines.coroutineScope
+
+/**
+ * Use case responsible for fetching current pending transactions
+ *
+ * @param networksRepository The repository for retrieving network-related data.
+ */
+class FetchPendingTransactionsUseCase(
+    private val networksRepository: NetworksRepository,
+) {
+
+    suspend operator fun invoke(userWalletId: UserWalletId, networks: Set<Network>) {
+        coroutineScope {
+            networksRepository.fetchNetworkPendingTransactions(userWalletId, networks)
+        }
+    }
+}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/FetchTokenListUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/FetchTokenListUseCase.kt
index 7e379288b9..0fe7e8b345 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/FetchTokenListUseCase.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/FetchTokenListUseCase.kt
@@ -7,8 +7,8 @@ import arrow.core.raise.either
 import arrow.core.raise.ensureNotNull
 import arrow.core.toNonEmptyListOrNull
 import com.tangem.domain.tokens.error.TokenListError
-import com.tangem.domain.tokens.models.CryptoCurrency
-import com.tangem.domain.tokens.models.Network
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.Network
 import com.tangem.domain.tokens.repository.CurrenciesRepository
 import com.tangem.domain.tokens.repository.NetworksRepository
 import com.tangem.domain.tokens.repository.QuotesRepository
@@ -48,7 +48,7 @@ class FetchTokenListUseCase(
                 val fetchStatuses = async {
                     fetchNetworksStatuses(
                         userWalletId,
-                        currencies.mapTo(hashSetOf()) { it.network.id },
+                        currencies.mapTo(hashSetOf()) { it.network },
                         refresh,
                     )
                 }
@@ -81,21 +81,21 @@ class FetchTokenListUseCase(
 
     private suspend fun Raise<TokenListError>.fetchNetworksStatuses(
         userWalletId: UserWalletId,
-        networksIds: Set<Network.ID>,
+        networks: Set<Network>,
         refresh: Boolean,
     ) {
         catch(
-            block = { networksRepository.getNetworkStatusesSync(userWalletId, networksIds, refresh) },
+            block = { networksRepository.getNetworkStatusesSync(userWalletId, networks, refresh) },
         ) {
             raise(TokenListError.DataError(it))
         }
     }
 
-    private suspend fun Raise<TokenListError>.fetchQuotes(currenciesIds: Set<CryptoCurrency.ID>, refresh: Boolean) {
+    private suspend fun fetchQuotes(currenciesIds: Set<CryptoCurrency.ID>, refresh: Boolean) {
         catch(
             block = { quotesRepository.getQuotesSync(currenciesIds, refresh) },
         ) {
-            raise(TokenListError.DataError(it))
+            /* Ignore error */
         }
     }
 }
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCardTokensListUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCardTokensListUseCase.kt
new file mode 100644
index 0000000000..efe0126403
--- /dev/null
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCardTokensListUseCase.kt
@@ -0,0 +1,70 @@
+package com.tangem.domain.tokens
+
+import arrow.core.Either
+import arrow.core.left
+import com.tangem.domain.tokens.error.TokenListError
+import com.tangem.domain.tokens.error.mapper.mapToTokenListError
+import com.tangem.domain.tokens.model.CryptoCurrencyStatus
+import com.tangem.domain.tokens.model.TokenList
+import com.tangem.domain.tokens.operations.CurrenciesStatusesOperations
+import com.tangem.domain.tokens.operations.TokenListOperations
+import com.tangem.domain.tokens.repository.CurrenciesRepository
+import com.tangem.domain.tokens.repository.NetworksRepository
+import com.tangem.domain.tokens.repository.QuotesRepository
+import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.*
+
+class GetCardTokensListUseCase(
+    internal val currenciesRepository: CurrenciesRepository,
+    internal val quotesRepository: QuotesRepository,
+    internal val networksRepository: NetworksRepository,
+    internal val dispatchers: CoroutineDispatcherProvider,
+) {
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    operator fun invoke(userWalletId: UserWalletId): Flow<Either<TokenListError, TokenList>> {
+        return getTokensStatuses(userWalletId).transformLatest { maybeTokens ->
+            maybeTokens.fold(
+                ifLeft = { error ->
+                    emit(error.left())
+                },
+                ifRight = { tokens ->
+                    emitAll(createTokenList(userWalletId, tokens))
+                },
+            )
+        }
+    }
+
+    private fun getTokensStatuses(
+        userWalletId: UserWalletId,
+    ): Flow<Either<TokenListError, List<CryptoCurrencyStatus>>> {
+        val operations = CurrenciesStatusesOperations(
+            userWalletId = userWalletId,
+            currenciesRepository = currenciesRepository,
+            quotesRepository = quotesRepository,
+            networksRepository = networksRepository,
+        )
+
+        return operations.getCardCurrenciesStatusesFlow()
+            .map { maybeCurrenciesStatuses ->
+                maybeCurrenciesStatuses.mapLeft(CurrenciesStatusesOperations.Error::mapToTokenListError)
+            }
+    }
+
+    private fun createTokenList(
+        userWalletId: UserWalletId,
+        tokens: List<CryptoCurrencyStatus>,
+    ): Flow<Either<TokenListError, TokenList>> {
+        val operations = TokenListOperations(
+            userWalletId = userWalletId,
+            tokens = tokens,
+            currenciesRepository = currenciesRepository,
+        )
+
+        return operations.getTokenListForSingleCurrencyFlow().map { maybeTokenList ->
+            maybeTokenList.mapLeft(TokenListOperations.Error::mapToTokenListError)
+        }
+    }
+}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCryptoCurrenciesUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCryptoCurrenciesUseCase.kt
new file mode 100644
index 0000000000..1ead96bd8a
--- /dev/null
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCryptoCurrenciesUseCase.kt
@@ -0,0 +1,24 @@
+package com.tangem.domain.tokens
+
+import arrow.core.Either
+import arrow.core.raise.catch
+import arrow.core.raise.either
+import com.tangem.domain.tokens.error.GetCurrenciesError
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.repository.CurrenciesRepository
+import com.tangem.domain.wallets.models.UserWalletId
+
+class GetCryptoCurrenciesUseCase(private val currenciesRepository: CurrenciesRepository) {
+
+    suspend operator fun invoke(
+        userWalletId: UserWalletId,
+        refresh: Boolean = false,
+    ): Either<GetCurrenciesError, List<CryptoCurrency>> {
+        return either {
+            catch(
+                block = { currenciesRepository.getMultiCurrencyWalletCurrenciesSync(userWalletId, refresh) },
+                catch = { raise(GetCurrenciesError.DataError(it)) },
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCryptoCurrencyActionsUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCryptoCurrencyActionsUseCase.kt
index d705aacf94..718b412716 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCryptoCurrencyActionsUseCase.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCryptoCurrencyActionsUseCase.kt
@@ -1,34 +1,123 @@
 package com.tangem.domain.tokens
 
+import com.tangem.domain.exchange.RampStateManager
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.CryptoCurrencyStatus
 import com.tangem.domain.tokens.model.TokenActionsState
+import com.tangem.domain.tokens.repository.MarketCryptoCurrencyRepository
 import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import com.tangem.utils.isNullOrZero
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
 
+/**
+ * Use case to determine which TokenActions are available for a [CryptoCurrency]
+ *
+ * @property rampManager Ramp manager to check ramp availability
+ */
 class GetCryptoCurrencyActionsUseCase(
+    private val rampManager: RampStateManager,
+    private val marketCryptoCurrencyRepository: MarketCryptoCurrencyRepository,
     private val dispatchers: CoroutineDispatcherProvider,
 ) {
 
-    operator fun invoke(userWalletId: UserWalletId, tokenId: String): Flow<TokenActionsState> {
+    operator fun invoke(
+        userWalletId: UserWalletId,
+        cryptoCurrencyStatus: CryptoCurrencyStatus,
+    ): Flow<TokenActionsState> {
         return flow {
-            emit(getMockState(userWalletId, tokenId))
+            val actionStates = createTokenActionsState(userWalletId, cryptoCurrencyStatus)
+            emit(actionStates)
         }.flowOn(dispatchers.io)
     }
 
-    // TODO replace by real data
-    private fun getMockState(userWalletId: UserWalletId, tokenId: String): TokenActionsState {
+    private suspend fun createTokenActionsState(
+        userWalletId: UserWalletId,
+        cryptoCurrencyStatus: CryptoCurrencyStatus,
+    ): TokenActionsState {
         return TokenActionsState(
             walletId = userWalletId,
-            tokenId = tokenId,
-            states = listOf(
-                TokenActionsState.ActionState.Buy(true),
-                TokenActionsState.ActionState.Send(true),
-                TokenActionsState.ActionState.Receive(true),
-                TokenActionsState.ActionState.Sell(true),
-                TokenActionsState.ActionState.Swap(true),
-            ),
+            cryptoCurrencyStatus = cryptoCurrencyStatus,
+            states = createListOfActions(userWalletId, cryptoCurrencyStatus),
         )
     }
+
+    /**
+     * Creates list of action for expected order
+     * Actions priority: [Buy Send Receive Sell Swap]
+     */
+    private suspend fun createListOfActions(
+        userWalletId: UserWalletId,
+        cryptoCurrencyStatus: CryptoCurrencyStatus,
+    ): List<TokenActionsState.ActionState> {
+        val cryptoCurrency = cryptoCurrencyStatus.currency
+        if (cryptoCurrencyStatus.value is CryptoCurrencyStatus.MissedDerivation) {
+            return listOf(TokenActionsState.ActionState.HideToken(true))
+        }
+        if (cryptoCurrencyStatus.value is CryptoCurrencyStatus.Unreachable) {
+            return getActionsForUnreachableCurrency(cryptoCurrency)
+        }
+
+        val activeList = mutableListOf<TokenActionsState.ActionState>()
+        val disabledList = mutableListOf<TokenActionsState.ActionState>()
+
+        // copy address
+        activeList.add(TokenActionsState.ActionState.CopyAddress(true))
+
+        // buy
+        if (rampManager.availableForBuy(cryptoCurrency)) {
+            activeList.add(TokenActionsState.ActionState.Buy(true))
+        } else {
+            disabledList.add(TokenActionsState.ActionState.Buy(false))
+        }
+
+        // send
+        if (cryptoCurrencyStatus.value.amount.isNullOrZero()) {
+            disabledList.add(TokenActionsState.ActionState.Send(false))
+        } else {
+            activeList.add(TokenActionsState.ActionState.Send(true))
+        }
+
+        // receive
+        activeList.add(TokenActionsState.ActionState.Receive(true))
+
+        // swap
+        if (marketCryptoCurrencyRepository.isExchangeable(userWalletId, cryptoCurrency.id)) {
+            activeList.add(TokenActionsState.ActionState.Swap(true))
+        } else {
+            disabledList.add(TokenActionsState.ActionState.Swap(false))
+        }
+
+        // sell
+        if (rampManager.availableForSell(cryptoCurrency)) {
+            activeList.add(TokenActionsState.ActionState.Sell(true))
+        } else {
+            disabledList.add(TokenActionsState.ActionState.Sell(false))
+        }
+
+        // hide
+        activeList.add(TokenActionsState.ActionState.HideToken(true))
+
+        return activeList + disabledList
+    }
+
+    private fun getActionsForUnreachableCurrency(cryptoCurrency: CryptoCurrency): List<TokenActionsState.ActionState> {
+        val activeList = mutableListOf<TokenActionsState.ActionState>()
+        val disabledList = mutableListOf<TokenActionsState.ActionState>()
+
+        activeList.add(TokenActionsState.ActionState.CopyAddress(true))
+        if (rampManager.availableForBuy(cryptoCurrency)) {
+            activeList.add(TokenActionsState.ActionState.Buy(true))
+        } else {
+            disabledList.add(TokenActionsState.ActionState.Buy(false))
+        }
+        disabledList.add(TokenActionsState.ActionState.Send(false))
+        disabledList.add(TokenActionsState.ActionState.Swap(false))
+        disabledList.add(TokenActionsState.ActionState.Sell(false))
+        activeList.add(TokenActionsState.ActionState.Receive(true))
+        activeList.add(TokenActionsState.ActionState.HideToken(true))
+        return activeList + disabledList
+    }
 }
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCryptoCurrencyUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCryptoCurrencyUseCase.kt
new file mode 100644
index 0000000000..ae9b7f6326
--- /dev/null
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCryptoCurrencyUseCase.kt
@@ -0,0 +1,60 @@
+package com.tangem.domain.tokens
+
+import arrow.core.Either
+import arrow.core.raise.Raise
+import arrow.core.raise.catch
+import arrow.core.raise.either
+import com.tangem.domain.tokens.error.CurrencyStatusError
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.Network
+import com.tangem.domain.tokens.repository.CurrenciesRepository
+import com.tangem.domain.wallets.models.UserWalletId
+
+class GetCryptoCurrencyUseCase(
+    private val currenciesRepository: CurrenciesRepository,
+) {
+
+    /**
+     * Returns specific cryptocurrency for a given user wallet.
+     *
+     * @param userWalletId The ID of the user's wallet.
+     * @param id The ID of the cryptocurrency.
+     * @param derivationPath currency derivation path.
+     * @return An [Either] representing success (Right) or an error (Left) in fetching the status.
+     */
+    suspend operator fun invoke(
+        userWalletId: UserWalletId,
+        id: CryptoCurrency.ID,
+        derivationPath: Network.DerivationPath,
+    ): Either<CurrencyStatusError, CryptoCurrency> {
+        return either { getCurrency(userWalletId, id, derivationPath) }
+    }
+
+    /**
+     * Returns the primary cryptocurrency for a given user wallet.
+     *
+     * @param userWalletId The ID of the user's wallet.
+     * @return An [Either] representing success (Right) or an error (Left) in fetching the status.
+     */
+    suspend operator fun invoke(userWalletId: UserWalletId): Either<CurrencyStatusError, CryptoCurrency> {
+        return either { getPrimaryCurrency(userWalletId) }
+    }
+
+    private suspend fun Raise<CurrencyStatusError>.getCurrency(
+        userWalletId: UserWalletId,
+        id: CryptoCurrency.ID,
+        derivationPath: Network.DerivationPath,
+    ): CryptoCurrency {
+        return catch(
+            block = { currenciesRepository.getMultiCurrencyWalletCurrency(userWalletId, id, derivationPath) },
+            catch = { raise(CurrencyStatusError.DataError(it)) },
+        )
+    }
+
+    private suspend fun Raise<CurrencyStatusError>.getPrimaryCurrency(userWalletId: UserWalletId): CryptoCurrency {
+        return catch(
+            block = { currenciesRepository.getSingleCurrencyWalletPrimaryCurrency(userWalletId) },
+            catch = { raise(CurrencyStatusError.DataError(it)) },
+        )
+    }
+}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCurrencyStatusUpdatesUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCurrencyStatusUpdatesUseCase.kt
index 068b7b1572..97f340256f 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCurrencyStatusUpdatesUseCase.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCurrencyStatusUpdatesUseCase.kt
@@ -3,8 +3,9 @@ package com.tangem.domain.tokens
 import arrow.core.Either
 import com.tangem.domain.tokens.error.CurrencyStatusError
 import com.tangem.domain.tokens.error.mapper.mapToCurrencyError
+import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
-import com.tangem.domain.tokens.models.CryptoCurrency
+import com.tangem.domain.tokens.model.Network
 import com.tangem.domain.tokens.operations.CurrenciesStatusesOperations
 import com.tangem.domain.tokens.repository.CurrenciesRepository
 import com.tangem.domain.tokens.repository.NetworksRepository
@@ -32,20 +33,33 @@ class GetCurrencyStatusUpdatesUseCase(
      *
      * @param userWalletId The unique identifier of the user's wallet.
      * @param currencyId The unique identifier of the cryptocurrency.
+     * @param derivationPath currency derivation path.
+     * @param isSingleWalletWithTokens Indicates whether the user wallet contains only one token on card (old cards)
      * @return A [Flow] emitting either a [CurrencyStatusError] or a [CryptoCurrencyStatus], indicating the result of the fetch operation.
      */
     operator fun invoke(
         userWalletId: UserWalletId,
         currencyId: CryptoCurrency.ID,
+        derivationPath: Network.DerivationPath,
+        isSingleWalletWithTokens: Boolean,
     ): Flow<Either<CurrencyStatusError, CryptoCurrencyStatus>> {
         return flow {
-            emitAll(getCurrency(userWalletId, currencyId))
+            emitAll(
+                getCurrency(
+                    userWalletId,
+                    currencyId,
+                    derivationPath,
+                    isSingleWalletWithTokens,
+                ),
+            )
         }.flowOn(dispatchers.io)
     }
 
     private suspend fun getCurrency(
         userWalletId: UserWalletId,
         currencyId: CryptoCurrency.ID,
+        derivationPath: Network.DerivationPath,
+        isSingleWalletWithTokens: Boolean,
     ): Flow<Either<CurrencyStatusError, CryptoCurrencyStatus>> {
         val operations = CurrenciesStatusesOperations(
             currenciesRepository = currenciesRepository,
@@ -54,7 +68,12 @@ class GetCurrencyStatusUpdatesUseCase(
             userWalletId = userWalletId,
         )
 
-        return operations.getCurrencyStatusFlow(currencyId).map { maybeCurrency ->
+        val currencyFlow = if (isSingleWalletWithTokens) {
+            operations.getCurrencyStatusSingleWalletWithTokensFlow(currencyId)
+        } else {
+            operations.getCurrencyStatusFlow(currencyId, derivationPath)
+        }
+        return currencyFlow.map { maybeCurrency ->
             maybeCurrency.mapLeft(CurrenciesStatusesOperations.Error::mapToCurrencyError)
         }
     }
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCurrencyWarningsUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCurrencyWarningsUseCase.kt
new file mode 100644
index 0000000000..f1b1b4c948
--- /dev/null
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCurrencyWarningsUseCase.kt
@@ -0,0 +1,128 @@
+package com.tangem.domain.tokens
+
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.CryptoCurrencyStatus
+import com.tangem.domain.tokens.model.Network
+import com.tangem.domain.tokens.model.warnings.CryptoCurrencyWarning
+import com.tangem.domain.tokens.operations.CurrenciesStatusesOperations
+import com.tangem.domain.tokens.repository.CurrenciesRepository
+import com.tangem.domain.tokens.repository.NetworksRepository
+import com.tangem.domain.tokens.repository.QuotesRepository
+import com.tangem.domain.walletmanager.WalletManagersFacade
+import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.flow.*
+import java.math.BigDecimal
+
+class GetCurrencyWarningsUseCase(
+    private val walletManagersFacade: WalletManagersFacade,
+    private val currenciesRepository: CurrenciesRepository,
+    private val quotesRepository: QuotesRepository,
+    private val networksRepository: NetworksRepository,
+    private val dispatchers: CoroutineDispatcherProvider,
+) {
+
+    suspend operator fun invoke(
+        userWalletId: UserWalletId,
+        currencyStatus: CryptoCurrencyStatus,
+        derivationPath: Network.DerivationPath,
+        isSingleWalletWithTokens: Boolean,
+    ): Flow<Set<CryptoCurrencyWarning>> {
+        val currency = currencyStatus.currency
+        return combine(
+            getCoinRelatedWarnings(
+                userWalletId = userWalletId,
+                networkId = currency.network.id,
+                currencyId = currency.id,
+                derivationPath = derivationPath,
+                isSingleWalletWithTokens = isSingleWalletWithTokens,
+            ),
+            flowOf(walletManagersFacade.getRentInfo(userWalletId, currency.network)),
+            flowOf(walletManagersFacade.getExistentialDeposit(userWalletId, currency.network)),
+            flowOf(getNetworkUnavailableWarning(currencyStatus)),
+            flowOf(getNetworkNoAccountWarning(currencyStatus)),
+        ) { coinRelatedWarnings, maybeRentWarning, maybeEdWarning, maybeNetworkUnavailable, maybeNetworkNoAccount ->
+            setOfNotNull(
+                maybeRentWarning,
+                maybeEdWarning?.let {
+                    CryptoCurrencyWarning.ExistentialDeposit(
+                        currencyName = currency.name,
+                        edStringValueWithSymbol = "${it.toPlainString()} ${currency.symbol}",
+                    )
+                },
+                *coinRelatedWarnings.toTypedArray(),
+                maybeNetworkUnavailable,
+                maybeNetworkNoAccount,
+            )
+        }.flowOn(dispatchers.io)
+    }
+
+    private suspend fun getCoinRelatedWarnings(
+        userWalletId: UserWalletId,
+        networkId: Network.ID,
+        currencyId: CryptoCurrency.ID,
+        derivationPath: Network.DerivationPath,
+        isSingleWalletWithTokens: Boolean,
+    ): Flow<List<CryptoCurrencyWarning>> {
+        val operations = CurrenciesStatusesOperations(
+            currenciesRepository = currenciesRepository,
+            quotesRepository = quotesRepository,
+            networksRepository = networksRepository,
+            userWalletId = userWalletId,
+        )
+
+        val currencyFlow = if (isSingleWalletWithTokens) {
+            operations.getCurrencyStatusSingleWalletWithTokensFlow(currencyId)
+        } else {
+            operations.getCurrencyStatusFlow(currencyId, derivationPath)
+        }
+        val networkFlow = if (isSingleWalletWithTokens) {
+            operations.getNetworkCoinForSingleWalletWithTokenFlow(networkId)
+        } else {
+            operations.getNetworkCoinFlow(networkId, derivationPath)
+        }
+        return combine(
+            currencyFlow.map { it.getOrNull() },
+            networkFlow.map { it.getOrNull() },
+        ) { tokenStatus, coinStatus ->
+            when {
+                tokenStatus != null && coinStatus != null -> {
+                    buildList {
+                        if (tokenStatus.value.hasCurrentNetworkTransactions) {
+                            add(CryptoCurrencyWarning.HasPendingTransactions(coinStatus.currency.symbol))
+                        }
+                        if (!tokenStatus.value.amount.isZero() && coinStatus.value.amount.isZero()) {
+                            add(
+                                CryptoCurrencyWarning.BalanceNotEnoughForFee(
+                                    currency = tokenStatus.currency,
+                                    blockchainFullName = coinStatus.currency.name,
+                                    blockchainSymbol = coinStatus.currency.symbol,
+                                ),
+                            )
+                        }
+                    }
+                }
+                else -> listOf(CryptoCurrencyWarning.SomeNetworksUnreachable)
+            }
+        }
+    }
+
+    private fun getNetworkUnavailableWarning(currencyStatus: CryptoCurrencyStatus): CryptoCurrencyWarning? {
+        return (currencyStatus.value as? CryptoCurrencyStatus.Unreachable)?.let {
+            CryptoCurrencyWarning.SomeNetworksUnreachable
+        }
+    }
+
+    private fun getNetworkNoAccountWarning(currencyStatus: CryptoCurrencyStatus): CryptoCurrencyWarning? {
+        return (currencyStatus.value as? CryptoCurrencyStatus.NoAccount)?.let {
+            CryptoCurrencyWarning.SomeNetworksNoAccount(
+                amountToCreateAccount = it.amountToCreateAccount,
+                amountCurrency = currencyStatus.currency,
+            )
+        }
+    }
+
+    private fun BigDecimal?.isZero(): Boolean {
+        return this?.signum() == 0
+    }
+}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetMissedAddressesCryptoCurrenciesUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetMissedAddressesCryptoCurrenciesUseCase.kt
new file mode 100644
index 0000000000..c6a1f90774
--- /dev/null
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetMissedAddressesCryptoCurrenciesUseCase.kt
@@ -0,0 +1,21 @@
+package com.tangem.domain.tokens
+
+import arrow.core.Either
+import arrow.core.left
+import arrow.core.right
+import com.tangem.domain.tokens.error.GetCurrenciesError
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.repository.CurrenciesRepository
+import com.tangem.domain.wallets.models.UserWalletId
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.map
+
+class GetMissedAddressesCryptoCurrenciesUseCase(private val currenciesRepository: CurrenciesRepository) {
+
+    operator fun invoke(userWalletId: UserWalletId): Flow<Either<GetCurrenciesError, List<CryptoCurrency>>> {
+        return currenciesRepository.getMissedAddressesCryptoCurrencies(userWalletId)
+            .map<List<CryptoCurrency>, Either<GetCurrenciesError, List<CryptoCurrency>>>(List<CryptoCurrency>::right)
+            .catch { emit(GetCurrenciesError.DataError(it).left()) }
+    }
+}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetNetworkCoinStatusUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetNetworkCoinStatusUseCase.kt
new file mode 100644
index 0000000000..f33b882c8e
--- /dev/null
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetNetworkCoinStatusUseCase.kt
@@ -0,0 +1,63 @@
+package com.tangem.domain.tokens
+
+import arrow.core.Either
+import com.tangem.domain.tokens.error.CurrencyStatusError
+import com.tangem.domain.tokens.error.mapper.mapToCurrencyError
+import com.tangem.domain.tokens.model.CryptoCurrencyStatus
+import com.tangem.domain.tokens.model.Network
+import com.tangem.domain.tokens.operations.CurrenciesStatusesOperations
+import com.tangem.domain.tokens.repository.CurrenciesRepository
+import com.tangem.domain.tokens.repository.NetworksRepository
+import com.tangem.domain.tokens.repository.QuotesRepository
+import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.flow.*
+
+class GetNetworkCoinStatusUseCase(
+    private val currenciesRepository: CurrenciesRepository,
+    private val quotesRepository: QuotesRepository,
+    private val networksRepository: NetworksRepository,
+    private val dispatchers: CoroutineDispatcherProvider,
+) {
+
+    operator fun invoke(
+        userWalletId: UserWalletId,
+        networkId: Network.ID,
+        derivationPath: Network.DerivationPath,
+        isSingleWalletWithTokens: Boolean,
+    ): Flow<Either<CurrencyStatusError, CryptoCurrencyStatus>> {
+        return flow {
+            emitAll(
+                flow = getCurrency(
+                    userWalletId = userWalletId,
+                    networkId = networkId,
+                    derivationPath = derivationPath,
+                    isSingleWalletWithTokens = isSingleWalletWithTokens,
+                ),
+            )
+        }
+            .flowOn(dispatchers.io)
+    }
+
+    private suspend fun getCurrency(
+        userWalletId: UserWalletId,
+        networkId: Network.ID,
+        derivationPath: Network.DerivationPath,
+        isSingleWalletWithTokens: Boolean,
+    ): Flow<Either<CurrencyStatusError, CryptoCurrencyStatus>> {
+        val operations = CurrenciesStatusesOperations(
+            currenciesRepository = currenciesRepository,
+            quotesRepository = quotesRepository,
+            networksRepository = networksRepository,
+            userWalletId = userWalletId,
+        )
+        val networkFlow = if (isSingleWalletWithTokens) {
+            operations.getNetworkCoinForSingleWalletWithTokenFlow(networkId)
+        } else {
+            operations.getNetworkCoinFlow(networkId, derivationPath)
+        }
+        return networkFlow.map { maybeCurrency ->
+            maybeCurrency.mapLeft(CurrenciesStatusesOperations.Error::mapToCurrencyError)
+        }
+    }
+}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetPrimaryCurrencyStatusUpdatesUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetPrimaryCurrencyStatusUpdatesUseCase.kt
index 7ae1e238aa..f1216be10f 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetPrimaryCurrencyStatusUpdatesUseCase.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetPrimaryCurrencyStatusUpdatesUseCase.kt
@@ -31,7 +31,6 @@ class GetPrimaryCurrencyStatusUpdatesUseCase(
      * Invokes the use case.
      *
      * @param userWalletId The unique identifier of the user's wallet.
-     * @param refresh A boolean flag indicating whether the data should be refreshed.
      * @return A [Flow] emitting either a [CurrencyStatusError] or a [CryptoCurrencyStatus], indicating the result of the fetch operation.
      */
     operator fun invoke(userWalletId: UserWalletId): Flow<Either<CurrencyStatusError, CryptoCurrencyStatus>> {
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetTokenListUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetTokenListUseCase.kt
index 99c107632a..1266f0cc23 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetTokenListUseCase.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetTokenListUseCase.kt
@@ -15,9 +15,9 @@ import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flatMapMerge
-import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.transformLatest
 
 class GetTokenListUseCase(
     internal val currenciesRepository: CurrenciesRepository,
@@ -28,13 +28,13 @@ class GetTokenListUseCase(
 
     @OptIn(ExperimentalCoroutinesApi::class)
     operator fun invoke(userWalletId: UserWalletId): Flow<Either<TokenListError, TokenList>> {
-        return getTokensStatuses(userWalletId).flatMapMerge { maybeTokens ->
+        return getTokensStatuses(userWalletId).transformLatest { maybeTokens ->
             maybeTokens.fold(
                 ifLeft = { error ->
-                    flowOf(error.left())
+                    emit(error.left())
                 },
                 ifRight = { tokens ->
-                    createTokenList(userWalletId, tokens)
+                    emitAll(createTokenList(userWalletId, tokens))
                 },
             )
         }
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/IsCryptoCurrencyCoinCouldHideUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/IsCryptoCurrencyCoinCouldHideUseCase.kt
new file mode 100644
index 0000000000..0dc5716838
--- /dev/null
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/IsCryptoCurrencyCoinCouldHideUseCase.kt
@@ -0,0 +1,17 @@
+package com.tangem.domain.tokens
+
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.repository.CurrenciesRepository
+import com.tangem.domain.wallets.models.UserWalletId
+
+class IsCryptoCurrencyCoinCouldHideUseCase(
+    private val currenciesRepository: CurrenciesRepository,
+) {
+
+    suspend operator fun invoke(userWalletId: UserWalletId, cryptoCurrencyCoin: CryptoCurrency.Coin): Boolean {
+        return currenciesRepository.getMultiCurrencyWalletCurrenciesSync(
+            userWalletId = userWalletId,
+            refresh = false,
+        ).none { it is CryptoCurrency.Token && it.network == cryptoCurrencyCoin.network }
+    }
+}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/RemoveCurrencyUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/RemoveCurrencyUseCase.kt
index 71dc767ed2..da933c144f 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/RemoveCurrencyUseCase.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/RemoveCurrencyUseCase.kt
@@ -3,9 +3,8 @@ package com.tangem.domain.tokens
 import arrow.core.Either
 import arrow.core.raise.catch
 import arrow.core.raise.either
-import arrow.core.raise.ensure
-import com.tangem.domain.tokens.models.CryptoCurrency
-import com.tangem.domain.tokens.models.remove.RemoveCurrencyError
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.remove.RemoveCurrencyError
 import com.tangem.domain.tokens.repository.CurrenciesRepository
 import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
@@ -20,10 +19,6 @@ class RemoveCurrencyUseCase(
         currency: CryptoCurrency,
     ): Either<RemoveCurrencyError, Unit> {
         return either {
-            ensure(
-                condition = !currency.hasLinkedTokens(userWalletId),
-                raise = { RemoveCurrencyError.HasLinkedTokens(currency) },
-            )
             catch(
                 block = { currenciesRepository.removeCurrency(userWalletId, currency) },
                 catch = { raise(RemoveCurrencyError.DataError(it)) },
@@ -31,10 +26,17 @@ class RemoveCurrencyUseCase(
         }
     }
 
-    private suspend fun CryptoCurrency.hasLinkedTokens(userWalletId: UserWalletId): Boolean {
-        val walletCurrencies = currenciesRepository
-            .getMultiCurrencyWalletCurrenciesSync(userWalletId = userWalletId, refresh = false)
+    suspend fun hasLinkedTokens(userWalletId: UserWalletId, currency: CryptoCurrency): Boolean {
+        return when (currency) {
+            is CryptoCurrency.Coin -> {
+                val walletCurrencies = currenciesRepository.getMultiCurrencyWalletCurrenciesSync(
+                    userWalletId = userWalletId,
+                    refresh = false,
+                )
 
-        return this is CryptoCurrency.Coin && walletCurrencies.any { it != this && it.network.id == this.network.id }
+                walletCurrencies.any { it is CryptoCurrency.Token && it.network == currency.network }
+            }
+            is CryptoCurrency.Token -> false
+        }
     }
 }
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/ToggleTokenListGroupingUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/ToggleTokenListGroupingUseCase.kt
index 6328868257..20f1ae77ef 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/ToggleTokenListGroupingUseCase.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/ToggleTokenListGroupingUseCase.kt
@@ -19,20 +19,20 @@ class ToggleTokenListGroupingUseCase(
     suspend operator fun invoke(tokenList: TokenList): Either<TokenListSortingError, TokenList> {
         return withContext(dispatchers.default) {
             either {
-                ensure(tokenList.totalFiatBalance !is TokenList.FiatBalance.Loading) {
-                    TokenListSortingError.TokenListIsLoading
-                }
-
                 when (tokenList) {
                     is TokenList.GroupedByNetwork -> ungroupTokens(tokenList)
                     is TokenList.Ungrouped -> groupTokens(tokenList)
-                    is TokenList.NotInitialized -> raise(TokenListSortingError.TokenListIsEmpty)
+                    is TokenList.Empty -> raise(TokenListSortingError.TokenListIsEmpty)
                 }
             }
         }
     }
 
     private fun Raise<TokenListSortingError>.groupTokens(tokenList: TokenList.Ungrouped): TokenList.GroupedByNetwork {
+        ensure(tokenList.totalFiatBalance !is TokenList.FiatBalance.Loading) {
+            TokenListSortingError.TokenListIsLoading
+        }
+
         val sortingOperations = TokenListSortingOperations(tokenList)
 
         return TokenList.GroupedByNetwork(
@@ -47,6 +47,10 @@ class ToggleTokenListGroupingUseCase(
     private fun Raise<TokenListSortingError>.ungroupTokens(
         tokenList: TokenList.GroupedByNetwork,
     ): TokenList.Ungrouped {
+        ensure(tokenList.totalFiatBalance !is TokenList.FiatBalance.Loading) {
+            TokenListSortingError.TokenListIsLoading
+        }
+
         val sortingOperations = TokenListSortingOperations(tokenList)
 
         return TokenList.Ungrouped(
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/ToggleTokenListSortingUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/ToggleTokenListSortingUseCase.kt
index d1ae3d9b74..482940452a 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/ToggleTokenListSortingUseCase.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/ToggleTokenListSortingUseCase.kt
@@ -19,14 +19,10 @@ class ToggleTokenListSortingUseCase(
     suspend operator fun invoke(tokenList: TokenList): Either<TokenListSortingError, TokenList> {
         return withContext(dispatchers.default) {
             either {
-                ensure(tokenList.totalFiatBalance !is TokenList.FiatBalance.Loading) {
-                    TokenListSortingError.TokenListIsLoading
-                }
-
                 when (tokenList) {
                     is TokenList.GroupedByNetwork -> sortGroupedTokenList(tokenList)
                     is TokenList.Ungrouped -> sortUngroupedTokenList(tokenList)
-                    is TokenList.NotInitialized -> raise(TokenListSortingError.TokenListIsEmpty)
+                    is TokenList.Empty -> raise(TokenListSortingError.TokenListIsEmpty)
                 }
             }
         }
@@ -35,6 +31,10 @@ class ToggleTokenListSortingUseCase(
     private fun Raise<TokenListSortingError>.sortGroupedTokenList(
         tokenList: TokenList.GroupedByNetwork,
     ): TokenList.GroupedByNetwork {
+        ensure(tokenList.totalFiatBalance !is TokenList.FiatBalance.Loading) {
+            TokenListSortingError.TokenListIsLoading
+        }
+
         val operations = getSortingOperations(tokenList)
 
         return tokenList.copy(
@@ -48,6 +48,10 @@ class ToggleTokenListSortingUseCase(
     private fun Raise<TokenListSortingError>.sortUngroupedTokenList(
         tokenList: TokenList.Ungrouped,
     ): TokenList.Ungrouped {
+        ensure(tokenList.totalFiatBalance !is TokenList.FiatBalance.Loading) {
+            TokenListSortingError.TokenListIsLoading
+        }
+
         val operations = getSortingOperations(tokenList)
 
         return tokenList.copy(
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/UpdateDelayedNetworkStatusUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/UpdateDelayedNetworkStatusUseCase.kt
new file mode 100644
index 0000000000..1991a33bf8
--- /dev/null
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/UpdateDelayedNetworkStatusUseCase.kt
@@ -0,0 +1,56 @@
+package com.tangem.domain.tokens
+
+import arrow.core.Either
+import arrow.core.raise.Raise
+import arrow.core.raise.catch
+import arrow.core.raise.either
+import com.tangem.domain.tokens.error.CurrencyStatusError
+import com.tangem.domain.tokens.model.Network
+import com.tangem.domain.tokens.repository.NetworksRepository
+import com.tangem.domain.wallets.models.UserWalletId
+import kotlinx.coroutines.delay
+
+/**
+ * Use case responsible for fetching currency status information, including network status
+ * and quotes for a given cryptocurrency. It provides methods to fetch currency status either
+ * by providing a specific currency ID or fetching the status of the primary currency.
+ *
+ * @param networksRepository The repository for retrieving network-related data.
+ */
+
+class UpdateDelayedNetworkStatusUseCase(
+    private val networksRepository: NetworksRepository,
+) {
+
+    /**
+     * Fetches the status of a specific cryptocurrency for a given user wallet.
+     *
+     * @param userWalletId The ID of the user's wallet.
+     * @param network Network of the cryptocurrency.
+     * @param refresh Indicates whether to force a refresh of the status data.
+     * @return An [Either] representing success (Right) or an error (Left) in fetching the status.
+     */
+    suspend operator fun invoke(
+        userWalletId: UserWalletId,
+        network: Network,
+        delayMillis: Long,
+        refresh: Boolean = false,
+    ): Either<CurrencyStatusError, Unit> {
+        delay(delayMillis)
+        return either {
+            fetchNetworkStatus(userWalletId, network, refresh)
+        }
+    }
+
+    private suspend fun Raise<CurrencyStatusError>.fetchNetworkStatus(
+        userWalletId: UserWalletId,
+        network: Network,
+        refresh: Boolean,
+    ) {
+        catch(
+            block = { networksRepository.getNetworkStatusesSync(userWalletId, setOf(network), refresh) },
+        ) {
+            raise(CurrencyStatusError.DataError(it))
+        }
+    }
+}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/error/GetCurrenciesError.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/error/GetCurrenciesError.kt
new file mode 100644
index 0000000000..0e68977605
--- /dev/null
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/error/GetCurrenciesError.kt
@@ -0,0 +1,6 @@
+package com.tangem.domain.tokens.error
+
+sealed class GetCurrenciesError {
+
+    data class DataError(val cause: Throwable) : GetCurrenciesError()
+}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/legacy/TradeCryptoAction.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/legacy/TradeCryptoAction.kt
index 3ef7c99d04..36ea2aa3c9 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/legacy/TradeCryptoAction.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/legacy/TradeCryptoAction.kt
@@ -1,9 +1,10 @@
 package com.tangem.domain.tokens.legacy
 
+import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
-import com.tangem.domain.tokens.models.CryptoCurrency
 import com.tangem.domain.wallets.models.UserWallet
 import org.rekotlin.Action
+import java.math.BigDecimal
 
 sealed class TradeCryptoAction : Action {
 
@@ -36,7 +37,13 @@ sealed class TradeCryptoAction : Action {
             val appCurrencyCode: String,
         ) : New()
 
-        object Send : New()
+        data class SendToken(
+            val userWallet: UserWallet,
+            val tokenStatus: CryptoCurrencyStatus,
+            val coinFiatRate: BigDecimal?,
+        ) : New()
+
+        data class SendCoin(val userWallet: UserWallet, val coinStatus: CryptoCurrencyStatus) : New()
 
         data class Swap(val cryptoCurrency: CryptoCurrency) : New()
     }
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/CryptoCurrencyStatus.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/CryptoCurrencyStatus.kt
deleted file mode 100644
index b71f6496b5..0000000000
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/CryptoCurrencyStatus.kt
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.tangem.domain.tokens.model
-
-import com.tangem.domain.tokens.models.CryptoCurrency
-import java.math.BigDecimal
-
-/**
- * Represents the status of a cryptocurrency asset within a network.
- *
- * This class encapsulates the details of a specific cryptocurrency, either a coin or token,
- * along with its current status within the blockchain network. The status can include various states
- * like Loading, Unreachable, Loaded, etc.
- *
- * @property currency The details of the cryptocurrency asset, including its type, name, symbol, and other properties.
- * @property value The current status of the cryptocurrency, reflecting its state within the network.
- */
-data class CryptoCurrencyStatus(
-    val currency: CryptoCurrency,
-    val value: Status,
-) {
-
-    /**
-     * Represents the various states a token can have, encapsulating different information based on the state.
-     */
-    sealed class Status {
-
-        /** The amount of the token. */
-        open val amount: BigDecimal? = null
-
-        /** The fiat equivalent of the token's amount. */
-        open val fiatAmount: BigDecimal? = null
-
-        /** The exchange rate used for converting the token amount to fiat. */
-        open val fiatRate: BigDecimal? = null
-
-        /** The change in price of the token. */
-        open val priceChange: BigDecimal? = null
-
-        /** Indicates if there are any transactions in progress related to the cryptocurrency network. */
-        open val hasCurrentNetworkTransactions: Boolean = false
-
-        /** The pending cryptocurrency transactions. */
-        open val pendingTransactions: Set<PendingTransaction> = emptySet()
-
-        /** The network address */
-        open val networkAddress: NetworkAddress? = null
-    }
-
-    /** Represents the Loading state of a token, typically while fetching its details. */
-    object Loading : Status()
-
-    /** Represents a state where the token is not reachable. */
-    object Unreachable : Status()
-
-    /** Represents a state where the token's derivation is missed. */
-    object MissedDerivation : Status()
-
-    /** Represents a state where there is no account associated with the token. */
-    object NoAccount : Status()
-
-    /**
-     * Represents a Loaded state of a token with complete information.
-     *
-     * @property amount The amount of the token.
-     * @property fiatAmount The fiat equivalent of the token's amount.
-     * @property fiatRate The exchange rate used for converting the token amount to fiat.
-     * @property priceChange The change in price of the token.
-     * @property hasCurrentNetworkTransactions Indicates if there are any transactions in progress related to the
-     * cryptocurrency network.
-     * @property pendingTransactions The current cryptocurrency transactions.
-     */
-    data class Loaded(
-        override val amount: BigDecimal,
-        override val fiatAmount: BigDecimal,
-        override val fiatRate: BigDecimal,
-        override val priceChange: BigDecimal,
-        override val hasCurrentNetworkTransactions: Boolean,
-        override val pendingTransactions: Set<PendingTransaction>,
-        override val networkAddress: NetworkAddress?,
-    ) : Status()
-
-    /**
-     * Represents a Custom state of a token, typically used for user-defined tokens.
-     *
-     * @property amount The amount of the token.
-     * @property fiatAmount The fiat equivalent of the token's amount (optional).
-     * @property fiatRate The exchange rate used for converting the token amount to fiat (optional).
-     * @property priceChange The change in price of the token (optional).
-     * @property hasCurrentNetworkTransactions Indicates if there are any transactions in progress related to the
-     * cryptocurrency network.
-     * @property pendingTransactions The current cryptocurrency transactions.
-     */
-    data class Custom(
-        override val amount: BigDecimal,
-        override val fiatAmount: BigDecimal?,
-        override val fiatRate: BigDecimal?,
-        override val priceChange: BigDecimal?,
-        override val hasCurrentNetworkTransactions: Boolean,
-        override val pendingTransactions: Set<PendingTransaction>,
-        override val networkAddress: NetworkAddress?,
-    ) : Status()
-
-    /**
-     * Represents a state where the token is available, but there is no current quote available for it.
-     *
-     * @property amount The amount of the token.
-     * @property hasCurrentNetworkTransactions Indicates if there are any transactions in progress related to the
-     * cryptocurrency network.
-     * @property pendingTransactions The current cryptocurrency transactions.
-     */
-    data class NoQuote(
-        override val amount: BigDecimal,
-        override val hasCurrentNetworkTransactions: Boolean,
-        override val pendingTransactions: Set<PendingTransaction>,
-        override val networkAddress: NetworkAddress?,
-    ) : Status()
-}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/NetworkGroup.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/NetworkGroup.kt
index d2463c0f16..57a74bd19d 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/NetworkGroup.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/NetworkGroup.kt
@@ -1,7 +1,5 @@
 package com.tangem.domain.tokens.model
 
-import com.tangem.domain.tokens.models.Network
-
 /**
  * Represents a group of cryptocurrencies associated with a specific network.
  *
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/TokenActionsState.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/TokenActionsState.kt
index b2d6e6e71b..f52641b2c8 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/TokenActionsState.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/TokenActionsState.kt
@@ -4,7 +4,7 @@ import com.tangem.domain.wallets.models.UserWalletId
 
 data class TokenActionsState(
     val walletId: UserWalletId,
-    val tokenId: String,
+    val cryptoCurrencyStatus: CryptoCurrencyStatus,
     val states: List<ActionState>,
 ) {
 
@@ -14,6 +14,8 @@ data class TokenActionsState(
 
         data class Buy(override val enabled: Boolean) : ActionState()
 
+        data class CopyAddress(override val enabled: Boolean) : ActionState()
+
         data class Sell(override val enabled: Boolean) : ActionState()
 
         data class Receive(override val enabled: Boolean) : ActionState()
@@ -21,5 +23,7 @@ data class TokenActionsState(
         data class Swap(override val enabled: Boolean) : ActionState()
 
         data class Send(override val enabled: Boolean) : ActionState()
+
+        data class HideToken(override val enabled: Boolean) : ActionState()
     }
 }
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/TokenList.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/TokenList.kt
index c447c3ac8d..089bbdefde 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/TokenList.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/TokenList.kt
@@ -41,8 +41,14 @@ sealed class TokenList {
         override val sortedBy: SortType,
     ) : TokenList()
 
-    /** Represents a state where the token list is not initialized. */
-    object NotInitialized : TokenList()
+    /** Represents a state where the token list is empty. */
+    object Empty : TokenList() {
+
+        override val totalFiatBalance: FiatBalance = FiatBalance.Loaded(
+            amount = BigDecimal.ZERO,
+            isAllAmountsSummarized = true,
+        )
+    }
 
     /** Defines the possible sorting criteria for the tokens. */
     enum class SortType {
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrenciesStatusesOperations.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrenciesStatusesOperations.kt
index cb8885e6b5..01eaa6942f 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrenciesStatusesOperations.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrenciesStatusesOperations.kt
@@ -3,11 +3,7 @@ package com.tangem.domain.tokens.operations
 import arrow.core.*
 import arrow.core.raise.*
 import com.tangem.domain.tokens.GetTokenListUseCase
-import com.tangem.domain.tokens.model.CryptoCurrencyStatus
-import com.tangem.domain.tokens.model.NetworkStatus
-import com.tangem.domain.tokens.models.CryptoCurrency
-import com.tangem.domain.tokens.models.Network
-import com.tangem.domain.tokens.models.Quote
+import com.tangem.domain.tokens.model.*
 import com.tangem.domain.tokens.repository.CurrenciesRepository
 import com.tangem.domain.tokens.repository.NetworksRepository
 import com.tangem.domain.tokens.repository.QuotesRepository
@@ -58,22 +54,97 @@ internal class CurrenciesStatusesOperations(
 
             emit(maybeLoadingCurrenciesStatuses)
 
-            val (networksIds, currenciesIds) = getIds(nonEmptyCurrencies)
+            val (networks, currenciesIds) = getIds(nonEmptyCurrencies)
 
             val currenciesFlow = combine(
                 getQuotes(currenciesIds),
-                getNetworksStatuses(networksIds),
+                getNetworksStatuses(networks),
             ) { maybeQuotes, maybeNetworksStatuses ->
                 createCurrenciesStatuses(nonEmptyCurrencies, maybeQuotes, maybeNetworksStatuses)
             }
 
             emitAll(currenciesFlow)
-        }.conflate()
+        }
     }
 
-    suspend fun getCurrencyStatusFlow(currencyId: CryptoCurrency.ID): Flow<Either<Error, CryptoCurrencyStatus>> {
+    fun getCardCurrenciesStatusesFlow(): Flow<Either<Error, List<CryptoCurrencyStatus>>> {
+        return flow {
+            val nonEmptyCurrencies = recover(
+                block = { getCurrenciesFromCard(userWalletId) },
+                recover = {
+                    emit(it.left())
+                    return@flow
+                },
+            ).toNonEmptyListOrNull()
+
+            if (nonEmptyCurrencies == null) {
+                val emptyCurrenciesStatuses = emptyList<CryptoCurrencyStatus>()
+
+                emit(emptyCurrenciesStatuses.right())
+                return@flow
+            }
+
+            val maybeLoadingCurrenciesStatuses = createCurrenciesStatuses(
+                currencies = nonEmptyCurrencies,
+                maybeNetworkStatuses = null,
+                maybeQuotes = null,
+            )
+
+            emit(maybeLoadingCurrenciesStatuses)
+
+            val (networks, currenciesIds) = getIds(nonEmptyCurrencies)
+
+            val currenciesFlow = combine(
+                getQuotes(currenciesIds),
+                getNetworksStatuses(networks),
+            ) { maybeQuotes, maybeNetworksStatuses ->
+                createCurrenciesStatuses(nonEmptyCurrencies, maybeQuotes, maybeNetworksStatuses)
+            }
+
+            emitAll(currenciesFlow)
+        }
+    }
+
+    suspend fun getCurrencyStatusFlow(
+        currencyId: CryptoCurrency.ID,
+        derivationPath: Network.DerivationPath,
+    ): Flow<Either<Error, CryptoCurrencyStatus>> {
         val currency = recover(
-            block = { getMultiCurrencyWalletCurrency(currencyId) },
+            block = { getMultiCurrencyWalletCurrency(currencyId, derivationPath) },
+            recover = { return flowOf(it.left()) },
+        )
+
+        return getCurrencyStatusFlow(currency)
+    }
+
+    suspend fun getCurrencyStatusSingleWalletWithTokensFlow(
+        currencyId: CryptoCurrency.ID,
+    ): Flow<Either<Error, CryptoCurrencyStatus>> {
+        val currency = recover(
+            block = { getSingleCurrencyWalletWithCardTokensCurrency(currencyId) },
+            recover = { return flowOf(it.left()) },
+        )
+
+        return getCurrencyStatusFlow(currency)
+    }
+
+    suspend fun getNetworkCoinFlow(
+        networkId: Network.ID,
+        derivationPath: Network.DerivationPath,
+    ): Flow<Either<Error, CryptoCurrencyStatus>> {
+        val currency = recover(
+            block = { getNetworkCoin(networkId, derivationPath) },
+            recover = { return flowOf(it.left()) },
+        )
+
+        return getCurrencyStatusFlow(currency)
+    }
+
+    suspend fun getNetworkCoinForSingleWalletWithTokenFlow(
+        networkId: Network.ID,
+    ): Flow<Either<Error, CryptoCurrencyStatus>> {
+        val currency = recover(
+            block = { getNetworkCoinForSingleWalletWithToken(networkId) },
             recover = { return flowOf(it.left()) },
         )
 
@@ -90,24 +161,26 @@ internal class CurrenciesStatusesOperations(
     }
 
     private fun getCurrencyStatusFlow(currency: CryptoCurrency): Flow<Either<Error, CryptoCurrencyStatus>> {
-        val (networksIds, currenciesIds) = getIds(nonEmptyListOf(currency))
+        val (networks, currenciesIds) = getIds(nonEmptyListOf(currency))
 
         val quoteFlow = getQuotes(currenciesIds)
             .map { maybeQuotes ->
-                maybeQuotes.map { quotes ->
-                    quotes.singleOrNull { it.rawCurrencyId == currency.id.rawCurrencyId }
+                maybeQuotes.flatMap { quotes ->
+                    quotes.singleOrNull { it.rawCurrencyId == currency.id.rawCurrencyId }?.right()
+                        ?: Error.EmptyQuotes.left()
                 }
             }
 
-        val statusFlow = getNetworksStatuses(networksIds)
+        val statusFlow = getNetworksStatuses(networks)
             .map { maybeStatuses ->
-                maybeStatuses.map { statuses ->
-                    statuses.singleOrNull { it.networkId == currency.network.id }
+                maybeStatuses.flatMap { statuses ->
+                    statuses.singleOrNull { it.network == currency.network }?.right()
+                        ?: Error.EmptyNetworksStatuses.left()
                 }
             }
 
         return combine(quoteFlow, statusFlow) { maybeQuote, maybeNetworkStatus ->
-            createStatus(currency, maybeQuote, maybeNetworkStatus)
+            createCurrencyStatus(currency, maybeQuote, maybeNetworkStatus)
         }
     }
 
@@ -126,13 +199,13 @@ internal class CurrenciesStatusesOperations(
 
         currencies.map { currency ->
             val quote = quotes?.firstOrNull { it.rawCurrencyId == currency.id.rawCurrencyId }
-            val networkStatus = networksStatuses?.firstOrNull { it.networkId == currency.network.id }
+            val networkStatus = networksStatuses?.firstOrNull { it.network == currency.network }
 
-            createStatus(currency, quote, networkStatus, ignoreQuote = quotesRetrievingFailed)
+            createCurrencyStatus(currency, quote, networkStatus, ignoreQuote = quotesRetrievingFailed)
         }
     }
 
-    private fun createStatus(
+    private fun createCurrencyStatus(
         currency: CryptoCurrency,
         maybeQuote: Either<Error, Quote?>,
         maybeNetworkStatus: Either<Error, NetworkStatus?>,
@@ -145,10 +218,10 @@ internal class CurrenciesStatusesOperations(
             null
         }
 
-        createStatus(currency, quote, networkStatus, ignoreQuote = quoteRetrievingFailed)
+        createCurrencyStatus(currency, quote, networkStatus, ignoreQuote = quoteRetrievingFailed)
     }
 
-    private fun createStatus(
+    private fun createCurrencyStatus(
         currency: CryptoCurrency,
         quote: Quote?,
         networkStatus: NetworkStatus?,
@@ -171,8 +244,44 @@ internal class CurrenciesStatusesOperations(
             .onEmpty { emit(Error.EmptyCurrencies.left()) }
     }
 
-    private suspend fun Raise<Error>.getMultiCurrencyWalletCurrency(currencyId: CryptoCurrency.ID): CryptoCurrency {
-        return Either.catch { currenciesRepository.getMultiCurrencyWalletCurrency(userWalletId, currencyId) }
+    private suspend fun Raise<Error>.getMultiCurrencyWalletCurrency(
+        currencyId: CryptoCurrency.ID,
+        derivationPath: Network.DerivationPath,
+    ): CryptoCurrency {
+        return Either.catch {
+            currenciesRepository.getMultiCurrencyWalletCurrency(
+                userWalletId,
+                currencyId,
+                derivationPath,
+            )
+        }
+            .mapLeft { Error.DataError(it) }
+            .bind()
+    }
+
+    private suspend fun Raise<Error>.getSingleCurrencyWalletWithCardTokensCurrency(
+        currencyId: CryptoCurrency.ID,
+    ): CryptoCurrency {
+        return Either.catch { currenciesRepository.getSingleCurrencyWalletWithCardCurrency(userWalletId, currencyId) }
+            .mapLeft { Error.DataError(it) }
+            .bind()
+    }
+
+    private suspend fun Raise<Error>.getNetworkCoin(
+        networkId: Network.ID,
+        derivationPath: Network.DerivationPath,
+    ): CryptoCurrency {
+        return Either.catch { currenciesRepository.getNetworkCoin(userWalletId, networkId, derivationPath) }
+            .mapLeft { Error.DataError(it) }
+            .bind()
+    }
+
+    private suspend fun Raise<Error>.getNetworkCoinForSingleWalletWithToken(networkId: Network.ID): CryptoCurrency {
+        return Either.catch {
+            currenciesRepository.getSingleCurrencyWalletWithCardCurrencies(userWalletId)
+                .find { it.network.id == networkId && it is CryptoCurrency.Coin }
+                ?: raise(Error.DataError(IllegalStateException("Coin with network $networkId not found for this card")))
+        }
             .mapLeft { Error.DataError(it) }
             .bind()
     }
@@ -184,14 +293,23 @@ internal class CurrenciesStatusesOperations(
         )
     }
 
-    private fun getQuotes(tokensIds: NonEmptySet<CryptoCurrency.ID>): Flow<Either<Error, Set<Quote>>> {
-        return quotesRepository.getQuotesUpdates(tokensIds)
-            .map<Set<Quote>, Either<Error, Set<Quote>>> { it.right() }
-            .catch { emit(Error.DataError(it).left()) }
-            .onEmpty { emit(Error.EmptyQuotes.left()) }
+    private suspend fun Raise<Error>.getCurrenciesFromCard(userWalletId: UserWalletId): List<CryptoCurrency> {
+        return catch({ currenciesRepository.getSingleCurrencyWalletWithCardCurrencies(userWalletId) }) {
+            raise(Error.DataError(it))
+        }
     }
 
-    private fun getNetworksStatuses(networks: NonEmptySet<Network.ID>): Flow<Either<Error, Set<NetworkStatus>>> {
+    private fun getQuotes(tokensIds: NonEmptySet<CryptoCurrency.ID>): Flow<Either<Error, Set<Quote>>> {
+        return quotesRepository.getQuotesUpdates(tokensIds)
+            .map<Set<Quote>, Either<Error, Set<Quote>>> { quotes ->
+                if (quotes.isEmpty()) Error.EmptyQuotes.left() else quotes.right()
+            }
+            .catch {
+                emit(Error.DataError(it).left())
+            }
+    }
+
+    private fun getNetworksStatuses(networks: NonEmptySet<Network>): Flow<Either<Error, Set<NetworkStatus>>> {
         return networksRepository.getNetworkStatusesUpdates(userWalletId, networks)
             .map<Set<NetworkStatus>, Either<Error, Set<NetworkStatus>>> { it.right() }
             .catch { emit(Error.DataError(it).left()) }
@@ -200,17 +318,17 @@ internal class CurrenciesStatusesOperations(
 
     private fun getIds(
         currencies: NonEmptyList<CryptoCurrency>,
-    ): Pair<NonEmptySet<Network.ID>, NonEmptySet<CryptoCurrency.ID>> {
+    ): Pair<NonEmptySet<Network>, NonEmptySet<CryptoCurrency.ID>> {
         val currencyIdToNetworkId = currencies.associate { currency ->
-            currency.id to currency.network.id
+            currency.id to currency.network
         }
         val currenciesIds = currencyIdToNetworkId.keys.toNonEmptySetOrNull()
-        val networksIds = currencyIdToNetworkId.values.toNonEmptySetOrNull()
+        val networks = currencyIdToNetworkId.values.toNonEmptySetOrNull()
 
         requireNotNull(currenciesIds) { "Currencies IDs cannot be empty" }
-        requireNotNull(networksIds) { "Networks IDs cannot be empty" }
+        requireNotNull(networks) { "Networks IDs cannot be empty" }
 
-        return networksIds to currenciesIds
+        return networks to currenciesIds
     }
 
     sealed class Error {
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrencyStatusOperations.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrencyStatusOperations.kt
index 2082010b8d..a4a39b5501 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrencyStatusOperations.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrencyStatusOperations.kt
@@ -1,9 +1,9 @@
 package com.tangem.domain.tokens.operations
 
+import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
 import com.tangem.domain.tokens.model.NetworkStatus
-import com.tangem.domain.tokens.models.CryptoCurrency
-import com.tangem.domain.tokens.models.Quote
+import com.tangem.domain.tokens.model.Quote
 import java.math.BigDecimal
 
 internal class CurrencyStatusOperations(
@@ -18,15 +18,37 @@ internal class CurrencyStatusOperations(
     private fun createStatus(): CryptoCurrencyStatus.Status {
         return when (val status = networkStatus?.value) {
             null -> CryptoCurrencyStatus.Loading
-            is NetworkStatus.MissedDerivation -> CryptoCurrencyStatus.MissedDerivation
-            is NetworkStatus.Unreachable -> CryptoCurrencyStatus.Unreachable
-            is NetworkStatus.NoAccount -> CryptoCurrencyStatus.NoAccount
+            is NetworkStatus.MissedDerivation -> createMissedDerivationStatus()
+            is NetworkStatus.Unreachable -> createUnreachableStatus()
+            is NetworkStatus.NoAccount -> createNoAccountStatus(status.amountToCreateAccount)
             is NetworkStatus.Verified -> createStatus(status)
         }
     }
 
+    private fun createMissedDerivationStatus(): CryptoCurrencyStatus.MissedDerivation =
+        CryptoCurrencyStatus.MissedDerivation(priceChange = quote?.priceChange, fiatRate = quote?.fiatRate)
+
+    private fun createUnreachableStatus(): CryptoCurrencyStatus.Unreachable =
+        CryptoCurrencyStatus.Unreachable(priceChange = quote?.priceChange, fiatRate = quote?.fiatRate)
+
+    private fun createNoAccountStatus(amount: BigDecimal): CryptoCurrencyStatus.NoAccount =
+        CryptoCurrencyStatus.NoAccount(
+            amountToCreateAccount = amount,
+            priceChange = quote?.priceChange,
+            fiatRate = quote?.fiatRate,
+        )
+
     private fun createStatus(status: NetworkStatus.Verified): CryptoCurrencyStatus.Status {
-        val amount = status.amounts[currency.id] ?: return CryptoCurrencyStatus.Unreachable
+        val amount = status.amounts[currency.id]?.let {
+            when (it) {
+                is NetworkStatus.UnreachableAmount -> {
+                    return CryptoCurrencyStatus.NoAmount(priceChange = quote?.priceChange, fiatRate = quote?.fiatRate)
+                }
+                is NetworkStatus.LoadedAmount -> {
+                    it.value
+                }
+            }
+        } ?: return CryptoCurrencyStatus.Loading
         val hasCurrentNetworkTransactions = status.pendingTransactions.isNotEmpty()
         val currentTransactions = status.pendingTransactions.getOrElse(currency.id, ::emptySet)
 
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListFiatBalanceOperations.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListFiatBalanceOperations.kt
index ec63a9fa0c..326fceb11f 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListFiatBalanceOperations.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListFiatBalanceOperations.kt
@@ -22,6 +22,7 @@ internal class TokenListFiatBalanceOperations(
                 }
                 is CryptoCurrencyStatus.MissedDerivation,
                 is CryptoCurrencyStatus.Unreachable,
+                is CryptoCurrencyStatus.NoAmount,
                 -> {
                     fiatBalance = TokenList.FiatBalance.Failed
                     break
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListOperations.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListOperations.kt
index 2fee6a75c0..1c77b372ce 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListOperations.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListOperations.kt
@@ -1,7 +1,9 @@
 package com.tangem.domain.tokens.operations
 
 import arrow.core.*
-import arrow.core.raise.*
+import arrow.core.raise.Raise
+import arrow.core.raise.either
+import arrow.core.raise.withError
 import com.tangem.domain.tokens.GetTokenListUseCase
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
 import com.tangem.domain.tokens.model.TokenList
@@ -37,9 +39,19 @@ internal class TokenListOperations(
         }
     }
 
+    fun getTokenListForSingleCurrencyFlow(): Flow<Either<Error, TokenList>> {
+        return flow {
+            emit(
+                either {
+                    createTokenList()
+                },
+            )
+        }
+    }
+
     private fun Raise<Error>.createTokenList(isGrouped: Boolean, isSortedByBalance: Boolean): TokenList {
         val nonEmptyCurrencies = tokens.toNonEmptyListOrNull()
-            ?: return TokenList.NotInitialized
+            ?: return TokenList.Empty
 
         val isAnyTokenLoading = nonEmptyCurrencies.any { it.value is CryptoCurrencyStatus.Loading }
         val fiatBalanceOperations = TokenListFiatBalanceOperations(nonEmptyCurrencies, isAnyTokenLoading)
@@ -53,6 +65,22 @@ internal class TokenListOperations(
         )
     }
 
+    private fun Raise<Error>.createTokenList(): TokenList {
+        val nonEmptyCurrencies = tokens.toNonEmptyListOrNull()
+            ?: return TokenList.Empty
+
+        val isAnyTokenLoading = nonEmptyCurrencies.any { it.value is CryptoCurrencyStatus.Loading }
+        val fiatBalanceOperations = TokenListFiatBalanceOperations(nonEmptyCurrencies, isAnyTokenLoading)
+
+        return createTokenList(
+            currencies = nonEmptyCurrencies,
+            fiatBalance = fiatBalanceOperations.calculateFiatBalance(),
+            isAnyTokenLoading = isAnyTokenLoading,
+            isGrouped = false,
+            isSortedByBalance = false,
+        )
+    }
+
     private fun Raise<Error>.createTokenList(
         currencies: NonEmptyList<CryptoCurrencyStatus>,
         fiatBalance: TokenList.FiatBalance,
@@ -125,6 +153,7 @@ internal class TokenListOperations(
             .map<Boolean, Either<Error, Boolean>> { it.right() }
             .catch { emit(Error.DataError(it).left()) }
             .onEmpty { emit(value = false.right()) }
+            .cancellable()
     }
 
     private fun getIsSortedByBalance(): Flow<Either<Error, Boolean>> {
@@ -132,6 +161,7 @@ internal class TokenListOperations(
             .map<Boolean, Either<Error, Boolean>> { it.right() }
             .catch { emit(Error.DataError(it).left()) }
             .onEmpty { emit(value = false.right()) }
+            .cancellable()
     }
 
     sealed class Error {
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListSortingOperations.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListSortingOperations.kt
index 281d35a8ba..2833be87eb 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListSortingOperations.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListSortingOperations.kt
@@ -8,9 +8,9 @@ import arrow.core.raise.ensure
 import arrow.core.raise.ensureNotNull
 import arrow.core.toNonEmptyListOrNull
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
+import com.tangem.domain.tokens.model.Network
 import com.tangem.domain.tokens.model.NetworkGroup
 import com.tangem.domain.tokens.model.TokenList
-import com.tangem.domain.tokens.models.Network
 import java.math.BigDecimal
 
 internal class TokenListSortingOperations(
@@ -27,7 +27,7 @@ internal class TokenListSortingOperations(
         currencies = when (tokenList) {
             is TokenList.GroupedByNetwork -> tokenList.groups.flatMap { it.currencies }
             is TokenList.Ungrouped -> tokenList.currencies
-            is TokenList.NotInitialized -> emptyList()
+            is TokenList.Empty -> emptyList()
         },
         isAnyTokenLoading = isAnyTokenLoading,
         sortByBalance = sortByBalance,
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/repository/CurrenciesRepository.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/repository/CurrenciesRepository.kt
index 97cbf78ede..13e3c83950 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/repository/CurrenciesRepository.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/repository/CurrenciesRepository.kt
@@ -1,6 +1,7 @@
 package com.tangem.domain.tokens.repository
 
-import com.tangem.domain.tokens.models.CryptoCurrency
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.Network
 import com.tangem.domain.wallets.models.UserWalletId
 import kotlinx.coroutines.flow.Flow
 
@@ -27,6 +28,16 @@ interface CurrenciesRepository {
         isSortedByBalance: Boolean,
     )
 
+    /**
+     * Add currencies to a specific user wallet.
+     *
+     * @param userWalletId The unique identifier of the user wallet.
+     * @param currencies The currencies which must be added.
+     * @throws com.tangem.domain.core.error.DataError.UserWalletError.WrongUserWallet If single-currency user wallet
+     * ID provided.
+     */
+    suspend fun addCurrencies(userWalletId: UserWalletId, currencies: List<CryptoCurrency>)
+
     /**
      * Removes currency from a specific user wallet.
      *
@@ -37,6 +48,16 @@ interface CurrenciesRepository {
      */
     suspend fun removeCurrency(userWalletId: UserWalletId, currency: CryptoCurrency)
 
+    /**
+     * Removes currencies from a specific user wallet.
+     *
+     * @param userWalletId The unique identifier of the user wallet.
+     * @param currencies The currencies which must be removed.
+     * @throws com.tangem.domain.core.error.DataError.UserWalletError.WrongUserWallet If single-currency user wallet
+     * ID provided.
+     */
+    suspend fun removeCurrencies(userWalletId: UserWalletId, currencies: List<CryptoCurrency>)
+
     /**
      * Retrieves the primary cryptocurrency for a specific single-currency user wallet.
      *
@@ -47,6 +68,31 @@ interface CurrenciesRepository {
      */
     suspend fun getSingleCurrencyWalletPrimaryCurrency(userWalletId: UserWalletId): CryptoCurrency
 
+    /**
+     * Retrieves the cryptocurrencies for a specific single-currency user wallet with tokens on the card.
+     *
+     * @param userWalletId The unique identifier of the user wallet.
+     * @return The primary cryptocurrency associated with the user wallet.
+     * @throws com.tangem.domain.core.error.DataError.UserWalletError.WrongUserWallet If multi-currency user wallet
+     * ID provided.
+     */
+    suspend fun getSingleCurrencyWalletWithCardCurrencies(userWalletId: UserWalletId): List<CryptoCurrency>
+
+    /**
+     * Retrieves the cryptocurrency for a specific single-currency user old wallet
+     * that stores token on card
+     *
+     * @param userWalletId The unique identifier of the user wallet.
+     * @param id The unique identifier of the cryptocurrency to be retrieved.
+     * @return The cryptocurrency associated with the user wallet and ID.
+     * @throws com.tangem.domain.core.error.DataError.UserWalletError.WrongUserWallet If single-currency user wallet
+     * ID provided.
+     */
+    suspend fun getSingleCurrencyWalletWithCardCurrency(
+        userWalletId: UserWalletId,
+        id: CryptoCurrency.ID,
+    ): CryptoCurrency
+
     /**
      * Retrieves updates of the list of cryptocurrencies within a multi-currency wallet.
      *
@@ -77,11 +123,29 @@ interface CurrenciesRepository {
      *
      * @param userWalletId The unique identifier of the user wallet.
      * @param id The unique identifier of the cryptocurrency to be retrieved.
+     * @param derivationPath currency derivation path.
      * @return The cryptocurrency associated with the user wallet and ID.
      * @throws com.tangem.domain.core.error.DataError.UserWalletError.WrongUserWallet If single-currency user wallet
      * ID provided.
      */
-    suspend fun getMultiCurrencyWalletCurrency(userWalletId: UserWalletId, id: CryptoCurrency.ID): CryptoCurrency
+    suspend fun getMultiCurrencyWalletCurrency(
+        userWalletId: UserWalletId,
+        id: CryptoCurrency.ID,
+        derivationPath: Network.DerivationPath,
+    ): CryptoCurrency
+
+    /**
+     * Get the coin for a specific network.
+     *
+     * @param userWalletId The unique identifier of the user wallet.
+     * @param networkId    The unique identifier of the network.
+     * @param derivationPath currency derivation path.
+     */
+    suspend fun getNetworkCoin(
+        userWalletId: UserWalletId,
+        networkId: Network.ID,
+        derivationPath: Network.DerivationPath,
+    ): CryptoCurrency.Coin
 
     /**
      * Determines whether the tokens within a specific multi-currency user wallet are grouped.
@@ -102,4 +166,6 @@ interface CurrenciesRepository {
      * ID provided.
      */
     fun isTokensSortedByBalance(userWalletId: UserWalletId): Flow<Boolean>
+
+    fun getMissedAddressesCryptoCurrencies(userWalletId: UserWalletId): Flow<List<CryptoCurrency>>
 }
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/repository/MarketCryptoCurrencyRepository.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/repository/MarketCryptoCurrencyRepository.kt
new file mode 100644
index 0000000000..0186226918
--- /dev/null
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/repository/MarketCryptoCurrencyRepository.kt
@@ -0,0 +1,12 @@
+package com.tangem.domain.tokens.repository
+
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.wallets.models.UserWalletId
+
+/**
+ * MarketCryptoCurrencyRepository works with data from Tangem coins backend, CoinMarketCap etc
+ */
+interface MarketCryptoCurrencyRepository {
+
+    suspend fun isExchangeable(userWalletId: UserWalletId, cryptoCurrencyId: CryptoCurrency.ID): Boolean
+}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/repository/NetworksRepository.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/repository/NetworksRepository.kt
index b019c7f3f5..8e1b1103ff 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/repository/NetworksRepository.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/repository/NetworksRepository.kt
@@ -1,7 +1,7 @@
 package com.tangem.domain.tokens.repository
 
+import com.tangem.domain.tokens.model.Network
 import com.tangem.domain.tokens.model.NetworkStatus
-import com.tangem.domain.tokens.models.Network
 import com.tangem.domain.wallets.models.UserWalletId
 import kotlinx.coroutines.flow.Flow
 
@@ -9,25 +9,24 @@ import kotlinx.coroutines.flow.Flow
  * Repository for everything related to the blockchain networks
  * */
 interface NetworksRepository {
-
-    /**
-     * Retrieves the details of the specified blockchain networks, identified by their unique IDs.
-     *
-     * @param networksIds The unique identifiers of the networks to be retrieved.
-     * @return A set of [Network] objects corresponding to the specified network IDs.
-     */
-    fun getNetworks(networksIds: Set<Network.ID>): Set<Network>
-
     /**
      * Retrieves updates of network statuses of specified blockchain networks for a specific user wallet.
      *
      * Loads remote network statuses if they have expired.
      *
      * @param userWalletId The unique identifier of the user wallet.
-     * @param networks A set of network IDs which statuses are to be retrieved.
+     * @param networks A set of network which statuses are to be retrieved.
      * @return A [Flow] emitting a set of [NetworkStatus] objects corresponding to the specified networks.
      */
-    fun getNetworkStatusesUpdates(userWalletId: UserWalletId, networks: Set<Network.ID>): Flow<Set<NetworkStatus>>
+    fun getNetworkStatusesUpdates(userWalletId: UserWalletId, networks: Set<Network>): Flow<Set<NetworkStatus>>
+
+    /**
+     * Fetches pending transactions for given network
+     *
+     * @param userWalletId The unique identifier of the user wallet.
+     * @param networks A set of network which statuses are to be retrieved.
+     */
+    suspend fun fetchNetworkPendingTransactions(userWalletId: UserWalletId, networks: Set<Network>)
 
     /**
      * Retrieves network statuses of specified blockchain networks for a specific user wallet.
@@ -35,13 +34,13 @@ interface NetworksRepository {
      * Loads remote network statuses if they have expired or if [refresh] is `true`.
      *
      * @param userWalletId The unique identifier of the user wallet.
-     * @param networks A set of network IDs which statuses are to be retrieved.
+     * @param networks A set of network which statuses are to be retrieved.
      * @param refresh A boolean flag indicating whether the data should be refreshed.
      * @return A [Flow] emitting a set of [NetworkStatus] objects corresponding to the specified networks.
      */
     suspend fun getNetworkStatusesSync(
         userWalletId: UserWalletId,
-        networks: Set<Network.ID>,
+        networks: Set<Network>,
         refresh: Boolean,
     ): Set<NetworkStatus>
 }
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/repository/QuotesRepository.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/repository/QuotesRepository.kt
index 7e82d77d52..a44b1e6c99 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/repository/QuotesRepository.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/repository/QuotesRepository.kt
@@ -1,7 +1,7 @@
 package com.tangem.domain.tokens.repository
 
-import com.tangem.domain.tokens.models.CryptoCurrency
-import com.tangem.domain.tokens.models.Quote
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.Quote
 import kotlinx.coroutines.flow.Flow
 
 /**
diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/ApplyTokenListSortingUseCaseTest.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/ApplyTokenListSortingUseCaseTest.kt
index c40e5fc94b..a7c421e527 100644
--- a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/ApplyTokenListSortingUseCaseTest.kt
+++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/ApplyTokenListSortingUseCaseTest.kt
@@ -6,7 +6,7 @@ import arrow.core.right
 import com.tangem.domain.core.error.DataError
 import com.tangem.domain.tokens.error.TokenListSortingError
 import com.tangem.domain.tokens.mock.MockTokens
-import com.tangem.domain.tokens.models.CryptoCurrency
+import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.tokens.repository.MockCurrenciesRepository
 import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.utils.coroutines.TestingCoroutineDispatcherProvider
diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/GetPrimaryCurrencyStatusUpdatesUseCaseTest.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/GetPrimaryCurrencyStatusUpdatesUseCaseTest.kt
index 41b1dda67b..6cdc76877c 100644
--- a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/GetPrimaryCurrencyStatusUpdatesUseCaseTest.kt
+++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/GetPrimaryCurrencyStatusUpdatesUseCaseTest.kt
@@ -9,10 +9,7 @@ import com.tangem.domain.tokens.mock.MockNetworks
 import com.tangem.domain.tokens.mock.MockQuotes
 import com.tangem.domain.tokens.mock.MockTokens
 import com.tangem.domain.tokens.mock.MockTokensStates
-import com.tangem.domain.tokens.model.CryptoCurrencyStatus
-import com.tangem.domain.tokens.model.NetworkStatus
-import com.tangem.domain.tokens.models.CryptoCurrency
-import com.tangem.domain.tokens.models.Quote
+import com.tangem.domain.tokens.model.*
 import com.tangem.domain.tokens.repository.MockCurrenciesRepository
 import com.tangem.domain.tokens.repository.MockNetworksRepository
 import com.tangem.domain.tokens.repository.MockQuotesRepository
@@ -24,6 +21,7 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
+import java.math.BigDecimal
 
 internal class GetPrimaryCurrencyStatusUpdatesUseCaseTest {
 
@@ -103,7 +101,7 @@ internal class GetPrimaryCurrencyStatusUpdatesUseCaseTest {
     fun `when quotes flow is empty then no quote status should be received`() = runTest {
         val expectedResult = MockTokensStates.noQuotesTokensStatuses.first().right()
 
-        val useCase = getUseCase(quotes = flowOf())
+        val useCase = getUseCase(quotes = flowOf(emptySet<Quote>().right()))
 
         // When
         val result = useCase(userWalletId).first()
@@ -113,9 +111,17 @@ internal class GetPrimaryCurrencyStatusUpdatesUseCaseTest {
     }
 
     @Test
-    fun `when quotes are empty and statuses are verified then loading token should be received`() = runTest {
-        val expectedResult = MockTokensStates.tokenState1
-            .copy(value = CryptoCurrencyStatus.Loading)
+    fun `when quotes are empty and statuses are verified then token without quote should be received`() = runTest {
+        val expectedResult = with(MockTokensStates.tokenState1) {
+            copy(
+                value = CryptoCurrencyStatus.NoQuote(
+                    amount = BigDecimal.TEN,
+                    hasCurrentNetworkTransactions = false,
+                    pendingTransactions = emptySet(),
+                    networkAddress = NetworkAddress.Single(defaultAddress = "mock"),
+                ),
+            )
+        }
             .right()
 
         val useCase = getUseCase(
@@ -131,10 +137,8 @@ internal class GetPrimaryCurrencyStatusUpdatesUseCaseTest {
     }
 
     @Test
-    fun `when quotes are loaded and statuses are empty then loading token should be received`() = runTest {
-        val expectedResult = MockTokensStates.tokenState1
-            .copy(value = CryptoCurrencyStatus.Loading)
-            .right()
+    fun `when quotes are loaded and statuses are empty then error be received`() = runTest {
+        val expectedResult = CurrencyStatusError.UnableToCreateCurrency.left()
 
         val useCase = getUseCase(
             statuses = flowOf(emptySet<NetworkStatus>().right()),
@@ -164,6 +168,6 @@ internal class GetPrimaryCurrencyStatusUpdatesUseCaseTest {
             isSortedByBalance = flowOf(),
         ),
         quotesRepository = MockQuotesRepository(quotes),
-        networksRepository = MockNetworksRepository(MockNetworks.networks.right(), statuses),
+        networksRepository = MockNetworksRepository(statuses),
     )
 }
\ No newline at end of file
diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/GetTokenListUseCaseTest.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/GetTokenListUseCaseTest.kt
index b3a5e61a2e..7702463cf6 100644
--- a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/GetTokenListUseCaseTest.kt
+++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/GetTokenListUseCaseTest.kt
@@ -9,10 +9,10 @@ import com.tangem.domain.tokens.mock.MockNetworks
 import com.tangem.domain.tokens.mock.MockQuotes
 import com.tangem.domain.tokens.mock.MockTokenLists
 import com.tangem.domain.tokens.mock.MockTokens
+import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.tokens.model.NetworkStatus
+import com.tangem.domain.tokens.model.Quote
 import com.tangem.domain.tokens.model.TokenList
-import com.tangem.domain.tokens.models.CryptoCurrency
-import com.tangem.domain.tokens.models.Quote
 import com.tangem.domain.tokens.repository.MockCurrenciesRepository
 import com.tangem.domain.tokens.repository.MockNetworksRepository
 import com.tangem.domain.tokens.repository.MockQuotesRepository
@@ -205,7 +205,7 @@ internal class GetTokenListUseCaseTest {
 
     @Test
     fun `when tokens is empty then not initialized token list should be received`() = runTest {
-        val expectedResult = MockTokenLists.notInitializedTokenList.right()
+        val expectedResult = MockTokenLists.emptyTokenList.right()
 
         val useCase = getUseCase(tokens = flowOf(emptyList<CryptoCurrency>().right()))
 
@@ -269,7 +269,7 @@ internal class GetTokenListUseCaseTest {
 
         val useCase = getUseCase(
             statuses = flowOf(MockNetworks.verifiedNetworksStatuses.right()),
-            quotes = flowOf(),
+            quotes = flowOf(emptySet<Quote>().right()),
         )
 
         // When
@@ -314,6 +314,6 @@ internal class GetTokenListUseCaseTest {
             isSortedByBalance = isSortedByBalance,
         ),
         quotesRepository = MockQuotesRepository(quotes),
-        networksRepository = MockNetworksRepository(MockNetworks.networks.right(), statuses),
+        networksRepository = MockNetworksRepository(statuses),
     )
 }
\ No newline at end of file
diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/ToggleTokenListGroupingTest.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/ToggleTokenListGroupingTest.kt
index 299b44a0d0..c34710cd97 100644
--- a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/ToggleTokenListGroupingTest.kt
+++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/ToggleTokenListGroupingTest.kt
@@ -12,21 +12,7 @@ import org.junit.Test
 internal class ToggleTokenListGroupingTest {
 
     @Test
-    fun `when grouped list is empty then error should be received`() = runTest {
-        // Given
-        val expectedResult = TokenListSortingError.TokenListIsEmpty.left()
-
-        val useCase = getUseCase()
-
-        // When
-        val result = useCase(MockTokenLists.emptyGroupedTokenList)
-
-        // Then
-        assertEquals(expectedResult, result)
-    }
-
-    @Test
-    fun `when ungrouped list is empty then error should be received`() = runTest {
+    fun `when list is empty then error should be received`() = runTest {
         // Given
         val expectedResult = TokenListSortingError.TokenListIsEmpty.left()
 
@@ -67,20 +53,6 @@ internal class ToggleTokenListGroupingTest {
         assertEquals(expectedResult, result)
     }
 
-    @Test
-    fun `when list is not initialized then error should be received`() = runTest {
-        // Given
-        val expectedResult = TokenListSortingError.TokenListIsLoading.left()
-
-        val useCase = getUseCase()
-
-        // When
-        val result = useCase(MockTokenLists.notInitializedTokenList)
-
-        // Then
-        assertEquals(expectedResult, result)
-    }
-
     @Test
     fun `when list is ungrouped and sorted then sorted grouped list should be received`() = runTest {
         // Given
diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/ToggleTokenListSortingUseCaseTest.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/ToggleTokenListSortingUseCaseTest.kt
index f8070694f7..ebbc935479 100644
--- a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/ToggleTokenListSortingUseCaseTest.kt
+++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/ToggleTokenListSortingUseCaseTest.kt
@@ -12,42 +12,14 @@ import org.junit.Test
 internal class ToggleTokenListSortingUseCaseTest {
 
     @Test
-    fun `when grouped list is not initialized then error should be received`() = runTest {
-        // Given
-        val expectedResult = TokenListSortingError.TokenListIsLoading.left()
-
-        val useCase = getUseCase()
-
-        // When
-        val result = useCase(MockTokenLists.notInitializedTokenList)
-
-        // Then
-        assertEquals(expectedResult, result)
-    }
-
-    @Test
-    fun `when grouped list is empty then error should be received`() = runTest {
+    fun `when list is empty then error should be received`() = runTest {
         // Given
         val expectedResult = TokenListSortingError.TokenListIsEmpty.left()
 
         val useCase = getUseCase()
 
         // When
-        val result = useCase(MockTokenLists.emptyGroupedTokenList)
-
-        // Then
-        assertEquals(expectedResult, result)
-    }
-
-    @Test
-    fun `when ungrouped list is empty then error should be received`() = runTest {
-        // Given
-        val expectedResult = TokenListSortingError.TokenListIsEmpty.left()
-
-        val useCase = getUseCase()
-
-        // When
-        val result = useCase(MockTokenLists.emptyUngroupedTokenList)
+        val result = useCase(MockTokenLists.emptyTokenList)
 
         // Then
         assertEquals(expectedResult, result)
diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockNetworks.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockNetworks.kt
index 831d0c308b..2980c80907 100644
--- a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockNetworks.kt
+++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockNetworks.kt
@@ -2,9 +2,9 @@ package com.tangem.domain.tokens.mock
 
 import arrow.core.NonEmptySet
 import arrow.core.nonEmptySetOf
+import com.tangem.domain.tokens.model.Network
 import com.tangem.domain.tokens.model.NetworkAddress
 import com.tangem.domain.tokens.model.NetworkStatus
-import com.tangem.domain.tokens.models.Network
 import java.math.BigDecimal
 
 @Suppress("MemberVisibilityCanBePrivate")
@@ -17,6 +17,7 @@ internal object MockNetworks {
         name = "Network One",
         isTestnet = false,
         standardType = Network.StandardType.ERC20,
+        derivationPath = Network.DerivationPath.None,
     )
 
     val network2 = Network(
@@ -24,6 +25,7 @@ internal object MockNetworks {
         name = "Network Two",
         isTestnet = false,
         standardType = Network.StandardType.ERC20,
+        derivationPath = Network.DerivationPath.None,
     )
 
     val network3 = Network(
@@ -31,25 +33,25 @@ internal object MockNetworks {
         name = "Network Three",
         isTestnet = false,
         standardType = Network.StandardType.ERC20,
+        derivationPath = Network.DerivationPath.None,
     )
 
-    val networks = nonEmptySetOf(network1, network2, network3)
-
     val networkStatus1 = NetworkStatus(
-        networkId = network1.id,
+        network = network1,
         value = NetworkStatus.Unreachable,
     )
 
     val networkStatus2 = NetworkStatus(
-        networkId = network2.id,
+        network = network2,
         value = NetworkStatus.MissedDerivation,
     )
 
     val networkStatus3 = NetworkStatus(
-        networkId = network3.id,
+        network = network3,
         value = NetworkStatus.NoAccount(
             amountToCreateAccount = amountToCreateAccount,
             address = NetworkAddress.Single(defaultAddress = "mock"),
+            errorMessage = "",
         ),
     )
 
@@ -59,9 +61,9 @@ internal object MockNetworks {
         get() = networkStatus1.copy(
             value = NetworkStatus.Verified(
                 amounts = mapOf(
-                    MockTokens.token1.id to BigDecimal.TEN,
-                    MockTokens.token2.id to BigDecimal.TEN,
-                    MockTokens.token3.id to BigDecimal.TEN,
+                    MockTokens.token1.id to NetworkStatus.LoadedAmount(BigDecimal.TEN),
+                    MockTokens.token2.id to NetworkStatus.LoadedAmount(BigDecimal.TEN),
+                    MockTokens.token3.id to NetworkStatus.LoadedAmount(BigDecimal.TEN),
                 ),
                 pendingTransactions = emptyMap(),
                 address = NetworkAddress.Single(defaultAddress = "mock"),
@@ -72,9 +74,9 @@ internal object MockNetworks {
         get() = networkStatus2.copy(
             value = NetworkStatus.Verified(
                 amounts = mapOf(
-                    MockTokens.token4.id to BigDecimal.TEN,
-                    MockTokens.token5.id to BigDecimal.TEN,
-                    MockTokens.token6.id to BigDecimal.TEN,
+                    MockTokens.token4.id to NetworkStatus.LoadedAmount(BigDecimal.TEN),
+                    MockTokens.token5.id to NetworkStatus.LoadedAmount(BigDecimal.TEN),
+                    MockTokens.token6.id to NetworkStatus.LoadedAmount(BigDecimal.TEN),
                 ),
                 pendingTransactions = emptyMap(),
                 address = NetworkAddress.Single(defaultAddress = "mock"),
@@ -85,10 +87,10 @@ internal object MockNetworks {
         get() = networkStatus3.copy(
             value = NetworkStatus.Verified(
                 amounts = mapOf(
-                    MockTokens.token7.id to BigDecimal.TEN,
-                    MockTokens.token8.id to BigDecimal.TEN,
-                    MockTokens.token9.id to BigDecimal.TEN,
-                    MockTokens.token10.id to BigDecimal.TEN,
+                    MockTokens.token7.id to NetworkStatus.LoadedAmount(BigDecimal.TEN),
+                    MockTokens.token8.id to NetworkStatus.LoadedAmount(BigDecimal.TEN),
+                    MockTokens.token9.id to NetworkStatus.LoadedAmount(BigDecimal.TEN),
+                    MockTokens.token10.id to NetworkStatus.LoadedAmount(BigDecimal.TEN),
                 ),
                 pendingTransactions = emptyMap(),
                 address = NetworkAddress.Single(defaultAddress = "mock"),
diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockQuotes.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockQuotes.kt
index a7e128d112..68de5e729a 100644
--- a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockQuotes.kt
+++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockQuotes.kt
@@ -1,7 +1,7 @@
 package com.tangem.domain.tokens.mock
 
 import arrow.core.nonEmptySetOf
-import com.tangem.domain.tokens.models.Quote
+import com.tangem.domain.tokens.model.Quote
 import java.math.BigDecimal
 
 @Suppress("MemberVisibilityCanBePrivate")
diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockTokenLists.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockTokenLists.kt
index cbfd65a56f..0cbc4a5d5c 100644
--- a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockTokenLists.kt
+++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockTokenLists.kt
@@ -15,7 +15,7 @@ internal object MockTokenLists {
     const val isGrouped = false
     const val isSortedByBalance = false
 
-    val notInitializedTokenList = TokenList.NotInitialized
+    val emptyTokenList = TokenList.Empty
 
     val emptyGroupedTokenList = TokenList.GroupedByNetwork(
         groups = emptyList(),
@@ -48,7 +48,7 @@ internal object MockTokenLists {
 
     val loadingUngroupedTokenList = with(failedUngroupedTokenList) {
         copy(
-            currencies = currencies.map { it.copy(value = CryptoCurrencyStatus.Loading) },
+            currencies = currencies.map { it.copy(value = CryptoCurrencyStatus.Loading) }.toNonEmptyListOrNull() ?: emptyList(),
             totalFiatBalance = TokenList.FiatBalance.Loading,
         )
     }
diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockTokens.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockTokens.kt
index fda72a1b06..25b37db845 100644
--- a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockTokens.kt
+++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockTokens.kt
@@ -1,23 +1,31 @@
 package com.tangem.domain.tokens.mock
 
-import com.tangem.domain.tokens.models.CryptoCurrency
-import com.tangem.domain.tokens.models.CryptoCurrency.ID
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.CryptoCurrency.ID
 
 internal object MockTokens {
 
     val token1
         get() = CryptoCurrency.Coin(
-            id = ID(ID.Prefix.COIN_PREFIX, MockNetworks.network1.id, ID.Suffix.RawID("token1")),
+            id = ID(
+                ID.Prefix.COIN_PREFIX,
+                ID.Body.NetworkId(MockNetworks.network1.id.value),
+                ID.Suffix.RawID("token1"),
+            ),
             network = MockNetworks.network1,
             name = "Token 1",
             symbol = "T1",
             decimals = 8,
             iconUrl = null,
-            derivationPath = null,
+            isCustom = false,
         )
     val token2
         get() = CryptoCurrency.Token(
-            id = ID(ID.Prefix.TOKEN_PREFIX, MockNetworks.network1.id, ID.Suffix.RawID("token2")),
+            id = ID(
+                ID.Prefix.TOKEN_PREFIX,
+                ID.Body.NetworkId(MockNetworks.network1.id.value),
+                ID.Suffix.RawID("token2"),
+            ),
             network = MockNetworks.network1,
             name = "Token 2",
             symbol = "T2",
@@ -25,11 +33,14 @@ internal object MockTokens {
             decimals = 8,
             iconUrl = null,
             contractAddress = "address",
-            derivationPath = null,
         )
     val token3
         get() = CryptoCurrency.Token(
-            id = ID(ID.Prefix.TOKEN_PREFIX, MockNetworks.network1.id, ID.Suffix.RawID("token3")),
+            id = ID(
+                ID.Prefix.TOKEN_PREFIX,
+                ID.Body.NetworkId(MockNetworks.network1.id.value),
+                ID.Suffix.RawID("token3"),
+            ),
             network = MockNetworks.network1,
             name = "Token 3",
             symbol = "T3",
@@ -37,21 +48,28 @@ internal object MockTokens {
             decimals = 8,
             iconUrl = null,
             contractAddress = "address",
-            derivationPath = null,
         )
     val token4
         get() = CryptoCurrency.Coin(
-            id = ID(ID.Prefix.COIN_PREFIX, MockNetworks.network2.id, ID.Suffix.RawID("token4")),
+            id = ID(
+                ID.Prefix.COIN_PREFIX,
+                ID.Body.NetworkId(MockNetworks.network2.id.value),
+                ID.Suffix.RawID("token4"),
+            ),
             network = MockNetworks.network2,
             name = "Token 4",
             symbol = "T4",
             decimals = 8,
             iconUrl = null,
-            derivationPath = null,
+            isCustom = false,
         )
     val token5
         get() = CryptoCurrency.Token(
-            id = ID(ID.Prefix.TOKEN_PREFIX, MockNetworks.network2.id, ID.Suffix.RawID("token5")),
+            id = ID(
+                ID.Prefix.TOKEN_PREFIX,
+                ID.Body.NetworkId(MockNetworks.network2.id.value),
+                ID.Suffix.RawID("token5"),
+            ),
             network = MockNetworks.network2,
             name = "Token 5",
             symbol = "T5",
@@ -59,11 +77,14 @@ internal object MockTokens {
             decimals = 8,
             iconUrl = null,
             contractAddress = "address",
-            derivationPath = null,
         )
     val token6
         get() = CryptoCurrency.Token(
-            id = ID(ID.Prefix.TOKEN_PREFIX, MockNetworks.network2.id, ID.Suffix.RawID("token6")),
+            id = ID(
+                ID.Prefix.TOKEN_PREFIX,
+                ID.Body.NetworkId(MockNetworks.network2.id.value),
+                ID.Suffix.RawID("token6"),
+            ),
             network = MockNetworks.network2,
             name = "Token 6",
             symbol = "T6",
@@ -71,21 +92,28 @@ internal object MockTokens {
             decimals = 8,
             iconUrl = null,
             contractAddress = "address",
-            derivationPath = null,
         )
     val token7
         get() = CryptoCurrency.Coin(
-            id = ID(ID.Prefix.COIN_PREFIX, MockNetworks.network3.id, ID.Suffix.RawID("token7")),
+            id = ID(
+                ID.Prefix.COIN_PREFIX,
+                ID.Body.NetworkId(MockNetworks.network3.id.value),
+                ID.Suffix.RawID("token7"),
+            ),
             network = MockNetworks.network3,
             name = "Token 7",
             symbol = "T7",
             decimals = 8,
             iconUrl = null,
-            derivationPath = null,
+            isCustom = false,
         )
     val token8
         get() = CryptoCurrency.Token(
-            id = ID(ID.Prefix.TOKEN_PREFIX, MockNetworks.network3.id, ID.Suffix.RawID("token8")),
+            id = ID(
+                ID.Prefix.TOKEN_PREFIX,
+                ID.Body.NetworkId(MockNetworks.network3.id.value),
+                ID.Suffix.RawID("token8"),
+            ),
             network = MockNetworks.network3,
             name = "Token 8",
             symbol = "T8",
@@ -93,11 +121,14 @@ internal object MockTokens {
             decimals = 8,
             iconUrl = null,
             contractAddress = "address",
-            derivationPath = null,
         )
     val token9
         get() = CryptoCurrency.Token(
-            id = ID(ID.Prefix.TOKEN_PREFIX, MockNetworks.network3.id, ID.Suffix.RawID("token9")),
+            id = ID(
+                ID.Prefix.TOKEN_PREFIX,
+                ID.Body.NetworkId(MockNetworks.network3.id.value),
+                ID.Suffix.RawID("token9"),
+            ),
             network = MockNetworks.network3,
             name = "Token 9",
             symbol = "T9",
@@ -105,11 +136,14 @@ internal object MockTokens {
             decimals = 8,
             iconUrl = null,
             contractAddress = "address",
-            derivationPath = null,
         )
     val token10
         get() = CryptoCurrency.Token(
-            id = ID(ID.Prefix.TOKEN_PREFIX, MockNetworks.network3.id, ID.Suffix.RawID("token10")),
+            id = ID(
+                ID.Prefix.TOKEN_PREFIX,
+                ID.Body.NetworkId(MockNetworks.network3.id.value),
+                ID.Suffix.RawID("token10"),
+            ),
             network = MockNetworks.network3,
             name = "Token 10",
             symbol = "T10",
@@ -117,7 +151,6 @@ internal object MockTokens {
             decimals = 8,
             iconUrl = null,
             contractAddress = "address",
-            derivationPath = null,
         )
 
     val tokens = listOf(token1, token2, token3, token4, token5, token6, token7, token8, token9, token10)
diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockTokensStates.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockTokensStates.kt
index d01254b1e7..8424c5cf4f 100644
--- a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockTokensStates.kt
+++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockTokensStates.kt
@@ -3,58 +3,93 @@ package com.tangem.domain.tokens.mock
 import arrow.core.nonEmptyListOf
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
 import com.tangem.domain.tokens.model.NetworkStatus
+import java.math.BigDecimal
 
 @Suppress("MemberVisibilityCanBePrivate")
 internal object MockTokensStates {
 
     val tokenState1 = CryptoCurrencyStatus(
         currency = MockTokens.token1,
-        value = CryptoCurrencyStatus.Unreachable,
+        value = CryptoCurrencyStatus.Unreachable(
+            priceChange = MockQuotes.quote1.priceChange,
+            fiatRate = MockQuotes.quote1.fiatRate,
+        ),
     )
 
     val tokenState2 = CryptoCurrencyStatus(
         currency = MockTokens.token2,
-        value = CryptoCurrencyStatus.Unreachable,
+        value = CryptoCurrencyStatus.Unreachable(
+            priceChange = MockQuotes.quote2.priceChange,
+            fiatRate = MockQuotes.quote2.fiatRate,
+        ),
     )
 
     val tokenState3 = CryptoCurrencyStatus(
         currency = MockTokens.token3,
-        value = CryptoCurrencyStatus.Unreachable,
+        value = CryptoCurrencyStatus.Unreachable(
+            priceChange = MockQuotes.quote3.priceChange,
+            fiatRate = MockQuotes.quote3.fiatRate,
+        ),
     )
 
     val tokenState4 = CryptoCurrencyStatus(
         currency = MockTokens.token4,
-        value = CryptoCurrencyStatus.MissedDerivation,
+        value = CryptoCurrencyStatus.MissedDerivation(
+            priceChange = MockQuotes.quote4.priceChange,
+            fiatRate = MockQuotes.quote4.fiatRate,
+        ),
     )
 
     val tokenState5 = CryptoCurrencyStatus(
         currency = MockTokens.token5,
-        value = CryptoCurrencyStatus.MissedDerivation,
+        value = CryptoCurrencyStatus.MissedDerivation(
+            priceChange = MockQuotes.quote5.priceChange,
+            fiatRate = MockQuotes.quote5.fiatRate,
+        ),
     )
 
     val tokenState6 = CryptoCurrencyStatus(
         currency = MockTokens.token6,
-        value = CryptoCurrencyStatus.MissedDerivation,
+        value = CryptoCurrencyStatus.MissedDerivation(
+            priceChange = MockQuotes.quote6.priceChange,
+            fiatRate = MockQuotes.quote6.fiatRate,
+        ),
     )
 
     val tokenState7 = CryptoCurrencyStatus(
         currency = MockTokens.token7,
-        value = CryptoCurrencyStatus.NoAccount,
+        value = CryptoCurrencyStatus.NoAccount(
+            priceChange = MockQuotes.quote7.priceChange,
+            fiatRate = MockQuotes.quote7.fiatRate,
+            amountToCreateAccount = MockNetworks.amountToCreateAccount,
+        ),
     )
 
     val tokenState8 = CryptoCurrencyStatus(
         currency = MockTokens.token8,
-        value = CryptoCurrencyStatus.NoAccount,
+        value = CryptoCurrencyStatus.NoAccount(
+            priceChange = MockQuotes.quote8.priceChange,
+            fiatRate = MockQuotes.quote8.fiatRate,
+            amountToCreateAccount = MockNetworks.amountToCreateAccount,
+        ),
     )
 
     val tokenState9 = CryptoCurrencyStatus(
         currency = MockTokens.token9,
-        value = CryptoCurrencyStatus.NoAccount,
+        value = CryptoCurrencyStatus.NoAccount(
+            priceChange = MockQuotes.quote9.priceChange,
+            fiatRate = MockQuotes.quote9.fiatRate,
+            amountToCreateAccount = MockNetworks.amountToCreateAccount,
+        ),
     )
 
     val tokenState10 = CryptoCurrencyStatus(
         currency = MockTokens.token10,
-        value = CryptoCurrencyStatus.NoAccount,
+        value = CryptoCurrencyStatus.NoAccount(
+            priceChange = MockQuotes.quote10.priceChange,
+            fiatRate = MockQuotes.quote10.fiatRate,
+            amountToCreateAccount = MockNetworks.amountToCreateAccount,
+        ),
     )
 
     val failedTokenStates = nonEmptyListOf(
@@ -72,8 +107,11 @@ internal object MockTokensStates {
 
     val loadedTokensStates = failedTokenStates.map { status ->
         val networkStatus = MockNetworks.verifiedNetworksStatuses
-            .first { it.networkId == status.currency.network.id }
-        val amount = (networkStatus.value as NetworkStatus.Verified).amounts[status.currency.id]!!
+            .first { it.network == status.currency.network }
+        val amount = (
+            (networkStatus.value as NetworkStatus.Verified).amounts[status.currency.id]!!
+                as? NetworkStatus.LoadedAmount
+            )?.value ?: BigDecimal.ZERO
         val quote = MockQuotes.quotes.first { it.rawCurrencyId == status.currency.id.rawCurrencyId }
         val fiatAmount = amount * quote.fiatRate
 
@@ -98,7 +136,7 @@ internal object MockTokensStates {
                 hasCurrentNetworkTransactions = false,
                 networkAddress = requireNotNull(
                     value = MockNetworks.verifiedNetworksStatuses
-                        .first { it.networkId == status.currency.network.id }
+                        .first { it.network == status.currency.network }
                         .value as? NetworkStatus.Verified,
                 ).address,
             ),
diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/repository/MockCurrenciesRepository.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/repository/MockCurrenciesRepository.kt
index 73e096b201..c3ae45ed54 100644
--- a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/repository/MockCurrenciesRepository.kt
+++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/repository/MockCurrenciesRepository.kt
@@ -3,7 +3,8 @@ package com.tangem.domain.tokens.repository
 import arrow.core.Either
 import arrow.core.getOrElse
 import com.tangem.domain.core.error.DataError
-import com.tangem.domain.tokens.models.CryptoCurrency
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.Network
 import com.tangem.domain.wallets.models.UserWalletId
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
@@ -40,10 +41,14 @@ internal class MockCurrenciesRepository(
         isTokensSortedByBalanceAfterSortingApply = isSortedByBalance
     }
 
+    override suspend fun addCurrencies(userWalletId: UserWalletId, currencies: List<CryptoCurrency>) = Unit
+
     override suspend fun removeCurrency(userWalletId: UserWalletId, currency: CryptoCurrency) {
         removeCurrencyResult.onLeft { throw it }
     }
 
+    override suspend fun removeCurrencies(userWalletId: UserWalletId, currencies: List<CryptoCurrency>) = Unit
+
     override suspend fun getMultiCurrencyWalletCurrenciesSync(
         userWalletId: UserWalletId,
         refresh: Boolean,
@@ -55,6 +60,17 @@ internal class MockCurrenciesRepository(
         return token.getOrElse { e -> throw e }
     }
 
+    override suspend fun getSingleCurrencyWalletWithCardCurrencies(userWalletId: UserWalletId): List<CryptoCurrency> {
+        return tokens.first().getOrElse { e -> throw e }
+    }
+
+    override suspend fun getSingleCurrencyWalletWithCardCurrency(
+        userWalletId: UserWalletId,
+        id: CryptoCurrency.ID,
+    ): CryptoCurrency {
+        return token.getOrElse { e -> throw e }
+    }
+
     override fun getMultiCurrencyWalletCurrenciesUpdates(userWalletId: UserWalletId): Flow<List<CryptoCurrency>> {
         return tokens.map { it.getOrElse { e -> throw e } }
     }
@@ -62,6 +78,7 @@ internal class MockCurrenciesRepository(
     override suspend fun getMultiCurrencyWalletCurrency(
         userWalletId: UserWalletId,
         id: CryptoCurrency.ID,
+        derivationPath: Network.DerivationPath,
     ): CryptoCurrency {
         val token = token.getOrElse { e -> throw e }
 
@@ -70,6 +87,14 @@ internal class MockCurrenciesRepository(
         return token
     }
 
+    override suspend fun getNetworkCoin(
+        userWalletId: UserWalletId,
+        networkId: Network.ID,
+        derivationPath: Network.DerivationPath,
+    ): CryptoCurrency.Coin {
+        TODO("Not yet implemented")
+    }
+
     override fun isTokensGrouped(userWalletId: UserWalletId): Flow<Boolean> {
         return isGrouped.map { it.getOrElse { e -> throw e } }
     }
diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/repository/MockNetworksRepository.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/repository/MockNetworksRepository.kt
index 0209a5e953..f345dbedeb 100644
--- a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/repository/MockNetworksRepository.kt
+++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/repository/MockNetworksRepository.kt
@@ -3,32 +3,31 @@ package com.tangem.domain.tokens.repository
 import arrow.core.Either
 import arrow.core.getOrElse
 import com.tangem.domain.core.error.DataError
+import com.tangem.domain.tokens.model.Network
 import com.tangem.domain.tokens.model.NetworkStatus
-import com.tangem.domain.tokens.models.Network
 import com.tangem.domain.wallets.models.UserWalletId
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 
 internal class MockNetworksRepository(
-    private val networks: Either<DataError, Set<Network>>,
     private val statuses: Flow<Either<DataError, Set<NetworkStatus>>>,
 ) : NetworksRepository {
 
-    override fun getNetworks(networksIds: Set<Network.ID>): Set<Network> {
-        return networks.getOrElse { throw it }
-    }
-
     override fun getNetworkStatusesUpdates(
         userWalletId: UserWalletId,
-        networks: Set<Network.ID>,
+        networks: Set<Network>,
     ): Flow<Set<NetworkStatus>> {
         return statuses.map { it.getOrElse { e -> throw e } }
     }
 
+    override suspend fun fetchNetworkPendingTransactions(userWalletId: UserWalletId, networks: Set<Network>) {
+        // no-op
+    }
+
     override suspend fun getNetworkStatusesSync(
         userWalletId: UserWalletId,
-        networks: Set<Network.ID>,
+        networks: Set<Network>,
         refresh: Boolean,
     ): Set<NetworkStatus> {
         return getNetworkStatusesUpdates(userWalletId, networks).first()
diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/repository/MockQuotesRepository.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/repository/MockQuotesRepository.kt
index 3a1470ba1a..6d1c1e1a27 100644
--- a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/repository/MockQuotesRepository.kt
+++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/repository/MockQuotesRepository.kt
@@ -3,8 +3,8 @@ package com.tangem.domain.tokens.repository
 import arrow.core.Either
 import arrow.core.getOrElse
 import com.tangem.domain.core.error.DataError
-import com.tangem.domain.tokens.models.CryptoCurrency
-import com.tangem.domain.tokens.models.Quote
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.Quote
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
diff --git a/domain/txhistory/build.gradle.kts b/domain/txhistory/build.gradle.kts
index 2ba0547f59..892e55e639 100644
--- a/domain/txhistory/build.gradle.kts
+++ b/domain/txhistory/build.gradle.kts
@@ -9,11 +9,15 @@ android {
 }
 
 dependencies {
-    implementation(deps.arrow.core)
-    implementation(deps.kotlin.coroutines)
-    implementation(deps.androidx.paging.runtime)
-
-    implementation(projects.core.utils)
+    /** Project - Domain */
+    implementation(projects.domain.core)
     implementation(projects.domain.tokens.models)
     implementation(projects.domain.txhistory.models)
+    implementation(projects.domain.wallets.models)
+
+    /** Project - Other */
+    implementation(projects.core.utils)
+
+    /** Android - Other */
+    implementation(deps.androidx.paging.runtime)
 }
\ No newline at end of file
diff --git a/domain/txhistory/models/src/main/kotlin/com/tangem/domain/txhistory/models/TxHistoryItem.kt b/domain/txhistory/models/src/main/kotlin/com/tangem/domain/txhistory/models/TxHistoryItem.kt
index c17f0dccb6..b956574ce5 100644
--- a/domain/txhistory/models/src/main/kotlin/com/tangem/domain/txhistory/models/TxHistoryItem.kt
+++ b/domain/txhistory/models/src/main/kotlin/com/tangem/domain/txhistory/models/TxHistoryItem.kt
@@ -6,7 +6,7 @@ data class TxHistoryItem(
     val txHash: String,
     val timestampInMillis: Long,
     val direction: TransactionDirection,
-    val status: TxStatus,
+    val status: TransactionStatus,
     val type: TransactionType,
     val amount: BigDecimal,
 ) {
@@ -20,9 +20,21 @@ data class TxHistoryItem(
 
     sealed interface TransactionType {
         object Transfer : TransactionType
+        object Submit : TransactionType
+        object Approve : TransactionType
+        object Supply : TransactionType
+        object Withdraw : TransactionType
+        object Deposit : TransactionType
+        object Swap : TransactionType
+        object Unoswap : TransactionType
+        data class Custom(val id: String) : TransactionType
     }
 
-    enum class TxStatus { Confirmed, Unconfirmed }
+    sealed class TransactionStatus {
+        object Failed : TransactionStatus()
+        object Unconfirmed : TransactionStatus()
+        object Confirmed : TransactionStatus()
+    }
 
     sealed class Address {
         data class Single(val rawAddress: String) : Address()
diff --git a/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/repository/TxHistoryRepository.kt b/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/repository/TxHistoryRepository.kt
index 8ff4c05cff..6ddb7efd6f 100644
--- a/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/repository/TxHistoryRepository.kt
+++ b/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/repository/TxHistoryRepository.kt
@@ -1,21 +1,26 @@
 package com.tangem.domain.txhistory.repository
 
 import androidx.paging.PagingData
-import com.tangem.domain.tokens.models.Network
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.Network
+import com.tangem.domain.txhistory.models.TxHistoryItem
 import com.tangem.domain.txhistory.models.TxHistoryListError
 import com.tangem.domain.txhistory.models.TxHistoryStateError
-import com.tangem.domain.txhistory.models.TxHistoryItem
+import com.tangem.domain.wallets.models.UserWalletId
 import kotlinx.coroutines.flow.Flow
 
 interface TxHistoryRepository {
 
     @Throws(TxHistoryStateError::class)
-    suspend fun getTxHistoryItemsCount(networkId: Network.ID, derivationPath: String?): Int
+    suspend fun getTxHistoryItemsCount(userWalletId: UserWalletId, network: Network): Int
 
     @Throws(TxHistoryListError::class)
     fun getTxHistoryItems(
-        networkId: Network.ID,
-        derivationPath: String?,
+        userWalletId: UserWalletId,
+        currency: CryptoCurrency,
         pageSize: Int,
+        refresh: Boolean,
     ): Flow<PagingData<TxHistoryItem>>
+
+    fun getTxExploreUrl(txHash: String, networkId: Network.ID): String
 }
\ No newline at end of file
diff --git a/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/usecase/GetExplorerTransactionUrlUseCase.kt b/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/usecase/GetExplorerTransactionUrlUseCase.kt
new file mode 100644
index 0000000000..d5628aa838
--- /dev/null
+++ b/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/usecase/GetExplorerTransactionUrlUseCase.kt
@@ -0,0 +1,12 @@
+package com.tangem.domain.txhistory.usecase
+
+import com.tangem.domain.tokens.model.Network
+import com.tangem.domain.txhistory.repository.TxHistoryRepository
+
+class GetExplorerTransactionUrlUseCase(
+    private val repository: TxHistoryRepository,
+) {
+    operator fun invoke(txHash: String, networkId: Network.ID): String {
+        return repository.getTxExploreUrl(txHash, networkId)
+    }
+}
\ No newline at end of file
diff --git a/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/usecase/GetTxHistoryItemsCountUseCase.kt b/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/usecase/GetTxHistoryItemsCountUseCase.kt
index 172c8c2b3f..ab14187a02 100644
--- a/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/usecase/GetTxHistoryItemsCountUseCase.kt
+++ b/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/usecase/GetTxHistoryItemsCountUseCase.kt
@@ -3,16 +3,18 @@ package com.tangem.domain.txhistory.usecase
 import arrow.core.Either
 import arrow.core.raise.catch
 import arrow.core.raise.either
-import com.tangem.domain.tokens.models.Network
+import com.tangem.domain.tokens.model.Network
 import com.tangem.domain.txhistory.models.TxHistoryStateError
 import com.tangem.domain.txhistory.repository.TxHistoryRepository
+import com.tangem.domain.wallets.models.UserWalletId
 
+// TODO: Add tests
 class GetTxHistoryItemsCountUseCase(private val repository: TxHistoryRepository) {
 
-    suspend operator fun invoke(networkId: Network.ID, derivationPath: String?): Either<TxHistoryStateError, Int> {
+    suspend operator fun invoke(userWalletId: UserWalletId, network: Network): Either<TxHistoryStateError, Int> {
         return either {
             catch(
-                block = { repository.getTxHistoryItemsCount(networkId, derivationPath) },
+                block = { repository.getTxHistoryItemsCount(userWalletId, network) },
                 catch = { throwable ->
                     raise(
                         when (throwable) {
diff --git a/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/usecase/GetTxHistoryItemsUseCase.kt b/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/usecase/GetTxHistoryItemsUseCase.kt
index 38fbf4b87e..e5570e8077 100644
--- a/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/usecase/GetTxHistoryItemsUseCase.kt
+++ b/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/usecase/GetTxHistoryItemsUseCase.kt
@@ -3,25 +3,29 @@ package com.tangem.domain.txhistory.usecase
 import androidx.paging.PagingData
 import arrow.core.Either
 import arrow.core.raise.either
-import com.tangem.domain.tokens.models.Network
-import com.tangem.domain.txhistory.models.TxHistoryListError
+import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.txhistory.models.TxHistoryItem
+import com.tangem.domain.txhistory.models.TxHistoryListError
 import com.tangem.domain.txhistory.repository.TxHistoryRepository
+import com.tangem.domain.wallets.models.UserWalletId
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
 
-private const val DEFAULT_PAGE_SIZE = 20
+private const val DEFAULT_PAGE_SIZE = 50
 
+// TODO: Add tests
 class GetTxHistoryItemsUseCase(private val repository: TxHistoryRepository) {
 
+    // FIXME: Provide UserWalletId
     operator fun invoke(
-        networkId: Network.ID,
-        derivationPath: String?,
+        userWalletId: UserWalletId,
+        currency: CryptoCurrency,
         pageSize: Int = DEFAULT_PAGE_SIZE,
+        refresh: Boolean = false,
     ): Either<TxHistoryListError, Flow<PagingData<TxHistoryItem>>> {
         return either {
             repository
-                .getTxHistoryItems(networkId = networkId, derivationPath = derivationPath, pageSize = pageSize)
+                .getTxHistoryItems(userWalletId, currency, pageSize, refresh)
                 .catch { raise(TxHistoryListError.DataError(it)) }
         }
     }
diff --git a/domain/wallets/build.gradle.kts b/domain/wallets/build.gradle.kts
index 474b10e64e..89f73bcf36 100644
--- a/domain/wallets/build.gradle.kts
+++ b/domain/wallets/build.gradle.kts
@@ -17,6 +17,7 @@ dependencies {
     // region Domain modules
     implementation(projects.domain.legacy)
     implementation(projects.domain.models)
+    implementation(projects.domain.tokens)
     implementation(projects.domain.tokens.models)
     implementation(projects.domain.wallets.models)
     // endregion
diff --git a/domain/wallets/models/src/main/java/com/tangem/domain/wallets/models/UserWallet.kt b/domain/wallets/models/src/main/java/com/tangem/domain/wallets/models/UserWallet.kt
index af407822fb..710566e799 100644
--- a/domain/wallets/models/src/main/java/com/tangem/domain/wallets/models/UserWallet.kt
+++ b/domain/wallets/models/src/main/java/com/tangem/domain/wallets/models/UserWallet.kt
@@ -1,34 +1,37 @@
 package com.tangem.domain.wallets.models
 
+import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.models.scan.ScanResponse
 
 /**
  * Represents user's wallet which stored in app persistence
- * @param name User wallet name
- * @param walletId User wallet [UserWalletId]
- * @param artworkUrl User wallet card artwork URL
- * @param cardsInWallet List of cards IDs assigned with this user's wallet
- * @param isMultiCurrency Indicates whether this user wallet can work with more than one currency
- * @param scanResponse [ScanResponse] of primary user's wallet card.
- * TODO: Replace with [com.tangem.domain.common.CardDTO]
- * @property cardId ID of user's wallet primary card
- * @property hasAccessCode Indicates if the user's wallet primary card has access code
- * @property isLocked Indicates if this primary card has no currency wallets
- * */
+ *
+ * @property name            User wallet name
+ * @property walletId        User wallet [UserWalletId]
+ * @property artworkUrl      User wallet card artwork URL
+ * @property cardsInWallet   List of cards IDs assigned with this user's wallet. The list will be empty if the wallet
+ *                              has been backed up on another device.
+ * @property isMultiCurrency Indicates whether this user wallet can work with more than one currency
+ * @property scanResponse    [ScanResponse] of primary user's wallet card.
+ */
 data class UserWallet(
     val name: String,
     val walletId: UserWalletId,
     val artworkUrl: String,
     val cardsInWallet: Set<String>,
     val isMultiCurrency: Boolean,
-    val scanResponse: ScanResponse,
+    val scanResponse: ScanResponse, // TODO: Replace with [com.tangem.domain.models.scan.CardDTO]
 ) {
-    val cardId: String
-        get() = scanResponse.card.cardId
 
-    val hasAccessCode: Boolean
-        get() = scanResponse.card.isAccessCodeSet
+    /** ID of user's wallet primary card */
+    val cardId: String get() = scanResponse.card.cardId
 
-    val isLocked: Boolean
-        get() = scanResponse.card.wallets.isEmpty()
+    /** Indicates if the user's wallet primary card has access code */
+    val hasAccessCode: Boolean get() = scanResponse.card.isAccessCodeSet
+
+    /** Indicates if this primary card has no currency wallets */
+    val isLocked: Boolean get() = scanResponse.card.wallets.isEmpty()
+
+    /** Indicated if this primary card is imported */
+    val isImported: Boolean get() = scanResponse.card.wallets.any(CardDTO.Wallet::isImported)
 }
\ No newline at end of file
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/legacy/UseCaseUtils.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/legacy/UseCaseUtils.kt
new file mode 100644
index 0000000000..ee7de756db
--- /dev/null
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/legacy/UseCaseUtils.kt
@@ -0,0 +1,16 @@
+package com.tangem.domain.wallets.legacy
+
+import arrow.core.raise.Raise
+import arrow.core.raise.ensureNotNull
+
+internal inline fun <Error> Raise<Error>.ensureUserWalletListManagerNotNull(
+    walletsStateHolder: WalletsStateHolder,
+    raise: (Throwable) -> Error,
+): UserWalletsListManager {
+    return ensureNotNull(
+        value = walletsStateHolder.userWalletsListManager,
+        raise = {
+            raise(IllegalStateException("User wallets list manager not initialized"))
+        },
+    )
+}
\ No newline at end of file
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/legacy/UserWalletsListManager.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/legacy/UserWalletsListManager.kt
index ff4e805ad1..db6a353f7b 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/legacy/UserWalletsListManager.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/legacy/UserWalletsListManager.kt
@@ -110,6 +110,13 @@ interface UserWalletsListManager {
          */
         suspend fun unlock(): CompletionResult<UserWallet>
 
+        /**
+         * Unlock all [UserWallet]s and select passed [UserWalletId]
+         *
+         * @param selectedWalletId [UserWalletId] of [UserWallet] which must be selected
+         */
+        suspend fun unlockAndSelect(selectedWalletId: UserWalletId): CompletionResult<UserWallet>
+
         /** Remove [UserWallet]s from [userWallets] and set [isLocked] as true */
         fun lock()
     }
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/models/DeleteWalletError.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/models/DeleteWalletError.kt
index 6ed1ab11b9..29669fa19e 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/models/DeleteWalletError.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/models/DeleteWalletError.kt
@@ -3,4 +3,6 @@ package com.tangem.domain.wallets.models
 sealed interface DeleteWalletError {
 
     object DataError : DeleteWalletError
+
+    object UnableToDelete : DeleteWalletError
 }
\ No newline at end of file
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/models/GetSelectedWalletError.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/models/GetSelectedWalletError.kt
deleted file mode 100644
index ad0867fa6e..0000000000
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/models/GetSelectedWalletError.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.tangem.domain.wallets.models
-
-sealed interface GetSelectedWalletError {
-
-    object DataError : GetSelectedWalletError
-
-    object NoUserWalletSelected : GetSelectedWalletError
-}
\ No newline at end of file
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/models/GetUserWalletError.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/models/GetUserWalletError.kt
new file mode 100644
index 0000000000..50d1bea262
--- /dev/null
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/models/GetUserWalletError.kt
@@ -0,0 +1,8 @@
+package com.tangem.domain.wallets.models
+
+sealed class GetUserWalletError {
+
+    data class DataError(val cause: Throwable) : GetUserWalletError()
+
+    object UserWalletNotFound : GetUserWalletError()
+}
\ No newline at end of file
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/models/SaveWalletError.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/models/SaveWalletError.kt
index f292875ed2..7b320009c7 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/models/SaveWalletError.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/models/SaveWalletError.kt
@@ -5,5 +5,7 @@ package com.tangem.domain.wallets.models
  */
 sealed interface SaveWalletError {
 
-    object CommonError : SaveWalletError
+    object DataError : SaveWalletError
+
+    data class WalletAlreadySaved(val messageId: Int) : SaveWalletError
 }
\ No newline at end of file
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/repository/WalletsRepository.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/repository/WalletsRepository.kt
index 7d5d65f233..6190b6d2e0 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/repository/WalletsRepository.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/repository/WalletsRepository.kt
@@ -1,6 +1,14 @@
 package com.tangem.domain.wallets.repository
 
+import kotlinx.coroutines.flow.Flow
+
 interface WalletsRepository {
 
-    suspend fun shouldSaveUserWallets(): Boolean
+    suspend fun initialize()
+
+    suspend fun shouldSaveUserWalletsSync(): Boolean
+
+    fun shouldSaveUserWallets(): Flow<Boolean>
+
+    suspend fun saveShouldSaveUserWallets(item: Boolean)
 }
\ No newline at end of file
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/DeleteWalletUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/DeleteWalletUseCase.kt
index e4102d98c2..2b43096bf4 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/DeleteWalletUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/DeleteWalletUseCase.kt
@@ -2,10 +2,12 @@ package com.tangem.domain.wallets.usecase
 
 import arrow.core.Either
 import arrow.core.left
+import arrow.core.raise.either
 import arrow.core.right
 import com.tangem.common.doOnFailure
 import com.tangem.common.doOnSuccess
 import com.tangem.domain.wallets.legacy.WalletsStateHolder
+import com.tangem.domain.wallets.legacy.ensureUserWalletListManagerNotNull
 import com.tangem.domain.wallets.models.DeleteWalletError
 import com.tangem.domain.wallets.models.UserWalletId
 
@@ -19,13 +21,17 @@ import com.tangem.domain.wallets.models.UserWalletId
 class DeleteWalletUseCase(private val walletsStateHolder: WalletsStateHolder) {
 
     suspend operator fun invoke(userWalletId: UserWalletId): Either<DeleteWalletError, Unit> {
-        val userWalletsListManager = walletsStateHolder.userWalletsListManager
-            ?: return DeleteWalletError.DataError.left()
+        return either {
+            val userWalletsListManager = ensureUserWalletListManagerNotNull(
+                walletsStateHolder = walletsStateHolder,
+                raise = { DeleteWalletError.DataError },
+            )
 
-        userWalletsListManager.delete(userWalletIds = listOf(userWalletId))
-            .doOnSuccess { return Unit.right() }
-            .doOnFailure { return DeleteWalletError.DataError.left() }
+            userWalletsListManager.delete(userWalletIds = listOf(userWalletId))
+                .doOnSuccess { return Unit.right() }
+                .doOnFailure { return DeleteWalletError.UnableToDelete.left() }
 
-        return Unit.right()
+            return Unit.right()
+        }
     }
 }
\ No newline at end of file
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetExploreUrlUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetExploreUrlUseCase.kt
index 564192c4f8..cc29827d31 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetExploreUrlUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetExploreUrlUseCase.kt
@@ -1,12 +1,22 @@
 package com.tangem.domain.wallets.usecase
 
-import com.tangem.domain.tokens.models.Network
+import arrow.core.raise.catch
+import com.tangem.domain.tokens.model.Network
+import com.tangem.blockchain.common.address.AddressType
 import com.tangem.domain.walletmanager.WalletManagersFacade
 import com.tangem.domain.wallets.models.UserWalletId
 
+// TODO: Add tests
 class GetExploreUrlUseCase(private val walletsManagersFacade: WalletManagersFacade) {
 
-    suspend operator fun invoke(userWalletId: UserWalletId, networkId: Network.ID): String {
-        return walletsManagersFacade.getExploreUrl(userWalletId, networkId)
+    // FIXME: Handle error
+    suspend operator fun invoke(
+        userWalletId: UserWalletId,
+        network: Network,
+        addressType: AddressType = AddressType.Default,
+    ): String {
+        return catch({ walletsManagersFacade.getExploreUrl(userWalletId, network, addressType) }) {
+            ""
+        }
     }
 }
\ No newline at end of file
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletSyncUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletSyncUseCase.kt
new file mode 100644
index 0000000000..7cd6ffa8a2
--- /dev/null
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletSyncUseCase.kt
@@ -0,0 +1,34 @@
+package com.tangem.domain.wallets.usecase
+
+import arrow.core.Either
+import arrow.core.raise.either
+import arrow.core.raise.ensureNotNull
+import com.tangem.domain.wallets.legacy.WalletsStateHolder
+import com.tangem.domain.wallets.legacy.ensureUserWalletListManagerNotNull
+import com.tangem.domain.wallets.models.GetUserWalletError
+import com.tangem.domain.wallets.models.UserWallet
+
+/**
+ * Use case for getting selected wallet.
+ * Important! If all wallets is locked, use case returns a error.
+ *
+ * @property walletsStateHolder state holder for getting static initialized 'userWalletsListManager'
+ *
+[REDACTED_AUTHOR]
+ */
+class GetSelectedWalletSyncUseCase(private val walletsStateHolder: WalletsStateHolder) {
+
+    operator fun invoke(): Either<GetUserWalletError, UserWallet> {
+        return either {
+            val userWalletsListManager = ensureUserWalletListManagerNotNull(
+                walletsStateHolder = walletsStateHolder,
+                raise = GetUserWalletError::DataError,
+            )
+
+            ensureNotNull(
+                value = userWalletsListManager.selectedUserWalletSync,
+                raise = { GetUserWalletError.UserWalletNotFound },
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletUseCase.kt
index 89d6fe1405..ee23723206 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletUseCase.kt
@@ -2,13 +2,14 @@ package com.tangem.domain.wallets.usecase
 
 import arrow.core.Either
 import arrow.core.raise.either
-import arrow.core.raise.ensureNotNull
 import com.tangem.domain.wallets.legacy.WalletsStateHolder
-import com.tangem.domain.wallets.models.GetSelectedWalletError
+import com.tangem.domain.wallets.legacy.ensureUserWalletListManagerNotNull
+import com.tangem.domain.wallets.models.GetUserWalletError
 import com.tangem.domain.wallets.models.UserWallet
+import kotlinx.coroutines.flow.Flow
 
 /**
- * Use case for getting selected wallet
+ * Use case for getting flow of selected wallet.
  *
  * @property walletsStateHolder state holder for getting static initialized 'userWalletsListManager'
  *
@@ -16,17 +17,14 @@ import com.tangem.domain.wallets.models.UserWallet
  */
 class GetSelectedWalletUseCase(private val walletsStateHolder: WalletsStateHolder) {
 
-    operator fun invoke(): Either<GetSelectedWalletError, UserWallet> {
+    operator fun invoke(): Either<GetUserWalletError, Flow<UserWallet>> {
         return either {
-            val userWalletsListManager = ensureNotNull(
-                value = walletsStateHolder.userWalletsListManager,
-                raise = { GetSelectedWalletError.DataError },
+            val userWalletsListManager = ensureUserWalletListManagerNotNull(
+                walletsStateHolder = walletsStateHolder,
+                raise = GetUserWalletError::DataError,
             )
 
-            ensureNotNull(
-                value = userWalletsListManager.selectedUserWalletSync,
-                raise = { GetSelectedWalletError.NoUserWalletSelected },
-            )
+            userWalletsListManager.selectedUserWallet
         }
     }
 }
\ No newline at end of file
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetUserWalletUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetUserWalletUseCase.kt
new file mode 100644
index 0000000000..ae2ace600a
--- /dev/null
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetUserWalletUseCase.kt
@@ -0,0 +1,27 @@
+package com.tangem.domain.wallets.usecase
+
+import arrow.core.Either
+import arrow.core.raise.either
+import arrow.core.raise.ensureNotNull
+import com.tangem.domain.wallets.legacy.WalletsStateHolder
+import com.tangem.domain.wallets.legacy.ensureUserWalletListManagerNotNull
+import com.tangem.domain.wallets.models.GetUserWalletError
+import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.wallets.models.UserWalletId
+import kotlinx.coroutines.flow.firstOrNull
+
+class GetUserWalletUseCase(private val walletsStateHolder: WalletsStateHolder) {
+
+    suspend operator fun invoke(userWalletId: UserWalletId): Either<Any, UserWallet> = either {
+        val userWalletsListManager = ensureUserWalletListManagerNotNull(
+            walletsStateHolder = walletsStateHolder,
+            raise = GetUserWalletError::DataError,
+        )
+
+        val userWallets = userWalletsListManager.userWallets.firstOrNull().orEmpty()
+
+        ensureNotNull(userWallets.firstOrNull { it.walletId == userWalletId }) {
+            raise(GetUserWalletError.UserWalletNotFound)
+        }
+    }
+}
\ No newline at end of file
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/IsNeedToBackupUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/IsNeedToBackupUseCase.kt
new file mode 100644
index 0000000000..24fdc5a232
--- /dev/null
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/IsNeedToBackupUseCase.kt
@@ -0,0 +1,27 @@
+package com.tangem.domain.wallets.usecase
+
+import com.tangem.domain.models.scan.CardDTO
+import com.tangem.domain.wallets.legacy.WalletsStateHolder
+import com.tangem.domain.wallets.models.UserWalletId
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+
+/**
+ * Use case that checks if wallet need backup cards
+ */
+class IsNeedToBackupUseCase(private val walletsStateHolder: WalletsStateHolder) {
+
+    operator fun invoke(id: UserWalletId): Flow<Boolean> {
+        val userWalletsListManager = requireNotNull(walletsStateHolder.userWalletsListManager)
+
+        return userWalletsListManager.userWallets
+            .map { wallets ->
+                val wallet = wallets.firstOrNull { it.walletId == id }
+                if (wallet == null) {
+                    false
+                } else {
+                    wallet.scanResponse.card.backupStatus is CardDTO.BackupStatus.NoBackup
+                }
+            }
+    }
+}
\ No newline at end of file
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SaveWalletUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SaveWalletUseCase.kt
index 3afdb23663..8e25c40c1e 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SaveWalletUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SaveWalletUseCase.kt
@@ -2,10 +2,13 @@ package com.tangem.domain.wallets.usecase
 
 import arrow.core.Either
 import arrow.core.left
+import arrow.core.raise.either
 import arrow.core.right
 import com.tangem.common.doOnFailure
 import com.tangem.common.doOnSuccess
+import com.tangem.domain.wallets.legacy.UserWalletsListError
 import com.tangem.domain.wallets.legacy.WalletsStateHolder
+import com.tangem.domain.wallets.legacy.ensureUserWalletListManagerNotNull
 import com.tangem.domain.wallets.models.SaveWalletError
 import com.tangem.domain.wallets.models.UserWallet
 
@@ -19,10 +22,24 @@ import com.tangem.domain.wallets.models.UserWallet
 class SaveWalletUseCase(private val walletsStateHolder: WalletsStateHolder) {
 
     suspend operator fun invoke(userWallet: UserWallet, canOverride: Boolean = false): Either<SaveWalletError, Unit> {
-        requireNotNull(walletsStateHolder.userWalletsListManager).save(userWallet, canOverride)
-            .doOnSuccess { return Unit.right() }
-            .doOnFailure { return SaveWalletError.CommonError.left() }
+        return either {
+            val userWalletsListManager = ensureUserWalletListManagerNotNull(
+                walletsStateHolder = walletsStateHolder,
+                raise = { SaveWalletError.DataError },
+            )
 
-        return Unit.right()
+            userWalletsListManager.save(userWallet, canOverride)
+                .doOnSuccess { return Unit.right() }
+                .doOnFailure {
+                    return when (it) {
+                        is UserWalletsListError.WalletAlreadySaved -> SaveWalletError.WalletAlreadySaved(
+                            it.messageResId,
+                        )
+                        else -> SaveWalletError.DataError
+                    }.left()
+                }
+
+            return Unit.right()
+        }
     }
 }
\ No newline at end of file
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SelectWalletUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SelectWalletUseCase.kt
index aa16ad812b..5dad261008 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SelectWalletUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SelectWalletUseCase.kt
@@ -3,11 +3,11 @@ package com.tangem.domain.wallets.usecase
 import arrow.core.Either
 import arrow.core.left
 import arrow.core.raise.either
-import arrow.core.raise.ensureNotNull
 import arrow.core.right
 import com.tangem.common.doOnFailure
 import com.tangem.common.doOnSuccess
 import com.tangem.domain.wallets.legacy.WalletsStateHolder
+import com.tangem.domain.wallets.legacy.ensureUserWalletListManagerNotNull
 import com.tangem.domain.wallets.models.SelectWalletError
 import com.tangem.domain.wallets.models.UserWalletId
 
@@ -22,8 +22,8 @@ class SelectWalletUseCase(private val walletsStateHolder: WalletsStateHolder) {
 
     suspend operator fun invoke(userWalletId: UserWalletId): Either<SelectWalletError, Unit> {
         return either {
-            val userWalletsListManager = ensureNotNull(
-                value = walletsStateHolder.userWalletsListManager,
+            val userWalletsListManager = ensureUserWalletListManagerNotNull(
+                walletsStateHolder = walletsStateHolder,
                 raise = { SelectWalletError.DataError },
             )
 
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/ShouldSaveUserWalletsSyncUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/ShouldSaveUserWalletsSyncUseCase.kt
new file mode 100644
index 0000000000..16efc0eadb
--- /dev/null
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/ShouldSaveUserWalletsSyncUseCase.kt
@@ -0,0 +1,8 @@
+package com.tangem.domain.wallets.usecase
+
+import com.tangem.domain.wallets.repository.WalletsRepository
+
+class ShouldSaveUserWalletsSyncUseCase(private val walletsRepository: WalletsRepository) {
+
+    suspend operator fun invoke(): Boolean = walletsRepository.shouldSaveUserWalletsSync()
+}
\ No newline at end of file
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/ShouldSaveUserWalletsUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/ShouldSaveUserWalletsUseCase.kt
index b21f04a003..fc62813050 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/ShouldSaveUserWalletsUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/ShouldSaveUserWalletsUseCase.kt
@@ -1,8 +1,9 @@
 package com.tangem.domain.wallets.usecase
 
 import com.tangem.domain.wallets.repository.WalletsRepository
+import kotlinx.coroutines.flow.Flow
 
 class ShouldSaveUserWalletsUseCase(private val walletsRepository: WalletsRepository) {
 
-    suspend operator fun invoke(): Boolean = walletsRepository.shouldSaveUserWallets()
+    operator fun invoke(): Flow<Boolean> = walletsRepository.shouldSaveUserWallets()
 }
\ No newline at end of file
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/UnlockWalletsUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/UnlockWalletsUseCase.kt
index 3459902720..2a713a0ac8 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/UnlockWalletsUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/UnlockWalletsUseCase.kt
@@ -8,6 +8,7 @@ import com.tangem.common.doOnSuccess
 import com.tangem.domain.wallets.legacy.WalletsStateHolder
 import com.tangem.domain.wallets.legacy.asLockable
 import com.tangem.domain.wallets.models.UnlockWalletError
+import com.tangem.domain.wallets.models.UserWalletId
 
 /**
  * Unlock wallets use case
@@ -18,11 +19,11 @@ import com.tangem.domain.wallets.models.UnlockWalletError
  */
 class UnlockWalletsUseCase(private val walletsStateHolder: WalletsStateHolder) {
 
-    suspend operator fun invoke(): Either<UnlockWalletError, Unit> {
+    suspend operator fun invoke(selectedWalletId: UserWalletId): Either<UnlockWalletError, Unit> {
         val userWalletsListManager = walletsStateHolder.userWalletsListManager?.asLockable()
             ?: return UnlockWalletError.CommonError.left()
 
-        userWalletsListManager.unlock()
+        userWalletsListManager.unlockAndSelect(selectedWalletId = selectedWalletId)
             .doOnSuccess { return Unit.right() }
             .doOnFailure { return UnlockWalletError.CommonError.left() }
 
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/UpdateWalletUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/UpdateWalletUseCase.kt
index 1990c26dda..3a97779a39 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/UpdateWalletUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/UpdateWalletUseCase.kt
@@ -2,10 +2,12 @@ package com.tangem.domain.wallets.usecase
 
 import arrow.core.Either
 import arrow.core.left
+import arrow.core.raise.either
 import arrow.core.right
 import com.tangem.common.doOnFailure
 import com.tangem.common.doOnSuccess
 import com.tangem.domain.wallets.legacy.WalletsStateHolder
+import com.tangem.domain.wallets.legacy.ensureUserWalletListManagerNotNull
 import com.tangem.domain.wallets.models.UpdateWalletError
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.domain.wallets.models.UserWalletId
@@ -22,14 +24,18 @@ class UpdateWalletUseCase(private val walletsStateHolder: WalletsStateHolder) {
     suspend operator fun invoke(
         userWalletId: UserWalletId,
         update: suspend (UserWallet) -> UserWallet,
-    ): Either<UpdateWalletError, Unit> {
-        val userWalletsListManager = walletsStateHolder.userWalletsListManager
-            ?: return UpdateWalletError.DataError.left()
+    ): Either<UpdateWalletError, UserWallet> {
+        return either {
+            val userWalletsListManager = ensureUserWalletListManagerNotNull(
+                walletsStateHolder = walletsStateHolder,
+                raise = { UpdateWalletError.DataError },
+            )
 
-        userWalletsListManager.update(userWalletId, update)
-            .doOnSuccess { return Unit.right() }
-            .doOnFailure { return UpdateWalletError.DataError.left() }
+            userWalletsListManager.update(userWalletId, update)
+                .doOnSuccess { return it.right() }
+                .doOnFailure { return UpdateWalletError.DataError.left() }
 
-        return Unit.right()
+            return UpdateWalletError.DataError.left()
+        }
     }
 }
\ No newline at end of file
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt
index a36d44f760..792105fb40 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt
@@ -22,7 +22,6 @@ import com.tangem.core.ui.components.SpacerH4
 import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.res.TangemColorPalette
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.core.ui.res.TangemTypography
 import com.tangem.feature.learn2earn.impl.R
 import com.tangem.feature.learn2earn.presentation.ui.component.GradientCircle
 import com.tangem.feature.learn2earn.presentation.ui.state.MainScreenState
@@ -70,13 +69,13 @@ internal fun GetBonusView(state: MainScreenState, modifier: Modifier = Modifier)
             ) {
                 Text(
                     text = state.description.title.resolveReference(),
-                    style = TangemTypography.body1,
+                    style = TangemTheme.typography.body1,
                     color = TangemTheme.colors.text.primary2,
                 )
                 SpacerH4()
                 Text(
                     text = state.description.subtitle.resolveReference(),
-                    style = TangemTypography.caption,
+                    style = TangemTheme.typography.caption2,
                     color = TangemTheme.colors.text.tertiary,
                 )
             }
diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnStoriesScreen.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnStoriesScreen.kt
index b91ffaf2f5..4d498fd377 100644
--- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnStoriesScreen.kt
+++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/Learn2earnStoriesScreen.kt
@@ -17,7 +17,6 @@ import com.tangem.core.ui.components.SecondaryButton
 import com.tangem.core.ui.components.SpacerH16
 import com.tangem.core.ui.components.SpacerH32
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.core.ui.res.TangemTypography
 import com.tangem.feature.learn2earn.impl.R
 import com.tangem.feature.learn2earn.presentation.ui.component.GradientCircle
 
@@ -106,7 +105,7 @@ private fun StoryDescription(headerText: String, bodyText: String, modifier: Mod
         Text(
             text = bodyText,
             textAlign = TextAlign.Center,
-            style = TangemTypography.subtitle1,
+            style = TangemTheme.typography.subtitle1,
             color = TangemTheme.colors.text.tertiary,
         )
     }
diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/api/OnboardingSeedPhrase.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/api/OnboardingSeedPhrase.kt
index 2f6b1d4a0c..75e0acda9f 100644
--- a/features/onboarding/src/main/java/com/tangem/feature/onboarding/api/OnboardingSeedPhrase.kt
+++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/api/OnboardingSeedPhrase.kt
@@ -1,6 +1,7 @@
 package com.tangem.feature.onboarding.api
 
 import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.LinearProgressIndicator
 import androidx.compose.runtime.Composable
@@ -18,7 +19,7 @@ class OnboardingSeedPhrase : OnboardingSeedPhraseApi {
     @Composable
     override fun ScreenContent(uiState: OnboardingSeedPhraseState, subScreen: SeedPhraseScreen, progress: Float) {
         BackHandler(onBack = uiState.onBackClick)
-        TangemTheme {
+        TangemTheme(isDark = isSystemInDarkTheme()) {
             Column {
                 ProgressIndicator(progress)
                 Content(subScreen, uiState)
diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/di/OnboardingRouterModule.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/di/OnboardingRouterModule.kt
new file mode 100644
index 0000000000..acc54e7b9b
--- /dev/null
+++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/di/OnboardingRouterModule.kt
@@ -0,0 +1,20 @@
+package com.tangem.feature.onboarding.di
+
+import com.tangem.feature.onboarding.navigation.DefaultOnboardingRouter
+import com.tangem.feature.onboarding.navigation.OnboardingRouter
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ActivityComponent
+import dagger.hilt.android.scopes.ActivityScoped
+
+@Module
+@InstallIn(ActivityComponent::class)
+internal object OnboardingRouterModule {
+
+    @Provides
+    @ActivityScoped
+    fun provideOnboardingRouter(): OnboardingRouter {
+        return DefaultOnboardingRouter()
+    }
+}
\ No newline at end of file
diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/navigation/DefaultOnboardingRouter.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/navigation/DefaultOnboardingRouter.kt
new file mode 100644
index 0000000000..0d34ac7cd3
--- /dev/null
+++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/navigation/DefaultOnboardingRouter.kt
@@ -0,0 +1,3 @@
+package com.tangem.feature.onboarding.navigation
+
+class DefaultOnboardingRouter : OnboardingRouter
\ No newline at end of file
diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/navigation/OnboardingRouter.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/navigation/OnboardingRouter.kt
new file mode 100644
index 0000000000..5704da9b7f
--- /dev/null
+++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/navigation/OnboardingRouter.kt
@@ -0,0 +1,12 @@
+package com.tangem.feature.onboarding.navigation
+
+/**
+ * Onboarding router
+ */
+// TODO: Move to onboarding api module [REDACTED_JIRA]
+interface OnboardingRouter {
+
+    companion object {
+        const val CAN_SKIP_BACKUP = "onboarding_wallet_can_skip_backup"
+    }
+}
\ No newline at end of file
diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/AboutSeedPhraseScreen.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/AboutSeedPhraseScreen.kt
index fc583bccc7..51e56a32da 100644
--- a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/AboutSeedPhraseScreen.kt
+++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/AboutSeedPhraseScreen.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Icon
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -135,13 +136,15 @@ private fun ReadMoreBlock(state: AboutState) {
                     vertical = TangemTheme.dimens.size8,
                 ),
         ) {
-            Image(
+            Icon(
                 painter = painterResource(id = R.drawable.ic_arrow_top_right_24),
                 contentDescription = null,
+                tint = TangemTheme.colors.icon.primary1,
             )
             SpacerW8()
             Text(
                 text = stringResource(id = R.string.onboarding_seed_button_read_more),
+                color = TangemTheme.colors.text.primary1,
             )
         }
     }
diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/ImportSeedPhraseScreen.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/ImportSeedPhraseScreen.kt
index 5f9b14ae11..10248b767a 100644
--- a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/ImportSeedPhraseScreen.kt
+++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/ImportSeedPhraseScreen.kt
@@ -112,7 +112,7 @@ private fun PhraseBlock(state: ImportSeedPhraseState, modifier: Modifier = Modif
                 Text(
                     modifier = Modifier.fillMaxSize(),
                     text = message,
-                    style = TangemTheme.typography.caption.copy(
+                    style = TangemTheme.typography.caption2.copy(
                         color = TangemTheme.colors.text.warning,
                     ),
                 )
diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/viewmodel/SeedPhraseViewModel.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/viewmodel/SeedPhraseViewModel.kt
index 7cdaf16171..719abb7761 100644
--- a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/viewmodel/SeedPhraseViewModel.kt
+++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/viewmodel/SeedPhraseViewModel.kt
@@ -156,6 +156,7 @@ class SeedPhraseViewModel @Inject constructor(
             ),
             suggestedPhraseClick = ::buttonSuggestedPhraseClick,
             buttonCreateWalletClick = {
+                analyticsEventHandler.send(SeedPhraseEvents.ButtonImport)
                 buttonImportWalletClick(importedMnemonicComponents, SeedPhraseSource.IMPORTED)
             },
         ),
@@ -165,7 +166,7 @@ class SeedPhraseViewModel @Inject constructor(
 
     // region CheckSeedPhrase
     private fun onTextFieldChanged(field: SeedPhraseField, textFieldValue: TextFieldValue) {
-        viewModelScope.launchSingle {
+        launchSingle {
             updateUi { uiBuilder.checkSeedPhrase.updateTextField(uiState, field, textFieldValue) }
 
             val fieldState = field.getState(uiState)
@@ -278,7 +279,6 @@ class SeedPhraseViewModel @Inject constructor(
     }
 
     private fun buttonImportWalletClick(mnemonicComponents: List<String>?, seedPhraseSource: SeedPhraseSource) {
-        analyticsEventHandler.send(SeedPhraseEvents.ButtonImport)
         mnemonicComponents ?: return
 
         viewModelScope.launch(dispatchers.io) {
@@ -325,7 +325,7 @@ class SeedPhraseViewModel @Inject constructor(
 
     private fun buttonGenerateSeedPhraseClick() {
         analyticsEventHandler.send(SeedPhraseEvents.ButtonGenerateSeedPhrase)
-        viewModelScope.launchSingle {
+        launchSingle {
             updateUi { uiBuilder.generateMnemonicComponents(uiState) }
             delay(DELAY_GENERATE_SEED_PHRASE)
             interactor.generateMnemonic()
@@ -380,7 +380,7 @@ class SeedPhraseViewModel @Inject constructor(
     }
 
     private fun buttonSuggestedPhraseClick(suggestionIndex: Int) {
-        viewModelScope.launchSingle {
+        launchSingle {
             val textFieldValue = uiState.importSeedPhraseState.tvSeedPhrase.textFieldValue
             val word = uiState.importSeedPhraseState.suggestionsList[suggestionIndex]
             val cursorPosition = textFieldValue.selection.end
@@ -420,7 +420,7 @@ class SeedPhraseViewModel @Inject constructor(
         SeedPhraseField.Eleventh -> uiState.checkSeedPhraseState.tvEleventhPhrase
     }
 
-    private fun CoroutineScope.launchSingle(block: suspend CoroutineScope.() -> Unit): Job {
+    private fun launchSingle(block: suspend CoroutineScope.() -> Unit): Job {
         return viewModelScope.launch(dispatchers.single, block = block)
     }
 
diff --git a/features/referral/data/src/main/java/com/tangem/feature/referral/converters/ReferralConverter.kt b/features/referral/data/src/main/java/com/tangem/feature/referral/converters/ReferralConverter.kt
index 11ee37cff4..921f57b107 100644
--- a/features/referral/data/src/main/java/com/tangem/feature/referral/converters/ReferralConverter.kt
+++ b/features/referral/data/src/main/java/com/tangem/feature/referral/converters/ReferralConverter.kt
@@ -1,13 +1,17 @@
 package com.tangem.feature.referral.converters
 
+import android.text.format.DateUtils
 import com.tangem.datasource.api.tangemTech.models.ReferralResponse
-import com.tangem.feature.referral.domain.models.DiscountType
-import com.tangem.feature.referral.domain.models.ReferralData
-import com.tangem.feature.referral.domain.models.ReferralInfo
-import com.tangem.feature.referral.domain.models.TokenData
+import com.tangem.feature.referral.domain.models.*
 import com.tangem.utils.converter.Converter
+import com.tangem.utils.extensions.isToday
+import com.tangem.utils.extensions.isYesterday
 import com.tangem.utils.safeValueOf
+import org.joda.time.DateTime
+import org.joda.time.DateTimeZone
+import org.joda.time.format.DateTimeFormatterBuilder
 import org.joda.time.format.ISODateTimeFormat
+import java.util.Locale
 import javax.inject.Inject
 
 class ReferralConverter @Inject constructor() : Converter<ReferralResponse, ReferralData> {
@@ -16,6 +20,7 @@ class ReferralConverter @Inject constructor() : Converter<ReferralResponse, Refe
         val conditions = value.conditions
         val referral = value.referral
         val tokenConverter = TokenConverter()
+        val expectedAwardsConverter = ExpectedAwardsConverter()
         return if (referral != null) {
             ReferralData.ParticipantData(
                 award = conditions.awards.firstOrNull()?.amount ?: 0,
@@ -32,6 +37,9 @@ class ReferralConverter @Inject constructor() : Converter<ReferralResponse, Refe
                         ISODateTimeFormat.dateTimeParser().parseDateTime(referral.termsAcceptedAt)
                     },
                 ),
+                expectedAwards = value.expectedAwards?.let {
+                    expectedAwardsConverter.convert(it)
+                },
             )
         } else {
             ReferralData.NonParticipantData(
@@ -45,6 +53,47 @@ class ReferralConverter @Inject constructor() : Converter<ReferralResponse, Refe
     }
 }
 
+private class ExpectedAwardsConverter : Converter<ReferralResponse.ExpectedAwards, ExpectedAwards> {
+
+    /** Example, 2 Aug, 2023 */
+    private val dateFormatter by lazy {
+        DateTimeFormatterBuilder()
+            .appendDayOfMonth(1)
+            .appendLiteral(' ')
+            .appendMonthOfYearShortText()
+            .appendLiteral(", ")
+            .appendYear(4, 4)
+            .toFormatter()
+            .withLocale(Locale.getDefault())
+    }
+
+    override fun convert(value: ReferralResponse.ExpectedAwards): ExpectedAwards {
+        return ExpectedAwards(
+            numberOfWallets = value.numberOfWallets,
+            expectedAwards = value.list.map {
+                ExpectedAward(
+                    paymentDate = it.paymentDate.toDateTimeAtStartOfDay().millis.toDateFormat(),
+                    amount = "${it.amount} ${it.currency}",
+                )
+            },
+        )
+    }
+
+    private fun Long.toDateFormat(): String {
+        val localDate = DateTime(this, DateTimeZone.getDefault())
+        return if (localDate.isToday() || localDate.isYesterday()) {
+            DateUtils.getRelativeTimeSpanString(
+                this,
+                DateTime.now().millis,
+                DateUtils.DAY_IN_MILLIS,
+                DateUtils.FORMAT_ABBREV_RELATIVE,
+            ).toString()
+        } else {
+            dateFormatter.print(localDate)
+        }
+    }
+}
+
 private class TokenConverter : Converter<ReferralResponse.Conditions.Award.Token, TokenData> {
 
     override fun convert(value: ReferralResponse.Conditions.Award.Token): TokenData {
diff --git a/features/referral/data/src/main/java/com/tangem/feature/referral/data/ReferralRepositoryImpl.kt b/features/referral/data/src/main/java/com/tangem/feature/referral/data/ReferralRepositoryImpl.kt
index 7f8d7470e7..8f8d3a5c42 100644
--- a/features/referral/data/src/main/java/com/tangem/feature/referral/data/ReferralRepositoryImpl.kt
+++ b/features/referral/data/src/main/java/com/tangem/feature/referral/data/ReferralRepositoryImpl.kt
@@ -22,7 +22,7 @@ internal class ReferralRepositoryImpl @Inject constructor(
     override val isDemoMode: Boolean
         get() = demoModeDatasource.isDemoModeActive
 
-    override suspend fun getReferralStatus(walletId: String): ReferralData {
+    override suspend fun getReferralData(walletId: String): ReferralData {
         return withContext(coroutineDispatcher.io) {
             referralConverter.convert(
                 referralApi.getReferralStatus(
diff --git a/features/referral/domain/build.gradle.kts b/features/referral/domain/build.gradle.kts
index 6f335c1221..036c5995f8 100644
--- a/features/referral/domain/build.gradle.kts
+++ b/features/referral/domain/build.gradle.kts
@@ -1,16 +1,26 @@
 plugins {
-    alias(deps.plugins.kotlin.jvm)
+    alias(deps.plugins.android.library)
+    alias(deps.plugins.kotlin.android)
     alias(deps.plugins.kotlin.kapt)
+    alias(deps.plugins.kotlin.serialization)
     id("configuration")
 }
 
+android {
+    namespace = "com.tangem.domain.referral"
+}
 dependencies {
 
     /** Libs */
-    implementation(project(":core:utils"))
-    implementation(project(":libs:crypto"))
+    implementation(projects.core.utils)
 
-    /** Time */
+    /** Core modules */
+    implementation(projects.libs.crypto)
+
+    /** Feature Apis */
+    implementation(projects.features.wallet.api)
+
+    /** Dependencies */
     implementation(deps.jodatime)
 
     /** DI */
diff --git a/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/ReferralInteractorImpl.kt b/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/ReferralInteractorImpl.kt
index 6280321c45..ecdb5989e3 100644
--- a/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/ReferralInteractorImpl.kt
+++ b/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/ReferralInteractorImpl.kt
@@ -5,7 +5,6 @@ import com.tangem.feature.referral.domain.models.ReferralData
 import com.tangem.feature.referral.domain.models.TokenData
 import com.tangem.lib.crypto.DerivationManager
 import com.tangem.lib.crypto.UserWalletManager
-import com.tangem.lib.crypto.models.Currency
 
 internal class ReferralInteractorImpl(
     private val repository: ReferralRepository,
@@ -20,15 +19,17 @@ internal class ReferralInteractorImpl(
         get() = repository.isDemoMode
 
     override suspend fun getReferralStatus(): ReferralData {
-        val refStatus = repository.getReferralStatus(userWalletManager.getWalletId())
-        saveRefTokens(refStatus.tokens)
-        return refStatus
+        val referralData = repository.getReferralData(userWalletManager.getWalletId())
+
+        saveReferralTokens(referralData.tokens)
+
+        return referralData
     }
 
     override suspend fun startReferral(): ReferralData {
         if (tokensForReferral.isNotEmpty()) {
             val currency = tokensConverter.convert(tokensForReferral.first())
-            val derivationPath = deriveOrAddTokens(currency)
+            val derivationPath = derivationManager.deriveAndAddTokens(currency)
             val publicAddress = userWalletManager.getWalletAddress(currency.networkId, derivationPath)
             return repository.startReferral(
                 walletId = userWalletManager.getWalletId(),
@@ -37,23 +38,11 @@ internal class ReferralInteractorImpl(
                 address = publicAddress,
             )
         } else {
-            error("tokens for ref is empty")
+            error("Tokens for ref is empty")
         }
     }
 
-    private suspend fun deriveOrAddTokens(currency: Currency): String {
-        val derivationPath = derivationManager.getDerivationPathForBlockchain(currency.networkId)
-        if (derivationPath.isNullOrEmpty()) error("derivationPath shouldn't be empty")
-        if (!derivationManager.hasDerivation(currency.networkId, derivationPath)) {
-            derivationManager.deriveMissingBlockchains(currency)
-        }
-        if (!userWalletManager.isTokenAdded(currency, derivationPath)) {
-            userWalletManager.addToken(currency, derivationPath)
-        }
-        return derivationPath
-    }
-
-    private fun saveRefTokens(tokens: List<TokenData>) {
+    private fun saveReferralTokens(tokens: List<TokenData>) {
         tokensForReferral.clear()
         tokensForReferral.addAll(tokens)
     }
diff --git a/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/ReferralRepository.kt b/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/ReferralRepository.kt
index ad770f8c2e..c3b5eaa9ca 100644
--- a/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/ReferralRepository.kt
+++ b/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/ReferralRepository.kt
@@ -7,7 +7,7 @@ interface ReferralRepository {
     val isDemoMode: Boolean
 
     /** Returns data object of [ReferralData] depends on user program status */
-    suspend fun getReferralStatus(walletId: String): ReferralData
+    suspend fun getReferralData(walletId: String): ReferralData
 
     /** Starts user referral program */
     suspend fun startReferral(walletId: String, networkId: String, tokenId: String, address: String): ReferralData
diff --git a/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/models/ReferralData.kt b/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/models/ReferralData.kt
index f5cc061cb0..751af6a116 100644
--- a/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/models/ReferralData.kt
+++ b/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/models/ReferralData.kt
@@ -18,6 +18,7 @@ sealed interface ReferralData {
         override val tosLink: String,
         override val tokens: List<TokenData>,
         val referral: ReferralInfo,
+        val expectedAwards: ExpectedAwards?,
     ) : ReferralData
 
     /** Data class that used if user is not participant of program */
@@ -47,6 +48,16 @@ data class ReferralInfo(
     val termsAcceptedAt: DateTime?,
 )
 
+data class ExpectedAwards(
+    val numberOfWallets: Int,
+    val expectedAwards: List<ExpectedAward>,
+)
+
+data class ExpectedAward(
+    val paymentDate: String,
+    val amount: String,
+)
+
 enum class DiscountType {
     PERCENTAGE, VALUE
 }
\ No newline at end of file
diff --git a/features/referral/presentation/build.gradle.kts b/features/referral/presentation/build.gradle.kts
index 0649e10587..280c994188 100644
--- a/features/referral/presentation/build.gradle.kts
+++ b/features/referral/presentation/build.gradle.kts
@@ -19,11 +19,10 @@ dependencies {
     implementation(deps.androidx.appCompat)
     implementation(deps.androidx.fragment.ktx)
     implementation(deps.lifecycle.viewModel.ktx)
-    implementation(deps.material)
 
     /** Compose */
     implementation(deps.compose.foundation)
-    implementation(deps.compose.material)
+    implementation(deps.compose.material3)
     implementation(deps.compose.ui.tooling)
 
     /** Domain */
@@ -32,6 +31,7 @@ dependencies {
     /** Other libraries */
     implementation(deps.compose.shimmer)
     implementation(deps.compose.accompanist.webView)
+    implementation(deps.compose.accompanist.systemUiController)
 
     /** DI */
     implementation(deps.hilt.android)
diff --git a/features/referral/presentation/src/main/java/com/tangem/feature/referral/ReferralFragment.kt b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ReferralFragment.kt
index b04b901b66..e7a122fb45 100644
--- a/features/referral/presentation/src/main/java/com/tangem/feature/referral/ReferralFragment.kt
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ReferralFragment.kt
@@ -1,47 +1,43 @@
 package com.tangem.feature.referral
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.compose.foundation.layout.systemBarsPadding
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.ComposeView
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.transition.TransitionInflater
+import com.tangem.core.ui.components.SystemBarsEffect
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.feature.referral.presentation.R
+import com.tangem.core.ui.screen.ComposeFragment
+import com.tangem.core.ui.theme.AppThemeModeHolder
 import com.tangem.feature.referral.router.ReferralRouter
 import com.tangem.feature.referral.ui.ReferralScreen
 import com.tangem.feature.referral.viewmodels.ReferralViewModel
 import dagger.hilt.android.AndroidEntryPoint
 import java.lang.ref.WeakReference
+import javax.inject.Inject
 
 @AndroidEntryPoint
-class ReferralFragment : Fragment() {
+class ReferralFragment : ComposeFragment() {
+
+    @Inject
+    override lateinit var appThemeModeHolder: AppThemeModeHolder
+
     private val viewModel by viewModels<ReferralViewModel>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        val inflater = TransitionInflater.from(requireContext())
-        enterTransition = inflater.inflateTransition(R.transition.fade)
-        exitTransition = inflater.inflateTransition(R.transition.fade)
+        viewModel.onScreenOpened()
+        viewModel.setRouter(ReferralRouter(fragmentManager = WeakReference(parentFragmentManager)))
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        viewModel.setRouter(ReferralRouter(fragmentManager = WeakReference(parentFragmentManager)))
-        viewModel.onScreenOpened()
-        return ComposeView(inflater.context).apply {
-            isTransitionGroup = true
-            setContent {
-                TangemTheme {
-                    ReferralScreen(
-                        modifier = Modifier.systemBarsPadding(),
-                        stateHolder = viewModel.uiState,
-                    )
-                }
-            }
-        }
+    @Composable
+    override fun ScreenContent(modifier: Modifier) {
+        val backgroundColor = TangemTheme.colors.background.secondary
+        SystemBarsEffect { setSystemBarsColor(backgroundColor) }
+
+        ReferralScreen(
+            modifier = Modifier.systemBarsPadding(),
+            stateHolder = viewModel.uiState,
+        )
     }
 }
\ No newline at end of file
diff --git a/features/referral/presentation/src/main/java/com/tangem/feature/referral/models/ReferralStateHolder.kt b/features/referral/presentation/src/main/java/com/tangem/feature/referral/models/ReferralStateHolder.kt
index 90e8def3d6..dc7b06e5ef 100644
--- a/features/referral/presentation/src/main/java/com/tangem/feature/referral/models/ReferralStateHolder.kt
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/models/ReferralStateHolder.kt
@@ -1,5 +1,7 @@
 package com.tangem.feature.referral.models
 
+import com.tangem.feature.referral.domain.models.ExpectedAwards
+
 internal data class ReferralStateHolder(
     val headerState: HeaderState,
     val referralInfoState: ReferralInfoState,
@@ -26,6 +28,7 @@ internal data class ReferralStateHolder(
             val code: String,
             val shareLink: String,
             override val url: String,
+            val expectedAwards: ExpectedAwards?,
         ) : ReferralInfoState, ReferralInfoContentState
 
         data class NonParticipantContent(
diff --git a/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/AgreementBottomSheetContent.kt b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/AgreementBottomSheetContent.kt
index 2a1c5b1e86..bc175c5bff 100644
--- a/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/AgreementBottomSheetContent.kt
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/AgreementBottomSheetContent.kt
@@ -9,13 +9,13 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.google.accompanist.web.WebView
 import com.google.accompanist.web.rememberWebViewState
 import com.tangem.core.ui.components.appbar.AppBarWithAdditionalButtons
-import com.tangem.core.ui.components.atoms.Hand
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.feature.referral.presentation.R
 
@@ -28,11 +28,9 @@ import com.tangem.feature.referral.presentation.R
 internal fun AgreementBottomSheetContent(url: String) {
     Column(
         modifier = Modifier
-            .background(color = TangemTheme.colors.background.secondary)
             .fillMaxWidth()
             .height(LocalConfiguration.current.screenHeightDp.dp - TangemTheme.dimens.spacing16),
     ) {
-        Hand()
         Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
             AppBarWithAdditionalButtons(text = stringResource(id = R.string.details_referral_title))
             AgreementHtmlView(url = url)
@@ -43,13 +41,17 @@ internal fun AgreementBottomSheetContent(url: String) {
 @Composable
 private fun AgreementHtmlView(url: String) {
     val state = rememberWebViewState(url)
+    val isInPreviewMode = LocalInspectionMode.current
     WebView(
         state = state,
         modifier = Modifier.background(TangemTheme.colors.background.secondary),
+        captureBackPresses = false,
         onCreated = {
-            it.settings.apply {
-                javaScriptEnabled = false
-                allowFileAccess = false
+            if (!isInPreviewMode) {
+                it.settings.apply {
+                    javaScriptEnabled = false
+                    allowFileAccess = false
+                }
             }
         },
     )
diff --git a/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/AgreementText.kt b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/AgreementText.kt
index c143b3b4e5..d29a6c996b 100644
--- a/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/AgreementText.kt
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/AgreementText.kt
@@ -26,7 +26,7 @@ internal fun AgreementText(@StringRes firstPartResId: Int, onClick: () -> Unit)
         modifier = Modifier
             .fillMaxWidth()
             .padding(horizontal = TangemTheme.dimens.spacing54),
-        style = TangemTheme.typography.caption.copy(textAlign = TextAlign.Center),
+        style = TangemTheme.typography.caption2.copy(textAlign = TextAlign.Center),
         maxLines = 2,
         onClick = {
             val clickableSpanStyle = requireNotNull(agreementText.spanStyles.getOrNull(1))
diff --git a/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/AwardItems.kt b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/AwardItems.kt
new file mode 100644
index 0000000000..a85c1a0f07
--- /dev/null
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/AwardItems.kt
@@ -0,0 +1,71 @@
+package com.tangem.feature.referral.ui
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.tooling.preview.Preview
+import com.tangem.core.ui.res.TangemTheme
+
+@Suppress("LongParameterList")
+@Composable
+internal fun AwardText(
+    startText: String,
+    startTextColor: Color,
+    startTextStyle: TextStyle,
+    endText: String,
+    endTextColor: Color,
+    endTextStyle: TextStyle,
+    cornersToRound: CornersToRound,
+) {
+    Surface(
+        shape = cornersToRound.getShape(),
+        color = TangemTheme.colors.background.primary,
+    ) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .heightIn(TangemTheme.dimens.size48)
+                .padding(
+                    horizontal = TangemTheme.dimens.spacing16,
+                    vertical = TangemTheme.dimens.spacing12,
+                ),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Text(
+                text = startText,
+                color = startTextColor,
+                maxLines = 1,
+                style = startTextStyle,
+            )
+
+            Text(
+                text = endText,
+                color = endTextColor,
+                maxLines = 1,
+                style = endTextStyle,
+            )
+        }
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+private fun Preview_AwardItem_Light() {
+    TangemTheme {
+        AwardText(
+            startText = "startText",
+            startTextColor = TangemTheme.colors.text.tertiary,
+            startTextStyle = TangemTheme.typography.subtitle2,
+            endText = "endText",
+            endTextColor = TangemTheme.colors.text.primary1,
+            endTextStyle = TangemTheme.typography.subtitle2,
+            cornersToRound = CornersToRound.TOP_2,
+        )
+    }
+}
\ No newline at end of file
diff --git a/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/CornersToRound.kt b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/CornersToRound.kt
new file mode 100644
index 0000000000..b5070cdb28
--- /dev/null
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/CornersToRound.kt
@@ -0,0 +1,27 @@
+package com.tangem.feature.referral.ui
+
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.unit.dp
+import com.tangem.core.ui.res.TangemTheme
+
+internal enum class CornersToRound {
+
+    ALL_4,
+    TOP_2,
+    BOTTOM_2,
+    ZERO,
+    ;
+
+    @Suppress("TopLevelComposableFunctions")
+    @Composable
+    fun getShape(): RoundedCornerShape {
+        val radius = TangemTheme.dimens.radius12
+        return when (this) {
+            ALL_4 -> RoundedCornerShape(radius)
+            TOP_2 -> RoundedCornerShape(topStart = radius, topEnd = radius)
+            BOTTOM_2 -> RoundedCornerShape(bottomStart = radius, bottomEnd = radius)
+            ZERO -> RoundedCornerShape(0.dp)
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/ParticipateBottomBlock.kt b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/ParticipateBottomBlock.kt
index 169fb81271..fb387358c1 100644
--- a/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/ParticipateBottomBlock.kt
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/ParticipateBottomBlock.kt
@@ -2,40 +2,45 @@ package com.tangem.feature.referral.ui
 
 import android.content.Context
 import android.content.Intent
+import androidx.compose.animation.*
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Text
+import androidx.compose.material3.Divider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.core.content.ContextCompat.startActivity
-import com.tangem.core.ui.components.PrimaryStartIconButton
-import com.tangem.core.ui.components.SmallInfoCard
+import com.tangem.core.ui.components.*
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.feature.referral.domain.models.ExpectedAward
+import com.tangem.feature.referral.domain.models.ExpectedAwards
 import com.tangem.feature.referral.presentation.R
 
 @Suppress("LongParameterList")
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 internal fun ParticipateBottomBlock(
     purchasedWalletCount: Int,
     code: String,
     shareLink: String,
+    expectedAwards: ExpectedAwards?,
     onAgreementClick: () -> Unit,
     onShowCopySnackbar: () -> Unit,
     onCopyClick: () -> Unit,
@@ -50,14 +55,6 @@ internal fun ParticipateBottomBlock(
             .padding(horizontal = TangemTheme.dimens.spacing16),
         verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing16),
     ) {
-        SmallInfoCard(
-            startText = stringResource(id = R.string.referral_friends_bought_title),
-            endText = pluralStringResource(
-                id = R.plurals.referral_wallets_purchased_count,
-                count = purchasedWalletCount,
-                purchasedWalletCount,
-            ),
-        )
         PersonalCodeCard(code = code)
         AdditionalButtons(
             code = code,
@@ -66,10 +63,186 @@ internal fun ParticipateBottomBlock(
             onCopyClick = onCopyClick,
             onShareClick = onShareClick,
         )
+        CounterAndAwards(purchasedWalletCount = purchasedWalletCount, expectedAwards = expectedAwards)
         AgreementText(firstPartResId = R.string.referral_tos_enroled_prefix, onClick = onAgreementClick)
     }
 }
 
+@Composable
+private fun CounterAndAwards(purchasedWalletCount: Int, expectedAwards: ExpectedAwards?) {
+    Column {
+        Counter(purchasedWalletCount, expectedAwards)
+
+        if (expectedAwards != null) {
+            Awards(expectedAwards)
+        } else if (purchasedWalletCount != 0) {
+            EmptyUpcomingPayments()
+        }
+    }
+}
+
+@Composable
+private fun Counter(purchasedWalletCount: Int, expectedAwards: ExpectedAwards?) {
+    val isExpectedAwardsPresent = expectedAwards != null
+
+    AwardText(
+        startText = stringResource(id = R.string.referral_friends_bought_title),
+        startTextColor = TangemTheme.colors.text.tertiary,
+        startTextStyle = TangemTheme.typography.subtitle2,
+        endText = pluralStringResource(
+            id = R.plurals.referral_wallets_purchased_count,
+            count = purchasedWalletCount,
+            purchasedWalletCount,
+        ),
+        endTextColor = TangemTheme.colors.text.primary1,
+        endTextStyle = TangemTheme.typography.body2,
+        cornersToRound = if (isExpectedAwardsPresent || purchasedWalletCount != 0) {
+            CornersToRound.TOP_2
+        } else {
+            CornersToRound.ALL_4
+        },
+    )
+}
+
+@Suppress("MagicNumber")
+@Composable
+private fun Awards(expectedAwards: ExpectedAwards) {
+    val elementsCountToShowInLessMode = 3
+    val isExpanded = remember { mutableStateOf(false) }
+
+    Divider(
+        color = TangemTheme.colors.stroke.primary,
+        thickness = TangemTheme.dimens.size0_5,
+    )
+    AwardText(
+        startText = stringResource(id = R.string.referral_expected_awards),
+        startTextColor = TangemTheme.colors.text.tertiary,
+        startTextStyle = TangemTheme.typography.subtitle2,
+        endText = pluralStringResource(
+            id = R.plurals.referral_number_of_wallets,
+            count = expectedAwards.numberOfWallets,
+            expectedAwards.numberOfWallets,
+        ),
+        endTextColor = TangemTheme.colors.text.tertiary,
+        endTextStyle = TangemTheme.typography.body2,
+        cornersToRound = CornersToRound.ZERO,
+    )
+
+    val initialItems = expectedAwards.expectedAwards.take(elementsCountToShowInLessMode)
+    val extraItems = expectedAwards.expectedAwards.drop(elementsCountToShowInLessMode)
+
+    initialItems.forEachIndexed { index, expectedAward ->
+        AwardText(
+            startText = expectedAward.paymentDate,
+            startTextColor = TangemTheme.colors.text.primary1,
+            startTextStyle = TangemTheme.typography.subtitle2,
+            endText = expectedAward.amount,
+            endTextColor = TangemTheme.colors.text.primary1,
+            endTextStyle = TangemTheme.typography.subtitle2,
+            cornersToRound = if (index == initialItems.size - 1 && extraItems.isEmpty()) {
+                CornersToRound.BOTTOM_2
+            } else {
+                CornersToRound.ZERO
+            },
+        )
+    }
+
+    AnimatedVisibility(
+        visible = isExpanded.value,
+        enter = fadeIn() + expandVertically(),
+        exit = shrinkVertically() + fadeOut(),
+    ) {
+        ExtraItems(extraItems = extraItems)
+    }
+
+    if (expectedAwards.expectedAwards.size > elementsCountToShowInLessMode) {
+        LessMoreButton(isExpanded = isExpanded)
+    }
+}
+
+@Composable
+private fun EmptyUpcomingPayments() {
+    Divider(
+        color = TangemTheme.colors.stroke.primary,
+        thickness = TangemTheme.dimens.size0_5,
+    )
+    AwardText(
+        startText = stringResource(id = R.string.referral_expected_awards),
+        startTextColor = TangemTheme.colors.text.tertiary,
+        startTextStyle = TangemTheme.typography.subtitle2,
+        endText = "",
+        endTextColor = TangemTheme.colors.text.tertiary,
+        endTextStyle = TangemTheme.typography.body2,
+        cornersToRound = CornersToRound.BOTTOM_2,
+    )
+}
+
+@Composable
+private fun LessMoreButton(isExpanded: MutableState<Boolean>) {
+    Surface(
+        shape = RoundedCornerShape(
+            bottomStart = TangemTheme.dimens.radius12,
+            bottomEnd = TangemTheme.dimens.radius12,
+        ),
+    ) {
+        Column(
+            modifier = Modifier.background(TangemTheme.colors.background.primary),
+        ) {
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .heightIn(TangemTheme.dimens.size48)
+                    .clickable { isExpanded.value = !isExpanded.value }
+                    .padding(
+                        horizontal = TangemTheme.dimens.spacing16,
+                        vertical = TangemTheme.dimens.spacing12,
+                    ),
+                horizontalArrangement = Arrangement.Start,
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Text(
+                    text = if (isExpanded.value) {
+                        stringResource(id = R.string.referral_less)
+                    } else {
+                        stringResource(id = R.string.referral_more)
+                    },
+                    color = TangemTheme.colors.text.tertiary,
+                    style = TangemTheme.typography.subtitle2,
+                )
+
+                val chevronIcon = if (isExpanded.value) {
+                    painterResource(id = com.tangem.core.ui.R.drawable.ic_chevron_up_24)
+                } else {
+                    painterResource(id = com.tangem.core.ui.R.drawable.ic_chevron_24)
+                }
+                Icon(
+                    modifier = Modifier.size(TangemTheme.dimens.size20),
+                    painter = chevronIcon,
+                    tint = TangemTheme.colors.text.tertiary,
+                    contentDescription = null,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun ExtraItems(extraItems: List<ExpectedAward>) {
+    Column {
+        extraItems.forEach { expectedAward ->
+            AwardText(
+                startText = expectedAward.paymentDate,
+                startTextColor = TangemTheme.colors.text.primary1,
+                startTextStyle = TangemTheme.typography.subtitle2,
+                endText = expectedAward.amount,
+                endTextColor = TangemTheme.colors.text.primary1,
+                endTextStyle = TangemTheme.typography.subtitle2,
+                cornersToRound = CornersToRound.ZERO,
+            )
+        }
+    }
+}
+
 @Composable
 private fun PersonalCodeCard(code: String) {
     Column(
@@ -157,11 +330,28 @@ private fun Context.shareText(text: String) {
 @Composable
 private fun Preview_ParticipateBottomBlock_InLightTheme() {
     TangemTheme(isDark = false) {
-        Column(Modifier.background(TangemTheme.colors.background.primary)) {
+        Column(Modifier.background(TangemTheme.colors.background.secondary)) {
             ParticipateBottomBlock(
                 purchasedWalletCount = 3,
                 code = "x4JdK",
                 shareLink = "",
+                expectedAwards = ExpectedAwards(
+                    numberOfWallets = 3,
+                    expectedAwards = listOf(
+                        ExpectedAward(
+                            amount = "10 USDT",
+                            paymentDate = "Today",
+                        ),
+                        ExpectedAward(
+                            amount = "20 USDT",
+                            paymentDate = "6 Aug 2023",
+                        ),
+                        ExpectedAward(
+                            amount = "30 USDT",
+                            paymentDate = "10 Aug 2023",
+                        ),
+                    ),
+                ),
                 onAgreementClick = {},
                 onShowCopySnackbar = {},
                 onCopyClick = {},
@@ -173,13 +363,64 @@ private fun Preview_ParticipateBottomBlock_InLightTheme() {
 
 @Preview(widthDp = 360, showBackground = true)
 @Composable
-private fun Preview_ParticipateBottomBlock_InDarkTheme() {
-    TangemTheme(isDark = true) {
-        Column(Modifier.background(TangemTheme.colors.background.primary)) {
+private fun Preview_ParticipateBottomBlock_Without_Awards_InLightTheme() {
+    TangemTheme(isDark = false) {
+        Column(Modifier.background(TangemTheme.colors.background.secondary)) {
             ParticipateBottomBlock(
                 purchasedWalletCount = 3,
                 code = "x4JdK",
                 shareLink = "",
+                expectedAwards = null,
+                onAgreementClick = {},
+                onShowCopySnackbar = {},
+                onCopyClick = {},
+                onShareClick = {},
+            )
+        }
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+private fun Preview_ParticipateBottomBlock_Without_Awards_And_Purchased_Wallets_InLightTheme() {
+    TangemTheme(isDark = false) {
+        Column(Modifier.background(TangemTheme.colors.background.secondary)) {
+            ParticipateBottomBlock(
+                purchasedWalletCount = 0,
+                code = "x4JdK",
+                shareLink = "",
+                expectedAwards = null,
+                onAgreementClick = {},
+                onShowCopySnackbar = {},
+                onCopyClick = {},
+                onShareClick = {},
+            )
+        }
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+private fun LessMoreButton_White() {
+    TangemTheme(isDark = false) {
+        LessMoreButton(
+            isExpanded = remember {
+                mutableStateOf(false)
+            },
+        )
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+private fun Preview_ParticipateBottomBlock_Without_Awards_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        Column(Modifier.background(TangemTheme.colors.background.secondary)) {
+            ParticipateBottomBlock(
+                purchasedWalletCount = 3,
+                code = "x4JdK",
+                shareLink = "",
+                expectedAwards = null,
                 onAgreementClick = {},
                 onShowCopySnackbar = {},
                 onCopyClick = {},
diff --git a/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/ReferralBottomSheet.kt b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/ReferralBottomSheet.kt
new file mode 100644
index 0000000000..2d70513c8a
--- /dev/null
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/ReferralBottomSheet.kt
@@ -0,0 +1,38 @@
+package com.tangem.feature.referral.ui
+
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.SheetState
+import androidx.compose.runtime.Composable
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.feature.referral.models.ReferralStateHolder
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+internal fun ReferralBottomSheet(
+    sheetState: SheetState,
+    isVisible: Boolean,
+    onDismissRequest: () -> Unit,
+    config: ReferralStateHolder.ReferralInfoState,
+) {
+    if (isVisible) {
+        ModalBottomSheet(
+            onDismissRequest = onDismissRequest,
+            sheetState = sheetState,
+            shape = RoundedCornerShape(
+                topStart = TangemTheme.dimens.radius16,
+                topEnd = TangemTheme.dimens.radius16,
+            ),
+            containerColor = TangemTheme.colors.background.primary,
+        ) {
+            AgreementBottomSheetContent(
+                url = when (config) {
+                    is ReferralStateHolder.ReferralInfoState.NonParticipantContent -> config.url
+                    is ReferralStateHolder.ReferralInfoState.ParticipantContent -> config.url
+                    is ReferralStateHolder.ReferralInfoState.Loading -> ""
+                },
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/ReferralScreen.kt b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/ReferralScreen.kt
index 7c3e8b2ddf..279154964b 100644
--- a/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/ReferralScreen.kt
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/ReferralScreen.kt
@@ -1,119 +1,102 @@
 package com.tangem.feature.referral.ui
 
 import androidx.annotation.DrawableRes
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.LocalOverscrollConfiguration
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
+import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.tangem.core.ui.components.RectangleShimmer
 import com.tangem.core.ui.components.SpacerH16
 import com.tangem.core.ui.components.SpacerH24
 import com.tangem.core.ui.components.SpacerH32
 import com.tangem.core.ui.components.appbar.AppBarWithBackButton
 import com.tangem.core.ui.res.TangemColorPalette
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.feature.referral.domain.models.ExpectedAward
+import com.tangem.feature.referral.domain.models.ExpectedAwards
 import com.tangem.feature.referral.models.DemoModeException
 import com.tangem.feature.referral.models.ReferralStateHolder
 import com.tangem.feature.referral.models.ReferralStateHolder.*
 import com.tangem.feature.referral.presentation.R
-import com.valentinilk.shimmer.shimmer
 import kotlinx.coroutines.launch
 
 /**
  * Referral program screen for participant and non-participant
  *
  * @param stateHolder state holder
+ * @param modifier    modifier
  */
-@OptIn(ExperimentalMaterialApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 internal fun ReferralScreen(stateHolder: ReferralStateHolder, modifier: Modifier = Modifier) {
-    val coroutineScope = rememberCoroutineScope()
-    val bottomSheetScaffoldState = rememberBottomSheetScaffoldState(
-        bottomSheetState = BottomSheetState(BottomSheetValue.Collapsed),
-    )
+    var isBottomSheetVisible by remember { mutableStateOf(value = false) }
+    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
 
-    BottomSheetScaffold(
+    Scaffold(
         modifier = modifier,
-        sheetContent = {
-            AgreementBottomSheetContent(
-                url = when (val state = stateHolder.referralInfoState) {
-                    is ReferralInfoState.NonParticipantContent -> state.url
-                    is ReferralInfoState.ParticipantContent -> state.url
-                    is ReferralInfoState.Loading -> ""
-                },
-            )
-        },
-        scaffoldState = bottomSheetScaffoldState,
-        sheetShape = RoundedCornerShape(
-            topStart = TangemTheme.dimens.radius16,
-            topEnd = TangemTheme.dimens.radius16,
-        ),
-        sheetElevation = TangemTheme.dimens.elevation24,
-        sheetPeekHeight = TangemTheme.dimens.size0,
-        content = {
-            ReferralContent(
-                stateHolder = stateHolder,
-                onAgreementClick = {
-                    stateHolder.analytics.onAgreementClicked.invoke()
-                    coroutineScope.launch {
-                        if (bottomSheetScaffoldState.bottomSheetState.isCollapsed) {
-                            bottomSheetScaffoldState.bottomSheetState.expand()
-                        } else {
-                            bottomSheetScaffoldState.bottomSheetState.collapse()
-                        }
-                    }
-                },
+        topBar = {
+            AppBarWithBackButton(
+                text = stringResource(R.string.details_referral_title),
+                onBackClick = stateHolder.headerState.onBackClicked,
             )
         },
+        containerColor = TangemTheme.colors.background.secondary,
+    ) {
+        ReferralContent(
+            stateHolder = stateHolder,
+            onAgreementClick = {
+                stateHolder.analytics.onAgreementClicked.invoke()
+                isBottomSheetVisible = true
+            },
+            modifier = Modifier.padding(it),
+        )
+    }
+
+    ReferralBottomSheet(
+        sheetState = sheetState,
+        isVisible = isBottomSheetVisible,
+        onDismissRequest = { isBottomSheetVisible = false },
+        config = stateHolder.referralInfoState,
     )
 }
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
-private fun ReferralContent(stateHolder: ReferralStateHolder, onAgreementClick: () -> Unit) {
-    val isCopyButtonPressed = remember { mutableStateOf(false) }
+private fun ReferralContent(
+    stateHolder: ReferralStateHolder,
+    onAgreementClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val isCopyButtonPressed = remember { mutableStateOf(value = false) }
 
-    Box {
-        CompositionLocalProvider(LocalOverscrollConfiguration provides null) {
-            LazyColumn(
-                modifier = Modifier
-                    .background(color = TangemTheme.colors.background.secondary)
-                    .fillMaxSize(),
-                horizontalAlignment = Alignment.CenterHorizontally,
-            ) {
-                stickyHeader {
-                    AppBarWithBackButton(
-                        text = stringResource(R.string.details_referral_title),
-                        onBackClick = stateHolder.headerState.onBackClicked,
-                    )
-                }
-                item { Header() }
-                item {
-                    ReferralInfo(
-                        stateHolder = stateHolder,
-                        onAgreementClick = onAgreementClick,
-                        onShowCopySnackbar = { isCopyButtonPressed.value = true },
-                    )
-                }
+    Box(modifier = modifier) {
+        LazyColumn(
+            modifier = Modifier.fillMaxSize(),
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            item { Header() }
+            item {
+                ReferralInfo(
+                    stateHolder = stateHolder,
+                    onAgreementClick = onAgreementClick,
+                    onShowCopySnackbar = { isCopyButtonPressed.value = true },
+                )
             }
         }
 
@@ -159,6 +142,7 @@ private fun ReferralInfo(
                 purchasedWalletCount = state.purchasedWalletCount,
                 code = state.code,
                 shareLink = state.shareLink,
+                expectedAwards = state.expectedAwards,
                 onAgreementClick = onAgreementClick,
                 onShowCopySnackbar = onShowCopySnackbar,
                 onCopyClick = stateHolder.analytics.onCopyClicked,
@@ -253,25 +237,47 @@ private fun Condition(@DrawableRes iconResId: Int, infoBlock: @Composable () ->
 private fun InfoForYou(award: String, networkName: String, address: String? = null) {
     ConditionInfo(title = stringResource(id = R.string.referral_point_currencies_title)) {
         Text(
-            text = buildAnnotatedString {
-                append(stringResource(id = R.string.referral_point_currencies_description_prefix))
-                withStyle(SpanStyle(color = TangemTheme.colors.text.primary1)) {
-                    append(" $award ")
-                }
-                append(
-                    String.format(
-                        stringResource(id = R.string.referral_point_currencies_description_suffix),
-                        networkName,
-                        if (!address.isNullOrBlank()) " $address" else "",
-                    ),
-                )
-            },
+            formatAwardConditionsString(
+                quantity = award,
+                network = networkName,
+                address = if (!address.isNullOrBlank()) " $address" else "",
+            ),
             color = TangemTheme.colors.text.tertiary,
             style = TangemTheme.typography.body2,
         )
     }
 }
 
+@Composable
+private fun formatAwardConditionsString(quantity: String, network: String, address: String): AnnotatedString {
+    val rawString = stringResource(R.string.referral_point_currencies_description, quantity, network, address)
+
+    val pattern = Regex("\\^\\^(.*?)\\^\\^")
+    var startIndex = 0
+    val annotatedString = buildAnnotatedString {
+        pattern.findAll(rawString).forEach { matchResult ->
+            val index = matchResult.range.first
+            val matchedValue = matchResult.groups[1]?.value ?: ""
+
+            // appends unformatted part
+            append(rawString.substring(startIndex, index))
+
+            // applies style on ^^-wrapped parts
+            withStyle(SpanStyle(color = TangemTheme.colors.text.primary1)) {
+                append(matchedValue)
+            }
+
+            // goes to next part
+            startIndex = matchResult.range.last + 1
+        }
+
+        // appends remaining ending if exists
+        append(rawString.substring(startIndex))
+    }
+
+    return annotatedString
+}
+
 @Composable
 private fun InfoForYourFriend(discount: String) {
     ConditionInfo(title = stringResource(id = R.string.referral_point_discount_title)) {
@@ -312,24 +318,18 @@ private fun ShimmerInfo() {
     Column(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(top = TangemTheme.dimens.spacing4)
-            .shimmer(),
+            .padding(top = TangemTheme.dimens.spacing4),
         verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing10),
     ) {
-        Box(
+        RectangleShimmer(
             modifier = Modifier
-                .clip(RoundedCornerShape(TangemTheme.dimens.radius6))
                 .width(TangemTheme.dimens.size102)
-                .height(TangemTheme.dimens.size16)
-                .background(TangemColorPalette.White),
-            // .background(Color(0xFFF8F8F8)),
+                .height(TangemTheme.dimens.size16),
         )
-        Box(
+        RectangleShimmer(
             modifier = Modifier
-                .clip(RoundedCornerShape(TangemTheme.dimens.radius6))
                 .width(TangemTheme.dimens.size40)
-                .height(TangemTheme.dimens.size12)
-                .background(TangemColorPalette.White),
+                .height(TangemTheme.dimens.size12),
         )
     }
 }
@@ -350,10 +350,9 @@ private fun BoxScope.ErrorSnackbarHost(errorSnackbar: ErrorSnackbar?) {
                     modifier = Modifier.fillMaxWidth(),
                     actionOnNewLine = true,
                     shape = RoundedCornerShape(size = TangemTheme.dimens.radius8),
-                    backgroundColor = TangemColorPalette.Black,
+                    containerColor = TangemColorPalette.Black,
                     contentColor = TangemTheme.colors.text.primary2,
                     actionColor = TangemTheme.colors.text.primary2,
-                    elevation = TangemTheme.dimens.elevation3,
                 )
             },
         )
@@ -382,7 +381,7 @@ private fun BoxScope.CopySnackbarHost(isCopyButtonPressed: MutableState<Boolean>
         val snackbarHostState by remember { mutableStateOf(SnackbarHostState()) }
         val coroutineScope = rememberCoroutineScope()
 
-        var snackbarSize by remember { mutableStateOf(0) }
+        var snackbarSize by remember { mutableIntStateOf(value = 0) }
         val width = LocalConfiguration.current.screenWidthDp.dp
         val snackbarWidth = with(LocalDensity.current) { snackbarSize.toDp() }
 
@@ -396,10 +395,9 @@ private fun BoxScope.CopySnackbarHost(isCopyButtonPressed: MutableState<Boolean>
                 Box(
                     modifier = Modifier
                         .onSizeChanged { snackbarSize = it.width }
-                        .background(TangemColorPalette.Black, RoundedCornerShape(size = TangemTheme.dimens.radius8))
-                        .shadow(
-                            TangemTheme.dimens.elevation3,
-                            RoundedCornerShape(size = TangemTheme.dimens.radius8),
+                        .background(
+                            color = TangemTheme.colors.icon.primary1,
+                            shape = RoundedCornerShape(size = TangemTheme.dimens.radius8),
                         )
                         .padding(
                             horizontal = TangemTheme.dimens.spacing16,
@@ -407,7 +405,7 @@ private fun BoxScope.CopySnackbarHost(isCopyButtonPressed: MutableState<Boolean>
                         ),
                 ) {
                     Text(
-                        text = it.message,
+                        text = it.visuals.message,
                         color = TangemTheme.colors.text.primary2,
                         style = TangemTheme.typography.body2,
                     )
@@ -464,6 +462,7 @@ private fun Preview_ReferralScreen_Participant_InLightTheme() {
                     code = "x4JdK",
                     shareLink = "",
                     url = "",
+                    expectedAwards = null,
                 ),
                 errorSnackbar = null,
                 analytics = Analytics(
@@ -492,6 +491,52 @@ private fun Preview_ReferralScreen_Participant_InDarkTheme() {
                     code = "x4JdK",
                     shareLink = "",
                     url = "",
+                    expectedAwards = null,
+                ),
+                errorSnackbar = null,
+                analytics = Analytics(
+                    onAgreementClicked = {},
+                    onCopyClicked = {},
+                    onShareClicked = {},
+                ),
+            ),
+        )
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+private fun Preview_ReferralScreen_Participant_With_Referrals_InLightTheme() {
+    TangemTheme(isDark = false) {
+        ReferralScreen(
+            stateHolder = ReferralStateHolder(
+                headerState = HeaderState(onBackClicked = {}),
+                referralInfoState = ReferralInfoState.ParticipantContent(
+                    award = "10 USDT",
+                    networkName = "Tron",
+                    address = "ma80...zk8q2",
+                    discount = "10%",
+                    purchasedWalletCount = 3,
+                    code = "x4JdK",
+                    shareLink = "",
+                    url = "",
+                    expectedAwards = ExpectedAwards(
+                        numberOfWallets = 5,
+                        expectedAwards = listOf(
+                            ExpectedAward(
+                                amount = "10 USDT",
+                                paymentDate = "Today",
+                            ),
+                            ExpectedAward(
+                                amount = "20 USDT",
+                                paymentDate = "6 Aug 2023",
+                            ),
+                            ExpectedAward(
+                                amount = "30 USDT",
+                                paymentDate = "10 Aug 2023",
+                            ),
+                        ),
+                    ),
                 ),
                 errorSnackbar = null,
                 analytics = Analytics(
diff --git a/features/referral/presentation/src/main/java/com/tangem/feature/referral/viewmodels/ReferralViewModel.kt b/features/referral/presentation/src/main/java/com/tangem/feature/referral/viewmodels/ReferralViewModel.kt
index b2f802e181..82c0d08bb8 100644
--- a/features/referral/presentation/src/main/java/com/tangem/feature/referral/viewmodels/ReferralViewModel.kt
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/viewmodels/ReferralViewModel.kt
@@ -36,7 +36,7 @@ internal class ReferralViewModel @Inject constructor(
 
     private var referralRouter: ReferralRouter by Delegates.notNull()
 
-    private val lastReferralData = mutableStateOf<ReferralData?>(null)
+    private var lastReferralData: ReferralData? = null
 
     init {
         loadReferralData()
@@ -67,7 +67,7 @@ internal class ReferralViewModel @Inject constructor(
         viewModelScope.launch(dispatchers.main) {
             runCatching(dispatchers.io) {
                 referralInteractor.getReferralStatus().apply {
-                    lastReferralData.value = this
+                    lastReferralData = this
                 }
             }
                 .onSuccess(::showContent)
@@ -84,14 +84,13 @@ internal class ReferralViewModel @Inject constructor(
             viewModelScope.launch(dispatchers.main) {
                 runCatching(dispatchers.io) { referralInteractor.startReferral() }
                     .onSuccess(::showContent)
-                    .onFailure {
-                        if (it is UserCancelledException) {
-                            val lastRefData = lastReferralData.value
-                            if (lastRefData != null) {
-                                showContent(lastRefData)
+                    .onFailure { throwable ->
+                        if (throwable is UserCancelledException) {
+                            lastReferralData?.let { referralData ->
+                                showContent(referralData)
                             }
                         } else {
-                            showErrorSnackbar(it)
+                            showErrorSnackbar(throwable)
                         }
                     }
             }
@@ -130,6 +129,7 @@ internal class ReferralViewModel @Inject constructor(
             code = referral.promocode,
             shareLink = referral.shareLink,
             url = tosLink,
+            expectedAwards = expectedAwards,
         )
         is ReferralData.NonParticipantData -> ReferralInfoState.NonParticipantContent(
             award = getAwardValue(),
diff --git a/features/send/api/.gitignore b/features/send/api/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/features/send/api/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/features/send/api/build.gradle.kts b/features/send/api/build.gradle.kts
new file mode 100644
index 0000000000..6b742b5542
--- /dev/null
+++ b/features/send/api/build.gradle.kts
@@ -0,0 +1,17 @@
+plugins {
+    alias(deps.plugins.android.library)
+    alias(deps.plugins.kotlin.android)
+    id("kotlin-parcelize")
+    id("configuration")
+}
+
+android {
+    namespace = "com.tangem.features.send.api"
+}
+
+dependencies {
+    implementation(projects.domain.tokens.models)
+
+    /** AndroidX */
+    implementation(deps.androidx.fragment.ktx)
+}
\ No newline at end of file
diff --git a/features/send/api/src/main/kotlin/com/tangem/features/send/navigation/SendRouter.kt b/features/send/api/src/main/kotlin/com/tangem/features/send/navigation/SendRouter.kt
new file mode 100644
index 0000000000..0d0676b23b
--- /dev/null
+++ b/features/send/api/src/main/kotlin/com/tangem/features/send/navigation/SendRouter.kt
@@ -0,0 +1,12 @@
+package com.tangem.features.send.navigation
+
+import androidx.fragment.app.Fragment
+
+interface SendRouter {
+
+    fun getEntryFragment(): Fragment
+
+    companion object {
+        const val CRYPTO_CURRENCY_KEY = "send_crypto_currency"
+    }
+}
\ No newline at end of file
diff --git a/features/swap/data/build.gradle.kts b/features/swap/data/build.gradle.kts
index 87bb14fe6b..f91ab4c7c0 100644
--- a/features/swap/data/build.gradle.kts
+++ b/features/swap/data/build.gradle.kts
@@ -16,6 +16,18 @@ dependencies {
     /** Network */
     implementation(deps.retrofit)
 
+    /** Domain */
+    implementation(projects.domain.tokens.models)
+    implementation(projects.domain.legacy)
+    implementation(projects.domain.models)
+    implementation(projects.domain.wallets.models)
+
+    /** Data */
+    implementation(projects.data.tokens)
+
+    /** Tangem SDKs */
+    implementation(deps.tangem.blockchain)
+
     /** DI */
     implementation(deps.hilt.android)
     kapt(deps.hilt.kapt)
diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/SwapRepositoryImpl.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/SwapRepositoryImpl.kt
index 09e9cea01c..59d374f03d 100644
--- a/features/swap/data/src/main/java/com/tangem/feature/swap/SwapRepositoryImpl.kt
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/SwapRepositoryImpl.kt
@@ -1,25 +1,38 @@
 package com.tangem.feature.swap
 
+import com.tangem.blockchain.common.Amount
+import com.tangem.blockchain.common.Approver
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchain.common.Token
+import com.tangem.blockchain.extensions.Result
+import com.tangem.data.tokens.utils.CryptoCurrencyFactory
 import com.tangem.datasource.api.oneinch.OneInchApi
 import com.tangem.datasource.api.oneinch.OneInchApiFactory
 import com.tangem.datasource.api.oneinch.OneInchErrorsHandler
 import com.tangem.datasource.api.oneinch.errors.OneIncResponseException
 import com.tangem.datasource.api.tangemTech.TangemTechApi
 import com.tangem.datasource.config.ConfigManager
-import com.tangem.feature.swap.converters.ApproveConverter
+import com.tangem.domain.common.extensions.fromNetworkId
+import com.tangem.domain.common.util.derivationStyleProvider
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.Network
+import com.tangem.domain.walletmanager.WalletManagersFacade
+import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.feature.swap.converters.QuotesConverter
 import com.tangem.feature.swap.converters.SwapConverter
 import com.tangem.feature.swap.converters.TokensConverter
 import com.tangem.feature.swap.domain.SwapRepository
 import com.tangem.feature.swap.domain.models.data.AggregatedSwapDataModel
-import com.tangem.feature.swap.domain.models.domain.ApproveModel
 import com.tangem.feature.swap.domain.models.domain.Currency
 import com.tangem.feature.swap.domain.models.domain.QuoteModel
 import com.tangem.feature.swap.domain.models.domain.SwapDataModel
 import com.tangem.feature.swap.domain.models.mapErrors
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.coroutines.withContext
+import java.math.BigDecimal
 import javax.inject.Inject
+import com.tangem.blockchain.common.Token as SdkToken
 
 internal class SwapRepositoryImpl @Inject constructor(
     private val tangemTechApi: TangemTechApi,
@@ -27,12 +40,12 @@ internal class SwapRepositoryImpl @Inject constructor(
     private val oneInchErrorsHandler: OneInchErrorsHandler,
     private val coroutineDispatcher: CoroutineDispatcherProvider,
     private val configManager: ConfigManager,
+    private val walletManagersFacade: WalletManagersFacade,
 ) : SwapRepository {
 
     private val tokensConverter = TokensConverter()
     private val quotesConverter = QuotesConverter()
     private val swapConverter = SwapConverter()
-    private val approveConverter = ApproveConverter()
 
     override suspend fun getRates(currencyId: String, tokenIds: List<String>): Map<String, Double> {
         // workaround cause backend do not return arbitrum and optimism rates
@@ -96,29 +109,6 @@ internal class SwapRepositoryImpl @Inject constructor(
         }
     }
 
-    override suspend fun dataToApprove(networkId: String, tokenAddress: String, amount: String?): ApproveModel {
-        return withContext(coroutineDispatcher.io) {
-            approveConverter.convert(getOneInchApi(networkId).approveTransaction(tokenAddress, amount))
-        }
-    }
-
-    override suspend fun checkTokensSpendAllowance(
-        networkId: String,
-        tokenAddress: String,
-        walletAddress: String,
-    ): AggregatedSwapDataModel<String> {
-        return withContext(coroutineDispatcher.io) {
-            try {
-                val response = oneInchErrorsHandler.handleOneInchResponse(
-                    getOneInchApi(networkId).approveAllowance(tokenAddress, walletAddress),
-                )
-                AggregatedSwapDataModel(response.allowance)
-            } catch (ex: OneIncResponseException) {
-                AggregatedSwapDataModel(null, mapErrors(ex.data.description))
-            }
-        }
-    }
-
     override suspend fun prepareSwapTransaction(
         networkId: String,
         fromTokenAddress: String,
@@ -152,6 +142,106 @@ internal class SwapRepositoryImpl @Inject constructor(
         return configManager.config.swapReferrerAccount?.fee?.toDoubleOrNull() ?: 0.0
     }
 
+    override suspend fun getCryptoCurrency(
+        userWallet: UserWallet,
+        currency: Currency,
+        network: Network,
+    ): CryptoCurrency? {
+        val blockchain = Blockchain.fromNetworkId(currency.networkId) ?: return null
+        val cryptoCurrencyFactory = CryptoCurrencyFactory()
+        return when (currency) {
+            is Currency.NativeToken -> {
+                cryptoCurrencyFactory.createCoin(
+                    blockchain = blockchain,
+                    extraDerivationPath = network.derivationPath.value,
+                    derivationStyleProvider = userWallet.scanResponse.derivationStyleProvider,
+                )
+            }
+            is Currency.NonNativeToken -> {
+                val sdkToken = SdkToken(
+                    name = currency.name,
+                    symbol = currency.symbol,
+                    contractAddress = currency.contractAddress,
+                    decimals = currency.decimalCount,
+                    id = currency.id,
+                )
+                cryptoCurrencyFactory.createToken(
+                    sdkToken = sdkToken,
+                    blockchain = blockchain,
+                    extraDerivationPath = network.derivationPath.value,
+                    derivationStyleProvider = userWallet.scanResponse.derivationStyleProvider,
+                )
+            }
+        } as CryptoCurrency
+    }
+
+    override suspend fun getAllowance(
+        userWalletId: UserWalletId,
+        networkId: String,
+        derivationPath: String?,
+        tokenDecimalCount: Int,
+        tokenAddress: String,
+    ): BigDecimal {
+        val blockchain = requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
+        val walletManager = walletManagersFacade.getOrCreateWalletManager(
+            userWalletId = userWalletId,
+            blockchain = blockchain,
+            derivationPath = derivationPath,
+        )
+        val spenderAddress = addressForTrust(networkId)
+
+        val result = (walletManager as? Approver)?.getAllowance(
+            spenderAddress,
+            Token(
+                symbol = blockchain.currency,
+                contractAddress = tokenAddress,
+                decimals = tokenDecimalCount,
+            ),
+        ) ?: error("Cannot cast to Approver")
+
+        return when (result) {
+            is Result.Success -> result.data
+            is Result.Failure -> error(result.error)
+        }
+    }
+
+    override suspend fun getApproveData(
+        userWalletId: UserWalletId,
+        networkId: String,
+        derivationPath: String?,
+        currency: Currency,
+        amount: BigDecimal?,
+    ): String {
+        val blockchain =
+            requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
+        val walletManager = walletManagersFacade.getOrCreateWalletManager(
+            userWalletId = userWalletId,
+            blockchain = blockchain,
+            derivationPath = derivationPath,
+        )
+        val spenderAddress = addressForTrust(networkId)
+
+        return (walletManager as? Approver)?.getApproveData(
+            spenderAddress,
+            amount?.let { convertToAmount(it, currency, blockchain) },
+        ) ?: error("Cannot cast to Approver")
+    }
+
+    private fun convertToAmount(amount: BigDecimal, currency: Currency, blockchain: Blockchain): Amount {
+        return when (currency) {
+            is Currency.NativeToken -> {
+                Amount(value = amount, blockchain = blockchain)
+            }
+            is Currency.NonNativeToken -> {
+                Amount(
+                    currencySymbol = currency.symbol,
+                    value = amount,
+                    decimals = currency.decimalCount,
+                )
+            }
+        }
+    }
+
     private fun getOneInchApi(networkId: String): OneInchApi {
         return oneInchApiFactory.getApi(networkId)
     }
diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/converters/ApproveConverter.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/converters/ApproveConverter.kt
deleted file mode 100644
index b281f8df49..0000000000
--- a/features/swap/data/src/main/java/com/tangem/feature/swap/converters/ApproveConverter.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.tangem.feature.swap.converters
-
-import com.tangem.datasource.api.oneinch.models.ApproveCalldataResponse
-import com.tangem.feature.swap.domain.models.domain.ApproveModel
-import com.tangem.utils.converter.Converter
-
-class ApproveConverter : Converter<ApproveCalldataResponse, ApproveModel> {
-
-    override fun convert(value: ApproveCalldataResponse): ApproveModel {
-        return ApproveModel(
-            data = value.data,
-            gasPrice = value.gasPrice,
-            toAddress = value.toAddress,
-        )
-    }
-}
\ No newline at end of file
diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/di/SwapDataModule.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/di/SwapDataModule.kt
index bdb28d8007..81931ca111 100644
--- a/features/swap/data/src/main/java/com/tangem/feature/swap/di/SwapDataModule.kt
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/di/SwapDataModule.kt
@@ -4,6 +4,7 @@ import com.tangem.datasource.api.oneinch.OneInchApiFactory
 import com.tangem.datasource.api.oneinch.OneInchErrorsHandler
 import com.tangem.datasource.api.tangemTech.TangemTechApi
 import com.tangem.datasource.config.ConfigManager
+import com.tangem.domain.walletmanager.WalletManagersFacade
 import com.tangem.feature.swap.SwapRepositoryImpl
 import com.tangem.feature.swap.domain.SwapRepository
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
@@ -25,6 +26,7 @@ class SwapDataModule {
         oneInchErrorsHandler: OneInchErrorsHandler,
         coroutineDispatcher: CoroutineDispatcherProvider,
         configManager: ConfigManager,
+        walletManagerFacade: WalletManagersFacade,
     ): SwapRepository {
         return SwapRepositoryImpl(
             tangemTechApi = tangemTechApi,
@@ -32,6 +34,7 @@ class SwapDataModule {
             oneInchErrorsHandler = oneInchErrorsHandler,
             coroutineDispatcher = coroutineDispatcher,
             configManager = configManager,
+            walletManagersFacade = walletManagerFacade,
         )
     }
 }
\ No newline at end of file
diff --git a/features/swap/domain/build.gradle.kts b/features/swap/domain/build.gradle.kts
index d5dec7c6d0..b757775fd0 100644
--- a/features/swap/domain/build.gradle.kts
+++ b/features/swap/domain/build.gradle.kts
@@ -1,19 +1,38 @@
 plugins {
-    alias(deps.plugins.kotlin.jvm)
+    alias(deps.plugins.android.library)
+    alias(deps.plugins.kotlin.android)
     alias(deps.plugins.kotlin.kapt)
     alias(deps.plugins.kotlin.serialization)
     id("configuration")
 }
 
+android {
+    namespace = "com.tangem.domain.swap"
+}
+
 dependencies {
     /** Libs */
-    implementation(project(":libs:crypto"))
-    implementation(project(":core:utils"))
+    implementation(projects.libs.crypto)
 
     /** DI */
     implementation(deps.hilt.core)
     kapt(deps.hilt.kapt)
 
+    /** Domain */
+    implementation(projects.domain.tokens)
+    implementation(projects.domain.tokens.models)
+    implementation(projects.domain.wallets)
+    implementation(projects.domain.wallets.models)
+
+    /** Core modules */
+    implementation(projects.core.utils)
+
+    /** Feature Apis */
+    implementation(projects.features.wallet.api)
+
     /** Other Libraries **/
     implementation(deps.kotlin.serialization)
+    implementation(deps.kotlin.coroutines)
+    implementation(deps.arrow.core)
+    implementation(deps.timber)
 }
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractor.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractor.kt
index 2415ba615a..3cae5f1d7e 100644
--- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractor.kt
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractor.kt
@@ -1,5 +1,6 @@
 package com.tangem.feature.swap.domain
 
+import com.tangem.domain.tokens.model.Network
 import com.tangem.feature.swap.domain.models.SwapAmount
 import com.tangem.feature.swap.domain.models.domain.Currency
 import com.tangem.feature.swap.domain.models.domain.PermissionOptions
@@ -7,7 +8,7 @@ import com.tangem.feature.swap.domain.models.ui.*
 
 interface SwapInteractor {
 
-    fun initDerivationPath(derivationPath: String?)
+    fun initDerivationPathAndNetwork(derivationPath: String?, network: Network?)
 
     /**
      * Init tokens to swap, load tokens list available to swap for given network
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt
index f3f193b180..1eef74bb08 100644
--- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt
@@ -1,40 +1,53 @@
 package com.tangem.feature.swap.domain
 
+import com.tangem.domain.tokens.model.Network
+import com.tangem.domain.tokens.repository.CurrenciesRepository
+import com.tangem.domain.tokens.repository.NetworksRepository
+import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
 import com.tangem.feature.swap.domain.cache.SwapDataCache
-import com.tangem.feature.swap.domain.converters.CryptoCurrencyConverter
-import com.tangem.feature.swap.domain.models.DataError
+import com.tangem.feature.swap.domain.converters.SwapCurrencyConverter
 import com.tangem.feature.swap.domain.models.SwapAmount
 import com.tangem.feature.swap.domain.models.domain.*
 import com.tangem.feature.swap.domain.models.domain.Currency
 import com.tangem.feature.swap.domain.models.toStringWithRightOffset
 import com.tangem.feature.swap.domain.models.ui.*
+import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles
 import com.tangem.lib.crypto.TransactionManager
 import com.tangem.lib.crypto.UserWalletManager
 import com.tangem.lib.crypto.models.*
 import com.tangem.lib.crypto.models.transactions.SendTxResult
 import com.tangem.utils.toFiatString
+import timber.log.Timber
 import java.math.BigDecimal
 import java.math.RoundingMode
 import javax.inject.Inject
 
-@Suppress("LargeClass")
+@Suppress("LargeClass", "LongParameterList")
 internal class SwapInteractorImpl @Inject constructor(
     private val transactionManager: TransactionManager,
     private val userWalletManager: UserWalletManager,
     private val repository: SwapRepository,
     private val cache: SwapDataCache,
     private val allowPermissionsHandler: AllowPermissionsHandler,
+    private val currenciesRepository: CurrenciesRepository,
+    private val networksRepository: NetworksRepository,
+    private val walletFeatureToggles: WalletFeatureToggles,
+    private val getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase,
 ) : SwapInteractor {
 
-    private val cryptoCurrencyConverter = CryptoCurrencyConverter()
+    private val swapCurrencyConverter = SwapCurrencyConverter()
     private val amountFormatter = AmountFormatter()
     private var derivationPath: String? = null
+    private var network: Network? = null
 
-    override fun initDerivationPath(derivationPath: String?) {
+    override fun initDerivationPathAndNetwork(derivationPath: String?, network: Network?) {
         this.derivationPath = derivationPath
+        this.network = network
     }
 
     override suspend fun initTokensToSwap(initialCurrency: Currency): TokensDataState {
+        // TODO: refactor this function
         val networkId = initialCurrency.networkId
         val availableTokens = cache.getAvailableTokens(networkId)
         val allLoadedTokens = availableTokens.ifEmpty {
@@ -45,18 +58,18 @@ internal class SwapInteractorImpl @Inject constructor(
 
         // replace tokens in wallet tokens list with loaded same
         val loadedOnWalletsMap = mutableSetOf<String>()
-        val tokensInWallet =
-            userWalletManager.getUserTokens(
-                networkId = networkId,
-                derivationPath = derivationPath,
-                isExcludeCustom = true,
-            ).filter { it.symbol != initialCurrency.symbol }
-                .map { token ->
-                    allLoadedTokens.firstOrNull { it.symbol == token.symbol }?.let {
-                        loadedOnWalletsMap.add(it.symbol)
-                        it
-                    } ?: cryptoCurrencyConverter.convertBack(token)
-                }
+        val tokensInWallet = userWalletManager.getUserTokens(
+            networkId = networkId,
+            derivationPath = derivationPath,
+            isExcludeCustom = true,
+        )
+            .map { token ->
+                allLoadedTokens.firstOrNull { it.symbol == token.symbol }?.let {
+                    loadedOnWalletsMap.add(it.symbol)
+                    it
+                } ?: swapCurrencyConverter.convertBack(token)
+            }
+            .filter { it.symbol != initialCurrency.symbol && allLoadedTokens.contains(it) }
         val loadedTokens = allLoadedTokens
             .filter {
                 !loadedOnWalletsMap.contains(it.symbol)
@@ -107,16 +120,20 @@ internal class SwapInteractorImpl @Inject constructor(
 
     override suspend fun givePermissionToSwap(networkId: String, permissionOptions: PermissionOptions): TxState {
         val dataToSign = if (permissionOptions.approveType == SwapApproveType.UNLIMITED) {
-            repository.dataToApprove(networkId, getTokenAddress(permissionOptions.fromToken)).data
+            getApproveData(
+                networkId = networkId,
+                derivationPath = derivationPath,
+                fromToken = permissionOptions.fromToken,
+            )
         } else {
-            permissionOptions.approveData.approveModel.data
+            permissionOptions.approveData.approveData
         }
         val result = transactionManager.sendApproveTransaction(
             txData = ApproveTxData(
                 networkId = networkId,
                 feeAmount = permissionOptions.txFee.feeValue,
                 gasLimit = permissionOptions.txFee.gasLimit,
-                destinationAddress = permissionOptions.approveData.approveModel.toAddress,
+                destinationAddress = getTokenAddress(permissionOptions.fromToken),
                 dataToSign = dataToSign,
             ),
             derivationPath = derivationPath,
@@ -153,7 +170,7 @@ internal class SwapInteractorImpl @Inject constructor(
         val amount = SwapAmount(amountDecimal, getTokenDecimals(fromToken))
         val fromTokenAddress = getTokenAddress(fromToken)
         val toTokenAddress = getTokenAddress(toToken)
-        val isAllowedToSpend = isAllowedToSpend(networkId, fromTokenAddress, amount)
+        val isAllowedToSpend = isAllowedToSpend(networkId, fromToken, amount)
         if (isAllowedToSpend && allowPermissionsHandler.isAddressAllowanceInProgress(fromTokenAddress)) {
             allowPermissionsHandler.removeAddressFromProgress(fromTokenAddress)
             transactionManager.updateWalletManager(networkId, derivationPath)
@@ -195,7 +212,7 @@ internal class SwapInteractorImpl @Inject constructor(
             txData = SwapTxData(
                 networkId = networkId,
                 amountToSend = amount,
-                currencyToSend = cryptoCurrencyConverter.convert(currencyToSend),
+                currencyToSend = swapCurrencyConverter.convert(currencyToSend),
                 feeAmount = fee.feeValue,
                 gasLimit = fee.gasLimit,
                 destinationAddress = swapStateData.swapModel.transaction.toWalletAddress,
@@ -210,8 +227,11 @@ internal class SwapInteractorImpl @Inject constructor(
         )
         return when (result) {
             is SendTxResult.Success -> {
-                userWalletManager.addToken(cryptoCurrencyConverter.convert(currencyToGet), derivationPath)
-                userWalletManager.refreshWallet()
+                if (walletFeatureToggles.isRedesignedScreenEnabled) {
+                    onSuccessNewFlow(currencyToGet)
+                } else {
+                    onSuccessLegacyFlow(currencyToGet)
+                }
                 TxState.TxSent(
                     fromAmount = amountFormatter.formatSwapAmountToUI(
                         swapStateData.swapModel.fromTokenAmount,
@@ -244,6 +264,37 @@ internal class SwapInteractorImpl @Inject constructor(
         return ONE_INCH_SUPPORTED_NETWORKS.contains(networkId)
     }
 
+    private suspend fun onSuccessLegacyFlow(currency: Currency) {
+        userWalletManager.addToken(swapCurrencyConverter.convert(currency), derivationPath)
+        userWalletManager.refreshWallet()
+    }
+
+    private suspend fun onSuccessNewFlow(currency: Currency) {
+        val network = network ?: return
+        getSelectedWalletSyncUseCase().fold(
+            ifRight = { userWallet ->
+                getAndAddCryptoCurrency(userWallet, currency, network)
+            },
+            ifLeft = {
+                Timber.e("Swap Error on getSelectedWalletUseCase")
+            },
+        )
+    }
+
+    private suspend fun getAndAddCryptoCurrency(userWallet: UserWallet, currency: Currency, network: Network) {
+        repository.getCryptoCurrency(userWallet, currency, network)?.let { cryptoCurrency ->
+            currenciesRepository.addCurrencies(
+                userWallet.walletId,
+                listOf(cryptoCurrency),
+            )
+            networksRepository.getNetworkStatusesSync(
+                userWalletId = userWallet.walletId,
+                networks = setOf(cryptoCurrency.network),
+                refresh = true,
+            )
+        }
+    }
+
     private fun getTangemFee(): Double {
         return repository.getTangemFee()
     }
@@ -300,14 +351,24 @@ internal class SwapInteractorImpl @Inject constructor(
         }
     }
 
-    private suspend fun isAllowedToSpend(networkId: String, fromTokenAddress: String, amount: SwapAmount): Boolean {
-        val allowance = repository.checkTokensSpendAllowance(
-            networkId = networkId,
-            tokenAddress = fromTokenAddress,
-            walletAddress = userWalletManager.getWalletAddress(networkId, derivationPath),
+    private suspend fun isAllowedToSpend(networkId: String, fromToken: Currency, amount: SwapAmount): Boolean {
+        if (fromToken is Currency.NativeToken) return true
+        return getSelectedWalletSyncUseCase().fold(
+            ifRight = { userWallet ->
+                val allowance = repository.getAllowance(
+                    userWallet.walletId,
+                    networkId,
+                    derivationPath,
+                    getTokenDecimals(fromToken),
+                    getTokenAddress(fromToken),
+                )
+                allowance >= amount.value
+            },
+            ifLeft = {
+                Timber.e("Swap Error on isAllowedToSpend")
+                false
+            },
         )
-        val allowanceAmount = allowance.dataModel?.toBigDecimalOrNull() ?: BigDecimal.ZERO
-        return allowance.error == DataError.NoError && allowanceAmount >= amount.value.movePointRight(amount.decimals)
     }
 
     private fun createEmptyAmountState(networkId: String, fromToken: Currency, toToken: Currency): SwapState {
@@ -409,7 +470,7 @@ internal class SwapInteractorImpl @Inject constructor(
                 val feeData = transactionManager.getFee(
                     networkId = networkId,
                     amountToSend = amount.value,
-                    currencyToSend = cryptoCurrencyConverter.convert(fromToken),
+                    currencyToSend = swapCurrencyConverter.convert(fromToken),
                     destinationAddress = swapData.transaction.toWalletAddress,
                     increaseBy = INCREASE_GAS_LIMIT_BY,
                     data = swapData.transaction.data,
@@ -518,18 +579,19 @@ internal class SwapInteractorImpl @Inject constructor(
             )
         }
         // setting up amount for approve with given amount for swap [SwapApproveType.Limited]
-        val transactionData = repository.dataToApprove(
+        val transactionData = getApproveData(
             networkId = networkId,
-            tokenAddress = getTokenAddress(fromToken),
-            amount = swapAmount.toStringWithRightOffset(),
+            derivationPath = derivationPath,
+            fromToken = fromToken,
+            swapAmount = swapAmount,
         )
         val feeData = transactionManager.getFee(
             networkId = networkId,
             amountToSend = BigDecimal.ZERO,
             currencyToSend = userWalletManager.getNativeTokenForNetwork(networkId),
-            destinationAddress = transactionData.toAddress,
+            destinationAddress = getTokenAddress(fromToken),
             increaseBy = INCREASE_GAS_LIMIT_BY,
-            data = transactionData.data,
+            data = transactionData,
             derivationPath = derivationPath,
         )
         val feeState = proxyFeesToFeeState(networkId, feeData)
@@ -544,10 +606,10 @@ internal class SwapInteractorImpl @Inject constructor(
                 currency = fromToken.symbol,
                 amount = INFINITY_SYMBOL,
                 walletAddress = getWalletAddress(networkId),
-                spenderAddress = transactionData.toAddress,
+                spenderAddress = getTokenAddress(fromToken),
                 requestApproveData = RequestApproveStateData(
                     fee = feeState,
-                    approveModel = transactionData,
+                    approveData = transactionData,
                 ),
             ),
             preparedSwapConfigState = quotesLoadedState.preparedSwapConfigState.copy(
@@ -562,7 +624,7 @@ internal class SwapInteractorImpl @Inject constructor(
             val tokensBalance =
                 userWalletManager.getCurrentWalletTokensBalance(
                     networkId = networkId,
-                    extraTokens = tokensToSync.map { cryptoCurrencyConverter.convert(it) },
+                    extraTokens = tokensToSync.map { swapCurrencyConverter.convert(it) },
                     derivationPath = derivationPath,
                 )
             cache.cacheBalances(
@@ -623,7 +685,7 @@ internal class SwapInteractorImpl @Inject constructor(
         }
     }
 
-    private fun getWalletAddress(networkId: String): String {
+    private suspend fun getWalletAddress(networkId: String): String {
         return userWalletManager.getWalletAddress(networkId, derivationPath)
     }
 
@@ -638,7 +700,7 @@ internal class SwapInteractorImpl @Inject constructor(
         }
     }
 
-    private fun checkFeeIsEnough(
+    private suspend fun checkFeeIsEnough(
         fee: BigDecimal?,
         spendAmount: SwapAmount,
         networkId: String,
@@ -678,6 +740,29 @@ internal class SwapInteractorImpl @Inject constructor(
         return (BigDecimal.ONE - toTokenFiatValue.divide(fromTokenFiatValue, 2, RoundingMode.HALF_UP)).toFloat()
     }
 
+    private suspend fun getApproveData(
+        networkId: String,
+        derivationPath: String?,
+        fromToken: Currency,
+        swapAmount: SwapAmount? = null,
+    ): String {
+        return getSelectedWalletSyncUseCase().fold(
+            ifRight = { userWallet ->
+                repository.getApproveData(
+                    userWalletId = userWallet.walletId,
+                    networkId = networkId,
+                    derivationPath = derivationPath,
+                    currency = fromToken,
+                    amount = swapAmount?.value,
+                )
+            },
+            ifLeft = {
+                Timber.e("Swap Error on getApproveData")
+                error("Swap Error on getApproveData")
+            },
+        )
+    }
+
     companion object {
         private const val DEFAULT_SLIPPAGE = 2
         private const val ZERO_BALANCE = "0"
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapRepository.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapRepository.kt
index 70289f0c3f..b303325c8c 100644
--- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapRepository.kt
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapRepository.kt
@@ -1,10 +1,14 @@
 package com.tangem.feature.swap.domain
 
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.Network
+import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.feature.swap.domain.models.data.AggregatedSwapDataModel
-import com.tangem.feature.swap.domain.models.domain.ApproveModel
 import com.tangem.feature.swap.domain.models.domain.Currency
 import com.tangem.feature.swap.domain.models.domain.QuoteModel
 import com.tangem.feature.swap.domain.models.domain.SwapDataModel
+import java.math.BigDecimal
 
 interface SwapRepository {
 
@@ -26,28 +30,6 @@ interface SwapRepository {
      */
     suspend fun addressForTrust(networkId: String): String
 
-    /**
-     * Generate "data" for calling contract in order to allow 1inch spend funds
-     *
-     * @param tokenAddress token you want to exchange
-     * @param amount number of tokens is allowed. By default infinite
-     */
-    suspend fun dataToApprove(networkId: String, tokenAddress: String, amount: String? = null): ApproveModel
-
-    /**
-     * Get the number of tokens that the 1inch router is allowed to spend
-     *
-     * @param tokenAddress Token address you want to exchange
-     * @param walletAddress address for which you want to check
-     *
-     * @return amount of tokens allowed to spend
-     */
-    suspend fun checkTokensSpendAllowance(
-        networkId: String,
-        tokenAddress: String,
-        walletAddress: String,
-    ): AggregatedSwapDataModel<String>
-
     @Suppress("LongParameterList")
     suspend fun prepareSwapTransaction(
         networkId: String,
@@ -63,4 +45,24 @@ interface SwapRepository {
      * Example: 0.35%
      */
     fun getTangemFee(): Double
+
+    suspend fun getCryptoCurrency(userWallet: UserWallet, currency: Currency, network: Network): CryptoCurrency?
+
+    @Throws(IllegalStateException::class)
+    suspend fun getAllowance(
+        userWalletId: UserWalletId,
+        networkId: String,
+        derivationPath: String?,
+        tokenDecimalCount: Int,
+        tokenAddress: String,
+    ): BigDecimal
+
+    @Throws(IllegalStateException::class)
+    suspend fun getApproveData(
+        userWalletId: UserWalletId,
+        networkId: String,
+        derivationPath: String?,
+        currency: Currency,
+        amount: BigDecimal?,
+    ): String
 }
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/converters/CryptoCurrencyConverter.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/converters/SwapCurrencyConverter.kt
similarity index 96%
rename from features/swap/domain/src/main/java/com/tangem/feature/swap/domain/converters/CryptoCurrencyConverter.kt
rename to features/swap/domain/src/main/java/com/tangem/feature/swap/domain/converters/SwapCurrencyConverter.kt
index 90b978100e..d766f5029a 100644
--- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/converters/CryptoCurrencyConverter.kt
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/converters/SwapCurrencyConverter.kt
@@ -4,7 +4,7 @@ import com.tangem.feature.swap.domain.models.domain.Currency
 import com.tangem.utils.converter.TwoWayConverter
 import com.tangem.lib.crypto.models.Currency as CryptoCurrency
 
-class CryptoCurrencyConverter : TwoWayConverter<Currency, CryptoCurrency> {
+class SwapCurrencyConverter : TwoWayConverter<Currency, CryptoCurrency> {
 
     override fun convert(value: Currency): CryptoCurrency {
         return when (value) {
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/di/SwapDomainModule.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/di/SwapDomainModule.kt
index 572c5484ac..7a94dfb303 100644
--- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/di/SwapDomainModule.kt
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/di/SwapDomainModule.kt
@@ -1,18 +1,19 @@
 package com.tangem.feature.swap.domain.di
 
-import com.tangem.feature.swap.domain.AllowPermissionsHandlerImpl
-import com.tangem.feature.swap.domain.BlockchainInteractor
-import com.tangem.feature.swap.domain.BlockchainInteractorImpl
-import com.tangem.feature.swap.domain.SwapInteractor
-import com.tangem.feature.swap.domain.SwapInteractorImpl
-import com.tangem.feature.swap.domain.SwapRepository
+import com.tangem.domain.tokens.repository.CurrenciesRepository
+import com.tangem.domain.tokens.repository.NetworksRepository
+import com.tangem.domain.wallets.legacy.WalletsStateHolder
+import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
+import com.tangem.feature.swap.domain.*
 import com.tangem.feature.swap.domain.cache.SwapDataCacheImpl
+import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles
 import com.tangem.lib.crypto.TransactionManager
 import com.tangem.lib.crypto.UserWalletManager
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import javax.inject.Qualifier
 import javax.inject.Singleton
 
 @Module
@@ -25,6 +26,10 @@ class SwapDomainModule {
         swapRepository: SwapRepository,
         userWalletManager: UserWalletManager,
         transactionManager: TransactionManager,
+        currenciesRepository: CurrenciesRepository,
+        networksRepository: NetworksRepository,
+        walletFeatureToggles: WalletFeatureToggles,
+        @SwapScope getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase,
     ): SwapInteractor {
         return SwapInteractorImpl(
             transactionManager = transactionManager,
@@ -32,6 +37,10 @@ class SwapDomainModule {
             repository = swapRepository,
             cache = SwapDataCacheImpl(),
             allowPermissionsHandler = AllowPermissionsHandlerImpl(),
+            currenciesRepository = currenciesRepository,
+            networksRepository = networksRepository,
+            walletFeatureToggles = walletFeatureToggles,
+            getSelectedWalletSyncUseCase = getSelectedWalletSyncUseCase,
         )
     }
 
@@ -42,4 +51,15 @@ class SwapDomainModule {
             transactionManager = transactionManager,
         )
     }
-}
\ No newline at end of file
+
+    @SwapScope
+    @Provides
+    @Singleton
+    fun providesGetSelectedWalletUseCase(walletsStateHolder: WalletsStateHolder): GetSelectedWalletSyncUseCase {
+        return GetSelectedWalletSyncUseCase(walletsStateHolder = walletsStateHolder)
+    }
+}
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class SwapScope
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/cache/SwapDataHolder.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/cache/SwapDataHolder.kt
deleted file mode 100644
index 1271078626..0000000000
--- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/cache/SwapDataHolder.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.tangem.feature.swap.domain.models.cache
-
-import com.tangem.feature.swap.domain.models.domain.ApproveModel
-import com.tangem.feature.swap.domain.models.domain.Currency
-import com.tangem.feature.swap.domain.models.domain.QuoteModel
-import com.tangem.feature.swap.domain.models.SwapAmount
-import com.tangem.feature.swap.domain.models.domain.SwapDataModel
-
-data class SwapDataHolder(
-    val quoteModel: QuoteModel? = null,
-    val swapModel: SwapDataModel? = null,
-    val approveTxModel: ApproveModel? = null,
-    val amountToSwap: SwapAmount? = null,
-    val networkId: String? = null,
-    val exchangeCurrencies: ExchangeCurrencies? = null,
-)
-
-data class ExchangeCurrencies(
-    val fromCurrency: Currency? = null,
-    val toCurrency: Currency? = null,
-)
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/domain/ApproveModel.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/domain/ApproveModel.kt
deleted file mode 100644
index c21b52c0fa..0000000000
--- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/domain/ApproveModel.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.tangem.feature.swap.domain.models.domain
-
-/**
- * Approve model
- *
- * @property data The encoded data to call the approve method on the swapped token contract
- * @property gasPrice Gas price for fast transaction processing
- * @property toAddress Token address that will be allowed to exchange through 1inch router
- */
-data class ApproveModel(
-    val data: String,
-    val gasPrice: String,
-    val toAddress: String,
-)
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/ui/SwapState.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/ui/SwapState.kt
index d2b760740e..d212c8d259 100644
--- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/ui/SwapState.kt
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/ui/SwapState.kt
@@ -2,7 +2,6 @@ package com.tangem.feature.swap.domain.models.ui
 
 import com.tangem.feature.swap.domain.models.DataError
 import com.tangem.feature.swap.domain.models.SwapAmount
-import com.tangem.feature.swap.domain.models.domain.ApproveModel
 import com.tangem.feature.swap.domain.models.domain.PreparedSwapConfigState
 import com.tangem.feature.swap.domain.models.domain.SwapDataModel
 import java.math.BigDecimal
@@ -59,7 +58,7 @@ data class TokenSwapInfo(
 
 data class RequestApproveStateData(
     val fee: TxFeeState,
-    val approveModel: ApproveModel,
+    val approveData: String,
 )
 
 data class SwapStateData(
diff --git a/features/swap/presentation/build.gradle.kts b/features/swap/presentation/build.gradle.kts
index 8248b21113..63f2d6414e 100644
--- a/features/swap/presentation/build.gradle.kts
+++ b/features/swap/presentation/build.gradle.kts
@@ -9,11 +9,15 @@ plugins {
 
 dependencies {
     /** Core modules */
-    implementation(project(":core:analytics"))
+    implementation(projects.core.analytics)
     implementation(projects.core.analytics.models)
-    implementation(project(":core:featuretoggles"))
-    implementation(project(":core:utils"))
-    implementation(project(":core:ui"))
+    implementation(projects.core.featuretoggles)
+    implementation(projects.core.utils)
+    implementation(projects.core.ui)
+    implementation(projects.common)
+
+    /** Domain modules **/
+    implementation(projects.domain.balanceHiding)
 
     /** AndroidX */
     implementation(deps.androidx.activity.compose)
@@ -28,12 +32,15 @@ dependencies {
     implementation(deps.compose.ui.tooling)
     implementation(deps.compose.coil)
     implementation(deps.compose.constraintLayout)
+    implementation(deps.compose.accompanist.systemUiController)
 
     /** Api */
-    implementation(project(":features:swap:api"))
+    implementation(projects.features.swap.api)
 
     /** Domain */
-    implementation(project(":features:swap:domain"))
+    implementation(projects.features.swap.domain)
+    implementation(projects.domain.tokens.models)
+    implementation(projects.domain.settings)
 
     /** Other libraries */
     implementation(deps.compose.shimmer)
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/analytics/SwapEvents.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/analytics/SwapEvents.kt
index d2395cf29b..768624019f 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/analytics/SwapEvents.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/analytics/SwapEvents.kt
@@ -14,14 +14,28 @@ sealed class SwapEvents(
 
     object SendTokenBalanceClicked : SwapEvents(event = "Send Token Balance Clicked")
     object ChooseTokenScreenOpened : SwapEvents(event = "Choose Token Screen Opened")
-    object SearchTokenClicked : SwapEvents(event = "Searched Token Clicked")
+
+    data class SearchTokenClicked(val currencySymbol: String?) : SwapEvents(
+        event = "Searched Token Clicked",
+        params = buildMap {
+            if (currencySymbol != null) {
+                put("Token", currencySymbol)
+            }
+        },
+    )
+
     data class ButtonSwapClicked(val sendToken: String, val receiveToken: String) : SwapEvents(
         event = "Button - Swap",
         params = mapOf("Send Token" to sendToken, "Receive Token" to receiveToken),
     )
 
     object ButtonGivePermissionClicked : SwapEvents(event = "Button - Give permission")
-    object ButtonPermissionApproveClicked : SwapEvents(event = "Button - Permission Approve")
+
+    data class ButtonPermissionApproveClicked(val sendToken: String, val receiveToken: String) : SwapEvents(
+        event = "Button - Permission Approve",
+        params = mapOf("Send Token" to sendToken, "Receive Token" to receiveToken),
+    )
+
     object ButtonPermissionCancelClicked : SwapEvents(event = "Button - Permission Cancel")
     object ButtonSwipeClicked : SwapEvents(event = "Button - Swipe")
     object SwapInProgressScreen : SwapEvents(event = "Swap in Progress Screen Opened")
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/converters/TokensDataConverter.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/converters/TokensDataConverter.kt
index 7491904442..cee76edbb1 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/converters/TokensDataConverter.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/converters/TokensDataConverter.kt
@@ -1,5 +1,6 @@
 package com.tangem.feature.swap.converters
 
+import com.tangem.common.Provider
 import com.tangem.feature.swap.domain.models.domain.Currency
 import com.tangem.feature.swap.domain.models.domain.NetworkInfo
 import com.tangem.feature.swap.domain.models.ui.FoundTokensState
@@ -12,6 +13,7 @@ import com.tangem.feature.swap.models.TokenToSelect
 class TokensDataConverter(
     private val onSearchEntered: (String) -> Unit,
     private val onTokenSelected: (String) -> Unit,
+    private val isBalanceHiddenProvider: Provider<Boolean>,
 ) {
 
     fun convertWithNetwork(value: FoundTokensState, network: NetworkInfo): SwapSelectTokenStateHolder {
@@ -34,6 +36,7 @@ class TokensDataConverter(
             addedTokenBalanceData = TokenBalanceData(
                 amount = tokenWithBalance.tokenBalanceData?.amount,
                 amountEquivalent = tokenWithBalance.tokenBalanceData?.amountEquivalent,
+                isBalanceHidden = isBalanceHiddenProvider.invoke(),
             ),
         )
     }
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapSelectTokenStateHolder.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapSelectTokenStateHolder.kt
index b51831dedb..2e48e108cc 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapSelectTokenStateHolder.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapSelectTokenStateHolder.kt
@@ -26,4 +26,5 @@ data class Network(
 data class TokenBalanceData(
     val amount: String?,
     val amountEquivalent: String?,
+    val isBalanceHidden: Boolean,
 )
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapStateHolder.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapStateHolder.kt
index a7ea53771e..1fc4583726 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapStateHolder.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapStateHolder.kt
@@ -25,7 +25,6 @@ data class SwapStateHolder(
     val onRefresh: () -> Unit,
     val onBackClicked: () -> Unit,
     val onChangeCardsClicked: () -> Unit,
-    val onSearchFocusChange: (Boolean) -> Unit,
     val onSelectTokenClick: (() -> Unit)? = null,
     val onSuccess: (() -> Unit)? = null,
     val onMaxAmountSelected: (() -> Unit)? = null,
@@ -41,6 +40,7 @@ data class SwapCardData(
     val tokenIconUrl: String,
     val tokenCurrency: String,
     val balance: String,
+    val isBalanceHidden: Boolean,
     val isNotNativeToken: Boolean,
     val canSelectAnotherToken: Boolean = false,
 )
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/UiActions.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/UiActions.kt
index 6d901ded7e..d250e06df6 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/UiActions.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/UiActions.kt
@@ -5,7 +5,6 @@ import com.tangem.feature.swap.domain.models.ui.TxFee
 
 data class UiActions(
     val onSearchEntered: (String) -> Unit,
-    val onSearchFocusChange: (Boolean) -> Unit,
     val onTokenSelected: (String) -> Unit,
     val onAmountChanged: (String) -> Unit,
     val onAmountSelected: (Boolean) -> Unit,
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/presentation/SwapFragment.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/presentation/SwapFragment.kt
index d2d2622426..8562c1e5db 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/presentation/SwapFragment.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/presentation/SwapFragment.kt
@@ -1,14 +1,14 @@
 package com.tangem.feature.swap.presentation
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.compose.animation.Crossfade
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.ComposeView
-import androidx.fragment.app.Fragment
+import androidx.compose.ui.Modifier
 import androidx.fragment.app.viewModels
+import com.tangem.core.ui.components.SystemBarsEffect
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.screen.ComposeFragment
+import com.tangem.core.ui.theme.AppThemeModeHolder
 import com.tangem.feature.swap.router.CustomTabsManager
 import com.tangem.feature.swap.router.SwapNavScreen
 import com.tangem.feature.swap.router.SwapRouter
@@ -18,32 +18,41 @@ import com.tangem.feature.swap.ui.SwapSuccessScreen
 import com.tangem.feature.swap.viewmodels.SwapViewModel
 import dagger.hilt.android.AndroidEntryPoint
 import java.lang.ref.WeakReference
+import javax.inject.Inject
 
 @AndroidEntryPoint
-class SwapFragment : Fragment() {
+class SwapFragment : ComposeFragment() {
+
+    @Inject
+    override lateinit var appThemeModeHolder: AppThemeModeHolder
 
     private val viewModel by viewModels<SwapViewModel>()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        lifecycle.addObserver(viewModel)
         viewModel.setRouter(
             SwapRouter(
                 fragmentManager = WeakReference(parentFragmentManager),
                 customTabsManager = CustomTabsManager(WeakReference(context)),
             ),
         )
+    }
+
+    @Composable
+    override fun ScreenContent(modifier: Modifier) {
         viewModel.onScreenOpened()
 
-        return ComposeView(inflater.context).apply {
-            setContent {
-                ScreenContent(viewModel = viewModel)
-            }
-        }
+        val backgroundColor = TangemTheme.colors.background.secondary
+        SystemBarsEffect { setSystemBarsColor(backgroundColor) }
+
+        ScreenContent(viewModel = viewModel)
     }
 
     @Suppress("TopLevelComposableFunctions")
     @Composable
     private fun ScreenContent(viewModel: SwapViewModel) {
-        Crossfade(targetState = viewModel.currentScreen) { screen ->
+        Crossfade(targetState = viewModel.currentScreen, label = "") { screen ->
             when (screen) {
                 SwapNavScreen.Main -> SwapScreen(stateHolder = viewModel.uiState)
                 SwapNavScreen.Success -> {
@@ -57,11 +66,7 @@ class SwapFragment : Fragment() {
                 SwapNavScreen.SelectToken -> {
                     val tokenState = viewModel.uiState.selectTokenState
                     if (tokenState != null) {
-                        SwapSelectTokenScreen(
-                            state = tokenState,
-                            onSearchFocusChange = viewModel.uiState.onSearchFocusChange,
-                            onBack = viewModel.uiState.onBackClicked,
-                        )
+                        SwapSelectTokenScreen(state = tokenState, onBack = viewModel.uiState.onBackClicked)
                     } else {
                         SwapScreen(stateHolder = viewModel.uiState)
                     }
@@ -70,8 +75,14 @@ class SwapFragment : Fragment() {
         }
     }
 
+    override fun onDestroy() {
+        lifecycle.removeObserver(viewModel)
+        super.onDestroy()
+    }
+
     companion object {
         const val CURRENCY_BUNDLE_KEY = "swap_currency"
         const val DERIVATION_PATH = "DERIVATION_STYLE"
+        const val NETWORK = "NETWORK"
     }
 }
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
index 00e8323623..5034c69a3f 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
@@ -2,6 +2,7 @@ package com.tangem.feature.swap.ui
 
 import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.input.TextFieldValue
+import com.tangem.common.Provider
 import com.tangem.core.ui.components.states.Item
 import com.tangem.core.ui.components.states.SelectableItemsState
 import com.tangem.core.ui.extensions.TextReference
@@ -21,9 +22,13 @@ import kotlinx.collections.immutable.toImmutableList
  * State builder creates a specific states for SwapScreen
  */
 @Suppress("LargeClass")
-internal class StateBuilder(val actions: UiActions) {
+internal class StateBuilder(val actions: UiActions, val isBalanceHiddenProvider: Provider<Boolean>) {
 
-    private val tokensDataConverter = TokensDataConverter(actions.onSearchEntered, actions.onTokenSelected)
+    private val tokensDataConverter = TokensDataConverter(
+        onSearchEntered = actions.onSearchEntered,
+        onTokenSelected = actions.onTokenSelected,
+        isBalanceHiddenProvider = isBalanceHiddenProvider,
+    )
 
     fun createInitialLoadingState(initialCurrency: Currency, networkInfo: NetworkInfo): SwapStateHolder {
         return SwapStateHolder(
@@ -39,6 +44,7 @@ internal class StateBuilder(val actions: UiActions) {
                 canSelectAnotherToken = false,
                 isNotNativeToken = initialCurrency.isNonNative(),
                 balance = "",
+                isBalanceHidden = true,
             ),
             receiveCardData = SwapCardData(
                 type = TransactionCardType.ReceiveCard(),
@@ -50,12 +56,12 @@ internal class StateBuilder(val actions: UiActions) {
                 balance = "",
                 isNotNativeToken = false,
                 coinId = null,
+                isBalanceHidden = true,
             ),
             fee = FeeState.Loading,
             networkCurrency = networkInfo.blockchainCurrency,
             swapButton = SwapButton(enabled = false, loading = true, onClick = {}),
             onRefresh = {},
-            onSearchFocusChange = actions.onSearchFocusChange,
             onBackClicked = actions.onBackClicked,
             onChangeCardsClicked = actions.onChangeCardsClicked,
             onMaxAmountSelected = actions.onMaxAmountSelected,
@@ -84,6 +90,7 @@ internal class StateBuilder(val actions: UiActions) {
                 isNotNativeToken = fromToken.isNonNative(),
                 canSelectAnotherToken = canSelectSendToken,
                 balance = if (!canSelectSendToken) uiStateHolder.sendCardData.balance else "",
+                isBalanceHidden = isBalanceHiddenProvider(),
             ),
             receiveCardData = SwapCardData(
                 type = TransactionCardType.ReceiveCard(),
@@ -95,6 +102,7 @@ internal class StateBuilder(val actions: UiActions) {
                 isNotNativeToken = toToken.isNonNative(),
                 canSelectAnotherToken = canSelectReceiveToken,
                 balance = if (!canSelectReceiveToken) uiStateHolder.receiveCardData.balance else "",
+                isBalanceHidden = isBalanceHiddenProvider(),
             ),
             fee = FeeState.Loading,
             swapButton = SwapButton(enabled = false, loading = true, onClick = {}),
@@ -144,6 +152,7 @@ internal class StateBuilder(val actions: UiActions) {
                 tokenCurrency = uiStateHolder.sendCardData.tokenCurrency,
                 canSelectAnotherToken = uiStateHolder.sendCardData.canSelectAnotherToken,
                 balance = quoteModel.fromTokenInfo.tokenWalletBalance,
+                isBalanceHidden = isBalanceHiddenProvider(),
             ),
             receiveCardData = SwapCardData(
                 type = TransactionCardType.ReceiveCard(),
@@ -155,6 +164,7 @@ internal class StateBuilder(val actions: UiActions) {
                 tokenCurrency = uiStateHolder.receiveCardData.tokenCurrency,
                 canSelectAnotherToken = uiStateHolder.receiveCardData.canSelectAnotherToken,
                 balance = quoteModel.toTokenInfo.tokenWalletBalance,
+                isBalanceHidden = isBalanceHiddenProvider(),
             ),
             networkCurrency = quoteModel.networkCurrency,
             warnings = warnings,
@@ -192,6 +202,7 @@ internal class StateBuilder(val actions: UiActions) {
                 tokenCurrency = uiStateHolder.sendCardData.tokenCurrency,
                 canSelectAnotherToken = uiStateHolder.sendCardData.canSelectAnotherToken,
                 balance = emptyAmountState.fromTokenWalletBalance,
+                isBalanceHidden = isBalanceHiddenProvider(),
             ),
             receiveCardData = SwapCardData(
                 type = TransactionCardType.ReceiveCard(),
@@ -203,6 +214,7 @@ internal class StateBuilder(val actions: UiActions) {
                 tokenCurrency = uiStateHolder.receiveCardData.tokenCurrency,
                 canSelectAnotherToken = uiStateHolder.receiveCardData.canSelectAnotherToken,
                 balance = emptyAmountState.toTokenWalletBalance,
+                isBalanceHidden = isBalanceHiddenProvider(),
             ),
             warnings = emptyList(),
             fee = FeeState.Empty,
@@ -254,6 +266,28 @@ internal class StateBuilder(val actions: UiActions) {
         )
     }
 
+    fun updateBalanceHiddenState(uiState: SwapStateHolder, isBalanceHidden: Boolean): SwapStateHolder {
+        val patchedSendCardData = uiState.sendCardData.copy(
+            isBalanceHidden = isBalanceHidden,
+        )
+        val patchedReceiveCardData = uiState.receiveCardData.copy(
+            isBalanceHidden = isBalanceHidden,
+        )
+        val selectTokenState = uiState.selectTokenState?.copy(
+            addedTokens = uiState.selectTokenState.addedTokens.map {
+                it.copy(
+                    addedTokenBalanceData = it.addedTokenBalanceData?.copy(isBalanceHidden = isBalanceHidden),
+                )
+            },
+        )
+
+        return uiState.copy(
+            sendCardData = patchedSendCardData,
+            receiveCardData = patchedReceiveCardData,
+            selectTokenState = selectTokenState,
+        )
+    }
+
     fun updateApproveType(uiState: SwapStateHolder, approveType: ApproveType): SwapStateHolder {
         return if (uiState.permissionState is SwapPermissionState.ReadyForRequest) {
             uiState.copy(
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreen.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreen.kt
index 9c43985c64..bfd13ad8c8 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreen.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreen.kt
@@ -5,11 +5,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.ModalBottomSheetLayout
-import androidx.compose.material.ModalBottomSheetState
-import androidx.compose.material.ModalBottomSheetValue
-import androidx.compose.material.rememberModalBottomSheetState
+import androidx.compose.material.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.rememberCoroutineScope
@@ -38,51 +34,50 @@ internal fun SwapScreen(stateHolder: SwapStateHolder) {
         },
     )
 
-    TangemTheme {
-        ModalBottomSheetLayout(
-            modifier = Modifier.systemBarsPadding(),
-            sheetContent = {
-                if (stateHolder.permissionState is SwapPermissionState.ReadyForRequest) {
-                    SwapPermissionBottomSheetContent(
-                        data = stateHolder.permissionState,
-                        onCancel = {
-                            hideBottomSheet(coroutineScope, stateHolder, bottomSheetState)
-                        },
-                    )
-                } else {
-                    // Required "else" block to prevent compose crash
-                    // always close BS if its empty, cause user should not see this
-                    LaunchedEffect(Unit) {
-                        coroutineScope.launch { bottomSheetState.hide() }
-                    }
-                    Box(modifier = Modifier.fillMaxSize())
-                }
-            },
-            sheetState = bottomSheetState,
-            sheetShape = RoundedCornerShape(
-                topStart = TangemTheme.dimens.radius16,
-                topEnd = TangemTheme.dimens.radius16,
-            ),
-            sheetElevation = TangemTheme.dimens.elevation24,
-            content = {
-                SwapScreenContent(
-                    state = stateHolder,
-                    onPermissionWarningClick = {
-                        val isBottomSheetReady = !bottomSheetState.isVisible &&
-                            stateHolder.permissionState is SwapPermissionState.ReadyForRequest
-                        coroutineScope.launch {
-                            if (isBottomSheetReady) {
-                                bottomSheetState.show()
-                                stateHolder.onShowPermissionBottomSheet.invoke()
-                            } else {
-                                bottomSheetState.hide()
-                            }
-                        }
+    ModalBottomSheetLayout(
+        modifier = Modifier.systemBarsPadding(),
+        sheetContent = {
+            if (stateHolder.permissionState is SwapPermissionState.ReadyForRequest) {
+                SwapPermissionBottomSheetContent(
+                    data = stateHolder.permissionState,
+                    onCancel = {
+                        hideBottomSheet(coroutineScope, stateHolder, bottomSheetState)
                     },
                 )
-            },
-        )
-    }
+            } else {
+                // Required "else" block to prevent compose crash
+                // always close BS if its empty, cause user should not see this
+                LaunchedEffect(Unit) {
+                    coroutineScope.launch { bottomSheetState.hide() }
+                }
+                Box(modifier = Modifier.fillMaxSize())
+            }
+        },
+        sheetState = bottomSheetState,
+        sheetShape = RoundedCornerShape(
+            topStart = TangemTheme.dimens.radius16,
+            topEnd = TangemTheme.dimens.radius16,
+        ),
+        sheetElevation = TangemTheme.dimens.elevation24,
+        scrimColor = TangemTheme.colors.background.secondary.copy(alpha = 0.4f),
+        content = {
+            SwapScreenContent(
+                state = stateHolder,
+                onPermissionWarningClick = {
+                    val isBottomSheetReady = !bottomSheetState.isVisible &&
+                        stateHolder.permissionState is SwapPermissionState.ReadyForRequest
+                    coroutineScope.launch {
+                        if (isBottomSheetReady) {
+                            bottomSheetState.show()
+                            stateHolder.onShowPermissionBottomSheet.invoke()
+                        } else {
+                            bottomSheetState.hide()
+                        }
+                    }
+                },
+            )
+        },
+    )
 }
 
 @OptIn(ExperimentalMaterialApi::class)
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt
index acad315b28..703f7bb82c 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt
@@ -17,6 +17,7 @@ import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.constraintlayout.compose.ConstraintLayout
+import com.tangem.common.Strings.STARS
 import com.tangem.core.ui.components.*
 import com.tangem.core.ui.components.appbar.AppBarWithBackButton
 import com.tangem.core.ui.components.states.Item
@@ -143,7 +144,11 @@ private fun MainInfo(state: SwapStateHolder) {
         val priceImpactWarning = state.warnings.filterIsInstance<SwapWarning.HighPriceImpact>().firstOrNull()
         TransactionCard(
             type = state.sendCardData.type,
-            balance = state.sendCardData.balance,
+            balance = if (state.sendCardData.isBalanceHidden) {
+                STARS
+            } else {
+                state.sendCardData.balance
+            },
             textFieldValue = state.sendCardData.amountTextFieldValue,
             amountEquivalent = state.sendCardData.amountEquivalent,
             tokenIconUrl = state.sendCardData.tokenIconUrl,
@@ -151,7 +156,7 @@ private fun MainInfo(state: SwapStateHolder) {
             priceImpact = priceImpactWarning,
             networkIconRes = if (state.sendCardData.isNotNativeToken) networkIconRes else null,
             iconPlaceholder = state.sendCardData.coinId?.let {
-                getActiveIconResByCoinId(it, state.networkId)
+                getActiveIconResByCoinId(it)
             },
             onChangeTokenClick = if (state.sendCardData.canSelectAnotherToken) state.onSelectTokenClick else null,
             modifier = Modifier.constrainAs(topCard) {
@@ -161,7 +166,7 @@ private fun MainInfo(state: SwapStateHolder) {
         val marginCard = TangemTheme.dimens.spacing16
         TransactionCard(
             type = state.receiveCardData.type,
-            balance = state.receiveCardData.balance,
+            balance = if (state.receiveCardData.isBalanceHidden) STARS else state.receiveCardData.balance,
             textFieldValue = state.receiveCardData.amountTextFieldValue,
             amountEquivalent = state.receiveCardData.amountEquivalent,
             tokenIconUrl = state.receiveCardData.tokenIconUrl,
@@ -169,7 +174,7 @@ private fun MainInfo(state: SwapStateHolder) {
             priceImpact = priceImpactWarning,
             networkIconRes = if (state.receiveCardData.isNotNativeToken) networkIconRes else null,
             iconPlaceholder = state.receiveCardData.coinId?.let {
-                getActiveIconResByCoinId(it, state.networkId)
+                getActiveIconResByCoinId(it)
             },
             onChangeTokenClick = if (state.receiveCardData.canSelectAnotherToken) {
                 state.onSelectTokenClick
@@ -288,10 +293,11 @@ private fun SwapWarnings(warnings: List<SwapWarning>) {
                             warning.tokenCurrency,
                         ),
                         icon = {
-                            Image(
+                            Icon(
                                 painter = painterResource(id = com.tangem.core.ui.R.drawable.ic_locked_24),
                                 contentDescription = null,
                                 modifier = Modifier.size(TangemTheme.dimens.size20),
+                                tint = TangemTheme.colors.icon.primary1,
                             )
                         },
                     )
@@ -326,16 +332,8 @@ private fun SwapWarnings(warnings: List<SwapWarning>) {
 
 @Composable
 private fun MainButton(state: SwapStateHolder, onPermissionWarningClick: () -> Unit) {
+    // order is important
     when {
-        state.warnings.any { it is SwapWarning.PermissionNeeded } -> {
-            PrimaryButton(
-                modifier = Modifier.fillMaxWidth(),
-                text = stringResource(id = R.string.swapping_give_permission),
-                enabled = true,
-                showProgress = state.swapButton.loading,
-                onClick = onPermissionWarningClick,
-            )
-        }
         state.warnings.any { it is SwapWarning.InsufficientFunds } -> {
             PrimaryButton(
                 modifier = Modifier.fillMaxWidth(),
@@ -345,6 +343,15 @@ private fun MainButton(state: SwapStateHolder, onPermissionWarningClick: () -> U
                 onClick = state.swapButton.onClick,
             )
         }
+        state.warnings.any { it is SwapWarning.PermissionNeeded } -> {
+            PrimaryButton(
+                modifier = Modifier.fillMaxWidth(),
+                text = stringResource(id = R.string.swapping_give_permission),
+                enabled = true,
+                showProgress = state.swapButton.loading,
+                onClick = onPermissionWarningClick,
+            )
+        }
         else -> {
             PrimaryButtonIconEnd(
                 modifier = Modifier.fillMaxWidth(),
@@ -370,6 +377,7 @@ private val sendCard = SwapCardData(
     canSelectAnotherToken = false,
     balance = "123",
     coinId = "",
+    isBalanceHidden = false,
 )
 
 private val receiveCard = SwapCardData(
@@ -382,6 +390,7 @@ private val receiveCard = SwapCardData(
     canSelectAnotherToken = true,
     balance = "33333",
     coinId = "",
+    isBalanceHidden = false,
 )
 
 val stateSelectable = SelectableItemsState(
@@ -445,8 +454,6 @@ private val state = SwapStateHolder(
     onChangeCardsClicked = {},
     permissionState = SwapPermissionState.InProgress,
     blockchainId = "POLYGON",
-    onSearchFocusChange = {},
-    // alert = SwapWarning.GenericWarning("There was an error. Please try again.") {},
 )
 
 @Preview
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt
index ad9b5d8d2c..566447924f 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt
@@ -5,18 +5,20 @@ import androidx.annotation.StringRes
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Divider
 import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.ColorMatrix
+import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -24,54 +26,51 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import coil.compose.SubcomposeAsyncImage
 import coil.request.ImageRequest
+import com.tangem.common.Strings
+import com.tangem.core.ui.components.CircleShimmer
 import com.tangem.core.ui.components.CurrencyPlaceholderIcon
 import com.tangem.core.ui.components.SpacerW2
 import com.tangem.core.ui.components.appbar.ExpandableSearchView
 import com.tangem.core.ui.extensions.getActiveIconRes
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.utils.ImageBackgroundContrastChecker
 import com.tangem.feature.swap.models.Network
 import com.tangem.feature.swap.models.SwapSelectTokenStateHolder
 import com.tangem.feature.swap.models.TokenBalanceData
 import com.tangem.feature.swap.models.TokenToSelect
 import com.tangem.feature.swap.presentation.R
-import com.valentinilk.shimmer.shimmer
+import kotlinx.coroutines.launch
 
 @Composable
-fun SwapSelectTokenScreen(
-    state: SwapSelectTokenStateHolder,
-    onSearchFocusChange: (Boolean) -> Unit,
-    onBack: () -> Unit,
-) {
-    TangemTheme {
-        Scaffold(
-            modifier = Modifier
-                .systemBarsPadding()
-                .background(color = TangemTheme.colors.background.secondary),
-            content = { padding ->
-                ListOfTokens(state = state, Modifier.padding(padding))
-            },
-            topBar = {
-                ExpandableSearchView(
-                    title = stringResource(R.string.swapping_token_list_title),
-                    onBackClick = onBack,
-                    placeholderSearchText = stringResource(id = R.string.common_search_tokens),
-                    onSearchChange = state.onSearchEntered,
-                    onSearchDisplayClose = { state.onSearchEntered("") },
-                    onFocusChange = onSearchFocusChange,
-                    subtitle = state.network.name,
-                    icon = painterResource(id = getActiveIconRes(state.network.blockchainId)),
-                )
-            },
-        )
-    }
+fun SwapSelectTokenScreen(state: SwapSelectTokenStateHolder, onBack: () -> Unit) {
+    Scaffold(
+        modifier = Modifier
+            .systemBarsPadding()
+            .background(color = TangemTheme.colors.background.secondary),
+        content = { padding ->
+            ListOfTokens(state = state, Modifier.padding(padding))
+        },
+        topBar = {
+            ExpandableSearchView(
+                title = stringResource(R.string.swapping_token_list_title),
+                onBackClick = onBack,
+                placeholderSearchText = stringResource(id = R.string.common_search_tokens),
+                onSearchChange = state.onSearchEntered,
+                onSearchDisplayClose = { state.onSearchEntered("") },
+                subtitle = state.network.name,
+                icon = painterResource(id = getActiveIconRes(state.network.blockchainId)),
+            )
+        },
+    )
 }
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 private fun ListOfTokens(state: SwapSelectTokenStateHolder, modifier: Modifier = Modifier) {
+    val screenBackgroundColor = TangemTheme.colors.background.secondary
     LazyColumn(
         modifier = modifier
-            .background(color = TangemTheme.colors.background.secondary)
+            .background(color = screenBackgroundColor)
             .fillMaxWidth(),
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
@@ -80,7 +79,15 @@ private fun ListOfTokens(state: SwapSelectTokenStateHolder, modifier: Modifier =
         }
 
         itemsIndexed(items = state.addedTokens) { index, item ->
-            TokenItem(token = item, network = state.network, onTokenClick = { state.onTokenSelected(item.id) })
+            TokenItem(
+                token = item,
+                network = state.network,
+                screenBackgroundColor = screenBackgroundColor,
+                onTokenClick = {
+                    state
+                        .onTokenSelected(item.id)
+                },
+            )
 
             if (index != state.addedTokens.lastIndex) {
                 Divider(
@@ -95,7 +102,12 @@ private fun ListOfTokens(state: SwapSelectTokenStateHolder, modifier: Modifier =
         }
 
         itemsIndexed(items = state.otherTokens) { index, item ->
-            TokenItem(token = item, network = state.network, onTokenClick = { state.onTokenSelected(item.id) })
+            TokenItem(
+                token = item,
+                network = state.network,
+                screenBackgroundColor = screenBackgroundColor,
+                onTokenClick = { state.onTokenSelected(item.id) },
+            )
             if (index != state.otherTokens.lastIndex) {
                 Divider(
                     color = TangemTheme.colors.stroke.primary,
@@ -124,7 +136,7 @@ private fun Header(@StringRes title: Int) {
 
 @Suppress("LongMethod")
 @Composable
-private fun TokenItem(token: TokenToSelect, network: Network, onTokenClick: () -> Unit) {
+private fun TokenItem(token: TokenToSelect, network: Network, screenBackgroundColor: Color, onTokenClick: () -> Unit) {
     Row(
         modifier = Modifier
             .fillMaxWidth()
@@ -137,6 +149,7 @@ private fun TokenItem(token: TokenToSelect, network: Network, onTokenClick: () -
     ) {
         TokenIcon(
             token = token,
+            screenBackgroundColor = screenBackgroundColor,
             iconPlaceholder = if (token.isNative) getActiveIconRes(network.blockchainId) else null,
         )
 
@@ -153,7 +166,7 @@ private fun TokenItem(token: TokenToSelect, network: Network, onTokenClick: () -
             SpacerW2()
             Text(
                 text = token.symbol,
-                style = TangemTheme.typography.caption,
+                style = TangemTheme.typography.caption2,
                 color = TangemTheme.colors.text.tertiary,
             )
         }
@@ -163,7 +176,7 @@ private fun TokenItem(token: TokenToSelect, network: Network, onTokenClick: () -
         if (!token.available) {
             Text(
                 text = stringResource(id = R.string.swapping_token_not_available),
-                style = TangemTheme.typography.caption,
+                style = TangemTheme.typography.caption2,
                 color = TangemTheme.colors.text.tertiary,
             )
         } else if (token.addedTokenBalanceData != null) {
@@ -173,14 +186,26 @@ private fun TokenItem(token: TokenToSelect, network: Network, onTokenClick: () -
                 modifier = Modifier.padding(start = TangemTheme.dimens.spacing8),
             ) {
                 Text(
-                    text = token.addedTokenBalanceData.amountEquivalent.orEmpty(),
+                    text = if (token.addedTokenBalanceData.isBalanceHidden &&
+                        !token.addedTokenBalanceData.amountEquivalent.isNullOrEmpty()
+                    ) {
+                        Strings.STARS
+                    } else {
+                        token.addedTokenBalanceData.amountEquivalent.orEmpty()
+                    },
                     style = TangemTheme.typography.subtitle1,
                     color = TangemTheme.colors.text.primary1,
                 )
                 SpacerW2()
                 Text(
-                    text = token.addedTokenBalanceData.amount.orEmpty(),
-                    style = TangemTheme.typography.caption,
+                    text = if (token.addedTokenBalanceData.isBalanceHidden &&
+                        !token.addedTokenBalanceData.amount.isNullOrEmpty()
+                    ) {
+                        Strings.STARS
+                    } else {
+                        token.addedTokenBalanceData.amount.orEmpty()
+                    },
+                    style = TangemTheme.typography.caption2,
                     color = TangemTheme.colors.text.tertiary,
                 )
             }
@@ -190,13 +215,21 @@ private fun TokenItem(token: TokenToSelect, network: Network, onTokenClick: () -
 
 @Suppress("MagicNumber")
 @Composable
-private fun TokenIcon(token: TokenToSelect, @DrawableRes iconPlaceholder: Int?) {
+private fun TokenIcon(token: TokenToSelect, screenBackgroundColor: Color, @DrawableRes iconPlaceholder: Int?) {
+    var iconBackgroundColor by remember { mutableStateOf(Color.Transparent) }
+    val isDarkTheme = isSystemInDarkTheme()
+    val coroutineScope = rememberCoroutineScope()
+
     val data = token.iconUrl.ifEmpty {
         iconPlaceholder
     }
     Box(
         modifier = Modifier
-            .padding(end = TangemTheme.dimens.spacing12),
+            .padding(end = TangemTheme.dimens.spacing12)
+            .background(
+                color = iconBackgroundColor,
+                shape = TangemTheme.shapes.roundedCorners8,
+            ),
     ) {
         val iconModifier = Modifier
             .size(TangemTheme.dimens.size40)
@@ -211,9 +244,22 @@ private fun TokenIcon(token: TokenToSelect, @DrawableRes iconPlaceholder: Int?)
             model = ImageRequest.Builder(LocalContext.current)
                 .data(data)
                 .crossfade(true)
-                .build(),
+                .allowHardware(false)
+                .listener(
+                    onSuccess = { _, result ->
+                        if (isDarkTheme) {
+                            coroutineScope.launch {
+                                val color = ImageBackgroundContrastChecker(
+                                    drawable = result.drawable,
+                                    backgroundColor = screenBackgroundColor.toArgb(),
+                                ).getContrastColorIfNeeded(isDarkTheme)
+                                iconBackgroundColor = color
+                            }
+                        }
+                    },
+                ).build(),
             contentDescription = token.id,
-            loading = { TokenImageShimmer(modifier = iconModifier) },
+            loading = { CircleShimmer(modifier = iconModifier) },
             error = { CurrencyPlaceholderIcon(modifier = iconModifier, id = token.id) },
             alpha = if (!token.available) 0.7f else 1f,
             colorFilter = colorFilter,
@@ -221,20 +267,6 @@ private fun TokenIcon(token: TokenToSelect, @DrawableRes iconPlaceholder: Int?)
     }
 }
 
-@Composable
-private fun TokenImageShimmer(modifier: Modifier = Modifier) {
-    Box(modifier = modifier.shimmer()) {
-        Box(
-            modifier = Modifier
-                .matchParentSize()
-                .background(
-                    color = TangemTheme.colors.button.secondary,
-                    shape = CircleShape,
-                ),
-        )
-    }
-}
-
 private val token = TokenToSelect(
     id = "",
     name = "USDC",
@@ -245,6 +277,7 @@ private val token = TokenToSelect(
         amount = "15 000 $",
         amountEquivalent = "15 000 " +
             "USDT",
+        isBalanceHidden = false,
     ),
 )
 
@@ -259,7 +292,6 @@ private fun TokenScreenPreview() {
             onTokenSelected = {},
             network = Network("Ethereum", "ETH"),
         ),
-        onSearchFocusChange = {},
         onBack = {},
     )
 }
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt
index 2d6f3e52b4..a05fbdb29b 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt
@@ -18,34 +18,32 @@ import com.tangem.feature.swap.presentation.R
 
 @Composable
 fun SwapSuccessScreen(state: SwapSuccessStateHolder, onBack: () -> Unit) {
-    TangemTheme {
-        Scaffold(
-            modifier = Modifier.systemBarsPadding(),
-            content = { padding ->
-                ResultScreenContent(
-                    resultMessage = makeSuccessMessage(
-                        fromTokenAmount = state.fromTokenAmount,
-                        toTokenAmount = state.toTokenAmount,
-                    ),
-                    resultColor = TangemTheme.colors.icon.attention,
-                    onButtonClick = onBack,
-                    icon = R.drawable.ic_clock_24,
-                    secondaryButtonIcon = R.drawable.ic_arrow_top_right_24,
-                    onSecondaryButtonClick = state.onSecondaryButtonClick,
-                    secondaryButtonText = R.string.swapping_success_view_explorer_button_title,
-                    title = R.string.swapping_success_view_title,
-                    modifier = Modifier.padding(padding),
-                )
-            },
-            topBar = {
-                AppBarWithBackButton(
-                    text = stringResource(R.string.common_swap),
-                    onBackClick = onBack,
-                    iconRes = R.drawable.ic_close_24,
-                )
-            },
-        )
-    }
+    Scaffold(
+        modifier = Modifier.systemBarsPadding(),
+        content = { padding ->
+            ResultScreenContent(
+                resultMessage = makeSuccessMessage(
+                    fromTokenAmount = state.fromTokenAmount,
+                    toTokenAmount = state.toTokenAmount,
+                ),
+                resultColor = TangemTheme.colors.icon.attention,
+                onButtonClick = onBack,
+                icon = R.drawable.ic_clock_24,
+                secondaryButtonIcon = R.drawable.ic_arrow_top_right_24,
+                onSecondaryButtonClick = state.onSecondaryButtonClick,
+                secondaryButtonText = R.string.swapping_success_view_explorer_button_title,
+                title = R.string.swapping_success_view_title,
+                modifier = Modifier.padding(padding),
+            )
+        },
+        topBar = {
+            AppBarWithBackButton(
+                text = stringResource(R.string.common_swap),
+                onBackClick = onBack,
+                iconRes = R.drawable.ic_close_24,
+            )
+        },
+    )
 }
 
 @Composable
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/TransactionCard.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/TransactionCard.kt
index 761a8f9448..bd57a551b1 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/TransactionCard.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/TransactionCard.kt
@@ -5,18 +5,8 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.defaultMinSize
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Card
@@ -24,11 +14,11 @@ import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.material.ripple.rememberRipple
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -38,21 +28,16 @@ import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import coil.compose.SubcomposeAsyncImage
 import coil.request.ImageRequest
 import com.tangem.core.ui.R
-import com.tangem.core.ui.components.FontSizeRange
-import com.tangem.core.ui.components.ResizableText
-import com.tangem.core.ui.components.SpacerH4
-import com.tangem.core.ui.components.SpacerH8
-import com.tangem.core.ui.components.SpacerW16
-import com.tangem.core.ui.components.SpacerW4
+import com.tangem.core.ui.components.*
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.utils.ImageBackgroundContrastChecker
 import com.tangem.feature.swap.models.SwapWarning
 import com.tangem.feature.swap.models.TransactionCardType
-import com.valentinilk.shimmer.shimmer
+import kotlinx.coroutines.launch
 
 @Suppress("LongParameterList")
 @Composable
@@ -156,14 +141,11 @@ private fun Header(type: TransactionCardType, balance: String, modifier: Modifie
                     .padding(top = TangemTheme.dimens.spacing2),
             )
         } else {
-            Box(
+            RectangleShimmer(
                 modifier = Modifier
-                    .size(width = TangemTheme.dimens.size80, height = TangemTheme.dimens.size12)
-                    .shimmer()
-                    .background(
-                        color = TangemTheme.colors.button.secondary,
-                        shape = RoundedCornerShape(TangemTheme.dimens.radius3),
-                    ),
+                    .width(TangemTheme.dimens.size80)
+                    .height(TangemTheme.dimens.size12),
+                radius = TangemTheme.dimens.radius3,
             )
         }
     }
@@ -206,15 +188,11 @@ private fun Content(
                             modifier = sumTextModifier,
                         )
                     } else {
-                        Box(
+                        RectangleShimmer(
                             modifier = Modifier
                                 .padding(vertical = TangemTheme.dimens.spacing4)
-                                .size(width = TangemTheme.dimens.size102, height = TangemTheme.dimens.size24)
-                                .shimmer()
-                                .background(
-                                    color = TangemTheme.colors.button.secondary,
-                                    shape = RoundedCornerShape(TangemTheme.dimens.radius6),
-                                ),
+                                .width(TangemTheme.dimens.size102)
+                                .height(TangemTheme.dimens.size24),
                         )
                     }
                 }
@@ -260,15 +238,12 @@ private fun Content(
                     )
                 }
             } else {
-                Box(
+                RectangleShimmer(
                     modifier = Modifier
                         .padding(vertical = TangemTheme.dimens.spacing4)
-                        .size(width = TangemTheme.dimens.size40, height = TangemTheme.dimens.size12)
-                        .shimmer()
-                        .background(
-                            color = TangemTheme.colors.button.secondary,
-                            shape = RoundedCornerShape(TangemTheme.dimens.radius3),
-                        ),
+                        .width(TangemTheme.dimens.size40)
+                        .height(TangemTheme.dimens.size12),
+                    radius = TangemTheme.dimens.radius3,
                 )
             }
         }
@@ -292,48 +267,13 @@ fun Token(
         verticalArrangement = Arrangement.Bottom,
         horizontalAlignment = Alignment.End,
     ) {
-        Box(
-            modifier = Modifier
-                .padding(end = TangemTheme.dimens.spacing16)
-                .size(TangemTheme.dimens.size42),
-        ) {
-            val tokenImageModifier = Modifier
-                .align(Alignment.BottomStart)
-                .size(TangemTheme.dimens.size36)
-
-            val data = tokenIconUrl.ifEmpty {
-                iconPlaceholder
-            }
-            SubcomposeAsyncImage(
-                modifier = tokenImageModifier,
-                model = ImageRequest.Builder(LocalContext.current)
-                    .data(data)
-                    .crossfade(true)
-                    .build(),
-                loading = { TokenImageShimmer(modifier = tokenImageModifier) },
-                // error = { CurrencyPlaceholderIcon(modifier = tokenImageModifier, tokenCurrency) },
-                contentDescription = tokenCurrency,
-            )
-
-            if (networkIconRes != null) {
-                Box(
-                    modifier = Modifier
-                        .align(Alignment.TopEnd)
-                        .size(TangemTheme.dimens.size18)
-                        .background(color = Color.White, shape = CircleShape),
-                    contentAlignment = Alignment.Center,
-                ) {
-                    Image(
-                        modifier = Modifier.padding(all = 0.5.dp),
-                        painter = painterResource(id = networkIconRes),
-                        contentDescription = null,
-                    )
-                }
-            }
-        }
-
+        TokenIcon(
+            tokenIconUrl = tokenIconUrl,
+            tokenCurrency = tokenCurrency,
+            iconPlaceholder = iconPlaceholder,
+            networkIconRes = networkIconRes,
+        )
         SpacerH4()
-
         Text(
             text = tokenCurrency,
             color = TangemTheme.colors.text.primary1,
@@ -345,6 +285,75 @@ fun Token(
     }
 }
 
+@Composable
+private fun TokenIcon(
+    tokenIconUrl: String,
+    tokenCurrency: String,
+    @DrawableRes iconPlaceholder: Int? = null,
+    @DrawableRes networkIconRes: Int? = null,
+) {
+    val itemBackgroundColor = TangemTheme.colors.background.primary.toArgb()
+    var iconBackgroundColor by remember { mutableStateOf(Color.Transparent) }
+    val isDarkTheme = isSystemInDarkTheme()
+    val coroutineScope = rememberCoroutineScope()
+
+    Box(
+        modifier = Modifier
+            .padding(end = TangemTheme.dimens.spacing16)
+            .size(TangemTheme.dimens.size42),
+    ) {
+        val tokenImageModifier = Modifier
+            .align(Alignment.BottomStart)
+            .size(TangemTheme.dimens.size36)
+            .background(
+                color = iconBackgroundColor,
+                shape = TangemTheme.shapes.roundedCorners8,
+            )
+
+        val data = tokenIconUrl.ifEmpty {
+            iconPlaceholder
+        }
+        SubcomposeAsyncImage(
+            modifier = tokenImageModifier,
+            model = ImageRequest.Builder(LocalContext.current)
+                .data(data)
+                .crossfade(true)
+                .allowHardware(false)
+                .listener(
+                    onSuccess = { _, result ->
+                        if (isDarkTheme) {
+                            coroutineScope.launch {
+                                val color = ImageBackgroundContrastChecker(
+                                    drawable = result.drawable,
+                                    backgroundColor = itemBackgroundColor,
+                                ).getContrastColorIfNeeded(isDarkTheme)
+                                iconBackgroundColor = color
+                            }
+                        }
+                    },
+                ).build(),
+            loading = { CircleShimmer(modifier = tokenImageModifier) },
+            contentDescription = tokenCurrency,
+        )
+
+        if (networkIconRes != null) {
+            Box(
+                modifier = Modifier
+                    .align(Alignment.TopEnd)
+                    .size(TangemTheme.dimens.size18)
+                    .background(color = TangemTheme.colors.background.primary, shape = CircleShape),
+                contentAlignment = Alignment.Center,
+            ) {
+                Image(
+                    modifier = Modifier.padding(all = TangemTheme.dimens.spacing0_5),
+                    painter = painterResource(id = networkIconRes),
+                    contentDescription = null,
+                )
+            }
+        }
+    }
+}
+
 @Composable
 fun ChangeTokenSelector() {
     Box(
@@ -378,20 +387,6 @@ private fun makePriceImpactBalanceWarning(value: String, priceImpactPercents: In
     }
 }
 
-@Composable
-private fun TokenImageShimmer(modifier: Modifier = Modifier) {
-    Box(modifier = modifier.shimmer()) {
-        Box(
-            modifier = Modifier
-                .matchParentSize()
-                .background(
-                    color = TangemTheme.colors.button.secondary,
-                    shape = CircleShape,
-                ),
-        )
-    }
-}
-
 // region preview
 
 @Preview(widthDp = 328, heightDp = 116, showBackground = true)
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
index e7a96cac0c..bfa7961c03 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
@@ -3,11 +3,13 @@ package com.tangem.feature.swap.viewmodels
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import androidx.lifecycle.SavedStateHandle
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.*
+import com.tangem.common.Provider
 import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.core.ui.utils.InputNumberFormatter
+import com.tangem.domain.balancehiding.IsBalanceHiddenUseCase
+import com.tangem.domain.balancehiding.ListenToFlipsUseCase
+import com.tangem.domain.tokens.model.Network
 import com.tangem.feature.swap.analytics.SwapEvents
 import com.tangem.feature.swap.domain.BlockchainInteractor
 import com.tangem.feature.swap.domain.SwapInteractor
@@ -27,41 +29,52 @@ import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import com.tangem.utils.coroutines.Debouncer
 import com.tangem.utils.coroutines.runCatching
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
-import kotlinx.serialization.decodeFromString
+import kotlinx.coroutines.withContext
 import kotlinx.serialization.json.Json
 import timber.log.Timber
 import java.text.DecimalFormat
 import java.text.NumberFormat
-import java.util.*
+import java.util.Locale
 import javax.inject.Inject
 import kotlin.properties.Delegates
 
-@Suppress("LargeClass")
+@Suppress("LargeClass", "LongParameterList")
 @HiltViewModel
 internal class SwapViewModel @Inject constructor(
     private val swapInteractor: SwapInteractor,
     private val blockchainInteractor: BlockchainInteractor,
     private val dispatchers: CoroutineDispatcherProvider,
     private val analyticsEventHandler: AnalyticsEventHandler,
+    private val isBalanceHiddenUseCase: IsBalanceHiddenUseCase,
+    private val listenToFlipsUseCase: ListenToFlipsUseCase,
     savedStateHandle: SavedStateHandle,
-) : ViewModel() {
+) : ViewModel(), DefaultLifecycleObserver {
 
     private val currency = Json.decodeFromString<Currency>(
         savedStateHandle[SwapFragment.CURRENCY_BUNDLE_KEY]
             ?: error("no expected parameter Currency found"),
     )
     private val derivationPath = savedStateHandle.get<String>(SwapFragment.DERIVATION_PATH)
+    private val network = savedStateHandle.get<Network>(SwapFragment.NETWORK)
+
+    private var isBalanceHidden = true
 
     private val stateBuilder = StateBuilder(
         actions = createUiActions(),
+        isBalanceHiddenProvider = Provider { isBalanceHidden },
     )
+
     private val inputNumberFormatter =
         InputNumberFormatter(NumberFormat.getInstance(Locale.getDefault()) as DecimalFormat)
     private val amountDebouncer = Debouncer()
     private val singleTaskScheduler = SingleTaskScheduler<SwapState>()
 
     private var dataState by mutableStateOf(SwapProcessDataState(networkId = currency.networkId))
+
     var uiState: SwapStateHolder by mutableStateOf(
         stateBuilder.createInitialLoadingState(
             initialCurrency = currency,
@@ -74,14 +87,32 @@ internal class SwapViewModel @Inject constructor(
     private var isOrderReversed = false
     private val lastAmount = mutableStateOf(INITIAL_AMOUNT)
     private var swapRouter: SwapRouter by Delegates.notNull()
-    var currentScreen = SwapNavScreen.Main
+    val currentScreen: SwapNavScreen
         get() = swapRouter.currentScreen
 
     init {
-        swapInteractor.initDerivationPath(derivationPath)
+        swapInteractor.initDerivationPathAndNetwork(derivationPath, network)
         initTokens(currency)
     }
 
+    override fun onCreate(owner: LifecycleOwner) {
+        isBalanceHiddenUseCase()
+            .flowWithLifecycle(owner.lifecycle)
+            .onEach { hidden ->
+                isBalanceHidden = hidden
+                withContext(dispatchers.main) {
+                    uiState = stateBuilder.updateBalanceHiddenState(uiState, isBalanceHidden)
+                }
+            }
+            .launchIn(viewModelScope)
+
+        viewModelScope.launch {
+            listenToFlipsUseCase()
+                .flowWithLifecycle(owner.lifecycle)
+                .collect()
+        }
+    }
+
     override fun onCleared() {
         singleTaskScheduler.cancelTask()
         super.onCleared()
@@ -328,6 +359,11 @@ internal class SwapViewModel @Inject constructor(
 
     private fun onTokenSelect(id: String) {
         val foundToken = swapInteractor.findTokenById(id)
+
+        analyticsEventHandler.send(
+            event = SwapEvents.SearchTokenClicked(currencySymbol = foundToken?.symbol),
+        )
+
         if (foundToken != null) {
             val fromToken: Currency
             val toToken: Currency
@@ -425,7 +461,16 @@ internal class SwapViewModel @Inject constructor(
             },
             onGivePermissionClick = {
                 givePermissionsToSwap()
-                analyticsEventHandler.send(SwapEvents.ButtonPermissionApproveClicked)
+                val sendTokenSymbol = dataState.fromCurrency?.symbol
+                val receiveTokenSymbol = dataState.toCurrency?.symbol
+                if (sendTokenSymbol != null && receiveTokenSymbol != null) {
+                    analyticsEventHandler.send(
+                        SwapEvents.ButtonPermissionApproveClicked(
+                            sendToken = sendTokenSymbol,
+                            receiveToken = receiveTokenSymbol,
+                        ),
+                    )
+                }
             },
             onChangeCardsClicked = {
                 onChangeCardsClicked()
@@ -440,11 +485,6 @@ internal class SwapViewModel @Inject constructor(
                 analyticsEventHandler.send(SwapEvents.ButtonPermissionCancelClicked)
             },
             onAmountSelected = { onAmountSelected(it) },
-            onSearchFocusChange = { focused ->
-                if (focused) {
-                    analyticsEventHandler.send(SwapEvents.SearchTokenClicked)
-                }
-            },
             onChangeApproveType = { approveType ->
                 uiState = stateBuilder.updateApproveType(uiState, approveType)
             },
diff --git a/features/swap/presentation/src/main/res/drawable-night/ill_one_inch_powered.webp b/features/swap/presentation/src/main/res/drawable-night/ill_one_inch_powered.webp
new file mode 100644
index 0000000000..329d1f977e
Binary files /dev/null and b/features/swap/presentation/src/main/res/drawable-night/ill_one_inch_powered.webp differ
diff --git a/features/tokendetails/api/build.gradle.kts b/features/tokendetails/api/build.gradle.kts
index b7c1f22eeb..26d2527cd2 100644
--- a/features/tokendetails/api/build.gradle.kts
+++ b/features/tokendetails/api/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(deps.plugins.android.library)
     alias(deps.plugins.kotlin.android)
+    id("kotlin-parcelize")
     id("configuration")
 }
 
@@ -9,6 +10,8 @@ android {
 }
 
 dependencies {
+    implementation(projects.domain.tokens.models)
+
     /** AndroidX */
     implementation(deps.androidx.fragment.ktx)
 }
\ No newline at end of file
diff --git a/features/tokendetails/api/src/main/kotlin/com/tangem/features/tokendetails/featuretoggles/TokenDetailsFeatureToggles.kt b/features/tokendetails/api/src/main/kotlin/com/tangem/features/tokendetails/featuretoggles/TokenDetailsFeatureToggles.kt
deleted file mode 100644
index 751dabea32..0000000000
--- a/features/tokendetails/api/src/main/kotlin/com/tangem/features/tokendetails/featuretoggles/TokenDetailsFeatureToggles.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.tangem.features.tokendetails.featuretoggles
-
-interface TokenDetailsFeatureToggles {
-    val isRedesignedScreenEnabled: Boolean
-}
\ No newline at end of file
diff --git a/features/tokendetails/api/src/main/kotlin/com/tangem/features/tokendetails/navigation/TokenDetailsRouter.kt b/features/tokendetails/api/src/main/kotlin/com/tangem/features/tokendetails/navigation/TokenDetailsRouter.kt
index 81dbc9eb69..a0f630c125 100644
--- a/features/tokendetails/api/src/main/kotlin/com/tangem/features/tokendetails/navigation/TokenDetailsRouter.kt
+++ b/features/tokendetails/api/src/main/kotlin/com/tangem/features/tokendetails/navigation/TokenDetailsRouter.kt
@@ -7,6 +7,7 @@ interface TokenDetailsRouter {
     fun getEntryFragment(): Fragment
 
     companion object {
-        const val SELECTED_CURRENCY_KEY = "selected_currency"
+        const val USER_WALLET_ID_KEY = "token_details_user_wallet_id"
+        const val CRYPTO_CURRENCY_KEY = "token_details_crypto_currency"
     }
 }
\ No newline at end of file
diff --git a/features/tokendetails/impl/build.gradle.kts b/features/tokendetails/impl/build.gradle.kts
index 1957acae29..c8d97e576c 100644
--- a/features/tokendetails/impl/build.gradle.kts
+++ b/features/tokendetails/impl/build.gradle.kts
@@ -27,6 +27,7 @@ dependencies {
     implementation(deps.compose.paging)
     implementation(deps.compose.ui)
     implementation(deps.compose.ui.tooling)
+    implementation(deps.compose.ui.utils)
 
     implementation(deps.arrow.core)
     implementation(deps.jodatime)
@@ -42,23 +43,28 @@ dependencies {
 
     /** Core modules */
     implementation(projects.common)
-    implementation(projects.core.featuretoggles)
     implementation(projects.core.navigation)
     implementation(projects.core.ui)
     implementation(projects.core.utils)
+    implementation(projects.core.analytics)
+    implementation(projects.core.analytics.models)
 
     /** Domain modules */
     implementation(projects.domain.appCurrency)
     implementation(projects.domain.appCurrency.models)
+    implementation(projects.domain.demo)
     implementation(projects.domain.legacy)
     implementation(projects.domain.models)
+    implementation(projects.domain.settings)
     implementation(projects.domain.tokens)
     implementation(projects.domain.tokens.models)
     implementation(projects.domain.txhistory)
     implementation(projects.domain.txhistory.models)
     implementation(projects.domain.wallets)
     implementation(projects.domain.wallets.models)
+    implementation(projects.domain.balanceHiding)
 
     /** Feature Apis */
     implementation(projects.features.tokendetails.api)
+    implementation(projects.features.send.api)
 }
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/di/TokenDetailsFeatureTogglesModule.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/di/TokenDetailsFeatureTogglesModule.kt
deleted file mode 100644
index 767b02d8a6..0000000000
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/di/TokenDetailsFeatureTogglesModule.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.tangem.feature.tokendetails.di
-
-import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
-import com.tangem.feature.tokendetails.featuretoggles.DefaultTokenDetailsFeatureToggles
-import com.tangem.features.tokendetails.featuretoggles.TokenDetailsFeatureToggles
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-internal object TokenDetailsFeatureTogglesModule {
-
-    @Provides
-    @Singleton
-    fun provideTokenDetailsFeatureToggles(featureTogglesManager: FeatureTogglesManager): TokenDetailsFeatureToggles {
-        return DefaultTokenDetailsFeatureToggles(featureTogglesManager = featureTogglesManager)
-    }
-}
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/featuretoggles/DefaultTokenDetailsFeatureToggles.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/featuretoggles/DefaultTokenDetailsFeatureToggles.kt
deleted file mode 100644
index 2ac8bd5fde..0000000000
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/featuretoggles/DefaultTokenDetailsFeatureToggles.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.tangem.feature.tokendetails.featuretoggles
-
-import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
-import com.tangem.features.tokendetails.featuretoggles.TokenDetailsFeatureToggles
-
-private const val REDESIGNED_TOKEN_DETAIL_SCREEN_ENABLED_KEY = "REDESIGNED_TOKEN_DETAIL_SCREEN_ENABLED"
-
-internal class DefaultTokenDetailsFeatureToggles(
-    private val featureTogglesManager: FeatureTogglesManager,
-) : TokenDetailsFeatureToggles {
-
-    override val isRedesignedScreenEnabled: Boolean
-        get() = featureTogglesManager.isFeatureEnabled(name = REDESIGNED_TOKEN_DETAIL_SCREEN_ENABLED_KEY)
-}
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/TokenDetailsPreviewData.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/TokenDetailsPreviewData.kt
index b4af868ab8..2a25900715 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/TokenDetailsPreviewData.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/TokenDetailsPreviewData.kt
@@ -1,42 +1,68 @@
 package com.tangem.feature.tokendetails.presentation.tokendetails
 
+import androidx.compose.ui.graphics.Color
 import com.tangem.core.ui.components.marketprice.MarketPriceBlockState
 import com.tangem.core.ui.components.transactions.state.TxHistoryState
-import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsBalanceBlockState
-import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsState
-import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsTopAppBarConfig
-import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenInfoBlockState
+import com.tangem.core.ui.event.consumedEvent
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.feature.tokendetails.presentation.tokendetails.state.*
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.components.TokenDetailsActionButton
+import com.tangem.feature.tokendetails.presentation.tokendetails.state.components.TokenDetailsPullToRefreshConfig
 import com.tangem.features.tokendetails.impl.R
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.flow.MutableStateFlow
 
 internal object TokenDetailsPreviewData {
 
-    val tokenDetailsTopAppBarConfig = TokenDetailsTopAppBarConfig(onBackClick = {}, onMoreClick = {})
+    val tokenDetailsTopAppBarConfig = TokenDetailsTopAppBarConfig(
+        onBackClick = {},
+        tokenDetailsAppBarMenuConfig = TokenDetailsAppBarMenuConfig(
+            persistentListOf(
+                TokenDetailsAppBarMenuConfig.MenuItem(
+                    title = TextReference.Res(id = R.string.token_details_hide_token),
+                    textColorProvider = { TangemTheme.colors.text.warning },
+                    onClick = { },
+                ),
+            ),
+        ),
+    )
 
     val tokenInfoBlockStateWithLongNameInMainCurrency = TokenInfoBlockState(
         name = "Stellar (XLM) with long name test",
-        iconUrl = "https://s3.eu-central-1.amazonaws.com/tangem.api/coins/large/stellar.png",
+        iconState = TokenInfoBlockState.IconState.CoinIcon(
+            url = "https://s3.eu-central-1.amazonaws.com/tangem.api/coins/large/stellar.png",
+            fallbackResId = R.drawable.img_stellar_22,
+            isGrayscale = false,
+        ),
         currency = TokenInfoBlockState.Currency.Native,
     )
     val tokenInfoBlockStateWithLongName = TokenInfoBlockState(
         name = "Tether (USDT) with long name test",
-        iconUrl = "https://s3.eu-central-1.amazonaws.com/tangem.api/coins/large/stellar.png",
+        iconState = TokenInfoBlockState.IconState.TokenIcon(
+            url = "https://s3.eu-central-1.amazonaws.com/tangem.api/coins/large/stellar.png",
+            fallbackTint = Color.Cyan,
+            fallbackBackground = Color.Blue,
+            isGrayscale = false,
+        ),
         currency = TokenInfoBlockState.Currency.Token(
-            networkName = "ERC20",
+            standardName = "ERC20",
             networkIcon = R.drawable.img_eth_22,
-            blockchainName = "Ethereum",
+            networkName = "Ethereum",
         ),
     )
 
     val tokenInfoBlockState = TokenInfoBlockState(
         name = "Tether USDT",
-        iconUrl = "https://s3.eu-central-1.amazonaws.com/tangem.api/coins/large/tether.png",
+        iconState = TokenInfoBlockState.IconState.CustomTokenIcon(
+            tint = Color.Green,
+            background = Color.Magenta,
+            isGrayscale = true,
+        ),
         currency = TokenInfoBlockState.Currency.Token(
-            networkName = "ERC20",
+            standardName = "ERC20",
             networkIcon = R.drawable.img_eth_22,
-            blockchainName = "Ethereum",
+            networkName = "Ethereum",
         ),
     )
 
@@ -55,17 +81,30 @@ internal object TokenDetailsPreviewData {
     )
     val balanceError = TokenDetailsBalanceBlockState.Error(actionButtons = actionButtons)
 
-    private val marketPriceLoading = MarketPriceBlockState.Loading(currencyName = "USDT")
+    private val marketPriceLoading = MarketPriceBlockState.Loading(currencySymbol = "USDT")
+
+    private val pullToRefreshConfig = TokenDetailsPullToRefreshConfig(
+        isRefreshing = false,
+        onRefresh = {},
+    )
 
     val tokenDetailsState = TokenDetailsState(
         topAppBarConfig = tokenDetailsTopAppBarConfig,
         tokenInfoBlockState = tokenInfoBlockState,
         tokenBalanceBlockState = balanceLoading,
         marketPriceBlockState = marketPriceLoading,
+        notifications = persistentListOf(),
         txHistoryState = TxHistoryState.Content(
             contentItems = MutableStateFlow(
                 value = TxHistoryState.getDefaultLoadingTransactions {},
             ),
         ),
+        dialogConfig = null,
+        pendingTxs = persistentListOf(),
+        pullToRefreshConfig = pullToRefreshConfig,
+        bottomSheetConfig = null,
+        isBalanceHidden = false,
+        isMarketPriceAvailable = false,
+        event = consumedEvent(),
     )
 }
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenDetailsAppBarMenuConfig.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenDetailsAppBarMenuConfig.kt
new file mode 100644
index 0000000000..4926ba0b4a
--- /dev/null
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenDetailsAppBarMenuConfig.kt
@@ -0,0 +1,14 @@
+package com.tangem.feature.tokendetails.presentation.tokendetails.state
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import com.tangem.core.ui.extensions.TextReference
+import kotlinx.collections.immutable.ImmutableList
+
+internal data class TokenDetailsAppBarMenuConfig(val items: ImmutableList<MenuItem>) {
+    data class MenuItem(
+        val title: TextReference,
+        val textColorProvider: @Composable () -> Color,
+        val onClick: () -> Unit,
+    )
+}
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenDetailsState.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenDetailsState.kt
index 7006b6c4ef..15f290adde 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenDetailsState.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenDetailsState.kt
@@ -1,12 +1,29 @@
 package com.tangem.feature.tokendetails.presentation.tokendetails.state
 
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
 import com.tangem.core.ui.components.marketprice.MarketPriceBlockState
+import com.tangem.core.ui.components.transactions.state.TransactionState
 import com.tangem.core.ui.components.transactions.state.TxHistoryState
+import com.tangem.core.ui.event.StateEvent
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.feature.tokendetails.presentation.tokendetails.state.components.TokenDetailsDialogConfig
+import com.tangem.feature.tokendetails.presentation.tokendetails.state.components.TokenDetailsNotification
+import com.tangem.feature.tokendetails.presentation.tokendetails.state.components.TokenDetailsPullToRefreshConfig
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.PersistentList
 
 internal data class TokenDetailsState(
     val topAppBarConfig: TokenDetailsTopAppBarConfig,
     val tokenInfoBlockState: TokenInfoBlockState,
     val tokenBalanceBlockState: TokenDetailsBalanceBlockState,
     val marketPriceBlockState: MarketPriceBlockState,
+    val notifications: ImmutableList<TokenDetailsNotification>,
+    val pendingTxs: PersistentList<TransactionState>,
     val txHistoryState: TxHistoryState,
+    val dialogConfig: TokenDetailsDialogConfig?,
+    val pullToRefreshConfig: TokenDetailsPullToRefreshConfig,
+    val bottomSheetConfig: TangemBottomSheetConfig?,
+    val isBalanceHidden: Boolean,
+    val isMarketPriceAvailable: Boolean,
+    val event: StateEvent<TextReference>,
 )
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenDetailsTopAppBarConfig.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenDetailsTopAppBarConfig.kt
index 8ed33f724b..88ecf53046 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenDetailsTopAppBarConfig.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenDetailsTopAppBarConfig.kt
@@ -1,6 +1,6 @@
 package com.tangem.feature.tokendetails.presentation.tokendetails.state
 
-data class TokenDetailsTopAppBarConfig(
+internal data class TokenDetailsTopAppBarConfig(
     val onBackClick: () -> Unit,
-    val onMoreClick: () -> Unit,
+    val tokenDetailsAppBarMenuConfig: TokenDetailsAppBarMenuConfig,
 )
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenInfoBlockState.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenInfoBlockState.kt
index ac4c80561c..7c1e1eda2b 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenInfoBlockState.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenInfoBlockState.kt
@@ -1,23 +1,52 @@
 package com.tangem.feature.tokendetails.presentation.tokendetails.state
 
 import androidx.annotation.DrawableRes
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.graphics.Color
 
-data class TokenInfoBlockState(
+internal data class TokenInfoBlockState(
     val name: String,
-    val iconUrl: String,
+    val iconState: IconState,
     val currency: Currency,
 ) {
+    @Immutable
     sealed class Currency {
         object Native : Currency()
 
         /**
-         * @param networkName - token standard. Samples: ERC20, BEP20, BEP2, TRC20 and etc.
-         * @param blockchainName - token's blockchain name. Ethereum, Tron and etc.
+         * @param standardName - token standard. Samples: ERC20, BEP20, BEP2, TRC20 and etc.
+         * @param networkName - token's network name.
+         * @param networkIcon - token's network icon.
          */
         data class Token(
+            val standardName: String,
             val networkName: String,
-            val blockchainName: String,
             @DrawableRes val networkIcon: Int,
         ) : Currency()
     }
+
+    @Immutable
+    sealed class IconState {
+
+        abstract val isGrayscale: Boolean
+
+        data class CoinIcon(
+            val url: String?,
+            @DrawableRes val fallbackResId: Int,
+            override val isGrayscale: Boolean,
+        ) : IconState()
+
+        data class TokenIcon(
+            val url: String?,
+            val fallbackTint: Color,
+            val fallbackBackground: Color,
+            override val isGrayscale: Boolean,
+        ) : IconState()
+
+        data class CustomTokenIcon(
+            val tint: Color,
+            val background: Color,
+            override val isGrayscale: Boolean,
+        ) : IconState()
+    }
 }
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/TokenDetailsDialogConfig.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/TokenDetailsDialogConfig.kt
new file mode 100644
index 0000000000..02fc3679f3
--- /dev/null
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/TokenDetailsDialogConfig.kt
@@ -0,0 +1,81 @@
+package com.tangem.feature.tokendetails.presentation.tokendetails.state.components
+
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.wrappedList
+import com.tangem.features.tokendetails.impl.R
+
+/**
+ * Wallet bottom sheet config
+ *
+ * @property isShow           flag that determine if bottom sheet is shown
+ * @property onDismissRequest lambda be invoked when bottom sheet is dismissed
+ * @property content          content config
+ */
+internal data class TokenDetailsDialogConfig(
+    val isShow: Boolean,
+    val onDismissRequest: () -> Unit,
+    val content: DialogContentConfig,
+) {
+
+    sealed class DialogContentConfig {
+
+        abstract val title: TextReference
+        abstract val message: TextReference
+        abstract val confirmButtonConfig: ButtonConfig
+        abstract val cancelButtonConfig: ButtonConfig?
+
+        data class ButtonConfig(
+            val text: TextReference,
+            val onClick: () -> Unit,
+            val warning: Boolean = false,
+        )
+
+        data class ConfirmHideConfig(
+            val currencySymbol: String,
+            val onConfirmClick: () -> Unit,
+            val onCancelClick: () -> Unit,
+        ) : DialogContentConfig() {
+            override val title: TextReference = TextReference.Res(
+                id = R.string.token_details_hide_alert_title,
+                formatArgs = wrappedList(currencySymbol),
+            )
+
+            override val message: TextReference = TextReference.Res(R.string.token_details_hide_alert_message)
+
+            override val cancelButtonConfig: ButtonConfig = ButtonConfig(
+                text = TextReference.Res(R.string.common_cancel),
+                onClick = onCancelClick,
+            )
+
+            override val confirmButtonConfig: ButtonConfig = ButtonConfig(
+                text = TextReference.Res(R.string.token_details_hide_alert_hide),
+                onClick = onConfirmClick,
+                warning = true,
+            )
+        }
+
+        data class HasLinkedTokensConfig(
+            val currencySymbol: String,
+            val networkName: String,
+            val onConfirmClick: () -> Unit,
+        ) : DialogContentConfig() {
+            override val title: TextReference = TextReference.Res(
+                id = R.string.token_details_unable_hide_alert_title,
+                formatArgs = wrappedList(currencySymbol),
+            )
+
+            override val message: TextReference = TextReference.Res(
+                id = R.string.token_details_unable_hide_alert_message,
+                formatArgs = wrappedList(currencySymbol, networkName),
+            )
+
+            override val cancelButtonConfig: ButtonConfig?
+                get() = null
+
+            override val confirmButtonConfig: ButtonConfig = ButtonConfig(
+                text = TextReference.Res(R.string.common_ok),
+                onClick = onConfirmClick,
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/TokenDetailsNotification.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/TokenDetailsNotification.kt
new file mode 100644
index 0000000000..c832472ce0
--- /dev/null
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/TokenDetailsNotification.kt
@@ -0,0 +1,112 @@
+package com.tangem.feature.tokendetails.presentation.tokendetails.state.components
+
+import androidx.compose.runtime.Immutable
+import com.tangem.core.ui.components.notifications.NotificationConfig
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.networkIconResId
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.core.ui.extensions.wrappedList
+import com.tangem.domain.tokens.model.warnings.CryptoCurrencyWarning
+import com.tangem.features.tokendetails.impl.R
+
+@Immutable
+internal sealed class TokenDetailsNotification(val config: NotificationConfig) {
+
+    sealed class Warning(
+        title: TextReference,
+        subtitle: TextReference,
+        iconResId: Int = R.drawable.img_attention_20,
+        buttonsState: NotificationConfig.ButtonsState? = null,
+    ) : TokenDetailsNotification(
+        config = NotificationConfig(
+            title = title,
+            subtitle = subtitle,
+            iconResId = iconResId,
+            buttonsState = buttonsState,
+        ),
+    )
+
+    sealed class Informational(
+        title: TextReference,
+        subtitle: TextReference,
+        onCloseClick: (() -> Unit)? = null,
+    ) : TokenDetailsNotification(
+        config = NotificationConfig(
+            title = title,
+            subtitle = subtitle,
+            iconResId = R.drawable.ic_alert_circle_24,
+            onCloseClick = onCloseClick,
+        ),
+    )
+
+    object NetworksUnreachable : Warning(
+        title = resourceReference(R.string.warning_network_unreachable_title),
+        subtitle = resourceReference(R.string.warning_network_unreachable_message),
+    )
+
+    data class NetworkFee(
+        private val feeInfo: CryptoCurrencyWarning.BalanceNotEnoughForFee,
+        private val onBuyClick: () -> Unit,
+    ) : Warning(
+        title = TextReference.Res(
+            id = R.string.warning_send_blocked_funds_for_fee_title,
+            formatArgs = wrappedList(feeInfo.blockchainFullName),
+        ),
+        subtitle = TextReference.Res(
+            id = R.string.warning_send_blocked_funds_for_fee_message,
+            formatArgs = wrappedList(
+                feeInfo.currency.name,
+                feeInfo.blockchainFullName,
+                feeInfo.currency.name,
+                feeInfo.blockchainFullName,
+                feeInfo.blockchainSymbol,
+            ),
+        ),
+        iconResId = feeInfo.currency.networkIconResId,
+        buttonsState = NotificationConfig.ButtonsState.SecondaryButtonConfig(
+            text = resourceReference(
+                id = R.string.common_buy_currency,
+                formatArgs = wrappedList(feeInfo.blockchainSymbol),
+            ),
+            onClick = onBuyClick,
+        ),
+    )
+
+    data class RentInfo(
+        private val rentInfo: CryptoCurrencyWarning.Rent,
+        private val onCloseClick: () -> Unit,
+    ) : Informational(
+        title = TextReference.Res(R.string.warning_rent_fee_title),
+        subtitle = TextReference.Res(
+            id = R.string.warning_solana_rent_fee_message,
+            formatArgs = wrappedList(rentInfo.rent, rentInfo.exemptionAmount),
+        ),
+        onCloseClick = onCloseClick,
+    )
+
+    data class ExistentialDeposit(
+        private val existentialInfo: CryptoCurrencyWarning.ExistentialDeposit,
+    ) : Informational(
+        title = resourceReference(R.string.warning_existential_deposit_title),
+        subtitle = TextReference.Res(
+            id = R.string.warning_existential_deposit_message,
+            formatArgs = wrappedList(existentialInfo.currencyName, existentialInfo.edStringValueWithSymbol),
+        ),
+    )
+
+    class NetworksNoAccount(val network: String, val symbol: String, val amount: String) : Informational(
+        title = resourceReference(R.string.warning_no_account_title),
+        subtitle = resourceReference(
+            id = R.string.no_account_generic,
+            formatArgs = wrappedList(network, amount, symbol),
+        ),
+    )
+
+    class HasPendingTransactions(val coinSymbol: String) : Informational(
+        title = resourceReference(R.string.warning_send_blocked_pending_transactions_title),
+        subtitle = resourceReference(
+            id = R.string.warning_send_blocked_pending_transactions_message,
+            formatArgs = wrappedList(coinSymbol),
+        ),
+    )
+}
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/TokenDetailsPullToRefreshConfig.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/TokenDetailsPullToRefreshConfig.kt
new file mode 100644
index 0000000000..5015995638
--- /dev/null
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/TokenDetailsPullToRefreshConfig.kt
@@ -0,0 +1,3 @@
+package com.tangem.feature.tokendetails.presentation.tokendetails.state.components
+
+data class TokenDetailsPullToRefreshConfig(val isRefreshing: Boolean, val onRefresh: () -> Unit)
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsActionButtonsConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsActionButtonsConverter.kt
index 3cd4b2e4de..ce22626609 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsActionButtonsConverter.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsActionButtonsConverter.kt
@@ -23,7 +23,7 @@ internal class TokenDetailsActionButtonsConverter(
 
     private fun List<TokenActionsState.ActionState>.mapToManageButtons(): ImmutableList<TokenDetailsActionButton> {
         return this
-            .map { action ->
+            .mapNotNull { action ->
                 when (action) {
                     is TokenActionsState.ActionState.Buy -> {
                         TokenDetailsActionButton.Buy(enabled = action.enabled, onClick = clickIntents::onBuyClick)
@@ -40,6 +40,9 @@ internal class TokenDetailsActionButtonsConverter(
                     is TokenActionsState.ActionState.Swap -> {
                         TokenDetailsActionButton.Swap(enabled = action.enabled, onClick = clickIntents::onSwapClick)
                     }
+                    else -> {
+                        null
+                    }
                 }
             }
             .toImmutableList()
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsIconStateConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsIconStateConverter.kt
new file mode 100644
index 0000000000..c428da7cec
--- /dev/null
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsIconStateConverter.kt
@@ -0,0 +1,47 @@
+package com.tangem.feature.tokendetails.presentation.tokendetails.state.factory
+
+import com.tangem.core.ui.extensions.getTintForTokenIcon
+import com.tangem.core.ui.extensions.networkIconResId
+import com.tangem.core.ui.extensions.tryGetBackgroundForTokenIcon
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenInfoBlockState
+import com.tangem.utils.converter.Converter
+
+internal class TokenDetailsIconStateConverter : Converter<CryptoCurrency, TokenInfoBlockState.IconState> {
+
+    override fun convert(value: CryptoCurrency): TokenInfoBlockState.IconState {
+        return when (value) {
+            is CryptoCurrency.Coin -> getIconStateForCoin(value)
+            is CryptoCurrency.Token -> getIconStateForToken(value)
+        }
+    }
+
+    private fun getIconStateForCoin(coin: CryptoCurrency.Coin): TokenInfoBlockState.IconState.CoinIcon {
+        return TokenInfoBlockState.IconState.CoinIcon(
+            url = coin.iconUrl,
+            fallbackResId = coin.networkIconResId,
+            isGrayscale = coin.network.isTestnet,
+        )
+    }
+
+    private fun getIconStateForToken(token: CryptoCurrency.Token): TokenInfoBlockState.IconState {
+        val isGrayscale = token.network.isTestnet
+        val background = token.tryGetBackgroundForTokenIcon(isGrayscale)
+        val tint = getTintForTokenIcon(background)
+
+        return if (token.isCustom && token.iconUrl == null) {
+            TokenInfoBlockState.IconState.CustomTokenIcon(
+                tint = tint,
+                background = background,
+                isGrayscale = isGrayscale,
+            )
+        } else {
+            TokenInfoBlockState.IconState.TokenIcon(
+                url = token.iconUrl,
+                isGrayscale = isGrayscale,
+                fallbackTint = tint,
+                fallbackBackground = background,
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsLoadedBalanceConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsLoadedBalanceConverter.kt
index 19c2d0c8b4..5fefb9e7d5 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsLoadedBalanceConverter.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsLoadedBalanceConverter.kt
@@ -3,36 +3,54 @@ package com.tangem.feature.tokendetails.presentation.tokendetails.state.factory
 import arrow.core.Either
 import com.tangem.common.Provider
 import com.tangem.core.ui.components.marketprice.MarketPriceBlockState
-import com.tangem.core.ui.components.marketprice.PriceChangeConfig
+import com.tangem.core.ui.components.marketprice.PriceChangeState
+import com.tangem.core.ui.components.marketprice.PriceChangeType
 import com.tangem.core.ui.utils.BigDecimalFormatter
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.tokens.error.CurrencyStatusError
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsBalanceBlockState
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsState
+import com.tangem.feature.tokendetails.presentation.tokendetails.state.components.TokenDetailsNotification
+import com.tangem.feature.tokendetails.presentation.tokendetails.state.factory.txhistory.TokenDetailsTxHistoryToTransactionStateConverter
+import com.tangem.feature.tokendetails.presentation.tokendetails.viewmodels.TokenDetailsClickIntents
 import com.tangem.utils.converter.Converter
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toPersistentList
 import java.math.BigDecimal
 
 internal class TokenDetailsLoadedBalanceConverter(
     private val currentStateProvider: Provider<TokenDetailsState>,
     private val appCurrencyProvider: Provider<AppCurrency>,
+    private val symbol: String,
+    private val decimals: Int,
+    private val clickIntents: TokenDetailsClickIntents,
 ) : Converter<Either<CurrencyStatusError, CryptoCurrencyStatus>, TokenDetailsState> {
 
+    private val txHistoryItemConverter by lazy {
+        TokenDetailsTxHistoryToTransactionStateConverter(symbol, decimals, clickIntents)
+    }
+
     override fun convert(value: Either<CurrencyStatusError, CryptoCurrencyStatus>): TokenDetailsState {
         return value.fold(ifLeft = { convertError() }, ifRight = ::convert)
     }
 
     private fun convertError(): TokenDetailsState {
-        // TODO:  [REDACTED_JIRA]
-        return currentStateProvider()
+        val state = currentStateProvider()
+        return state.copy(
+            tokenBalanceBlockState = TokenDetailsBalanceBlockState.Error(state.tokenBalanceBlockState.actionButtons),
+            marketPriceBlockState = MarketPriceBlockState.Error(state.marketPriceBlockState.currencySymbol),
+            notifications = persistentListOf(TokenDetailsNotification.NetworksUnreachable),
+        )
     }
 
     private fun convert(status: CryptoCurrencyStatus): TokenDetailsState {
         val state = currentStateProvider()
-        val currencyName = state.marketPriceBlockState.currencyName
+        val currencyName = state.marketPriceBlockState.currencySymbol
         return state.copy(
             tokenBalanceBlockState = getBalanceState(state.tokenBalanceBlockState, status),
-            marketPriceBlockState = getMarketPriceState(status = status.value, currencyName = currencyName),
+            marketPriceBlockState = getMarketPriceState(status = status.value, currencySymbol = currencyName),
+            pendingTxs = status.value.pendingTransactions.map(txHistoryItemConverter::convert).toPersistentList(),
         )
     }
 
@@ -43,56 +61,49 @@ internal class TokenDetailsLoadedBalanceConverter(
         return when (status.value) {
             is CryptoCurrencyStatus.NoQuote,
             is CryptoCurrencyStatus.Loaded,
-            -> {
-                TokenDetailsBalanceBlockState.Content(
-                    actionButtons = currentState.actionButtons,
-                    fiatBalance = formatFiatAmount(status.value, appCurrencyProvider()),
-                    cryptoBalance = formatCryptoAmount(status),
-                )
-            }
-            is CryptoCurrencyStatus.Loading -> {
-                TokenDetailsBalanceBlockState.Loading(currentState.actionButtons)
-            }
-            is CryptoCurrencyStatus.MissedDerivation,
             is CryptoCurrencyStatus.NoAccount,
             is CryptoCurrencyStatus.Custom,
-            // TODO:  [REDACTED_JIRA]
+            -> TokenDetailsBalanceBlockState.Content(
+                actionButtons = currentState.actionButtons,
+                fiatBalance = formatFiatAmount(status.value, appCurrencyProvider()),
+                cryptoBalance = formatCryptoAmount(status),
+            )
+            is CryptoCurrencyStatus.Loading -> TokenDetailsBalanceBlockState.Loading(currentState.actionButtons)
+            is CryptoCurrencyStatus.MissedDerivation,
             is CryptoCurrencyStatus.Unreachable,
-            -> {
-                TokenDetailsBalanceBlockState.Error(currentState.actionButtons)
-            }
+            is CryptoCurrencyStatus.NoAmount,
+            -> TokenDetailsBalanceBlockState.Error(currentState.actionButtons)
         }
     }
 
-    private fun getMarketPriceState(status: CryptoCurrencyStatus.Status, currencyName: String): MarketPriceBlockState {
+    private fun getMarketPriceState(
+        status: CryptoCurrencyStatus.Status,
+        currencySymbol: String,
+    ): MarketPriceBlockState {
         return when (status) {
-            is CryptoCurrencyStatus.NoQuote,
+            is CryptoCurrencyStatus.Loading -> MarketPriceBlockState.Loading(currencySymbol)
+            is CryptoCurrencyStatus.NoQuote -> MarketPriceBlockState.Error(currencySymbol)
             is CryptoCurrencyStatus.Loaded,
+            is CryptoCurrencyStatus.Custom,
+            is CryptoCurrencyStatus.MissedDerivation,
+            is CryptoCurrencyStatus.NoAccount,
+            is CryptoCurrencyStatus.Unreachable,
+            is CryptoCurrencyStatus.NoAmount,
             -> MarketPriceBlockState.Content(
-                currencyName = currencyName,
+                currencySymbol = currencySymbol,
                 price = formatPrice(status, appCurrencyProvider()),
-                priceChangeConfig = PriceChangeConfig(
+                priceChangeConfig = PriceChangeState.Content(
                     valueInPercent = formatPriceChange(status),
                     type = getPriceChangeType(status),
                 ),
             )
-            is CryptoCurrencyStatus.Loading -> MarketPriceBlockState.Loading(currencyName)
-            is CryptoCurrencyStatus.Custom,
-            is CryptoCurrencyStatus.MissedDerivation,
-            is CryptoCurrencyStatus.NoAccount,
-            is CryptoCurrencyStatus.Unreachable,
-            -> MarketPriceBlockState.Error(currencyName)
         }
     }
 
-    private fun getPriceChangeType(status: CryptoCurrencyStatus.Status): PriceChangeConfig.Type {
-        val priceChange = status.priceChange ?: return PriceChangeConfig.Type.DOWN
+    private fun getPriceChangeType(status: CryptoCurrencyStatus.Status): PriceChangeType {
+        val priceChange = status.priceChange ?: return PriceChangeType.DOWN
 
-        return if (priceChange > BigDecimal.ZERO) {
-            PriceChangeConfig.Type.UP
-        } else {
-            PriceChangeConfig.Type.DOWN
-        }
+        return if (priceChange > BigDecimal.ZERO) PriceChangeType.UP else PriceChangeType.DOWN
     }
 
     private fun formatPriceChange(status: CryptoCurrencyStatus.Status): String {
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsNotificationConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsNotificationConverter.kt
new file mode 100644
index 0000000000..0f34733f00
--- /dev/null
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsNotificationConverter.kt
@@ -0,0 +1,50 @@
+package com.tangem.feature.tokendetails.presentation.tokendetails.state.factory
+
+import com.tangem.domain.tokens.model.warnings.CryptoCurrencyWarning
+import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsState
+import com.tangem.feature.tokendetails.presentation.tokendetails.state.components.TokenDetailsNotification
+import com.tangem.feature.tokendetails.presentation.tokendetails.viewmodels.TokenDetailsClickIntents
+import com.tangem.utils.converter.Converter
+import com.tangem.utils.extensions.removeBy
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
+
+internal class TokenDetailsNotificationConverter(
+    private val clickIntents: TokenDetailsClickIntents,
+) : Converter<Set<CryptoCurrencyWarning>, ImmutableList<TokenDetailsNotification>> {
+
+    override fun convert(value: Set<CryptoCurrencyWarning>): ImmutableList<TokenDetailsNotification> {
+        return value.map(::mapToNotification).toImmutableList()
+    }
+
+    fun removeRentInfo(currentState: TokenDetailsState): ImmutableList<TokenDetailsNotification> {
+        val newNotifications = currentState.notifications.toMutableList()
+        newNotifications.removeBy { it is TokenDetailsNotification.RentInfo }
+        return newNotifications.toImmutableList()
+    }
+
+    private fun mapToNotification(warning: CryptoCurrencyWarning): TokenDetailsNotification {
+        return when (warning) {
+            is CryptoCurrencyWarning.BalanceNotEnoughForFee -> TokenDetailsNotification.NetworkFee(
+                feeInfo = warning,
+                onBuyClick = clickIntents::onBuyClick,
+            )
+            is CryptoCurrencyWarning.ExistentialDeposit -> TokenDetailsNotification.ExistentialDeposit(
+                existentialInfo = warning,
+            )
+            is CryptoCurrencyWarning.Rent -> TokenDetailsNotification.RentInfo(
+                rentInfo = warning,
+                onCloseClick = clickIntents::onCloseRentInfoNotification,
+            )
+            CryptoCurrencyWarning.SomeNetworksUnreachable -> TokenDetailsNotification.NetworksUnreachable
+            is CryptoCurrencyWarning.SomeNetworksNoAccount -> TokenDetailsNotification.NetworksNoAccount(
+                network = warning.amountCurrency.name,
+                amount = warning.amountToCreateAccount.toString(),
+                symbol = warning.amountCurrency.symbol,
+            )
+            is CryptoCurrencyWarning.HasPendingTransactions -> TokenDetailsNotification.HasPendingTransactions(
+                coinSymbol = warning.blockchainSymbol,
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsRefreshStateConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsRefreshStateConverter.kt
new file mode 100644
index 0000000000..23c045fe3f
--- /dev/null
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsRefreshStateConverter.kt
@@ -0,0 +1,19 @@
+package com.tangem.feature.tokendetails.presentation.tokendetails.state.factory
+
+import com.tangem.common.Provider
+import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsState
+import com.tangem.utils.converter.Converter
+
+internal class TokenDetailsRefreshStateConverter(
+    private val currentStateProvider: Provider<TokenDetailsState>,
+) : Converter<Boolean, TokenDetailsState> {
+
+    override fun convert(value: Boolean): TokenDetailsState {
+        val state = currentStateProvider()
+        return state.createPullToRefresh(value)
+    }
+
+    private fun TokenDetailsState.createPullToRefresh(isRefreshing: Boolean): TokenDetailsState {
+        return copy(pullToRefreshConfig = pullToRefreshConfig.copy(isRefreshing = isRefreshing))
+    }
+}
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSkeletonStateConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSkeletonStateConverter.kt
index a02f4cc5fe..e92142e90c 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSkeletonStateConverter.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSkeletonStateConverter.kt
@@ -2,15 +2,16 @@ package com.tangem.feature.tokendetails.presentation.tokendetails.state.factory
 
 import com.tangem.core.ui.components.marketprice.MarketPriceBlockState
 import com.tangem.core.ui.components.transactions.state.TxHistoryState
-import com.tangem.core.ui.extensions.iconResId
-import com.tangem.domain.tokens.models.CryptoCurrency
-import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsBalanceBlockState
-import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsState
-import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsTopAppBarConfig
-import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenInfoBlockState
+import com.tangem.core.ui.event.consumedEvent
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.networkIconResId
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.feature.tokendetails.presentation.tokendetails.state.*
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.components.TokenDetailsActionButton
-import com.tangem.feature.tokendetails.presentation.tokendetails.state.factory.TokenDetailsSkeletonStateConverter.SkeletonModel
+import com.tangem.feature.tokendetails.presentation.tokendetails.state.components.TokenDetailsPullToRefreshConfig
 import com.tangem.feature.tokendetails.presentation.tokendetails.viewmodels.TokenDetailsClickIntents
+import com.tangem.features.tokendetails.impl.R
 import com.tangem.utils.converter.Converter
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
@@ -18,38 +19,56 @@ import kotlinx.coroutines.flow.MutableStateFlow
 
 internal class TokenDetailsSkeletonStateConverter(
     private val clickIntents: TokenDetailsClickIntents,
-) : Converter<SkeletonModel, TokenDetailsState> {
+) : Converter<CryptoCurrency, TokenDetailsState> {
 
-    override fun convert(value: SkeletonModel): TokenDetailsState {
+    private val iconStateConverter by lazy { TokenDetailsIconStateConverter() }
+
+    override fun convert(value: CryptoCurrency): TokenDetailsState {
         return TokenDetailsState(
             topAppBarConfig = TokenDetailsTopAppBarConfig(
                 onBackClick = clickIntents::onBackClick,
-                onMoreClick = clickIntents::onMoreClick,
+                tokenDetailsAppBarMenuConfig = createMenu(),
             ),
             tokenInfoBlockState = TokenInfoBlockState(
-                name = value.cryptoCurrency.name,
-                iconUrl = requireNotNull(value.cryptoCurrency.iconUrl),
-                currency = when (val currency = value.cryptoCurrency) {
+                name = value.name,
+                iconState = iconStateConverter.convert(value),
+                currency = when (value) {
                     is CryptoCurrency.Coin -> TokenInfoBlockState.Currency.Native
                     is CryptoCurrency.Token -> TokenInfoBlockState.Currency.Token(
-                        networkName = currency.network.standardType.name,
-                        blockchainName = currency.network.name,
-                        networkIcon = currency.iconResId,
+                        standardName = value.network.standardType.name,
+                        networkName = value.network.name,
+                        networkIcon = value.networkIconResId,
                     )
                 },
             ),
-            tokenBalanceBlockState = TokenDetailsBalanceBlockState.Loading(
-                actionButtons = createButtons(),
-            ),
-            marketPriceBlockState = MarketPriceBlockState.Loading(value.cryptoCurrency.name),
+            tokenBalanceBlockState = TokenDetailsBalanceBlockState.Loading(actionButtons = createButtons()),
+            marketPriceBlockState = MarketPriceBlockState.Loading(value.symbol),
+            notifications = persistentListOf(),
+            pendingTxs = persistentListOf(),
             txHistoryState = TxHistoryState.Content(
                 contentItems = MutableStateFlow(
                     value = TxHistoryState.getDefaultLoadingTransactions(clickIntents::onExploreClick),
                 ),
             ),
+            dialogConfig = null,
+            pullToRefreshConfig = createPullToRefresh(),
+            bottomSheetConfig = null,
+            isBalanceHidden = true,
+            isMarketPriceAvailable = value.id.rawCurrencyId != null,
+            event = consumedEvent(),
         )
     }
 
+    private fun createMenu(): TokenDetailsAppBarMenuConfig = TokenDetailsAppBarMenuConfig(
+        items = persistentListOf(
+            TokenDetailsAppBarMenuConfig.MenuItem(
+                title = TextReference.Res(id = R.string.token_details_hide_token),
+                textColorProvider = { TangemTheme.colors.text.warning },
+                onClick = clickIntents::onHideClick,
+            ),
+        ),
+    )
+
     private fun createButtons(): ImmutableList<TokenDetailsActionButton> {
         return persistentListOf(
             TokenDetailsActionButton.Buy(enabled = false, onClick = {}),
@@ -60,5 +79,8 @@ internal class TokenDetailsSkeletonStateConverter(
         )
     }
 
-    data class SkeletonModel(val cryptoCurrency: CryptoCurrency)
+    private fun createPullToRefresh(): TokenDetailsPullToRefreshConfig = TokenDetailsPullToRefreshConfig(
+        isRefreshing = false,
+        onRefresh = clickIntents::onRefreshSwipe,
+    )
 }
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStateFactory.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStateFactory.kt
index e0ad501d38..b8a29d17cb 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStateFactory.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStateFactory.kt
@@ -2,20 +2,33 @@ package com.tangem.feature.tokendetails.presentation.tokendetails.state.factory
 
 import androidx.paging.PagingData
 import arrow.core.Either
+import com.tangem.blockchain.common.address.Address
 import com.tangem.common.Provider
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
+import com.tangem.core.ui.components.bottomsheets.chooseaddress.ChooseAddressBottomSheetConfig
+import com.tangem.core.ui.components.bottomsheets.tokenreceive.AddressModel
+import com.tangem.core.ui.components.bottomsheets.tokenreceive.TokenReceiveBottomSheetConfig
+import com.tangem.core.ui.components.transactions.state.TxHistoryState
+import com.tangem.core.ui.event.consumedEvent
+import com.tangem.core.ui.event.triggeredEvent
+import com.tangem.core.ui.extensions.TextReference
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.tokens.error.CurrencyStatusError
+import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
 import com.tangem.domain.tokens.model.TokenActionsState
-import com.tangem.domain.tokens.models.CryptoCurrency
+import com.tangem.domain.tokens.model.warnings.CryptoCurrencyWarning
 import com.tangem.domain.txhistory.models.TxHistoryItem
 import com.tangem.domain.txhistory.models.TxHistoryListError
 import com.tangem.domain.txhistory.models.TxHistoryStateError
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsState
+import com.tangem.feature.tokendetails.presentation.tokendetails.state.components.TokenDetailsDialogConfig
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.factory.txhistory.TokenDetailsLoadedTxHistoryConverter
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.factory.txhistory.TokenDetailsLoadingTxHistoryConverter
 import com.tangem.feature.tokendetails.presentation.tokendetails.viewmodels.TokenDetailsClickIntents
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
 
 internal class TokenDetailsStateFactory(
     private val currentStateProvider: Provider<TokenDetailsState>,
@@ -29,10 +42,17 @@ internal class TokenDetailsStateFactory(
         TokenDetailsSkeletonStateConverter(clickIntents = clickIntents)
     }
 
+    private val notificationConverter by lazy {
+        TokenDetailsNotificationConverter(clickIntents = clickIntents)
+    }
+
     private val tokenDetailsLoadedBalanceConverter by lazy {
         TokenDetailsLoadedBalanceConverter(
             currentStateProvider = currentStateProvider,
             appCurrencyProvider = appCurrencyProvider,
+            symbol = symbol,
+            decimals = decimals,
+            clickIntents = clickIntents,
         )
     }
 
@@ -56,12 +76,16 @@ internal class TokenDetailsStateFactory(
         )
     }
 
-    fun getInitialState(cryptoCurrency: CryptoCurrency): TokenDetailsState {
-        return skeletonStateConverter.convert(
-            TokenDetailsSkeletonStateConverter.SkeletonModel(cryptoCurrency = cryptoCurrency),
+    private val refreshStateConverter by lazy {
+        TokenDetailsRefreshStateConverter(
+            currentStateProvider = currentStateProvider,
         )
     }
 
+    fun getInitialState(screenArgument: CryptoCurrency): TokenDetailsState {
+        return skeletonStateConverter.convert(value = screenArgument)
+    }
+
     fun getCurrencyLoadedBalanceState(
         cryptoCurrencyEither: Either<CurrencyStatusError, CryptoCurrencyStatus>,
     ): TokenDetailsState {
@@ -72,6 +96,16 @@ internal class TokenDetailsStateFactory(
         return tokenDetailsButtonsConverter.convert(actions)
     }
 
+    fun getLoadingTxHistoryState(): TokenDetailsState {
+        return currentStateProvider().copy(
+            txHistoryState = TxHistoryState.Content(
+                contentItems = MutableStateFlow(
+                    value = TxHistoryState.getDefaultLoadingTransactions(clickIntents::onExploreClick),
+                ),
+            ),
+        )
+    }
+
     fun getLoadingTxHistoryState(itemsCountEither: Either<TxHistoryStateError, Int>): TokenDetailsState {
         return loadingTransactionsStateConverter.convert(value = itemsCountEither)
     }
@@ -79,6 +113,135 @@ internal class TokenDetailsStateFactory(
     fun getLoadedTxHistoryState(
         txHistoryEither: Either<TxHistoryListError, Flow<PagingData<TxHistoryItem>>>,
     ): TokenDetailsState {
-        return loadedTxHistoryConverter.convert(txHistoryEither)
+        return currentStateProvider().copy(
+            txHistoryState = loadedTxHistoryConverter.convert(txHistoryEither),
+        )
+    }
+
+    fun getStateWithClosedDialog(): TokenDetailsState {
+        val state = currentStateProvider()
+        return state.copy(dialogConfig = state.dialogConfig?.copy(isShow = false))
+    }
+
+    fun getStateWithConfirmHideTokenDialog(currency: CryptoCurrency): TokenDetailsState {
+        return currentStateProvider().copy(
+            dialogConfig = TokenDetailsDialogConfig(
+                isShow = true,
+                onDismissRequest = clickIntents::onDismissDialog,
+                content = TokenDetailsDialogConfig.DialogContentConfig.ConfirmHideConfig(
+                    currencySymbol = currency.symbol,
+                    onConfirmClick = clickIntents::onHideConfirmed,
+                    onCancelClick = clickIntents::onDismissDialog,
+                ),
+            ),
+        )
+    }
+
+    fun getStateWithLinkedTokensDialog(currency: CryptoCurrency): TokenDetailsState {
+        return currentStateProvider().copy(
+            dialogConfig = TokenDetailsDialogConfig(
+                isShow = true,
+                onDismissRequest = clickIntents::onDismissDialog,
+                content = TokenDetailsDialogConfig.DialogContentConfig.HasLinkedTokensConfig(
+                    currencySymbol = currency.symbol,
+                    networkName = currency.network.name,
+                    onConfirmClick = clickIntents::onDismissDialog,
+                ),
+            ),
+        )
+    }
+
+    fun getRefreshingState(): TokenDetailsState {
+        return refreshStateConverter.convert(true)
+    }
+
+    fun getRefreshedState(): TokenDetailsState {
+        return refreshStateConverter.convert(false)
+    }
+
+    fun getStateWithReceiveBottomSheet(
+        currency: CryptoCurrency,
+        addresses: List<Address>,
+        sendCopyAnalyticsEvent: () -> Unit,
+        sendShareAnalyticsEvent: () -> Unit,
+    ): TokenDetailsState {
+        return currentStateProvider().copy(
+            bottomSheetConfig = TangemBottomSheetConfig(
+                isShow = true,
+                onDismissRequest = clickIntents::onDismissBottomSheet,
+                content = TokenReceiveBottomSheetConfig(
+                    name = currency.name,
+                    symbol = currency.symbol,
+                    network = currency.network.name,
+                    addresses = addresses.map {
+                        AddressModel(
+                            value = it.value,
+                            type = AddressModel.Type.valueOf(it.type.name),
+                        )
+                    },
+                    onCopyClick = sendCopyAnalyticsEvent,
+                    onShareClick = sendShareAnalyticsEvent,
+                ),
+            ),
+        )
+    }
+
+    fun getStateWithChooseAddressBottomSheet(addresses: List<Address>): TokenDetailsState {
+        return currentStateProvider().copy(
+            bottomSheetConfig = TangemBottomSheetConfig(
+                isShow = true,
+                onDismissRequest = clickIntents::onDismissBottomSheet,
+                content = ChooseAddressBottomSheetConfig(
+                    addressModels = addresses
+                        .map { address ->
+                            AddressModel(
+                                value = address.value,
+                                type = AddressModel.Type.valueOf(address.type.name),
+                            )
+                        }
+                        .toImmutableList(),
+                    onClick = clickIntents::onAddressTypeSelected,
+                ),
+            ),
+        )
+    }
+
+    fun getStateWithClosedBottomSheet(): TokenDetailsState {
+        val state = currentStateProvider()
+        return state.copy(
+            bottomSheetConfig = state.bottomSheetConfig?.copy(isShow = false),
+        )
+    }
+
+    fun getStateWithUpdatedHidden(isBalanceHidden: Boolean): TokenDetailsState {
+        val currentState = currentStateProvider()
+
+        return currentState.copy(isBalanceHidden = isBalanceHidden)
+    }
+
+    fun getStateWithNotifications(warnings: Set<CryptoCurrencyWarning>): TokenDetailsState {
+        val state = currentStateProvider()
+        return state.copy(notifications = notificationConverter.convert(warnings))
+    }
+
+    fun getStateWithRemovedRentNotification(): TokenDetailsState {
+        val state = currentStateProvider()
+        return state.copy(notifications = notificationConverter.removeRentInfo(state))
+    }
+
+    fun getStateAndTriggerEvent(
+        state: TokenDetailsState,
+        errorMessage: TextReference,
+        setUiState: (TokenDetailsState) -> Unit,
+    ): TokenDetailsState {
+        return state.copy(
+            event = triggeredEvent(
+                data = errorMessage,
+                onConsume = {
+                    val currentState = currentStateProvider()
+                    setUiState(currentState.copy(event = consumedEvent()))
+                },
+            ),
+        )
     }
 }
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/txhistory/TokenDetailsLoadedTxHistoryConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/txhistory/TokenDetailsLoadedTxHistoryConverter.kt
index f9146ee1d3..b5675ea9f0 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/txhistory/TokenDetailsLoadedTxHistoryConverter.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/txhistory/TokenDetailsLoadedTxHistoryConverter.kt
@@ -3,20 +3,20 @@ package com.tangem.feature.tokendetails.presentation.tokendetails.state.factory.
 import androidx.paging.PagingData
 import arrow.core.Either
 import com.tangem.common.Provider
-import com.tangem.core.ui.components.transactions.intents.TxHistoryClickIntents
 import com.tangem.core.ui.components.transactions.state.TxHistoryState
 import com.tangem.domain.txhistory.models.TxHistoryItem
 import com.tangem.domain.txhistory.models.TxHistoryListError
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsState
+import com.tangem.feature.tokendetails.presentation.tokendetails.viewmodels.TokenDetailsClickIntents
 import com.tangem.utils.converter.Converter
 import kotlinx.coroutines.flow.Flow
 
 internal class TokenDetailsLoadedTxHistoryConverter(
     private val currentStateProvider: Provider<TokenDetailsState>,
-    private val clickIntents: TxHistoryClickIntents,
+    private val clickIntents: TokenDetailsClickIntents,
     symbol: String,
     decimals: Int,
-) : Converter<Either<TxHistoryListError, Flow<PagingData<TxHistoryItem>>>, TokenDetailsState> {
+) : Converter<Either<TxHistoryListError, Flow<PagingData<TxHistoryItem>>>, TxHistoryState> {
 
     private val txHistoryItemFlowConverter by lazy {
         TokenDetailsTxHistoryItemFlowConverter(
@@ -27,23 +27,19 @@ internal class TokenDetailsLoadedTxHistoryConverter(
         )
     }
 
-    override fun convert(value: Either<TxHistoryListError, Flow<PagingData<TxHistoryItem>>>): TokenDetailsState {
+    override fun convert(value: Either<TxHistoryListError, Flow<PagingData<TxHistoryItem>>>): TxHistoryState {
         return value.fold(ifLeft = ::convertError, ifRight = ::convert)
     }
 
-    private fun convertError(error: TxHistoryListError): TokenDetailsState {
-        return currentStateProvider().copy(
-            txHistoryState = when (error) {
-                is TxHistoryListError.DataError -> {
-                    TxHistoryState.Error(onReloadClick = clickIntents::onReloadClick)
-                }
-            },
-        )
+    private fun convertError(error: TxHistoryListError): TxHistoryState {
+        return when (error) {
+            is TxHistoryListError.DataError -> {
+                TxHistoryState.Error(onReloadClick = clickIntents::onReloadClick)
+            }
+        }
     }
 
-    private fun convert(items: Flow<PagingData<TxHistoryItem>>): TokenDetailsState {
-        return currentStateProvider().copy(
-            txHistoryState = txHistoryItemFlowConverter.convert(value = items),
-        )
+    private fun convert(items: Flow<PagingData<TxHistoryItem>>): TxHistoryState {
+        return txHistoryItemFlowConverter.convert(value = items)
     }
 }
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/txhistory/TokenDetailsLoadingTxHistoryConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/txhistory/TokenDetailsLoadingTxHistoryConverter.kt
index 9f98c1ccf3..591a42c218 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/txhistory/TokenDetailsLoadingTxHistoryConverter.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/txhistory/TokenDetailsLoadingTxHistoryConverter.kt
@@ -3,17 +3,18 @@ package com.tangem.feature.tokendetails.presentation.tokendetails.state.factory.
 import androidx.paging.PagingData
 import arrow.core.Either
 import com.tangem.common.Provider
-import com.tangem.core.ui.components.transactions.intents.TxHistoryClickIntents
 import com.tangem.core.ui.components.transactions.state.TransactionState
 import com.tangem.core.ui.components.transactions.state.TxHistoryState
 import com.tangem.domain.txhistory.models.TxHistoryStateError
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsState
+import com.tangem.feature.tokendetails.presentation.tokendetails.viewmodels.TokenDetailsClickIntents
 import com.tangem.utils.converter.Converter
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update
 
 internal class TokenDetailsLoadingTxHistoryConverter(
     private val currentStateProvider: Provider<TokenDetailsState>,
-    private val clickIntents: TxHistoryClickIntents,
+    private val clickIntents: TokenDetailsClickIntents,
 ) : Converter<Either<TxHistoryStateError, Int>, TokenDetailsState> {
 
     override fun convert(value: Either<TxHistoryStateError, Int>): TokenDetailsState {
@@ -23,12 +24,8 @@ internal class TokenDetailsLoadingTxHistoryConverter(
     private fun convertError(error: TxHistoryStateError): TokenDetailsState {
         return currentStateProvider().copy(
             txHistoryState = when (error) {
-                is TxHistoryStateError.EmptyTxHistories -> {
-                    TxHistoryState.Empty(onBuyClick = clickIntents::onBuyClick)
-                }
-                is TxHistoryStateError.DataError -> {
-                    TxHistoryState.Error(onReloadClick = clickIntents::onReloadClick)
-                }
+                is TxHistoryStateError.EmptyTxHistories -> TxHistoryState.Empty
+                is TxHistoryStateError.DataError -> TxHistoryState.Error(onReloadClick = clickIntents::onReloadClick)
                 is TxHistoryStateError.TxHistoryNotImplemented -> {
                     TxHistoryState.NotSupported(onExploreClick = clickIntents::onExploreClick)
                 }
@@ -38,22 +35,28 @@ internal class TokenDetailsLoadingTxHistoryConverter(
 
     private fun convert(value: Int): TokenDetailsState {
         val state = currentStateProvider()
-        val txHistoryContent = state.txHistoryState as TxHistoryState.Content
 
-        txHistoryContent.contentItems.update {
-            PagingData.from(
-                data = listOf(TxHistoryState.TxHistoryItemState.Title(onExploreClick = clickIntents::onExploreClick)) +
-                    MutableList(
-                        size = value,
-                        init = {
-                            TxHistoryState.TxHistoryItemState.Transaction(
-                                state = TransactionState.Loading(it.toString()),
-                            )
-                        },
-                    ),
+        return if (state.txHistoryState is TxHistoryState.Content) {
+            state.txHistoryState.contentItems.update {
+                PagingData.from(data = createLoadingItems(value))
+            }
+            state
+        } else {
+            val txHistoryContent = TxHistoryState.Content(
+                contentItems = MutableStateFlow(
+                    value = PagingData.from(data = createLoadingItems(value)),
+                ),
             )
+            state.copy(txHistoryState = txHistoryContent)
         }
+    }
 
-        return state
+    private fun createLoadingItems(size: Int): List<TxHistoryState.TxHistoryItemState> {
+        return buildList {
+            add(TxHistoryState.TxHistoryItemState.Title(onExploreClick = clickIntents::onExploreClick))
+            (1..size).forEach {
+                add(TxHistoryState.TxHistoryItemState.Transaction(state = TransactionState.Loading(it.toString())))
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/txhistory/TokenDetailsTxHistoryItemFlowConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/txhistory/TokenDetailsTxHistoryItemFlowConverter.kt
index a8f2d95f25..c0aead9837 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/txhistory/TokenDetailsTxHistoryItemFlowConverter.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/txhistory/TokenDetailsTxHistoryItemFlowConverter.kt
@@ -3,60 +3,44 @@ package com.tangem.feature.tokendetails.presentation.tokendetails.state.factory.
 import android.text.format.DateUtils
 import androidx.paging.*
 import com.tangem.common.Provider
-import com.tangem.core.ui.components.transactions.intents.TxHistoryClickIntents
 import com.tangem.core.ui.components.transactions.state.TransactionState
 import com.tangem.core.ui.components.transactions.state.TxHistoryState
 import com.tangem.core.ui.components.transactions.state.TxHistoryState.TxHistoryItemState
-import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.utils.DateTimeFormatters
 import com.tangem.domain.txhistory.models.TxHistoryItem
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsState
-import com.tangem.features.tokendetails.impl.R
+import com.tangem.feature.tokendetails.presentation.tokendetails.viewmodels.TokenDetailsClickIntents
 import com.tangem.utils.converter.Converter
 import com.tangem.utils.extensions.isToday
 import com.tangem.utils.extensions.isYesterday
-import com.tangem.utils.toBriefAddressFormat
-import com.tangem.utils.toFormattedCurrencyString
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.*
 import org.joda.time.DateTime
 import org.joda.time.DateTimeZone
-import org.joda.time.format.DateTimeFormatterBuilder
-import java.math.BigDecimal
-import java.util.Locale
 
 internal class TokenDetailsTxHistoryItemFlowConverter(
     private val currentStateProvider: Provider<TokenDetailsState>,
     private val symbol: String,
     private val decimals: Int,
-    private val clickIntents: TxHistoryClickIntents,
+    private val clickIntents: TokenDetailsClickIntents,
 ) : Converter<Flow<PagingData<TxHistoryItem>>, TxHistoryState> {
 
-    /** Example, 2 Aug, 2023 */
-    private val dateFormatter by lazy {
-        DateTimeFormatterBuilder()
-            .appendDayOfMonth(1)
-            .appendLiteral(' ')
-            .appendMonthOfYearShortText()
-            .appendLiteral(", ")
-            .appendYear(4, 4)
-            .toFormatter()
-            .withLocale(Locale.getDefault())
-    }
-
-    /** Example, 13:35 */
-    private val timeFormatter by lazy {
-        DateTimeFormatterBuilder()
-            .appendHourOfDay(1)
-            .appendLiteral(':')
-            .appendMinuteOfHour(2)
-            .toFormatter()
-            .withLocale(Locale.getDefault())
+    private val txHistoryItemConverter by lazy {
+        TokenDetailsTxHistoryTransactionStateConverter(
+            symbol = symbol,
+            decimals = decimals,
+            clickIntents = clickIntents,
+        )
     }
 
     override fun convert(value: Flow<PagingData<TxHistoryItem>>): TxHistoryState {
-        val txHistoryContent = currentStateProvider().txHistoryState as TxHistoryState.Content
-
+        val state = currentStateProvider()
+        val txHistoryContent = if (state.txHistoryState is TxHistoryState.Content) {
+            state.txHistoryState
+        } else {
+            TxHistoryState.Content(contentItems = MutableStateFlow(PagingData.empty()))
+        }
         // FIXME: TxHistoryRepository should send loading transactions
         // [REDACTED_JIRA]
         value
@@ -81,62 +65,7 @@ internal class TokenDetailsTxHistoryItemFlowConverter(
     }
 
     private fun createTransactionState(item: TxHistoryItem): TransactionState {
-        return when (item.type) {
-            TxHistoryItem.TransactionType.Transfer -> {
-                when (val direction = item.direction) {
-                    is TxHistoryItem.TransactionDirection.Incoming -> {
-                        createIncomingTransferTransaction(item, direction)
-                    }
-                    is TxHistoryItem.TransactionDirection.Outgoing -> {
-                        createOutgoingTransferTransaction(item, direction)
-                    }
-                }
-            }
-        }
-    }
-
-    private fun createIncomingTransferTransaction(
-        item: TxHistoryItem,
-        direction: TxHistoryItem.TransactionDirection.Incoming,
-    ): TransactionState {
-        return when (item.status) {
-            TxHistoryItem.TxStatus.Confirmed -> TransactionState.Receive(
-                txHash = item.txHash,
-                address = direction.extractAddress(),
-                amount = item.amount.toCryptoCurrencyFormat(),
-                timestamp = item.getRawTimestamp(),
-            )
-            TxHistoryItem.TxStatus.Unconfirmed -> TransactionState.Receiving(
-                txHash = item.txHash,
-                address = direction.extractAddress(),
-                amount = item.amount.toCryptoCurrencyFormat(),
-                timestamp = item.getRawTimestamp(),
-            )
-        }
-    }
-
-    private fun createOutgoingTransferTransaction(
-        item: TxHistoryItem,
-        direction: TxHistoryItem.TransactionDirection.Outgoing,
-    ): TransactionState {
-        return when (item.status) {
-            TxHistoryItem.TxStatus.Confirmed -> TransactionState.Send(
-                txHash = item.txHash,
-                address = direction.extractAddress(),
-                amount = item.amount.toCryptoCurrencyFormat(),
-                timestamp = item.getRawTimestamp(),
-            )
-            TxHistoryItem.TxStatus.Unconfirmed -> TransactionState.Sending(
-                txHash = item.txHash,
-                address = direction.extractAddress(),
-                amount = item.amount.toCryptoCurrencyFormat(),
-                timestamp = item.getRawTimestamp(),
-            )
-        }
-    }
-
-    private fun BigDecimal.toCryptoCurrencyFormat(): String {
-        return toFormattedCurrencyString(currency = symbol, decimals = decimals)
+        return txHistoryItemConverter.convert(value = item)
     }
 
     private fun PagingData<TxHistoryItemState>.insertGroupTitle(): PagingData<TxHistoryItemState> {
@@ -182,14 +111,6 @@ internal class TokenDetailsTxHistoryItemFlowConverter(
         }
     }
 
-    /**
-     * Get timestamp without formatting.
-     * It's life hack that help us to add transaction's group title to flow.
-     *
-     * @see [convert]
-     */
-    private fun TxHistoryItem.getRawTimestamp() = this.timestampInMillis.toString()
-
     private fun TxHistoryItemState?.getTimestamp(): Long? {
         return if (this is TxHistoryItemState.Transaction && this.state is TransactionState.Content) {
             val txContent = this.state as TransactionState.Content
@@ -201,7 +122,7 @@ internal class TokenDetailsTxHistoryItemFlowConverter(
 
     /**
      * If [this] timestamp is today or yesterday, returns relative date,
-     * otherwise returns formatting date by [dateFormatter]
+     * otherwise returns formatting date.
      */
     private fun Long.toDateFormat(): String {
         val localDate = DateTime(this, DateTimeZone.getDefault())
@@ -213,18 +134,11 @@ internal class TokenDetailsTxHistoryItemFlowConverter(
                 DateUtils.FORMAT_ABBREV_RELATIVE,
             ).toString()
         } else {
-            dateFormatter.print(localDate)
+            DateTimeFormatters.formatDate(date = localDate)
         }
     }
 
     private fun String.toTimeFormat(): String {
-        return timeFormatter.print(
-            DateTime(this.toLong(), DateTimeZone.getDefault()),
-        )
-    }
-
-    private fun TxHistoryItem.TransactionDirection.extractAddress(): TextReference = when (val addr = address) {
-        TxHistoryItem.Address.Multiple -> TextReference.Res(R.string.transaction_history_multiple_addresses)
-        is TxHistoryItem.Address.Single -> TextReference.Str(addr.rawAddress.toBriefAddressFormat())
+        return DateTimeFormatters.formatTime(time = DateTime(this.toLong(), DateTimeZone.getDefault()))
     }
 }
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/txhistory/TokenDetailsTxHistoryToTransactionStateConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/txhistory/TokenDetailsTxHistoryToTransactionStateConverter.kt
new file mode 100644
index 0000000000..9425cf38e5
--- /dev/null
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/txhistory/TokenDetailsTxHistoryToTransactionStateConverter.kt
@@ -0,0 +1,163 @@
+package com.tangem.feature.tokendetails.presentation.tokendetails.state.factory.txhistory
+
+import com.tangem.core.ui.components.transactions.state.TransactionState
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.utils.DateTimeFormatters
+import com.tangem.domain.txhistory.models.TxHistoryItem
+import com.tangem.feature.tokendetails.presentation.tokendetails.viewmodels.TokenDetailsClickIntents
+import com.tangem.features.tokendetails.impl.R
+import com.tangem.utils.converter.Converter
+import com.tangem.utils.toBriefAddressFormat
+import com.tangem.utils.toFormattedCurrencyString
+import org.joda.time.DateTime
+import org.joda.time.DateTimeZone
+
+internal class TokenDetailsTxHistoryToTransactionStateConverter(
+    private val symbol: String,
+    private val decimals: Int,
+    private val clickIntents: TokenDetailsClickIntents,
+) : Converter<TxHistoryItem, TransactionState> {
+
+    override fun convert(value: TxHistoryItem): TransactionState {
+        return createTransactionStateItem(item = value)
+    }
+
+    // TODO: Finalize transaction types [REDACTED_JIRA]
+    @Suppress("LongMethod")
+    private fun createTransactionStateItem(item: TxHistoryItem): TransactionState {
+        return when (val type = item.type) {
+            TxHistoryItem.TransactionType.Transfer -> mapTransfer(item)
+            TxHistoryItem.TransactionType.Approve -> mapApprove(item)
+            TxHistoryItem.TransactionType.Swap -> mapSwap(item)
+            TxHistoryItem.TransactionType.Deposit -> TransactionState.Custom(
+                txHash = item.txHash,
+                address = item.direction.extractAddress(),
+                amount = item.getAmount(),
+                timestamp = item.timestampInMillis.toTimeFormat(),
+                status = item.status.tiUiStatus(),
+                direction = item.direction.toUiDirection(),
+                title = TextReference.Str("Deposit"),
+                subtitle = item.direction.extractAddress(),
+                onClick = { clickIntents.onTransactionClick(item.txHash) },
+            )
+            TxHistoryItem.TransactionType.Submit -> TransactionState.Custom(
+                txHash = item.txHash,
+                address = item.direction.extractAddress(),
+                amount = item.getAmount(),
+                timestamp = item.timestampInMillis.toTimeFormat(),
+                status = item.status.tiUiStatus(),
+                direction = item.direction.toUiDirection(),
+                title = TextReference.Str("Submit"),
+                subtitle = item.direction.extractAddress(),
+                onClick = { clickIntents.onTransactionClick(item.txHash) },
+            )
+            TxHistoryItem.TransactionType.Supply -> TransactionState.Custom(
+                txHash = item.txHash,
+                address = item.direction.extractAddress(),
+                amount = item.getAmount(),
+                timestamp = item.timestampInMillis.toTimeFormat(),
+                status = item.status.tiUiStatus(),
+                direction = item.direction.toUiDirection(),
+                title = TextReference.Str("Supply"),
+                subtitle = item.direction.extractAddress(),
+                onClick = { clickIntents.onTransactionClick(item.txHash) },
+            )
+            TxHistoryItem.TransactionType.Unoswap -> TransactionState.Custom(
+                txHash = item.txHash,
+                address = item.direction.extractAddress(),
+                amount = item.getAmount(),
+                timestamp = item.timestampInMillis.toTimeFormat(),
+                status = item.status.tiUiStatus(),
+                direction = item.direction.toUiDirection(),
+                title = TextReference.Str("Unoswap"),
+                subtitle = item.direction.extractAddress(),
+                onClick = { clickIntents.onTransactionClick(item.txHash) },
+            )
+            TxHistoryItem.TransactionType.Withdraw -> TransactionState.Custom(
+                txHash = item.txHash,
+                address = item.direction.extractAddress(),
+                amount = item.getAmount(),
+                timestamp = item.timestampInMillis.toTimeFormat(),
+                status = item.status.tiUiStatus(),
+                direction = item.direction.toUiDirection(),
+                title = TextReference.Str("Withdraw"),
+                subtitle = item.direction.extractAddress(),
+                onClick = { clickIntents.onTransactionClick(item.txHash) },
+            )
+            is TxHistoryItem.TransactionType.Custom -> TransactionState.Custom(
+                txHash = item.txHash,
+                address = item.direction.extractAddress(),
+                amount = item.getAmount(),
+                timestamp = item.timestampInMillis.toTimeFormat(),
+                status = item.status.tiUiStatus(),
+                direction = item.direction.toUiDirection(),
+                title = TextReference.Str(type.id),
+                subtitle = item.direction.extractAddress(),
+                onClick = { clickIntents.onTransactionClick(item.txHash) },
+            )
+        }
+    }
+
+    private fun mapTransfer(item: TxHistoryItem): TransactionState {
+        return TransactionState.Transfer(
+            txHash = item.txHash,
+            address = item.direction.extractAddress(),
+            amount = item.getAmount(),
+            timestamp = item.timestampInMillis.toTimeFormat(),
+            status = item.status.tiUiStatus(),
+            direction = item.direction.toUiDirection(),
+            onClick = { clickIntents.onTransactionClick(item.txHash) },
+        )
+    }
+
+    private fun mapApprove(item: TxHistoryItem): TransactionState {
+        return TransactionState.Approve(
+            txHash = item.txHash,
+            address = item.direction.extractAddress(),
+            amount = item.getAmount(),
+            timestamp = item.timestampInMillis.toTimeFormat(),
+            status = item.status.tiUiStatus(),
+            direction = item.direction.toUiDirection(),
+            onClick = { clickIntents.onTransactionClick(item.txHash) },
+        )
+    }
+    private fun mapSwap(item: TxHistoryItem): TransactionState {
+        return TransactionState.Swap(
+            txHash = item.txHash,
+            address = item.direction.extractAddress(),
+            amount = item.getAmount(),
+            timestamp = item.timestampInMillis.toTimeFormat(),
+            status = item.status.tiUiStatus(),
+            direction = item.direction.toUiDirection(),
+            onClick = { clickIntents.onTransactionClick(item.txHash) },
+        )
+    }
+
+    private fun TxHistoryItem.TransactionDirection.extractAddress(): TextReference = when (val addr = address) {
+        TxHistoryItem.Address.Multiple -> TextReference.Res(R.string.transaction_history_multiple_addresses)
+        is TxHistoryItem.Address.Single -> TextReference.Str(addr.rawAddress.toBriefAddressFormat())
+    }
+
+    private fun TxHistoryItem.TransactionStatus.tiUiStatus() = when (this) {
+        TxHistoryItem.TransactionStatus.Confirmed -> TransactionState.Content.Status.Confirmed
+        TxHistoryItem.TransactionStatus.Failed -> TransactionState.Content.Status.Failed
+        TxHistoryItem.TransactionStatus.Unconfirmed -> TransactionState.Content.Status.Unconfirmed
+    }
+
+    private fun Long.toTimeFormat(): String {
+        return DateTimeFormatters.formatTime(time = DateTime(this, DateTimeZone.getDefault()))
+    }
+
+    private fun TxHistoryItem.TransactionDirection.toUiDirection() = when (this) {
+        is TxHistoryItem.TransactionDirection.Incoming -> TransactionState.Content.Direction.INCOMING
+        is TxHistoryItem.TransactionDirection.Outgoing -> TransactionState.Content.Direction.OUTGOING
+    }
+
+    private fun TxHistoryItem.getAmount(): String {
+        val prefix = when (direction) {
+            is TxHistoryItem.TransactionDirection.Incoming -> "+"
+            is TxHistoryItem.TransactionDirection.Outgoing -> "-"
+        }
+        return prefix + amount.toFormattedCurrencyString(currency = symbol, decimals = decimals)
+    }
+}
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/txhistory/TokenDetailsTxHistoryTransactionStateConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/txhistory/TokenDetailsTxHistoryTransactionStateConverter.kt
new file mode 100644
index 0000000000..6690c6d52f
--- /dev/null
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/txhistory/TokenDetailsTxHistoryTransactionStateConverter.kt
@@ -0,0 +1,164 @@
+package com.tangem.feature.tokendetails.presentation.tokendetails.state.factory.txhistory
+
+import com.tangem.core.ui.components.transactions.state.TransactionState
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.domain.txhistory.models.TxHistoryItem
+import com.tangem.feature.tokendetails.presentation.tokendetails.viewmodels.TokenDetailsClickIntents
+import com.tangem.features.tokendetails.impl.R
+import com.tangem.utils.converter.Converter
+import com.tangem.utils.toBriefAddressFormat
+import com.tangem.utils.toFormattedCurrencyString
+
+internal class TokenDetailsTxHistoryTransactionStateConverter(
+    private val symbol: String,
+    private val decimals: Int,
+    private val clickIntents: TokenDetailsClickIntents,
+) : Converter<TxHistoryItem, TransactionState> {
+
+    override fun convert(value: TxHistoryItem): TransactionState {
+        return createTransactionStateItem(item = value)
+    }
+
+    // TODO: Finalize transaction types [REDACTED_JIRA]
+    @Suppress("LongMethod")
+    private fun createTransactionStateItem(item: TxHistoryItem): TransactionState {
+        return when (val type = item.type) {
+            TxHistoryItem.TransactionType.Transfer -> mapTransfer(item)
+            TxHistoryItem.TransactionType.Approve -> mapApprove(item)
+            TxHistoryItem.TransactionType.Swap -> mapSwap(item)
+            TxHistoryItem.TransactionType.Deposit -> TransactionState.Custom(
+                txHash = item.txHash,
+                address = item.direction.extractAddress(),
+                amount = item.getAmount(),
+                timestamp = item.getRawTimestamp(),
+                status = item.status.tiUiStatus(),
+                direction = item.direction.toUiDirection(),
+                title = TextReference.Str("Deposit"),
+                subtitle = item.direction.extractAddress(),
+                onClick = { clickIntents.onTransactionClick(item.txHash) },
+            )
+            TxHistoryItem.TransactionType.Submit -> TransactionState.Custom(
+                txHash = item.txHash,
+                address = item.direction.extractAddress(),
+                amount = item.getAmount(),
+                timestamp = item.getRawTimestamp(),
+                status = item.status.tiUiStatus(),
+                direction = item.direction.toUiDirection(),
+                title = TextReference.Str("Submit"),
+                subtitle = item.direction.extractAddress(),
+                onClick = { clickIntents.onTransactionClick(item.txHash) },
+            )
+            TxHistoryItem.TransactionType.Supply -> TransactionState.Custom(
+                txHash = item.txHash,
+                address = item.direction.extractAddress(),
+                amount = item.getAmount(),
+                timestamp = item.getRawTimestamp(),
+                status = item.status.tiUiStatus(),
+                direction = item.direction.toUiDirection(),
+                title = TextReference.Str("Supply"),
+                subtitle = item.direction.extractAddress(),
+                onClick = { clickIntents.onTransactionClick(item.txHash) },
+            )
+            TxHistoryItem.TransactionType.Unoswap -> TransactionState.Custom(
+                txHash = item.txHash,
+                address = item.direction.extractAddress(),
+                amount = item.getAmount(),
+                timestamp = item.getRawTimestamp(),
+                status = item.status.tiUiStatus(),
+                direction = item.direction.toUiDirection(),
+                title = TextReference.Str("Unoswap"),
+                subtitle = item.direction.extractAddress(),
+                onClick = { clickIntents.onTransactionClick(item.txHash) },
+            )
+            TxHistoryItem.TransactionType.Withdraw -> TransactionState.Custom(
+                txHash = item.txHash,
+                address = item.direction.extractAddress(),
+                amount = item.getAmount(),
+                timestamp = item.getRawTimestamp(),
+                status = item.status.tiUiStatus(),
+                direction = item.direction.toUiDirection(),
+                title = TextReference.Str("Withdraw"),
+                subtitle = item.direction.extractAddress(),
+                onClick = { clickIntents.onTransactionClick(item.txHash) },
+            )
+            is TxHistoryItem.TransactionType.Custom -> TransactionState.Custom(
+                txHash = item.txHash,
+                address = item.direction.extractAddress(),
+                amount = item.getAmount(),
+                timestamp = item.getRawTimestamp(),
+                status = item.status.tiUiStatus(),
+                direction = item.direction.toUiDirection(),
+                title = TextReference.Str(type.id),
+                subtitle = item.direction.extractAddress(),
+                onClick = { clickIntents.onTransactionClick(item.txHash) },
+            )
+        }
+    }
+
+    private fun mapTransfer(item: TxHistoryItem): TransactionState {
+        return TransactionState.Transfer(
+            txHash = item.txHash,
+            address = item.direction.extractAddress(),
+            amount = item.getAmount(),
+            timestamp = item.getRawTimestamp(),
+            status = item.status.tiUiStatus(),
+            direction = item.direction.toUiDirection(),
+            onClick = { clickIntents.onTransactionClick(item.txHash) },
+        )
+    }
+
+    private fun mapApprove(item: TxHistoryItem): TransactionState {
+        return TransactionState.Approve(
+            txHash = item.txHash,
+            address = item.direction.extractAddress(),
+            amount = item.getAmount(),
+            timestamp = item.getRawTimestamp(),
+            status = item.status.tiUiStatus(),
+            direction = item.direction.toUiDirection(),
+            onClick = { clickIntents.onTransactionClick(item.txHash) },
+        )
+    }
+    private fun mapSwap(item: TxHistoryItem): TransactionState {
+        return TransactionState.Swap(
+            txHash = item.txHash,
+            address = item.direction.extractAddress(),
+            amount = item.getAmount(),
+            timestamp = item.getRawTimestamp(),
+            status = item.status.tiUiStatus(),
+            direction = item.direction.toUiDirection(),
+            onClick = { clickIntents.onTransactionClick(item.txHash) },
+        )
+    }
+
+    /**
+     * Get timestamp without formatting.
+     * It's life hack that help us to add transaction's group title to flow.
+     *
+     * @see [convert]
+     */
+    private fun TxHistoryItem.getRawTimestamp() = this.timestampInMillis.toString()
+
+    private fun TxHistoryItem.TransactionDirection.extractAddress(): TextReference = when (val addr = address) {
+        TxHistoryItem.Address.Multiple -> TextReference.Res(R.string.transaction_history_multiple_addresses)
+        is TxHistoryItem.Address.Single -> TextReference.Str(addr.rawAddress.toBriefAddressFormat())
+    }
+
+    private fun TxHistoryItem.TransactionStatus.tiUiStatus() = when (this) {
+        TxHistoryItem.TransactionStatus.Confirmed -> TransactionState.Content.Status.Confirmed
+        TxHistoryItem.TransactionStatus.Failed -> TransactionState.Content.Status.Failed
+        TxHistoryItem.TransactionStatus.Unconfirmed -> TransactionState.Content.Status.Unconfirmed
+    }
+
+    private fun TxHistoryItem.TransactionDirection.toUiDirection() = when (this) {
+        is TxHistoryItem.TransactionDirection.Incoming -> TransactionState.Content.Direction.INCOMING
+        is TxHistoryItem.TransactionDirection.Outgoing -> TransactionState.Content.Direction.OUTGOING
+    }
+
+    private fun TxHistoryItem.getAmount(): String {
+        val prefix = when (direction) {
+            is TxHistoryItem.TransactionDirection.Incoming -> "+"
+            is TxHistoryItem.TransactionDirection.Outgoing -> "-"
+        }
+        return prefix + amount.toFormattedCurrencyString(currency = symbol, decimals = decimals)
+    }
+}
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/TokenDetailsScreen.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/TokenDetailsScreen.kt
index a54eef8db7..e5e3b0945e 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/TokenDetailsScreen.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/TokenDetailsScreen.kt
@@ -1,30 +1,70 @@
 package com.tangem.feature.tokendetails.presentation.tokendetails.ui
 
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.pullrefresh.PullRefreshIndicator
+import androidx.compose.material.pullrefresh.pullRefresh
+import androidx.compose.material.pullrefresh.rememberPullRefreshState
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.util.fastForEach
 import androidx.paging.compose.collectAsLazyPagingItems
+import com.tangem.core.ui.components.bottomsheets.chooseaddress.ChooseAddressBottomSheet
+import com.tangem.core.ui.components.bottomsheets.chooseaddress.ChooseAddressBottomSheetConfig
+import com.tangem.core.ui.components.bottomsheets.tokenreceive.TokenReceiveBottomSheet
+import com.tangem.core.ui.components.bottomsheets.tokenreceive.TokenReceiveBottomSheetConfig
 import com.tangem.core.ui.components.marketprice.MarketPriceBlock
 import com.tangem.core.ui.components.marketprice.MarketPriceBlockState
+import com.tangem.core.ui.components.notifications.Notification
+import com.tangem.core.ui.components.transactions.Transaction
+import com.tangem.core.ui.components.transactions.state.TransactionState
 import com.tangem.core.ui.components.transactions.state.TxHistoryState
 import com.tangem.core.ui.components.transactions.txHistoryItems
+import com.tangem.core.ui.event.EventEffect
+import com.tangem.core.ui.event.StateEvent
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.feature.tokendetails.presentation.tokendetails.TokenDetailsPreviewData
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsState
+import com.tangem.feature.tokendetails.presentation.tokendetails.state.components.TokenDetailsNotification
 import com.tangem.feature.tokendetails.presentation.tokendetails.ui.components.TokenDetailsBalanceBlock
+import com.tangem.feature.tokendetails.presentation.tokendetails.ui.components.TokenDetailsDialogs
 import com.tangem.feature.tokendetails.presentation.tokendetails.ui.components.TokenDetailsTopAppBar
 import com.tangem.feature.tokendetails.presentation.tokendetails.ui.components.TokenInfoBlock
+import kotlinx.collections.immutable.PersistentList
 
+// TODO: Split to blocks [REDACTED_JIRA]
+@Suppress("LongMethod")
+@OptIn(ExperimentalMaterialApi::class, ExperimentalFoundationApi::class)
 @Composable
 internal fun TokenDetailsScreen(state: TokenDetailsState) {
+    BackHandler(onBack = state.topAppBarConfig.onBackClick)
+
+    val snackbarHostState = remember { SnackbarHostState() }
     Scaffold(
         topBar = { TokenDetailsTopAppBar(config = state.topAppBarConfig) },
+        snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
         containerColor = TangemTheme.colors.background.secondary,
     ) { scaffoldPaddings ->
+        val pullRefreshState = rememberPullRefreshState(
+            refreshing = state.pullToRefreshConfig.isRefreshing,
+            onRefresh = state.pullToRefreshConfig.onRefresh,
+        )
+
         val txHistoryItems = if (state.txHistoryState is TxHistoryState.Content) {
             state.txHistoryState.contentItems.collectAsLazyPagingItems()
         } else {
@@ -35,30 +75,122 @@ internal fun TokenDetailsScreen(state: TokenDetailsState) {
         val itemModifier = Modifier
             .padding(top = betweenItemsPadding)
             .padding(horizontal = horizontalPadding)
-        LazyColumn(
+
+        Box(
             modifier = Modifier
-                .padding(paddingValues = scaffoldPaddings)
-                .fillMaxSize(),
+                .padding(scaffoldPaddings)
+                .pullRefresh(pullRefreshState),
         ) {
-            item {
-                TokenInfoBlock(
-                    modifier = Modifier
-                        .padding(top = TangemTheme.dimens.spacing4)
-                        .padding(horizontal = horizontalPadding),
-                    state = state.tokenInfoBlockState,
+            LazyColumn(
+                modifier = Modifier
+                    .fillMaxSize(),
+            ) {
+                item {
+                    TokenInfoBlock(
+                        modifier = Modifier
+                            .padding(top = TangemTheme.dimens.spacing4)
+                            .padding(horizontal = horizontalPadding),
+                        state = state.tokenInfoBlockState,
+                    )
+                }
+                item {
+                    TokenDetailsBalanceBlock(
+                        modifier = itemModifier,
+                        isBalanceHidden = state.isBalanceHidden,
+                        state = state.tokenBalanceBlockState,
+                    )
+                }
+                items(
+                    items = state.notifications,
+                    key = { it::class.java },
+                    contentType = { it.config::class.java },
+                    itemContent = {
+                        Notification(
+                            modifier = itemModifier.animateItemPlacement(),
+                            config = it.config,
+                            iconTint = when (it) {
+                                is TokenDetailsNotification.Warning -> null
+                                is TokenDetailsNotification.Informational -> TangemTheme.colors.icon.accent
+                            },
+                        )
+                    },
+                )
+                if (state.isMarketPriceAvailable) {
+                    item(
+                        key = MarketPriceBlockState::class.java,
+                        contentType = MarketPriceBlockState::class.java,
+                        content = { MarketPriceBlock(modifier = itemModifier, state = state.marketPriceBlockState) },
+                    )
+                }
+                if (state.txHistoryState is TxHistoryState.NotSupported && state.pendingTxs.isNotEmpty()) {
+                    item {
+                        PendingTxsBlock(
+                            pendingTxs = state.pendingTxs,
+                            isBalanceHidden = state.isBalanceHidden,
+                            modifier = itemModifier,
+                        )
+                    }
+                }
+                txHistoryItems(
+                    state = state.txHistoryState,
+                    isBalanceHidden = state.isBalanceHidden,
+                    txHistoryItems = txHistoryItems,
                 )
             }
-            item { TokenDetailsBalanceBlock(modifier = itemModifier, state = state.tokenBalanceBlockState) }
-            item(
-                key = MarketPriceBlockState::class.java,
-                contentType = MarketPriceBlockState::class.java,
-                content = { MarketPriceBlock(modifier = itemModifier, state = state.marketPriceBlockState) },
+
+            PullRefreshIndicator(
+                modifier = Modifier.align(Alignment.TopCenter),
+                refreshing = state.pullToRefreshConfig.isRefreshing,
+                state = pullRefreshState,
             )
-            txHistoryItems(state = state.txHistoryState, txHistoryItems = txHistoryItems)
         }
+
+        TokenDetailsDialogs(state = state)
+
+        state.bottomSheetConfig?.let { config ->
+            when (config.content) {
+                is TokenReceiveBottomSheetConfig -> {
+                    TokenReceiveBottomSheet(config = config)
+                }
+                is ChooseAddressBottomSheetConfig -> {
+                    ChooseAddressBottomSheet(config = config)
+                }
+            }
+        }
+
+        TokenDetailsEventEffect(snackbarHostState = snackbarHostState, event = state.event)
     }
 }
 
+@Composable
+private fun PendingTxsBlock(
+    pendingTxs: PersistentList<TransactionState>,
+    isBalanceHidden: Boolean,
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier
+            .clip(shape = TangemTheme.shapes.roundedCornersXMedium)
+            .background(color = TangemTheme.colors.background.primary),
+        verticalArrangement = Arrangement.spacedBy(space = TangemTheme.dimens.spacing8),
+        horizontalAlignment = Alignment.Start,
+    ) {
+        pendingTxs.fastForEach { Transaction(state = it, isBalanceHidden = isBalanceHidden) }
+    }
+}
+
+@Composable
+internal fun TokenDetailsEventEffect(snackbarHostState: SnackbarHostState, event: StateEvent<TextReference>) {
+    val resources = LocalContext.current.resources
+
+    EventEffect(
+        event = event,
+        onTrigger = { value ->
+            snackbarHostState.showSnackbar(message = value.resolveReference(resources))
+        },
+    )
+}
+
 @Preview
 @Composable
 private fun Preview_TokenDetailsScreen_LightTheme() {
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/DropdownMenu.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/DropdownMenu.kt
new file mode 100644
index 0000000000..fa6ff8aca3
--- /dev/null
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/DropdownMenu.kt
@@ -0,0 +1,229 @@
+@file:Suppress("TopLevelPropertyNaming")
+package com.tangem.feature.tokendetails.presentation.tokendetails.ui.components
+
+import androidx.compose.animation.core.*
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.TransformOrigin
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.*
+import androidx.compose.ui.window.Popup
+import androidx.compose.ui.window.PopupPositionProvider
+import androidx.compose.ui.window.PopupProperties
+
+/**
+ * Just copy paste [DropdownMenu] from material3 with deleting vertical paddings.
+ */
+@Composable
+internal fun TangemDropdownMenu(
+    expanded: Boolean,
+    onDismissRequest: () -> Unit,
+    modifier: Modifier = Modifier,
+    offset: DpOffset = DpOffset(0.dp, 0.dp),
+    properties: PopupProperties = PopupProperties(focusable = true),
+    content: @Composable ColumnScope.() -> Unit,
+) {
+    val expandedStates = remember { MutableTransitionState(false) }
+    expandedStates.targetState = expanded
+
+    if (expandedStates.currentState || expandedStates.targetState) {
+        val transformOriginState = remember { mutableStateOf(TransformOrigin.Center) }
+        val density = LocalDensity.current
+        val popupPositionProvider = DropdownMenuPositionProvider(
+            offset,
+            density,
+        ) { parentBounds, menuBounds ->
+            transformOriginState.value = calculateTransformOrigin(parentBounds, menuBounds)
+        }
+
+        Popup(
+            onDismissRequest = onDismissRequest,
+            popupPositionProvider = popupPositionProvider,
+            properties = properties,
+        ) {
+            DropdownMenuContent(
+                expandedStates = expandedStates,
+                transformOriginState = transformOriginState,
+                modifier = modifier,
+                content = content,
+            )
+        }
+    }
+}
+
+private const val InTransitionDuration = 120
+private const val OutTransitionDuration = 75
+
+@Suppress("ReusedModifierInstance", "MagicNumber")
+@Composable
+private fun DropdownMenuContent(
+    expandedStates: MutableTransitionState<Boolean>,
+    transformOriginState: MutableState<TransformOrigin>,
+    modifier: Modifier = Modifier,
+    content: @Composable ColumnScope.() -> Unit,
+) {
+    // Menu open/close animation.
+    val transition = updateTransition(expandedStates, "DropDownMenu")
+
+    val scale by transition.animateFloat(
+        transitionSpec = {
+            if (false isTransitioningTo true) {
+                // Dismissed to expanded
+                tween(
+                    durationMillis = InTransitionDuration,
+                    easing = LinearOutSlowInEasing,
+                )
+            } else {
+                // Expanded to dismissed.
+                tween(
+                    durationMillis = 1,
+                    delayMillis = OutTransitionDuration - 1,
+                )
+            }
+        },
+        label = "",
+    ) {
+        if (it) {
+            // Menu is expanded.
+            1f
+        } else {
+            // Menu is dismissed.
+            0.8f
+        }
+    }
+
+    val alpha by transition.animateFloat(
+        transitionSpec = {
+            if (false isTransitioningTo true) {
+                // Dismissed to expanded
+                tween(durationMillis = 30)
+            } else {
+                // Expanded to dismissed.
+                tween(durationMillis = OutTransitionDuration)
+            }
+        },
+        label = "",
+    ) {
+        if (it) {
+            // Menu is expanded.
+            1f
+        } else {
+            // Menu is dismissed.
+            0f
+        }
+    }
+    Card(
+        modifier = Modifier.graphicsLayer {
+            scaleX = scale
+            scaleY = scale
+            this.alpha = alpha
+            transformOrigin = transformOriginState.value
+        },
+        elevation = CardDefaults.cardElevation(),
+    ) {
+        Column(
+            modifier = modifier
+                .width(IntrinsicSize.Max)
+                .verticalScroll(rememberScrollState()),
+            content = content,
+        )
+    }
+}
+
+private fun calculateTransformOrigin(parentBounds: IntRect, menuBounds: IntRect): TransformOrigin {
+    val pivotX = when {
+        menuBounds.left >= parentBounds.right -> 0f
+        menuBounds.right <= parentBounds.left -> 1f
+        menuBounds.width == 0 -> 0f
+        else -> {
+            val intersectionCenter =
+                (
+                    kotlin.math.max(parentBounds.left, menuBounds.left) +
+                        kotlin.math.min(parentBounds.right, menuBounds.right)
+                    ) / 2
+            (intersectionCenter - menuBounds.left).toFloat() / menuBounds.width
+        }
+    }
+    val pivotY = when {
+        menuBounds.top >= parentBounds.bottom -> 0f
+        menuBounds.bottom <= parentBounds.top -> 1f
+        menuBounds.height == 0 -> 0f
+        else -> {
+            val intersectionCenter =
+                (
+                    kotlin.math.max(parentBounds.top, menuBounds.top) +
+                        kotlin.math.min(parentBounds.bottom, menuBounds.bottom)
+                    ) / 2
+            (intersectionCenter - menuBounds.top).toFloat() / menuBounds.height
+        }
+    }
+    return TransformOrigin(pivotX, pivotY)
+}
+
+private val MenuVerticalMargin = 48.dp
+
+@Immutable
+internal data class DropdownMenuPositionProvider(
+    val contentOffset: DpOffset,
+    val density: Density,
+    val onPositionCalculated: (IntRect, IntRect) -> Unit = { _, _ -> },
+) : PopupPositionProvider {
+    override fun calculatePosition(
+        anchorBounds: IntRect,
+        windowSize: IntSize,
+        layoutDirection: LayoutDirection,
+        popupContentSize: IntSize,
+    ): IntOffset {
+        // The min margin above and below the menu, relative to the screen.
+        val verticalMargin = with(density) { MenuVerticalMargin.roundToPx() }
+        // The content offset specified using the dropdown offset parameter.
+        val contentOffsetX = with(density) { contentOffset.x.roundToPx() }
+        val contentOffsetY = with(density) { contentOffset.y.roundToPx() }
+
+        // Compute horizontal position.
+        val toRight = anchorBounds.left + contentOffsetX
+        val toLeft = anchorBounds.right - contentOffsetX - popupContentSize.width
+        val toDisplayRight = windowSize.width - popupContentSize.width
+        val toDisplayLeft = 0
+        val x = if (layoutDirection == LayoutDirection.Ltr) {
+            sequenceOf(
+                toRight,
+                toLeft,
+                // If the anchor gets outside of the window on the left, we want to position
+                // toDisplayLeft for proximity to the anchor. Otherwise, toDisplayRight.
+                if (anchorBounds.left >= 0) toDisplayRight else toDisplayLeft,
+            )
+        } else {
+            sequenceOf(
+                toLeft,
+                toRight,
+                // If the anchor gets outside of the window on the right, we want to position
+                // toDisplayRight for proximity to the anchor. Otherwise, toDisplayLeft.
+                if (anchorBounds.right <= windowSize.width) toDisplayLeft else toDisplayRight,
+            )
+        }.firstOrNull {
+            it >= 0 && it + popupContentSize.width <= windowSize.width
+        } ?: toLeft
+
+        // Compute vertical position.
+        val toBottom = maxOf(anchorBounds.bottom + contentOffsetY, verticalMargin)
+        val toTop = anchorBounds.top - contentOffsetY - popupContentSize.height
+        val toCenter = anchorBounds.top - popupContentSize.height / 2
+        val toDisplayBottom = windowSize.height - popupContentSize.height - verticalMargin
+        val y = sequenceOf(toBottom, toTop, toCenter, toDisplayBottom).firstOrNull {
+            it >= verticalMargin &&
+                it + popupContentSize.height <= windowSize.height - verticalMargin
+        } ?: toTop
+
+        onPositionCalculated(
+            anchorBounds,
+            IntRect(x, y, x + popupContentSize.width, y + popupContentSize.height),
+        )
+        return IntOffset(x, y)
+    }
+}
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenDetailsBalanceBlock.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenDetailsBalanceBlock.kt
index b1b9ac832a..8280f9aeab 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenDetailsBalanceBlock.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenDetailsBalanceBlock.kt
@@ -9,6 +9,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
+import com.tangem.common.Strings.STARS
 import com.tangem.core.ui.components.RectangleShimmer
 import com.tangem.core.ui.components.buttons.HorizontalActionChips
 import com.tangem.core.ui.res.TangemTheme
@@ -20,7 +21,11 @@ import com.tangem.features.tokendetails.impl.R
 import kotlinx.collections.immutable.toImmutableList
 
 @Composable
-internal fun TokenDetailsBalanceBlock(state: TokenDetailsBalanceBlockState, modifier: Modifier = Modifier) {
+internal fun TokenDetailsBalanceBlock(
+    state: TokenDetailsBalanceBlockState,
+    isBalanceHidden: Boolean,
+    modifier: Modifier = Modifier,
+) {
     Surface(
         modifier = modifier.fillMaxWidth(),
         shape = TangemTheme.shapes.roundedCornersXMedium,
@@ -36,17 +41,19 @@ internal fun TokenDetailsBalanceBlock(state: TokenDetailsBalanceBlockState, modi
                     ),
                 text = stringResource(id = R.string.onboarding_balance_title),
                 color = TangemTheme.colors.text.tertiary,
-                style = TangemTheme.typography.body2,
+                style = TangemTheme.typography.subtitle2,
                 maxLines = 1,
             )
             FiatBalance(
                 state = state,
+                isBalanceHidden = isBalanceHidden,
                 modifier = Modifier
                     .padding(top = TangemTheme.dimens.spacing4)
                     .padding(horizontal = TangemTheme.dimens.spacing12),
             )
             CryptoBalance(
                 state = state,
+                isBalanceHidden = isBalanceHidden,
                 modifier = Modifier
                     .padding(top = TangemTheme.dimens.spacing4)
                     .padding(horizontal = TangemTheme.dimens.spacing12),
@@ -62,7 +69,11 @@ internal fun TokenDetailsBalanceBlock(state: TokenDetailsBalanceBlockState, modi
 }
 
 @Composable
-private fun FiatBalance(state: TokenDetailsBalanceBlockState, modifier: Modifier = Modifier) {
+private fun FiatBalance(
+    state: TokenDetailsBalanceBlockState,
+    isBalanceHidden: Boolean,
+    modifier: Modifier = Modifier,
+) {
     when (state) {
         is TokenDetailsBalanceBlockState.Loading -> RectangleShimmer(
             modifier = modifier.size(
@@ -72,13 +83,13 @@ private fun FiatBalance(state: TokenDetailsBalanceBlockState, modifier: Modifier
         )
         is TokenDetailsBalanceBlockState.Content -> Text(
             modifier = modifier,
-            text = state.fiatBalance,
+            text = if (isBalanceHidden) STARS else state.fiatBalance,
             style = TangemTheme.typography.h2,
             color = TangemTheme.colors.text.primary1,
         )
         is TokenDetailsBalanceBlockState.Error -> Text(
             modifier = modifier,
-            text = BigDecimalFormatter.EMPTY_BALANCE_SIGN,
+            text = if (isBalanceHidden) STARS else BigDecimalFormatter.EMPTY_BALANCE_SIGN,
             style = TangemTheme.typography.h2,
             color = TangemTheme.colors.text.primary1,
         )
@@ -86,7 +97,11 @@ private fun FiatBalance(state: TokenDetailsBalanceBlockState, modifier: Modifier
 }
 
 @Composable
-private fun CryptoBalance(state: TokenDetailsBalanceBlockState, modifier: Modifier = Modifier) {
+private fun CryptoBalance(
+    state: TokenDetailsBalanceBlockState,
+    isBalanceHidden: Boolean,
+    modifier: Modifier = Modifier,
+) {
     when (state) {
         is TokenDetailsBalanceBlockState.Loading -> RectangleShimmer(
             modifier = modifier.size(
@@ -96,15 +111,15 @@ private fun CryptoBalance(state: TokenDetailsBalanceBlockState, modifier: Modifi
         )
         is TokenDetailsBalanceBlockState.Content -> Text(
             modifier = modifier,
-            text = state.cryptoBalance,
-            style = TangemTheme.typography.caption,
-            color = TangemTheme.colors.text.primary1,
+            text = if (isBalanceHidden) STARS else state.cryptoBalance,
+            style = TangemTheme.typography.caption2,
+            color = TangemTheme.colors.text.tertiary,
         )
         is TokenDetailsBalanceBlockState.Error -> Text(
             modifier = modifier,
-            text = BigDecimalFormatter.EMPTY_BALANCE_SIGN,
-            style = TangemTheme.typography.caption,
-            color = TangemTheme.colors.text.primary1,
+            text = if (isBalanceHidden) STARS else BigDecimalFormatter.EMPTY_BALANCE_SIGN,
+            style = TangemTheme.typography.caption2,
+            color = TangemTheme.colors.text.tertiary,
         )
     }
 }
@@ -115,7 +130,7 @@ private fun Preview_TokenDetailsBalanceBlock_LightTheme(
     @PreviewParameter(TokenDetailsBalanceBlockStateProvider::class) state: TokenDetailsBalanceBlockState,
 ) {
     TangemTheme(isDark = false) {
-        TokenDetailsBalanceBlock(state)
+        TokenDetailsBalanceBlock(state = state, isBalanceHidden = false)
     }
 }
 
@@ -125,7 +140,7 @@ private fun Preview_TokenDetailsBalanceBlock_DarkTheme(
     @PreviewParameter(TokenDetailsBalanceBlockStateProvider::class) state: TokenDetailsBalanceBlockState,
 ) {
     TangemTheme(isDark = true) {
-        TokenDetailsBalanceBlock(state)
+        TokenDetailsBalanceBlock(state = state, isBalanceHidden = false)
     }
 }
 
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenDetailsDialogs.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenDetailsDialogs.kt
new file mode 100644
index 0000000000..174eb35567
--- /dev/null
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenDetailsDialogs.kt
@@ -0,0 +1,37 @@
+package com.tangem.feature.tokendetails.presentation.tokendetails.ui.components
+
+import androidx.compose.runtime.Composable
+import com.tangem.core.ui.components.BasicDialog
+import com.tangem.core.ui.components.DialogButton
+import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsState
+import com.tangem.feature.tokendetails.presentation.tokendetails.state.components.TokenDetailsDialogConfig
+
+@Composable
+internal fun TokenDetailsDialogs(state: TokenDetailsState) {
+    val dialogConfig = state.dialogConfig
+    if (dialogConfig != null && dialogConfig.isShow) {
+        TokenDetailsDialog(config = dialogConfig)
+    }
+}
+
+@Composable
+private fun TokenDetailsDialog(config: TokenDetailsDialogConfig) {
+    BasicDialog(
+        message = config.content.message.resolveReference(),
+        confirmButton = DialogButton(
+            title = config.content.confirmButtonConfig.text.resolveReference(),
+            warning = config.content.confirmButtonConfig.warning,
+            onClick = config.content.confirmButtonConfig.onClick,
+        ),
+        onDismissDialog = config.onDismissRequest,
+        title = config.content.title.resolveReference(),
+        dismissButton = config.content.cancelButtonConfig?.let { cancelButtonConfig ->
+            DialogButton(
+                title = cancelButtonConfig.text.resolveReference(),
+                warning = cancelButtonConfig.warning,
+                onClick = cancelButtonConfig.onClick,
+            )
+        },
+    )
+}
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenDetailsTopAppBar.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenDetailsTopAppBar.kt
index a7901787f0..b5e0839679 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenDetailsTopAppBar.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenDetailsTopAppBar.kt
@@ -1,17 +1,31 @@
 package com.tangem.feature.tokendetails.presentation.tokendetails.ui.components
 
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.DpOffset
+import androidx.compose.ui.util.fastForEach
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.feature.tokendetails.presentation.tokendetails.TokenDetailsPreviewData
-import com.tangem.features.tokendetails.impl.R
+import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsAppBarMenuConfig
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsTopAppBarConfig
+import com.tangem.features.tokendetails.impl.R
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 internal fun TokenDetailsTopAppBar(config: TokenDetailsTopAppBarConfig) {
+    var showDropdownMenu by rememberSaveable { mutableStateOf(false) }
     TopAppBar(
         navigationIcon = {
             IconButton(onClick = config.onBackClick) {
@@ -24,13 +38,28 @@ internal fun TokenDetailsTopAppBar(config: TokenDetailsTopAppBarConfig) {
         },
         title = {},
         actions = {
-            IconButton(onClick = config.onMoreClick) {
+            IconButton(onClick = { showDropdownMenu = true }) {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_more_vertical_24),
                     tint = TangemTheme.colors.icon.primary1,
                     contentDescription = "More",
                 )
             }
+
+            TangemDropdownMenu(
+                expanded = showDropdownMenu,
+                modifier = Modifier.background(TangemTheme.colors.background.primary),
+                onDismissRequest = { showDropdownMenu = false },
+                offset = DpOffset(x = TangemTheme.dimens.spacing20, y = TangemTheme.dimens.spacing10.times(-1)),
+                content = {
+                    config.tokenDetailsAppBarMenuConfig.items.fastForEach {
+                        AppBarDropdownItem(
+                            item = it,
+                            dismissParent = { showDropdownMenu = false },
+                        )
+                    }
+                },
+            )
         },
         colors = TopAppBarDefaults.topAppBarColors(
             containerColor = TangemTheme.colors.background.secondary,
@@ -41,6 +70,57 @@ internal fun TokenDetailsTopAppBar(config: TokenDetailsTopAppBarConfig) {
     )
 }
 
+@Suppress("ComposableEventParameterNaming")
+@Composable
+private fun AppBarDropdownItem(
+    item: TokenDetailsAppBarMenuConfig.MenuItem,
+    dismissParent: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Text(
+        modifier = modifier
+            .clickable {
+                dismissParent()
+                item.onClick()
+            }
+            .padding(vertical = TangemTheme.dimens.spacing8, horizontal = TangemTheme.dimens.spacing16),
+        text = item.title.resolveReference(),
+        style = TangemTheme.typography.body1.copy(color = item.textColorProvider()),
+    )
+}
+
+@Preview
+@Composable
+private fun Preview_TokenDetailsAppBarDropdownItem_LightTheme() {
+    TangemTheme(isDark = false) {
+        AppBarDropdownItem(
+            modifier = Modifier.background(TangemTheme.colors.background.primary),
+            dismissParent = {},
+            item = TokenDetailsAppBarMenuConfig.MenuItem(
+                title = TextReference.Res(id = R.string.token_details_hide_token),
+                textColorProvider = { TangemTheme.colors.text.warning },
+                onClick = { },
+            ),
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun Preview_TokenDetailsAppBarDropdownItem_DarkTheme() {
+    TangemTheme(isDark = true) {
+        AppBarDropdownItem(
+            modifier = Modifier.background(TangemTheme.colors.background.primary),
+            dismissParent = {},
+            item = TokenDetailsAppBarMenuConfig.MenuItem(
+                title = TextReference.Res(id = R.string.token_details_hide_token),
+                textColorProvider = { TangemTheme.colors.text.warning },
+                onClick = { },
+            ),
+        )
+    }
+}
+
 @Preview
 @Composable
 private fun Preview_TokenDetailsTopAppBar_LightTheme() {
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenIcon.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenIcon.kt
new file mode 100644
index 0000000000..2a11731a45
--- /dev/null
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenIcon.kt
@@ -0,0 +1,173 @@
+package com.tangem.feature.tokendetails.presentation.tokendetails.ui.components
+
+import androidx.annotation.DrawableRes
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.Icon
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import coil.compose.SubcomposeAsyncImage
+import coil.request.ImageRequest
+import com.tangem.core.ui.components.CircleShimmer
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.utils.ImageBackgroundContrastChecker
+import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenInfoBlockState
+import com.tangem.features.tokendetails.impl.R
+import kotlinx.coroutines.launch
+
+@Composable
+internal fun CurrencyIcon(
+    icon: TokenInfoBlockState.IconState,
+    alpha: Float,
+    colorFilter: ColorFilter?,
+    modifier: Modifier = Modifier,
+) {
+    when (icon) {
+        is TokenInfoBlockState.IconState.CoinIcon -> CoinIcon(
+            modifier = modifier,
+            url = icon.url,
+            fallbackResId = icon.fallbackResId,
+            alpha = alpha,
+            colorFilter = colorFilter,
+        )
+        is TokenInfoBlockState.IconState.TokenIcon -> TokenIcon(
+            modifier = modifier,
+            url = icon.url,
+            alpha = alpha,
+            colorFilter = colorFilter,
+            errorIcon = {
+                CustomTokenIcon(
+                    modifier = modifier,
+                    tint = icon.fallbackTint,
+                    background = icon.fallbackBackground,
+                    alpha = alpha,
+                )
+            },
+        )
+        is TokenInfoBlockState.IconState.CustomTokenIcon -> CustomTokenIcon(
+            modifier = modifier,
+            tint = icon.tint,
+            background = icon.background,
+            alpha = alpha,
+        )
+    }
+}
+
+@Composable
+private fun CoinIcon(
+    url: String?,
+    @DrawableRes fallbackResId: Int,
+    alpha: Float,
+    colorFilter: ColorFilter?,
+    modifier: Modifier = Modifier,
+) {
+    val iconData: Any = if (url.isNullOrBlank()) fallbackResId else url
+
+    DefaultCurrencyIcon(
+        modifier = modifier,
+        iconData = iconData,
+        errorIcon = {
+            Image(
+                painter = painterResource(id = fallbackResId),
+                alpha = alpha,
+                colorFilter = colorFilter,
+                contentDescription = null,
+            )
+        },
+        alpha = alpha,
+        colorFilter = colorFilter,
+    )
+}
+
+@Composable
+private fun TokenIcon(
+    url: String?,
+    alpha: Float,
+    colorFilter: ColorFilter?,
+    errorIcon: @Composable () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    if (url == null) {
+        errorIcon()
+    } else {
+        DefaultCurrencyIcon(
+            modifier = modifier,
+            iconData = url,
+            errorIcon = errorIcon,
+            alpha = alpha,
+            colorFilter = colorFilter,
+        )
+    }
+}
+
+@Composable
+private fun CustomTokenIcon(tint: Color, background: Color, alpha: Float, modifier: Modifier = Modifier) {
+    Box(
+        modifier = modifier
+            .background(
+                color = background.copy(alpha = alpha),
+                shape = CircleShape,
+            ),
+        contentAlignment = Alignment.Center,
+    ) {
+        Icon(
+            modifier = Modifier.matchParentSize(),
+            painter = painterResource(id = R.drawable.ic_custom_token_44),
+            tint = tint.copy(alpha = alpha),
+            contentDescription = null,
+        )
+    }
+}
+
+@Composable
+private inline fun DefaultCurrencyIcon(
+    iconData: Any,
+    alpha: Float,
+    colorFilter: ColorFilter?,
+    crossinline errorIcon: @Composable () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val itemBackgroundColor = TangemTheme.colors.background.primary.toArgb()
+    var iconBackgroundColor by remember { mutableStateOf(Color.Transparent) }
+    val isDarkTheme = isSystemInDarkTheme()
+    val coroutineScope = rememberCoroutineScope()
+
+    SubcomposeAsyncImage(
+        modifier = modifier
+            .background(
+                color = iconBackgroundColor,
+                shape = TangemTheme.shapes.roundedCorners8,
+            ),
+        model = ImageRequest.Builder(context = LocalContext.current)
+            .data(iconData)
+            .crossfade(enable = true)
+            .allowHardware(false)
+            .listener(
+                onSuccess = { _, result ->
+                    if (isDarkTheme) {
+                        coroutineScope.launch {
+                            val color = ImageBackgroundContrastChecker(
+                                drawable = result.drawable,
+                                backgroundColor = itemBackgroundColor,
+                            ).getContrastColorIfNeeded(isDarkTheme)
+                            iconBackgroundColor = color
+                        }
+                    }
+                },
+            ).build(),
+        loading = { CircleShimmer() },
+        error = { errorIcon() },
+        alpha = alpha,
+        colorFilter = colorFilter,
+        contentDescription = null,
+    )
+}
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenInfoBlock.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenInfoBlock.kt
index 96ac8f6bf3..7ccdf694b5 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenInfoBlock.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenInfoBlock.kt
@@ -1,6 +1,5 @@
 package com.tangem.feature.tokendetails.presentation.tokendetails.ui.components
 
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.Text
@@ -10,19 +9,23 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.ColorMatrix
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
-import coil.compose.rememberAsyncImagePainter
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.feature.tokendetails.presentation.tokendetails.TokenDetailsPreviewData
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenInfoBlockState
 import com.tangem.features.tokendetails.impl.R
 
+private const val GRAY_SCALE_SATURATION = 0f
+private const val GRAY_SCALE_ALPHA = 0.4f
+private const val NORMAL_ALPHA = 1f
+
 @Composable
 internal fun TokenInfoBlock(state: TokenInfoBlockState, modifier: Modifier = Modifier) {
     Row(modifier = modifier.fillMaxWidth()) {
@@ -31,22 +34,24 @@ internal fun TokenInfoBlock(state: TokenInfoBlockState, modifier: Modifier = Mod
         ) {
             Text(
                 text = state.name,
-                style = TangemTheme.typography.h1,
+                style = TangemTheme.typography.head,
                 color = TangemTheme.colors.text.primary1,
             )
             NetworkInfoText(state.currency)
         }
 
-        val tokenIconPainter = when (LocalInspectionMode.current) {
-            // show drawable res in preview
-            true -> painterResource(id = R.drawable.img_stellar_22)
-            false -> rememberAsyncImagePainter(model = state.iconUrl)
+        val (alpha, colorFilter) = remember(state.iconState.isGrayscale) {
+            if (state.iconState.isGrayscale) {
+                GRAY_SCALE_ALPHA to GrayscaleColorFilter
+            } else {
+                NORMAL_ALPHA to null
+            }
         }
-
-        Image(
+        CurrencyIcon(
             modifier = Modifier.size(TangemTheme.dimens.size48),
-            painter = tokenIconPainter,
-            contentDescription = null,
+            icon = state.iconState,
+            alpha = alpha,
+            colorFilter = colorFilter,
         )
     }
 }
@@ -58,7 +63,7 @@ private fun NetworkInfoText(currency: TokenInfoBlockState.Currency) {
             Text(
                 text = stringResource(id = R.string.common_main_network),
                 color = TangemTheme.colors.text.tertiary,
-                style = TangemTheme.typography.caption,
+                style = TangemTheme.typography.caption2,
             )
         }
         is TokenInfoBlockState.Currency.Token -> {
@@ -69,7 +74,7 @@ private fun NetworkInfoText(currency: TokenInfoBlockState.Currency) {
                 val state = extractNetwork(tokenCurrency = currency)
                 Text(
                     text = state.normalText,
-                    style = TangemTheme.typography.caption,
+                    style = TangemTheme.typography.caption2,
                     color = TangemTheme.colors.text.tertiary,
                 )
                 Icon(
@@ -80,7 +85,7 @@ private fun NetworkInfoText(currency: TokenInfoBlockState.Currency) {
                 )
                 Text(
                     text = state.boldText,
-                    style = TangemTheme.typography.caption.copy(fontWeight = FontWeight.Medium),
+                    style = TangemTheme.typography.caption2.copy(fontWeight = FontWeight.Medium),
                     color = TangemTheme.colors.text.primary1,
                 )
             }
@@ -95,8 +100,8 @@ private fun extractNetwork(tokenCurrency: TokenInfoBlockState.Currency.Token): E
     val splitString = stringResource(
         id = R.string.token_details_token_type_subtitle,
         formatArgs = arrayOf(
+            tokenCurrency.standardName,
             tokenCurrency.networkName,
-            tokenCurrency.blockchainName,
         ),
     ).split(SEPARATOR)
 
@@ -110,6 +115,9 @@ private fun extractNetwork(tokenCurrency: TokenInfoBlockState.Currency.Token): E
 
 private data class ExtractedTokenNetworkText(val normalText: String, val boldText: String)
 
+private val GrayscaleColorFilter: ColorFilter
+    get() = ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(GRAY_SCALE_SATURATION) })
+
 @Preview
 @Composable
 private fun Preview_TokenInfoBlock_LightTheme(
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/viewmodels/TokenDetailsClickIntents.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/viewmodels/TokenDetailsClickIntents.kt
index fba6130de7..be5c08eab8 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/viewmodels/TokenDetailsClickIntents.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/viewmodels/TokenDetailsClickIntents.kt
@@ -1,13 +1,11 @@
 package com.tangem.feature.tokendetails.presentation.tokendetails.viewmodels
 
-import com.tangem.core.ui.components.transactions.intents.TxHistoryClickIntents
+import com.tangem.core.ui.components.bottomsheets.tokenreceive.AddressModel
 
-interface TokenDetailsClickIntents : TxHistoryClickIntents {
+interface TokenDetailsClickIntents {
 
     fun onBackClick()
 
-    fun onMoreClick()
-
     fun onSendClick()
 
     fun onReceiveClick()
@@ -15,4 +13,26 @@ interface TokenDetailsClickIntents : TxHistoryClickIntents {
     fun onSellClick()
 
     fun onSwapClick()
+
+    fun onDismissDialog()
+
+    fun onHideClick()
+
+    fun onHideConfirmed()
+
+    fun onRefreshSwipe()
+
+    fun onBuyClick()
+
+    fun onReloadClick()
+
+    fun onExploreClick()
+
+    fun onTransactionClick(txHash: String)
+
+    fun onAddressTypeSelected(addressModel: AddressModel)
+
+    fun onDismissBottomSheet()
+
+    fun onCloseRentInfoNotification()
 }
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/viewmodels/TokenDetailsViewModel.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/viewmodels/TokenDetailsViewModel.kt
index f4defde6c4..d9b9707177 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/viewmodels/TokenDetailsViewModel.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/viewmodels/TokenDetailsViewModel.kt
@@ -6,59 +6,90 @@ import androidx.compose.runtime.setValue
 import androidx.lifecycle.*
 import androidx.paging.cachedIn
 import arrow.core.getOrElse
+import com.tangem.blockchain.common.address.AddressType
 import com.tangem.common.Provider
+import com.tangem.core.analytics.api.AnalyticsEventHandler
+import com.tangem.core.ui.components.bottomsheets.tokenreceive.AddressModel
+import com.tangem.core.ui.components.transactions.state.TxHistoryState
+import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
+import com.tangem.domain.balancehiding.IsBalanceHiddenUseCase
+import com.tangem.domain.balancehiding.ListenToFlipsUseCase
+import com.tangem.domain.demo.IsDemoCardUseCase
 import com.tangem.domain.redux.ReduxStateHolder
-import com.tangem.domain.tokens.GetCryptoCurrencyActionsUseCase
-import com.tangem.domain.tokens.GetCurrencyStatusUpdatesUseCase
+import com.tangem.domain.tokens.*
 import com.tangem.domain.tokens.legacy.TradeCryptoAction
+import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
-import com.tangem.domain.tokens.models.CryptoCurrency
+import com.tangem.domain.tokens.models.analytics.TokenReceiveAnalyticsEvent
+import com.tangem.domain.tokens.models.analytics.TokenScreenAnalyticsEvent
+import com.tangem.domain.txhistory.usecase.GetExplorerTransactionUrlUseCase
 import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsCountUseCase
 import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsUseCase
+import com.tangem.domain.walletmanager.WalletManagersFacade
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.domain.wallets.usecase.GetExploreUrlUseCase
-import com.tangem.domain.wallets.usecase.GetSelectedWalletUseCase
+import com.tangem.domain.wallets.usecase.GetUserWalletUseCase
 import com.tangem.feature.tokendetails.presentation.router.InnerTokenDetailsRouter
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsState
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.factory.TokenDetailsStateFactory
+import com.tangem.features.tokendetails.impl.R
 import com.tangem.features.tokendetails.navigation.TokenDetailsRouter
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import com.tangem.utils.coroutines.JobHolder
 import com.tangem.utils.coroutines.saveIn
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
+import timber.log.Timber
 import javax.inject.Inject
 import kotlin.properties.Delegates
 
-@Suppress("LongParameterList")
+@Suppress("LongParameterList", "LargeClass")
 @HiltViewModel
 internal class TokenDetailsViewModel @Inject constructor(
     private val dispatchers: CoroutineDispatcherProvider,
-    private val getSelectedWalletUseCase: GetSelectedWalletUseCase,
+    private val getUserWalletUseCase: GetUserWalletUseCase,
     private val getCurrencyStatusUpdatesUseCase: GetCurrencyStatusUpdatesUseCase,
     private val getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase,
+    private val fetchCurrencyStatusUseCase: FetchCurrencyStatusUseCase,
     private val txHistoryItemsCountUseCase: GetTxHistoryItemsCountUseCase,
     private val txHistoryItemsUseCase: GetTxHistoryItemsUseCase,
     private val getExploreUrlUseCase: GetExploreUrlUseCase,
     private val getCryptoCurrencyActionsUseCase: GetCryptoCurrencyActionsUseCase,
+    private val removeCurrencyUseCase: RemoveCurrencyUseCase,
+    private val getNetworkCoinStatusUseCase: GetNetworkCoinStatusUseCase,
+    private val isBalanceHiddenUseCase: IsBalanceHiddenUseCase,
+    private val listenToFlipsUseCase: ListenToFlipsUseCase,
+    private val getCurrencyWarningsUseCase: GetCurrencyWarningsUseCase,
+    private val getExplorerTransactionUrlUseCase: GetExplorerTransactionUrlUseCase,
+    private val walletManagersFacade: WalletManagersFacade,
+    private val isDemoCardUseCase: IsDemoCardUseCase,
     private val reduxStateHolder: ReduxStateHolder,
+    private val analyticsEventsHandler: AnalyticsEventHandler,
     savedStateHandle: SavedStateHandle,
 ) : ViewModel(), DefaultLifecycleObserver, TokenDetailsClickIntents {
 
-    private val cryptoCurrency: CryptoCurrency = savedStateHandle[TokenDetailsRouter.SELECTED_CURRENCY_KEY]
-        ?: error("no expected parameter CryptoCurrency found")
+    private val userWalletId: UserWalletId = savedStateHandle.get<String>(TokenDetailsRouter.USER_WALLET_ID_KEY)
+        ?.let { stringValue -> UserWalletId(stringValue) }
+        ?: error("This screen can't open without `UserWalletId`")
+
+    private val cryptoCurrency: CryptoCurrency = savedStateHandle[TokenDetailsRouter.CRYPTO_CURRENCY_KEY]
+        ?: error("This screen can't open without `CryptoCurrency`")
 
     var router by Delegates.notNull<InnerTokenDetailsRouter>()
 
     private val marketPriceJobHolder = JobHolder()
+    private val refreshStateJobHolder = JobHolder()
+    private val warningsJobHolder = JobHolder()
     private var cryptoCurrencyStatus: CryptoCurrencyStatus? = null
-    private var wallet by Delegates.notNull<UserWallet>()
 
     private val selectedAppCurrencyFlow: StateFlow<AppCurrency> = createSelectedAppCurrencyFlow()
+
     private val stateFactory = TokenDetailsStateFactory(
         currentStateProvider = Provider { uiState },
         appCurrencyProvider = Provider(selectedAppCurrencyFlow::value),
@@ -66,69 +97,116 @@ internal class TokenDetailsViewModel @Inject constructor(
         symbol = cryptoCurrency.symbol,
         decimals = cryptoCurrency.decimals,
     )
+
     var uiState: TokenDetailsState by mutableStateOf(stateFactory.getInitialState(cryptoCurrency))
         private set
 
     override fun onCreate(owner: LifecycleOwner) {
-        getWallet()
-        updateContent(selectedWallet = wallet)
+        analyticsEventsHandler.send(
+            event = TokenScreenAnalyticsEvent.DetailsScreenOpened(token = cryptoCurrency.symbol),
+        )
+        updateContent()
+        handleBalanceHiding(owner)
     }
 
-    private fun getWallet() {
-        return getSelectedWalletUseCase()
-            .fold(
-                ifLeft = { error("Can not get selected wallet $it") },
-                ifRight = { wallet = it },
-            )
+    private fun updateContent() {
+        subscribeOnCurrencyStatusUpdates()
+        updateTxHistory(refresh = false, showItemsLoading = true)
     }
 
-    private fun updateContent(selectedWallet: UserWallet) {
-        updateMarketPrice(selectedWallet = selectedWallet)
-        updateButtons(userWalletId = selectedWallet.walletId, currencyId = cryptoCurrency.id.value)
-        updateTxHistory()
+    private fun handleBalanceHiding(owner: LifecycleOwner) {
+        isBalanceHiddenUseCase()
+            .flowWithLifecycle(owner.lifecycle)
+            .onEach { hidden ->
+                uiState = stateFactory.getStateWithUpdatedHidden(
+                    isBalanceHidden = hidden,
+                )
+            }
+            .launchIn(viewModelScope)
+
+        viewModelScope.launch {
+            listenToFlipsUseCase()
+                .flowWithLifecycle(owner.lifecycle)
+                .collect()
+        }
     }
 
-    private fun updateButtons(userWalletId: UserWalletId, currencyId: String) {
-        getCryptoCurrencyActionsUseCase(userWalletId = userWalletId, tokenId = currencyId)
+    private fun updateButtons(userWalletId: UserWalletId, currencyStatus: CryptoCurrencyStatus) {
+        getCryptoCurrencyActionsUseCase(userWalletId = userWalletId, cryptoCurrencyStatus = currencyStatus)
             .distinctUntilChanged()
             .onEach { uiState = stateFactory.getManageButtonsState(actions = it.states) }
             .flowOn(dispatchers.io)
             .launchIn(viewModelScope)
     }
 
-    private fun updateMarketPrice(selectedWallet: UserWallet) {
-        getCurrencyStatusUpdatesUseCase(
-            userWalletId = selectedWallet.walletId,
-            currencyId = cryptoCurrency.id,
-        )
-            .distinctUntilChanged()
-            .onEach { either ->
-                uiState = stateFactory.getCurrencyLoadedBalanceState(either)
-                either.onRight { status -> cryptoCurrencyStatus = status }
-            }
-            .flowOn(dispatchers.io)
-            .launchIn(viewModelScope)
-            .saveIn(marketPriceJobHolder)
+    private fun updateWarnings(cryptoCurrencyStatus: CryptoCurrencyStatus) {
+        viewModelScope.launch(dispatchers.io) {
+            val wallet = getUserWalletUseCase(userWalletId).getOrElse { return@launch }
+            getCurrencyWarningsUseCase.invoke(
+                userWalletId = userWalletId,
+                currencyStatus = cryptoCurrencyStatus,
+                derivationPath = cryptoCurrency.network.derivationPath,
+                isSingleWalletWithTokens = isSingleWalletWithTokens(wallet),
+            )
+                .distinctUntilChanged()
+                .onEach { uiState = stateFactory.getStateWithNotifications(it) }
+                .launchIn(viewModelScope)
+                .saveIn(warningsJobHolder)
+        }
     }
 
-    private fun updateTxHistory() {
+    private fun subscribeOnCurrencyStatusUpdates() {
+        viewModelScope.launch(dispatchers.io) {
+            val wallet = getUserWalletUseCase(userWalletId).getOrElse { return@launch }
+            getCurrencyStatusUpdatesUseCase(
+                userWalletId = userWalletId,
+                currencyId = cryptoCurrency.id,
+                derivationPath = cryptoCurrency.network.derivationPath,
+                isSingleWalletWithTokens = isSingleWalletWithTokens(wallet),
+            )
+                .distinctUntilChanged()
+                .onEach { either ->
+                    uiState = stateFactory.getCurrencyLoadedBalanceState(either)
+                    either.onRight { status ->
+                        cryptoCurrencyStatus = status
+                        updateButtons(userWalletId = userWalletId, currencyStatus = status)
+                        updateWarnings(status)
+                    }
+                }
+                .flowOn(dispatchers.io)
+                .launchIn(viewModelScope)
+                .saveIn(marketPriceJobHolder)
+        }
+    }
+
+    private fun isSingleWalletWithTokens(userWallet: UserWallet): Boolean {
+        return userWallet.scanResponse.walletData?.token != null && !userWallet.isMultiCurrency
+    }
+
+    /**
+     * @param refresh - invalidate cache and get data from remote
+     * @param showItemsLoading - show loading items placeholder.
+     */
+    private fun updateTxHistory(refresh: Boolean, showItemsLoading: Boolean) {
         viewModelScope.launch(dispatchers.io) {
             val txHistoryItemsCountEither = txHistoryItemsCountUseCase(
-                networkId = cryptoCurrency.network.id,
-                derivationPath = cryptoCurrency.derivationPath,
+                userWalletId = userWalletId,
+                network = cryptoCurrency.network,
             )
 
-            uiState = stateFactory.getLoadingTxHistoryState(itemsCountEither = txHistoryItemsCountEither)
+            // if countEither is left, handling error state run inside getLoadingTxHistoryState
+            if (showItemsLoading || txHistoryItemsCountEither.isLeft()) {
+                uiState = stateFactory.getLoadingTxHistoryState(itemsCountEither = txHistoryItemsCountEither)
+            }
 
             txHistoryItemsCountEither.onRight {
-                uiState = stateFactory.getLoadedTxHistoryState(
-                    txHistoryEither = txHistoryItemsUseCase(
-                        networkId = cryptoCurrency.network.id,
-                        derivationPath = cryptoCurrency.derivationPath,
-                    ).map {
-                        it.cachedIn(viewModelScope)
-                    },
-                )
+                val maybeTxHistory = txHistoryItemsUseCase(
+                    userWalletId = userWalletId,
+                    currency = cryptoCurrency,
+                    refresh = refresh,
+                ).map { it.cachedIn(viewModelScope) }
+
+                uiState = stateFactory.getLoadedTxHistoryState(maybeTxHistory)
             }
         }
     }
@@ -149,56 +227,238 @@ internal class TokenDetailsViewModel @Inject constructor(
         router.popBackStack()
     }
 
-    override fun onMoreClick() {
-        TODO("Not yet implemented")
-    }
-
     override fun onBuyClick() {
-        val status = cryptoCurrencyStatus ?: return
+        analyticsEventsHandler.send(TokenScreenAnalyticsEvent.ButtonBuy(cryptoCurrency.symbol))
 
-        reduxStateHolder.dispatch(
-            TradeCryptoAction.New.Buy(
-                userWallet = wallet,
-                cryptoCurrencyStatus = status,
-                appCurrencyCode = selectedAppCurrencyFlow.value.code,
-            ),
-        )
+        showErrorIfDemoModeOrElse {
+            val status = cryptoCurrencyStatus ?: return@showErrorIfDemoModeOrElse
+
+            viewModelScope.launch(dispatchers.io) {
+                reduxStateHolder.dispatch(
+                    TradeCryptoAction.New.Buy(
+                        userWallet = getUserWalletUseCase(userWalletId).getOrElse { return@launch },
+                        cryptoCurrencyStatus = status,
+                        appCurrencyCode = selectedAppCurrencyFlow.value.code,
+                    ),
+                )
+            }
+        }
     }
 
     override fun onReloadClick() {
-        updateTxHistory()
+        analyticsEventsHandler.send(TokenScreenAnalyticsEvent.ButtonReload(cryptoCurrency.symbol))
+        uiState = stateFactory.getLoadingTxHistoryState()
+        updateTxHistory(refresh = true, showItemsLoading = true)
     }
 
     override fun onSendClick() {
-        reduxStateHolder.dispatch(TradeCryptoAction.New.Send)
+        analyticsEventsHandler.send(TokenScreenAnalyticsEvent.ButtonSend(cryptoCurrency.symbol))
+
+        val cryptoCurrencyStatus = cryptoCurrencyStatus ?: return
+
+        viewModelScope.launch(dispatchers.io) {
+            when (cryptoCurrencyStatus.currency) {
+                is CryptoCurrency.Coin -> {
+                    reduxStateHolder.dispatch(
+                        action = TradeCryptoAction.New.SendCoin(
+                            userWallet = getUserWalletUseCase(userWalletId).getOrElse { return@launch },
+                            coinStatus = cryptoCurrencyStatus,
+                        ),
+                    )
+                }
+                is CryptoCurrency.Token -> sendToken(status = cryptoCurrencyStatus)
+            }
+        }
+    }
+
+    private fun sendToken(status: CryptoCurrencyStatus) {
+        viewModelScope.launch(dispatchers.io) {
+            val wallet = getUserWalletUseCase(userWalletId).getOrElse { return@launch }
+            val maybeCoinStatus = getNetworkCoinStatusUseCase(
+                userWalletId = userWalletId,
+                networkId = status.currency.network.id,
+                derivationPath = status.currency.network.derivationPath,
+                isSingleWalletWithTokens = isSingleWalletWithTokens(wallet),
+            ).firstOrNull()
+
+            maybeCoinStatus?.onRight { coinStatus ->
+                reduxStateHolder.dispatch(
+                    action = TradeCryptoAction.New.SendToken(
+                        userWallet = getUserWalletUseCase(userWalletId).getOrElse { return@launch },
+                        tokenStatus = status,
+                        coinFiatRate = coinStatus.value.fiatRate,
+                    ),
+                )
+            }
+        }
     }
 
     override fun onReceiveClick() {
-        // TODO: [REDACTED_JIRA]
+        analyticsEventsHandler.send(TokenScreenAnalyticsEvent.ButtonReceive(cryptoCurrency.symbol))
+
+        viewModelScope.launch(dispatchers.io) {
+            val addresses = walletManagersFacade.getAddress(
+                userWalletId = userWalletId,
+                network = cryptoCurrency.network,
+            )
+
+            analyticsEventsHandler.send(event = TokenReceiveAnalyticsEvent.ReceiveScreenOpened)
+
+            uiState = stateFactory.getStateWithReceiveBottomSheet(
+                currency = cryptoCurrency,
+                addresses = addresses,
+                sendCopyAnalyticsEvent = {
+                    analyticsEventsHandler.send(TokenReceiveAnalyticsEvent.ButtonCopyAddress(cryptoCurrency.symbol))
+                },
+                sendShareAnalyticsEvent = {
+                    analyticsEventsHandler.send(TokenReceiveAnalyticsEvent.ButtonShareAddress(cryptoCurrency.symbol))
+                },
+            )
+        }
     }
 
     override fun onSellClick() {
-        val status = cryptoCurrencyStatus ?: return
-        reduxStateHolder.dispatch(
-            TradeCryptoAction.New.Sell(
-                cryptoCurrencyStatus = status,
-                appCurrencyCode = selectedAppCurrencyFlow.value.code,
-            ),
-        )
-    }
+        analyticsEventsHandler.send(TokenScreenAnalyticsEvent.ButtonSell(cryptoCurrency.symbol))
 
-    override fun onSwapClick() {
-        reduxStateHolder.dispatch(TradeCryptoAction.New.Swap(cryptoCurrency))
-    }
+        showErrorIfDemoModeOrElse {
+            val status = cryptoCurrencyStatus ?: return@showErrorIfDemoModeOrElse
 
-    override fun onExploreClick() {
-        viewModelScope.launch {
-            router.openUrl(
-                url = getExploreUrlUseCase(
-                    userWalletId = wallet.walletId,
-                    networkId = cryptoCurrency.network.id,
+            reduxStateHolder.dispatch(
+                TradeCryptoAction.New.Sell(
+                    cryptoCurrencyStatus = status,
+                    appCurrencyCode = selectedAppCurrencyFlow.value.code,
                 ),
             )
         }
     }
+
+    override fun onSwapClick() {
+        analyticsEventsHandler.send(TokenScreenAnalyticsEvent.ButtonExchange(cryptoCurrency.symbol))
+
+        reduxStateHolder.dispatch(TradeCryptoAction.New.Swap(cryptoCurrency))
+    }
+
+    override fun onDismissDialog() {
+        uiState = stateFactory.getStateWithClosedDialog()
+    }
+
+    override fun onHideClick() {
+        analyticsEventsHandler.send(TokenScreenAnalyticsEvent.ButtonRemoveToken(cryptoCurrency.symbol))
+
+        viewModelScope.launch {
+            val hasLinkedTokens = removeCurrencyUseCase.hasLinkedTokens(userWalletId, cryptoCurrency)
+            uiState = if (hasLinkedTokens) {
+                stateFactory.getStateWithLinkedTokensDialog(cryptoCurrency)
+            } else {
+                stateFactory.getStateWithConfirmHideTokenDialog(cryptoCurrency)
+            }
+        }
+    }
+
+    override fun onHideConfirmed() {
+        viewModelScope.launch {
+            removeCurrencyUseCase.invoke(userWalletId, cryptoCurrency)
+                .onLeft { Timber.e(it) }
+                .onRight { router.popBackStack() }
+        }
+    }
+
+    override fun onExploreClick() {
+        analyticsEventsHandler.send(TokenScreenAnalyticsEvent.ButtonExplore(cryptoCurrency.symbol))
+        showErrorIfDemoModeOrElse(action = ::openExplorer)
+    }
+
+    private fun openExplorer() {
+        viewModelScope.launch(dispatchers.io) {
+            val addresses = walletManagersFacade.getAddress(
+                userWalletId = userWalletId,
+                network = cryptoCurrency.network,
+            )
+
+            if (addresses.size == 1) {
+                router.openUrl(
+                    url = getExploreUrlUseCase(
+                        userWalletId = userWalletId,
+                        network = cryptoCurrency.network,
+                        addressType = AddressType.Default,
+                    ),
+                )
+            } else {
+                uiState = stateFactory.getStateWithChooseAddressBottomSheet(addresses = addresses)
+            }
+        }
+    }
+
+    private fun showErrorIfDemoModeOrElse(action: () -> Unit) {
+        viewModelScope.launch(dispatchers.main) {
+            val wallet = getUserWalletUseCase(userWalletId = userWalletId).getOrElse { return@launch }
+
+            if (isDemoCardUseCase(cardId = wallet.cardId)) {
+                uiState = stateFactory.getStateWithClosedBottomSheet()
+                uiState = stateFactory.getStateAndTriggerEvent(
+                    state = uiState,
+                    errorMessage = resourceReference(id = R.string.alert_demo_feature_disabled),
+                    setUiState = { uiState = it },
+                )
+            } else {
+                action()
+            }
+        }
+    }
+
+    override fun onAddressTypeSelected(addressModel: AddressModel) {
+        viewModelScope.launch {
+            router.openUrl(
+                url = getExploreUrlUseCase(
+                    userWalletId = userWalletId,
+                    network = cryptoCurrency.network,
+                    addressType = AddressType.valueOf(addressModel.type.name),
+                ),
+            )
+            uiState = stateFactory.getStateWithClosedBottomSheet()
+        }
+    }
+
+    override fun onTransactionClick(txHash: String) {
+        router.openUrl(
+            url = getExplorerTransactionUrlUseCase(
+                txHash = txHash,
+                networkId = cryptoCurrency.network.id,
+            ),
+        )
+    }
+
+    override fun onRefreshSwipe() {
+        analyticsEventsHandler.send(TokenScreenAnalyticsEvent.Refreshed(cryptoCurrency.symbol))
+
+        uiState = stateFactory.getRefreshingState()
+
+        viewModelScope.launch(dispatchers.io) {
+            listOf(
+                async {
+                    fetchCurrencyStatusUseCase(
+                        userWalletId = userWalletId,
+                        id = cryptoCurrency.id,
+                        derivationPath = cryptoCurrency.network.derivationPath,
+                        refresh = true,
+                    )
+                },
+                async {
+                    updateTxHistory(
+                        refresh = true,
+                        showItemsLoading = uiState.txHistoryState !is TxHistoryState.Content,
+                    )
+                },
+            ).awaitAll()
+            uiState = stateFactory.getRefreshedState()
+        }.saveIn(refreshStateJobHolder)
+    }
+
+    override fun onDismissBottomSheet() {
+        uiState = stateFactory.getStateWithClosedBottomSheet()
+    }
+
+    override fun onCloseRentInfoNotification() {
+        uiState = stateFactory.getStateWithRemovedRentNotification()
+    }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/build.gradle.kts b/features/wallet/impl/build.gradle.kts
index 0e84af12c3..d95c4421f7 100644
--- a/features/wallet/impl/build.gradle.kts
+++ b/features/wallet/impl/build.gradle.kts
@@ -29,11 +29,13 @@ dependencies {
 
     /** Other libraries */
     implementation(deps.arrow.core)
+    implementation(deps.googlePlay.core)
     implementation(deps.jodatime)
     implementation(deps.kotlin.immutable.collections)
     implementation(deps.reKotlin)
     implementation(deps.tangem.card.core)
     implementation(deps.tangem.blockchain)
+    implementation(deps.timber)
 
     /** DI */
     implementation(deps.hilt.android)
@@ -44,6 +46,8 @@ dependencies {
     implementation(projects.core.navigation)
     implementation(projects.core.ui)
     implementation(projects.core.utils)
+    implementation(projects.core.analytics)
+    implementation(projects.core.analytics.models)
 
     /** Domain modules */
     implementation(projects.common)
@@ -60,8 +64,13 @@ dependencies {
     implementation(projects.domain.wallets.models)
     implementation(projects.domain.appCurrency)
     implementation(projects.domain.appCurrency.models)
+    implementation(projects.domain.balanceHiding)
+
+    //TODO: Create api/impl modules for onboarding [REDACTED_JIRA]
+    implementation(projects.features.onboarding)
 
     /** Feature Apis */
     implementation(projects.features.wallet.api)
     implementation(projects.features.tokendetails.api)
+    implementation(projects.features.send.api)
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/WalletFragment.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/WalletFragment.kt
index 91a98afe61..e8c0881cfe 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/WalletFragment.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/WalletFragment.kt
@@ -38,7 +38,7 @@ internal class WalletFragment : ComposeFragment() {
             setSystemBarsColor(systemBarsColor)
         }
 
-        _walletRouter.Initialize(fragmentManager = requireActivity().supportFragmentManager)
+        _walletRouter.Initialize(onFinish = requireActivity()::finish)
     }
 
     companion object {
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 60f3ec11ff..69902f587b 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
@@ -1,20 +1,26 @@
 package com.tangem.feature.wallet.presentation.common
 
 import androidx.paging.PagingData
-import com.tangem.core.ui.R
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
 import com.tangem.core.ui.components.marketprice.MarketPriceBlockState
-import com.tangem.core.ui.components.marketprice.PriceChangeConfig
+import com.tangem.core.ui.components.marketprice.PriceChangeState
+import com.tangem.core.ui.components.marketprice.PriceChangeType
 import com.tangem.core.ui.components.transactions.state.TransactionState
 import com.tangem.core.ui.components.transactions.state.TxHistoryState
-import com.tangem.core.ui.event.consumed
+import com.tangem.core.ui.event.consumedEvent
 import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.stringReference
+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.common.state.TokenItemState.TokenOptionsState
 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
-import com.tangem.feature.wallet.presentation.wallet.state.*
+import com.tangem.feature.wallet.presentation.wallet.state.ActionsBottomSheetConfig
+import com.tangem.feature.wallet.presentation.wallet.state.TokenActionButtonConfig
+import com.tangem.feature.wallet.presentation.wallet.state.WalletMultiCurrencyState
+import com.tangem.feature.wallet.presentation.wallet.state.WalletSingleCurrencyState
 import com.tangem.feature.wallet.presentation.wallet.state.components.*
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletTokensListState.TokensListItemState
 import kotlinx.collections.immutable.persistentListOf
@@ -26,17 +32,21 @@ import java.util.UUID
 @Suppress("LargeClass")
 internal object WalletPreviewData {
 
-    val walletTopBarConfig by lazy { WalletTopBarConfig(onScanCardClick = {}, onMoreClick = {}) }
+    val topBarConfig by lazy { WalletTopBarConfig(onDetailsClick = {}) }
 
     val walletCardContentState by lazy {
         WalletCardState.Content(
             id = UserWalletId(stringValue = "123"),
-            title = "Wallet 1",
-            balance = "8923,05 $",
-            additionalInfo = TextReference.Str("3 cards • Seed phrase"),
-            imageResId = R.drawable.ill_businessman_3d,
+            title = "Wallet1Wallet1Wallet1Wallet1Wallet1Wallet1Wallet1Wallet1",
+            balance = "8923,05312312312312312312331231231233432423423424234 $",
+            additionalInfo = WalletAdditionalInfo(
+                hideable = false,
+                content = TextReference.Str("3 cards • Seed phrase3 cards • Seed phrasephrasephrasephrase"),
+            ),
+            imageResId = R.drawable.ill_wallet2_cards3_120_106,
             onRenameClick = { _, _ -> },
             onDeleteClick = {},
+            cardCount = 1,
         )
     }
 
@@ -44,17 +54,7 @@ internal object WalletPreviewData {
         WalletCardState.Loading(
             id = UserWalletId("321"),
             title = "Wallet 1",
-            imageResId = R.drawable.ill_businessman_3d,
-            onRenameClick = { _, _ -> },
-            onDeleteClick = {},
-        )
-    }
-
-    val walletCardHiddenContentState by lazy {
-        WalletCardState.HiddenContent(
-            id = UserWalletId("42"),
-            title = "Wallet 1",
-            imageResId = R.drawable.ill_businessman_3d,
+            imageResId = R.drawable.ill_wallet2_cards3_120_106,
             onRenameClick = { _, _ -> },
             onDeleteClick = {},
         )
@@ -64,7 +64,7 @@ internal object WalletPreviewData {
         WalletCardState.Error(
             id = UserWalletId("24"),
             title = "Wallet 1",
-            imageResId = R.drawable.ill_businessman_3d,
+            imageResId = R.drawable.ill_wallet2_cards3_120_106,
             onRenameClick = { _, _ -> },
             onDeleteClick = {},
         )
@@ -74,7 +74,6 @@ internal object WalletPreviewData {
         mapOf(
             UserWalletId(stringValue = "123") to walletCardContentState,
             UserWalletId(stringValue = "321") to walletCardLoadingState,
-            UserWalletId(stringValue = "42") to walletCardHiddenContentState,
             UserWalletId(stringValue = "24") to walletCardErrorState,
         )
     }
@@ -87,23 +86,40 @@ internal object WalletPreviewData {
         )
     }
 
+    val coinIconState
+        get() = TokenItemState.IconState.CoinIcon(
+            url = null,
+            fallbackResId = R.drawable.img_polygon_22,
+            isGrayscale = false,
+            showCustomBadge = false,
+        )
+
+    private val tokenIconState
+        get() = TokenItemState.IconState.TokenIcon(
+            url = null,
+            networkBadgeIconResId = R.drawable.img_polygon_22,
+            fallbackTint = TangemColorPalette.Black,
+            fallbackBackground = TangemColorPalette.Meadow,
+            isGrayscale = false,
+            showCustomBadge = false,
+        )
+
+    private val customTokenIconState
+        get() = TokenItemState.IconState.CustomTokenIcon(
+            tint = TangemColorPalette.Black,
+            background = TangemColorPalette.Meadow,
+            networkBadgeIconResId = R.drawable.img_polygon_22,
+            isGrayscale = false,
+        )
+
     val tokenItemVisibleState by lazy {
         TokenItemState.Content(
             id = UUID.randomUUID().toString(),
-            tokenIconUrl = null,
-            tokenIconResId = R.drawable.img_polygon_22,
-            networkBadgeIconResId = R.drawable.img_polygon_22,
-            name = "Polygon",
-            amount = "5,412 MATIC",
-            hasPending = true,
-            tokenOptions = TokenOptionsState.Visible(
-                fiatAmount = "321 $",
-                config = PriceChangeConfig(
-                    valueInPercent = "2%",
-                    type = PriceChangeConfig.Type.UP,
-                ),
-            ),
-            isTestnet = false,
+            iconState = coinIconState,
+            titleState = TokenItemState.TitleState.Content(text = "Polygon", hasPending = true),
+            fiatAmountState = TokenItemState.FiatAmountState.Content(text = "321 $"),
+            cryptoAmountState = TokenItemState.CryptoAmountState.Content(text = "5,412 MATIC"),
+            priceChangeState = TokenItemState.PriceChangeState.Unknown,
             onItemClick = {},
             onItemLongClick = {},
         )
@@ -111,27 +127,22 @@ internal object WalletPreviewData {
 
     val testnetTokenItemVisibleState by lazy {
         tokenItemVisibleState.copy(
-            name = "Polygon testnet",
-            isTestnet = true,
+            titleState = TokenItemState.TitleState.Content(text = "Polygon testnet"),
+            iconState = tokenIconState.copy(isGrayscale = true),
         )
     }
 
     val tokenItemHiddenState by lazy {
         TokenItemState.Content(
             id = UUID.randomUUID().toString(),
-            tokenIconUrl = null,
-            tokenIconResId = R.drawable.img_polygon_22,
-            networkBadgeIconResId = R.drawable.img_polygon_22,
-            name = "Polygon",
-            amount = "5,412 MATIC",
-            hasPending = true,
-            tokenOptions = TokenOptionsState.Hidden(
-                config = PriceChangeConfig(
-                    valueInPercent = "2%",
-                    type = PriceChangeConfig.Type.UP,
-                ),
+            iconState = tokenIconState,
+            titleState = TokenItemState.TitleState.Content(text = "Polygon"),
+            fiatAmountState = TokenItemState.FiatAmountState.Content(text = "321 $"),
+            cryptoAmountState = TokenItemState.CryptoAmountState.Content(text = "5,412 MATIC"),
+            priceChangeState = TokenItemState.PriceChangeState.Content(
+                valueInPercent = "2.0%",
+                type = PriceChangeType.UP,
             ),
-            isTestnet = false,
             onItemClick = {},
             onItemLongClick = {},
         )
@@ -140,26 +151,55 @@ internal object WalletPreviewData {
     val tokenItemDragState by lazy {
         TokenItemState.Draggable(
             id = UUID.randomUUID().toString(),
-            tokenIconUrl = null,
-            tokenIconResId = R.drawable.img_polygon_22,
-            networkBadgeIconResId = R.drawable.img_polygon_22,
-            name = "Polygon",
-            isTestnet = false,
-            fiatAmount = "3 172,14 $",
+            iconState = tokenIconState,
+            titleState = TokenItemState.TitleState.Content(text = "Polygon"),
+            cryptoAmountState = TokenItemState.CryptoAmountState.Content(text = "3 172,14 $"),
         )
     }
 
     val tokenItemUnreachableState by lazy {
         TokenItemState.Unreachable(
             id = UUID.randomUUID().toString(),
-            tokenIconUrl = null,
-            tokenIconResId = R.drawable.img_polygon_22,
-            networkBadgeIconResId = R.drawable.img_polygon_22,
-            name = "Polygon",
+            iconState = tokenIconState,
+            titleState = TokenItemState.TitleState.Content(text = "Polygon"),
+            onItemClick = {},
+            onItemLongClick = {},
         )
     }
 
-    val loadingTokenItemState by lazy { TokenItemState.Loading(id = "Loading#1") }
+    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
@@ -171,7 +211,7 @@ internal object WalletPreviewData {
                 val networkNumber = index + 1
 
                 val group = DraggableItem.GroupHeader(
-                    id = "group_$networkNumber",
+                    id = networkNumber,
                     networkName = "$networkNumber",
                     roundingMode = when (index) {
                         0 -> DraggableItem.RoundingMode.Top()
@@ -187,8 +227,9 @@ internal object WalletPreviewData {
                         DraggableItem.Token(
                             tokenItemState = tokenItemDragState.copy(
                                 id = "${group.id}_token_$tokenNumber",
-                                name = "Token $tokenNumber from $networkNumber network",
-                                networkBadgeIconResId = R.drawable.img_eth_22.takeIf { i != 0 },
+                                titleState = TokenItemState.TitleState.Content(
+                                    text = "Token $tokenNumber from $networkNumber network",
+                                ),
                             ),
                             groupId = group.id,
                             roundingMode = when {
@@ -199,7 +240,7 @@ internal object WalletPreviewData {
                     )
                 }
 
-                val divider = DraggableItem.GroupPlaceholder(id = "divider_$networkNumber")
+                val divider = DraggableItem.Placeholder(id = "divider_$networkNumber")
 
                 buildList {
                     add(group)
@@ -234,7 +275,7 @@ internal object WalletPreviewData {
             ),
             dndConfig = OrganizeTokensState.DragAndDropConfig(
                 onItemDragged = { _, _ -> },
-                onDragStart = {},
+                onItemDragStart = {},
                 canDragItemOver = { _, _ -> false },
                 onItemDragEnd = {},
             ),
@@ -242,7 +283,8 @@ internal object WalletPreviewData {
                 onApplyClick = {},
                 onCancelClick = {},
             ),
-            scrollListToTop = consumed,
+            scrollListToTop = consumedEvent(),
+            isBalanceHidden = true,
         )
     }
 
@@ -255,10 +297,10 @@ internal object WalletPreviewData {
     }
 
     val bottomSheet by lazy {
-        WalletBottomSheetConfig(
+        TangemBottomSheetConfig(
             isShow = false,
             onDismissRequest = {},
-            content = WalletBottomSheetConfig.BottomSheetContentConfig.UnlockWallets(
+            content = WalletBottomSheetConfig.UnlockWallets(
                 onUnlockClick = {},
                 onScanClick = {},
             ),
@@ -266,11 +308,9 @@ internal object WalletPreviewData {
     }
 
     val actionsBottomSheet = ActionsBottomSheetConfig(
-        isShow = true,
-        onDismissRequest = {},
         actions = listOf(
             TokenActionButtonConfig(
-                text = "Send",
+                text = TextReference.Str("Send"),
                 iconResId = R.drawable.ic_share_24,
                 onClick = {},
             ),
@@ -290,94 +330,84 @@ internal object WalletPreviewData {
     val multicurrencyWalletScreenState by lazy {
         WalletMultiCurrencyState.Content(
             onBackClick = {},
-            topBarConfig = walletTopBarConfig,
+            topBarConfig = topBarConfig,
             walletsListConfig = walletListConfig,
             tokensListState = WalletTokensListState.Content(
                 persistentListOf(
-                    TokensListItemState.NetworkGroupTitle(TextReference.Str("Bitcoin")),
+                    TokensListItemState.NetworkGroupTitle(id = 0, stringReference("Bitcoin")),
                     TokensListItemState.Token(
                         tokenItemVisibleState.copy(
                             id = "token_1",
-                            name = "Ethereum",
-                            tokenIconResId = R.drawable.img_eth_22,
-                            networkBadgeIconResId = null,
-                            amount = "1,89340821 ETH",
+                            titleState = TokenItemState.TitleState.Content(text = "Ethereum"),
+                            cryptoAmountState = TokenItemState.CryptoAmountState.Content("1,89340821 ETH"),
                         ),
                     ),
                     TokensListItemState.Token(
                         tokenItemVisibleState.copy(
                             id = "token_2",
-                            name = "Ethereum",
-                            tokenIconResId = R.drawable.img_eth_22,
-                            networkBadgeIconResId = null,
-                            amount = "1,89340821 ETH",
+                            titleState = TokenItemState.TitleState.Content(text = "Ethereum"),
+                            cryptoAmountState = TokenItemState.CryptoAmountState.Content("1,89340821 ETH"),
                         ),
                     ),
                     TokensListItemState.Token(
                         tokenItemVisibleState.copy(
                             id = "token_3",
-                            name = "Ethereum",
-                            tokenIconResId = R.drawable.img_eth_22,
-                            networkBadgeIconResId = null,
-                            amount = "1,89340821 ETH",
+                            titleState = TokenItemState.TitleState.Content(text = "Ethereum"),
+                            cryptoAmountState = TokenItemState.CryptoAmountState.Content("1,89340821 ETH"),
                         ),
                     ),
                     TokensListItemState.Token(
                         tokenItemVisibleState.copy(
                             id = "token_4",
-                            name = "Ethereum",
-                            tokenIconResId = R.drawable.img_eth_22,
-                            networkBadgeIconResId = null,
-                            amount = "1,89340821 ETH",
+                            titleState = TokenItemState.TitleState.Content(text = "Ethereum"),
+                            cryptoAmountState = TokenItemState.CryptoAmountState.Content("1,89340821 ETH"),
                         ),
                     ),
-                    TokensListItemState.NetworkGroupTitle(TextReference.Str("Ethereum")),
+                    TokensListItemState.NetworkGroupTitle(id = 1, stringReference("Ethereum")),
                     TokensListItemState.Token(
                         tokenItemVisibleState.copy(
                             id = "token_5",
-                            name = "Ethereum",
-                            tokenIconResId = R.drawable.img_eth_22,
-                            networkBadgeIconResId = null,
-                            amount = "1,89340821 ETH",
+                            titleState = TokenItemState.TitleState.Content(text = "Ethereum"),
+                            cryptoAmountState = TokenItemState.CryptoAmountState.Content("1,89340821 ETH"),
                         ),
                     ),
                 ),
-                onOrganizeTokensClick = {},
+                organizeTokensButton = WalletTokensListState.OrganizeTokensButtonState.Visible(isEnabled = true, {}),
             ),
             pullToRefreshConfig = WalletPullToRefreshConfig(
                 isRefreshing = false,
                 onRefresh = {},
             ),
             notifications = persistentListOf(
-                WalletNotification.UnreachableNetworks,
-                WalletNotification.LikeTangemApp(onClick = {}),
-                WalletNotification.BackupCard(onClick = {}),
-                WalletNotification.ScanCard(onClick = {}),
+                WalletNotification.Critical.DevCard,
+                WalletNotification.Informational.MissingAddresses(missingAddressesCount = 0, onGenerateClick = {}),
+                WalletNotification.Warning.NetworksUnreachable,
             ),
             bottomSheetConfig = bottomSheet,
-            tokenActionsBottomSheet = actionsBottomSheet,
             onManageTokensClick = {},
+            event = consumedEvent(),
+            isBalanceHidden = false,
         )
     }
 
     val singleWalletScreenState by lazy {
         WalletSingleCurrencyState.Content(
             onBackClick = {},
-            topBarConfig = walletTopBarConfig,
+            topBarConfig = topBarConfig,
             walletsListConfig = walletListConfig,
             pullToRefreshConfig = WalletPullToRefreshConfig(
                 isRefreshing = false,
                 onRefresh = {},
             ),
-            notifications = persistentListOf(WalletNotification.LikeTangemApp(onClick = {})),
+            notifications = persistentListOf(WalletNotification.Warning.NetworksUnreachable),
             buttons = manageButtons,
             bottomSheetConfig = bottomSheet,
             marketPriceBlockState = MarketPriceBlockState.Content(
-                currencyName = "BTC",
+                currencySymbol = "BTC",
                 price = "98900.12$",
-                priceChangeConfig = PriceChangeConfig(
+                priceChangeConfig = PriceChangeState.Content(
                     valueInPercent = "5.16%",
-                    type = PriceChangeConfig.Type.UP,
+                    type = PriceChangeType.UP,
                 ),
             ),
             txHistoryState = TxHistoryState.Content(
@@ -386,26 +416,34 @@ internal object WalletPreviewData {
                         listOf(
                             TxHistoryState.TxHistoryItemState.GroupTitle("Today"),
                             TxHistoryState.TxHistoryItemState.Transaction(
-                                TransactionState.Sending(
+                                TransactionState.Transfer(
                                     txHash = UUID.randomUUID().toString(),
                                     address = TextReference.Str("33BddS...ga2B"),
                                     amount = "-0.500913 BTC",
                                     timestamp = "8:41",
+                                    status = TransactionState.Content.Status.Unconfirmed,
+                                    direction = TransactionState.Content.Direction.OUTGOING,
+                                    onClick = {},
                                 ),
                             ),
                             TxHistoryState.TxHistoryItemState.GroupTitle("Yesterday"),
                             TxHistoryState.TxHistoryItemState.Transaction(
-                                TransactionState.Sending(
+                                TransactionState.Transfer(
                                     txHash = UUID.randomUUID().toString(),
                                     address = TextReference.Str("33BddS...ga2B"),
                                     amount = "-0.500913 BTC",
                                     timestamp = "8:41",
+                                    status = TransactionState.Content.Status.Confirmed,
+                                    direction = TransactionState.Content.Direction.OUTGOING,
+                                    onClick = {},
                                 ),
                             ),
                         ),
                     ),
                 ),
             ),
+            event = consumedEvent(),
+            isBalanceHidden = false,
         )
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/TokenItem.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/TokenItem.kt
index 6169aa9a8c..9e0ea7e0cd 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/TokenItem.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/TokenItem.kt
@@ -3,140 +3,408 @@ package com.tangem.feature.wallet.presentation.common.component
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.hapticfeedback.HapticFeedbackType
-import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.composed
+import androidx.compose.ui.layout.*
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
-import androidx.constraintlayout.compose.ConstrainedLayoutReference
-import androidx.constraintlayout.compose.ConstraintLayout
-import androidx.constraintlayout.compose.ConstraintLayoutScope
-import androidx.constraintlayout.compose.Dimension
-import com.tangem.core.ui.components.*
+import androidx.compose.ui.unit.Constraints
+import com.tangem.core.ui.components.marketprice.PriceChangeType
+import com.tangem.core.ui.extensions.rememberHapticFeedback
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.feature.wallet.presentation.common.WalletPreviewData
-import com.tangem.feature.wallet.presentation.common.component.token.TokenCryptoInfoBlock
-import com.tangem.feature.wallet.presentation.common.component.token.TokenFiatInfoBlock
-import com.tangem.feature.wallet.presentation.common.component.token.TokenIcon
+import com.tangem.feature.wallet.presentation.common.component.token.*
+import com.tangem.feature.wallet.presentation.common.component.token.icon.TokenIcon
 import com.tangem.feature.wallet.presentation.common.state.TokenItemState
 import org.burnoutcrew.reorderable.ReorderableLazyListState
+import kotlin.math.max
+
+private const val TITLE_MIN_WIDTH_COEFFICIENT = 0.22
+private const val PRICE_CHANGE_MIN_WIDTH_COEFFICIENT = 0.16
+
+private enum class LayoutId {
+    ICON, TITLE, FIAT_AMOUNT, CRYPTO_AMOUNT, PRICE_CHANGE, NON_FIAT_CONTENT
+}
 
-// TODO: Add custom token state: [REDACTED_JIRA]
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 internal fun TokenItem(
     state: TokenItemState,
+    isBalanceHidden: Boolean,
     modifier: Modifier = Modifier,
     reorderableTokenListState: ReorderableLazyListState? = null,
 ) {
-    val hapticFeedback = LocalHapticFeedback.current
-    val containerModifier: Modifier = remember(state) {
-        when (state) {
-            is TokenItemState.Content -> modifier.combinedClickable(
-                onClick = state.onItemClick,
-                onLongClick = {
-                    hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
-                    state.onItemLongClick()
-                },
-            )
-            else -> modifier
-        }
-    }
-    BaseContainer(modifier = containerModifier) {
-        val (iconRef, cryptoInfoRef, fiatInfoRef) = createRefs()
-
-        TokenIcon(
-            state = state,
-            modifier = Modifier.constrainAs(iconRef) {
-                centerVerticallyTo(parent)
-                start.linkTo(parent.start)
-            },
-        )
-
-        TokenCryptoInfoBlock(
-            state = state,
-            modifier = Modifier
-                .padding(horizontal = TangemTheme.dimens.spacing8)
-                .constrainAs(cryptoInfoRef) {
-                    centerVerticallyTo(parent)
-                    start.linkTo(iconRef.end)
-                    end.linkTo(fiatInfoRef.start)
-                    width = Dimension.fillToConstraints
-                },
-        )
-
-        TokenFiatInfoBlock(
-            state = state,
-            modifier = Modifier.constrainAsOptionsItem(scope = this, ref = fiatInfoRef),
-            reorderableTokenListState = reorderableTokenListState,
-        )
-    }
-}
-
-@Composable
-private inline fun BaseContainer(
-    modifier: Modifier = Modifier,
-    crossinline content: @Composable ConstraintLayoutScope.() -> Unit,
-) {
-    Box(
+    CustomContainer(
+        state = state,
         modifier = modifier
-            .defaultMinSize(minHeight = TangemTheme.dimens.size68)
+            .tokenClickable(state = state)
             .background(color = TangemTheme.colors.background.primary),
     ) {
-        ConstraintLayout(
+        TokenIcon(state = state.iconState, modifier = Modifier.layoutId(layoutId = LayoutId.ICON))
+
+        TokenTitle(
+            state = state.titleState,
             modifier = Modifier
-                .fillMaxSize()
-                .padding(
-                    horizontal = TangemTheme.dimens.spacing14,
-                    vertical = TangemTheme.dimens.spacing14,
-                ),
-            content = content,
+                .layoutId(layoutId = LayoutId.TITLE)
+                .padding(horizontal = TangemTheme.dimens.spacing8)
+                .padding(bottom = TangemTheme.dimens.spacing2),
+        )
+
+        TokenFiatAmount(
+            state = state.fiatAmountState,
+            isBalanceHidden = isBalanceHidden,
+            modifier = Modifier
+                .layoutId(layoutId = LayoutId.FIAT_AMOUNT)
+                .padding(bottom = TangemTheme.dimens.spacing2),
+        )
+
+        TokenCryptoAmount(
+            state = state.cryptoAmountState,
+            isBalanceHidden = isBalanceHidden,
+            modifier = Modifier
+                .layoutId(layoutId = LayoutId.CRYPTO_AMOUNT)
+                .padding(horizontal = TangemTheme.dimens.spacing8),
+        )
+
+        TokenPriceChange(
+            state = state.priceChangeState,
+            modifier = Modifier.layoutId(layoutId = LayoutId.PRICE_CHANGE),
+        )
+
+        NonFiatContentBlock(
+            state = state,
+            reorderableTokenListState = reorderableTokenListState,
+            modifier = Modifier.layoutId(layoutId = LayoutId.NON_FIAT_CONTENT),
         )
     }
 }
 
-@Stable
-private fun Modifier.constrainAsOptionsItem(scope: ConstraintLayoutScope, ref: ConstrainedLayoutReference): Modifier {
-    return with(scope) {
-        this@constrainAsOptionsItem.constrainAs(ref) {
-            centerVerticallyTo(parent)
-            end.linkTo(parent.end)
+@OptIn(ExperimentalFoundationApi::class)
+private fun Modifier.tokenClickable(state: TokenItemState): Modifier = composed {
+    when (state) {
+        is TokenItemState.Content -> {
+            val onLongClick = rememberHapticFeedback(state = state, onAction = state.onItemLongClick)
+            combinedClickable(onClick = state.onItemClick, onLongClick = onLongClick)
+        }
+        is TokenItemState.Unreachable -> {
+            val onLongClick = rememberHapticFeedback(state = state, onAction = state.onItemLongClick)
+            combinedClickable(onClick = state.onItemClick, onLongClick = onLongClick)
+        }
+        is TokenItemState.NoAddress -> {
+            val onLongClick = rememberHapticFeedback(state = state, onAction = state.onItemLongClick)
+            combinedClickable(onClick = {}, onLongClick = onLongClick)
+        }
+        is TokenItemState.Draggable,
+        is TokenItemState.Loading,
+        is TokenItemState.Locked,
+        -> this
+    }
+}
+
+/**
+ * IMPORTANT! All margins that used between children setup like as children paddings.
+ */
+@Suppress("LongMethod")
+@Composable
+private fun CustomContainer(state: TokenItemState, modifier: Modifier = Modifier, content: @Composable () -> Unit) {
+    val density = LocalDensity.current
+    val dimens = TangemTheme.dimens
+
+    Layout(content = content, modifier = modifier) { measurables, constraints ->
+
+        val layoutWidth = constraints.maxWidth
+        val layoutPadding = with(density) { dimens.size14.roundToPx() }
+        val layoutWidthWithPaddings = layoutWidth - 2 * layoutPadding
+
+        val titleMinWidth = (layoutWidth * TITLE_MIN_WIDTH_COEFFICIENT).toInt()
+        val priceChangeMinWidth = (layoutWidth * PRICE_CHANGE_MIN_WIDTH_COEFFICIENT).toInt()
+
+        val icon = measurables.measure(layoutId = LayoutId.ICON, constraints = constraints)
+
+        /*
+         * Title width take the whole REMAINING space.
+         * If FiatAmount took the whole free space, then Title will has min width.
+         */
+        val title: Placeable
+
+        // FiatAmount width must take the whole free space but is not greater the Title min size
+        var fiatAmount: Placeable? = null
+
+        // CryptoAmount width must take the whole free space but is not greater the PriceChange min size
+        var cryptoAmount: Placeable? = null
+
+        /*
+         * PriceChange width take the whole REMAINING space.
+         * If CryptoAmount took the whole free space, then PriceChange will has min width.
+         */
+        val priceChange: Placeable?
+
+        val nonFiatContent = measurables.measure(layoutId = LayoutId.NON_FIAT_CONTENT, constraints = constraints)
+
+        var firstRowRemainingFreeSpace: Int? = null
+        var secondRowRemainingFreeSpace: Int? = null
+
+        when (state) {
+            is TokenItemState.Content,
+            is TokenItemState.Loading,
+            is TokenItemState.Locked,
+            -> {
+                fiatAmount = measurables.measureFiatAmount(
+                    state = state,
+                    maxWidth = layoutWidthWithPaddings - icon.width - titleMinWidth,
+                    defaultConstraints = constraints,
+                )
+
+                cryptoAmount = measurables.measureCryptoAmount(
+                    state = state,
+                    maxWidth = layoutWidthWithPaddings - icon.width - priceChangeMinWidth,
+                    defaultConstraints = constraints,
+                )
+
+                firstRowRemainingFreeSpace = layoutWidthWithPaddings - icon.width - fiatAmount.width
+                secondRowRemainingFreeSpace = layoutWidthWithPaddings - icon.width - cryptoAmount.width
+            }
+            is TokenItemState.Draggable -> {
+                cryptoAmount = measurables.measureCryptoAmount(
+                    state = state,
+                    maxWidth = layoutWidthWithPaddings - icon.width - nonFiatContent.width,
+                    defaultConstraints = constraints,
+                )
+
+                firstRowRemainingFreeSpace = layoutWidthWithPaddings - icon.width - nonFiatContent.width
+            }
+            is TokenItemState.NoAddress,
+            is TokenItemState.Unreachable,
+            -> {
+                firstRowRemainingFreeSpace = layoutWidthWithPaddings - icon.width - nonFiatContent.width
+            }
+        }
+
+        title = measurables.measureTitle(
+            state = state,
+            minWidth = titleMinWidth,
+            remainingFreeSpace = firstRowRemainingFreeSpace,
+            defaultConstraints = constraints,
+        )
+
+        priceChange = secondRowRemainingFreeSpace?.let {
+            measurables.measurePriceChange(
+                state = state,
+                minWidth = priceChangeMinWidth,
+                remainingFreeSpace = secondRowRemainingFreeSpace,
+                defaultConstraints = constraints,
+            )
+        }
+
+        val layoutHeight = calculateLayoutHeight(
+            state = state,
+            minLayoutHeight = with(density) { dimens.size68.roundToPx() },
+            layoutPadding = layoutPadding,
+            betweenRowsPadding = with(density) { dimens.size2.roundToPx() },
+            title = title,
+            fiatAmount = fiatAmount,
+            cryptoAmount = cryptoAmount,
+            priceChange = priceChange,
+        )
+
+        layout(width = constraints.maxWidth, height = layoutHeight) {
+            icon.placeRelative(x = layoutPadding, y = (layoutHeight - icon.height).div(other = 2))
+
+            title.placeRelative(
+                x = layoutPadding + icon.width,
+                y = when (state) {
+                    is TokenItemState.NoAddress,
+                    is TokenItemState.Unreachable,
+                    -> (layoutHeight - title.height).div(other = 2)
+                    else -> layoutPadding
+                },
+            )
+
+            cryptoAmount?.placeRelative(
+                x = layoutPadding + icon.width,
+                y = layoutHeight - cryptoAmount.height - layoutPadding,
+            )
+
+            fiatAmount?.placeRelative(x = layoutWidth - fiatAmount.width - layoutPadding, y = layoutPadding)
+
+            priceChange?.placeRelative(
+                x = layoutWidth - priceChange.width - layoutPadding,
+                y = layoutHeight - priceChange.height - layoutPadding,
+            )
+
+            nonFiatContent.placeRelative(
+                x = layoutWidth - nonFiatContent.width - layoutPadding,
+                y = (layoutHeight - nonFiatContent.height).div(other = 2),
+            )
         }
     }
 }
 
-// region preview
+private fun List<Measurable>.measureFiatAmount(
+    state: TokenItemState,
+    maxWidth: Int,
+    defaultConstraints: Constraints,
+): Placeable {
+    return measure(
+        layoutId = LayoutId.FIAT_AMOUNT,
+        constraints = when (state) {
+            is TokenItemState.Content,
+            is TokenItemState.Draggable,
+            -> createConstrainsSafely(maxWidth = maxWidth)
+            else -> defaultConstraints
+        },
+    )
+}
 
-@Preview
+private fun List<Measurable>.measureCryptoAmount(
+    state: TokenItemState,
+    maxWidth: Int,
+    defaultConstraints: Constraints,
+): Placeable {
+    return measure(
+        layoutId = LayoutId.CRYPTO_AMOUNT,
+        constraints = when (state) {
+            is TokenItemState.Content,
+            is TokenItemState.Draggable,
+            -> createConstrainsSafely(maxWidth = maxWidth)
+            else -> defaultConstraints
+        },
+    )
+}
+
+private fun List<Measurable>.measureTitle(
+    state: TokenItemState,
+    minWidth: Int,
+    remainingFreeSpace: Int,
+    defaultConstraints: Constraints,
+): Placeable {
+    return measure(
+        layoutId = LayoutId.TITLE,
+        constraints = when (state) {
+            is TokenItemState.Content,
+            is TokenItemState.Draggable,
+            is TokenItemState.NoAddress,
+            is TokenItemState.Unreachable,
+            -> createDynamicConstrains(minWidth = minWidth, remainingFreeSpace = remainingFreeSpace)
+            else -> defaultConstraints
+        },
+    )
+}
+
+private fun List<Measurable>.measurePriceChange(
+    state: TokenItemState,
+    minWidth: Int,
+    remainingFreeSpace: Int,
+    defaultConstraints: Constraints,
+): Placeable {
+    return measure(
+        layoutId = LayoutId.PRICE_CHANGE,
+        constraints = when (state) {
+            is TokenItemState.Content,
+            -> createDynamicConstrains(minWidth = minWidth, remainingFreeSpace = remainingFreeSpace)
+            else -> defaultConstraints
+        },
+    )
+}
+
+private fun List<Measurable>.measure(layoutId: LayoutId, constraints: Constraints): Placeable {
+    return requireNotNull(
+        value = firstOrNull { it.layoutId == layoutId },
+        lazyMessage = { "Measurables[$layoutId] is null" },
+    ).measure(constraints)
+}
+
+private fun createDynamicConstrains(minWidth: Int, remainingFreeSpace: Int): Constraints {
+    return createConstrainsSafely(
+        minWidth = minWidth,
+        maxWidth = max(a = minWidth, b = remainingFreeSpace),
+    )
+}
+
+private fun createConstrainsSafely(
+    minWidth: Int = 0,
+    maxWidth: Int = Constraints.Infinity,
+    minHeight: Int = 0,
+    maxHeight: Int = Constraints.Infinity,
+): Constraints {
+    return Constraints(
+        minWidth = minWidth.makeNotLessZero(),
+        maxWidth = maxWidth.makeNotLessZero(),
+        minHeight = minHeight.makeNotLessZero(),
+        maxHeight = maxHeight.makeNotLessZero(),
+    )
+}
+
+private fun Int.makeNotLessZero(): Int = max(a = 0, b = this)
+
+@Suppress("LongParameterList")
+private fun calculateLayoutHeight(
+    state: TokenItemState,
+    minLayoutHeight: Int,
+    layoutPadding: Int,
+    betweenRowsPadding: Int,
+    title: Placeable,
+    fiatAmount: Placeable?,
+    cryptoAmount: Placeable?,
+    priceChange: Placeable?,
+): Int {
+    val firstColumnHeight: Int
+    val secondColumnHeight: Int
+
+    when (state) {
+        is TokenItemState.Content,
+        is TokenItemState.Loading,
+        is TokenItemState.Locked,
+        -> {
+            firstColumnHeight = 2 * layoutPadding + title.height + betweenRowsPadding + (cryptoAmount?.height ?: 0)
+            secondColumnHeight = 2 * layoutPadding + (fiatAmount?.height ?: 0) + betweenRowsPadding +
+                (priceChange?.height ?: 0)
+        }
+        is TokenItemState.Draggable,
+        is TokenItemState.NoAddress,
+        is TokenItemState.Unreachable,
+        -> {
+            firstColumnHeight = minLayoutHeight
+            secondColumnHeight = minLayoutHeight
+        }
+    }
+
+    return max(firstColumnHeight, secondColumnHeight).coerceAtLeast(minLayoutHeight)
+}
+
+@Preview(widthDp = 360)
 @Composable
-private fun Preview_Tokens_LightTheme(@PreviewParameter(TokenConfigProvider::class) state: TokenItemState) {
+private fun Preview_CustomTokenItem_InLight(@PreviewParameter(TokenItemStateProvider::class) state: TokenItemState) {
     TangemTheme(isDark = false) {
-        TokenItem(state)
+        TokenItem(state = state, isBalanceHidden = false)
     }
 }
 
-@Preview
-@Composable
-private fun Preview_Tokens_DarkTheme(@PreviewParameter(TokenConfigProvider::class) state: TokenItemState) {
-    TangemTheme(isDark = true) {
-        TokenItem(state)
-    }
-}
-
-private class TokenConfigProvider : CollectionPreviewParameterProvider<TokenItemState>(
+private class TokenItemStateProvider : CollectionPreviewParameterProvider<TokenItemState>(
     collection = listOf(
-        WalletPreviewData.tokenItemVisibleState,
+        WalletPreviewData.tokenItemVisibleState.copy(
+            iconState = WalletPreviewData.coinIconState.copy(showCustomBadge = true),
+            titleState = TokenItemState.TitleState.Content(
+                text = "PolygonPolygonPolygonPolygonPolygonPolygon",
+                hasPending = true,
+            ),
+            fiatAmountState = TokenItemState.FiatAmountState.Content(text = "3213123123321312312312312312 $"),
+            cryptoAmountState = TokenItemState.CryptoAmountState.Content(text = "5,4123123213123123123123123123 MATIC"),
+            priceChangeState = TokenItemState.PriceChangeState.Content(
+                valueInPercent = "2365723643724723423742342374623642374723472342342.0%",
+                type = PriceChangeType.UP,
+            ),
+        ),
         WalletPreviewData.tokenItemUnreachableState,
+        WalletPreviewData.tokenItemNoAddressState,
         WalletPreviewData.tokenItemDragState,
         WalletPreviewData.tokenItemHiddenState,
         WalletPreviewData.loadingTokenItemState,
         WalletPreviewData.testnetTokenItemVisibleState,
+        WalletPreviewData.customTokenItemVisibleState,
+        WalletPreviewData.customTestnetTokenItemVisibleState,
     ),
-)
-
-// endregion preview
\ No newline at end of file
+)
\ 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/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/LockedRectangle.kt
index cf31ecffca..238d2ebb0d 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/LockedRectangle.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/LockedRectangle.kt
@@ -11,7 +11,7 @@ import com.tangem.core.ui.res.TangemTheme
 internal fun LockedRectangle(modifier: Modifier = Modifier) {
     Box(
         modifier = modifier.background(
-            color = TangemTheme.colors.background.secondary,
+            color = TangemTheme.colors.field.primary,
             shape = RoundedCornerShape(TangemTheme.dimens.radius4),
         ),
     )
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/NonFiatContentBlock.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/NonFiatContentBlock.kt
new file mode 100644
index 0000000000..ab86fc3d08
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/NonFiatContentBlock.kt
@@ -0,0 +1,76 @@
+package com.tangem.feature.wallet.presentation.common.component.token
+
+import androidx.annotation.StringRes
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+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.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
+
+@Composable
+internal fun NonFiatContentBlock(
+    state: TokenItemState,
+    reorderableTokenListState: ReorderableLazyListState?,
+    modifier: Modifier = Modifier,
+) {
+    AnimatedContent(
+        targetState = state,
+        label = "Update non content fiat block",
+        modifier = modifier,
+        contentKey = { it::class.java },
+    ) { animatedState ->
+        when (animatedState) {
+            is TokenItemState.Draggable -> DraggableImage(reorderableTokenListState = reorderableTokenListState)
+            is TokenItemState.Unreachable -> NonFiatContentText(text = R.string.common_unreachable)
+            is TokenItemState.NoAddress -> NonFiatContentText(text = R.string.common_no_address)
+            is TokenItemState.Content,
+            is TokenItemState.Loading,
+            is TokenItemState.Locked,
+            -> Unit
+        }
+    }
+}
+
+@Composable
+private fun DraggableImage(reorderableTokenListState: ReorderableLazyListState?) {
+    Box(
+        modifier = Modifier
+            .size(size = TangemTheme.dimens.size32)
+            .then(
+                other = if (reorderableTokenListState != null) {
+                    Modifier.detectReorder(reorderableTokenListState)
+                } else {
+                    Modifier
+                },
+            ),
+        contentAlignment = Alignment.Center,
+    ) {
+        Icon(
+            painter = painterResource(id = R.drawable.ic_drag_24),
+            tint = TangemTheme.colors.icon.informative,
+            contentDescription = null,
+        )
+    }
+}
+
+@Composable
+private fun NonFiatContentText(@StringRes text: Int) {
+    Text(
+        text = stringResource(id = text),
+        color = TangemTheme.colors.text.tertiary,
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
+        style = TangemTheme.typography.body2,
+    )
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenCryptoAmount.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenCryptoAmount.kt
new file mode 100644
index 0000000000..426d6d153a
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenCryptoAmount.kt
@@ -0,0 +1,59 @@
+package com.tangem.feature.wallet.presentation.common.component.token
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+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.common.Strings
+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.CryptoAmountState as TokenCryptoAmountState
+
+@Composable
+internal fun TokenCryptoAmount(
+    state: TokenCryptoAmountState?,
+    isBalanceHidden: Boolean,
+    modifier: Modifier = Modifier,
+) {
+    when (state) {
+        is TokenCryptoAmountState.Content -> {
+            CryptoAmountText(
+                amount = if (isBalanceHidden) Strings.STARS else state.text,
+                modifier = modifier,
+            )
+        }
+        is TokenCryptoAmountState.Unreachable -> {
+            CryptoAmountText(amount = stringResource(id = R.string.common_unreachable), modifier = modifier)
+        }
+        is TokenCryptoAmountState.Loading -> {
+            RectangleShimmer(modifier = modifier.placeholderSize(), radius = TangemTheme.dimens.radius4)
+        }
+        is TokenCryptoAmountState.Locked -> {
+            LockedRectangle(modifier = modifier.placeholderSize())
+        }
+        null -> Unit
+    }
+}
+
+@Composable
+private fun CryptoAmountText(amount: String, modifier: Modifier = Modifier) {
+    Text(
+        text = amount,
+        modifier = modifier,
+        color = TangemTheme.colors.text.tertiary,
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
+        style = TangemTheme.typography.body2,
+    )
+}
+
+private fun Modifier.placeholderSize(): Modifier = composed {
+    return@composed this
+        .padding(vertical = TangemTheme.dimens.spacing3)
+        .size(width = TangemTheme.dimens.size52, height = TangemTheme.dimens.size12)
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenCryptoInfoBlock.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenCryptoInfoBlock.kt
deleted file mode 100644
index 40740ab8c7..0000000000
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenCryptoInfoBlock.kt
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.tangem.feature.wallet.presentation.common.component.token
-
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.*
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.composed
-import androidx.compose.ui.res.painterResource
-import com.tangem.core.ui.components.RectangleShimmer
-import com.tangem.core.ui.res.TangemTheme
-import com.tangem.core.ui.res.TangemTypography
-import com.tangem.feature.wallet.impl.R
-import com.tangem.feature.wallet.presentation.common.state.TokenItemState
-import com.tangem.feature.wallet.presentation.common.state.TokenItemState.Companion.DOTS
-import com.tangem.feature.wallet.presentation.common.state.TokenItemState.TokenOptionsState
-
-@Composable
-internal fun TokenCryptoInfoBlock(state: TokenItemState, modifier: Modifier = Modifier) {
-    when (state) {
-        is TokenItemState.ContentState -> ContentBlock(state = state, modifier = modifier)
-        is TokenItemState.Loading -> LoadingBlock(modifier = modifier)
-        is TokenItemState.Locked -> LockedBlock(modifier = modifier)
-    }
-}
-
-@Composable
-private fun ContentBlock(state: TokenItemState.ContentState, modifier: Modifier = Modifier) {
-    Column(
-        modifier = modifier,
-        verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing2),
-    ) {
-        CurrencyNameText(
-            name = state.name,
-            hasPending = (state as? TokenItemState.Content)?.hasPending == true,
-        )
-
-        AmountText(
-            amount = when (state) {
-                is TokenItemState.Content -> if (state.tokenOptions is TokenOptionsState.Hidden) DOTS else state.amount
-                is TokenItemState.Draggable -> state.fiatAmount
-                is TokenItemState.Unreachable -> null
-            },
-        )
-    }
-}
-
-@Composable
-private fun CurrencyNameText(name: String, hasPending: Boolean) {
-    Row(horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing8)) {
-        Text(
-            text = name,
-            style = TangemTypography.subtitle2,
-            color = TangemTheme.colors.text.primary1,
-        )
-
-        PendingTransactionImage(hasPending = hasPending, modifier = Modifier.align(Alignment.CenterVertically))
-    }
-}
-
-@Composable
-private fun PendingTransactionImage(hasPending: Boolean, modifier: Modifier = Modifier) {
-    AnimatedVisibility(visible = hasPending, modifier = modifier) {
-        Image(
-            painter = painterResource(id = R.drawable.img_loader_15),
-            contentDescription = null,
-        )
-    }
-}
-
-@Composable
-private fun AmountText(amount: String?) {
-    AnimatedVisibility(visible = !amount.isNullOrBlank()) {
-        if (amount == null) return@AnimatedVisibility
-        Text(
-            text = amount,
-            style = TangemTypography.body2,
-            color = TangemTheme.colors.text.tertiary,
-        )
-    }
-}
-
-@Composable
-private fun LoadingBlock(modifier: Modifier = Modifier) {
-    NonContentContainer(modifier = modifier) {
-        RectangleShimmer(modifier = Modifier.nameSize(), radius = TangemTheme.dimens.radius4)
-        RectangleShimmer(modifier = Modifier.amountSize(), radius = TangemTheme.dimens.radius4)
-    }
-}
-
-@Composable
-private fun LockedBlock(modifier: Modifier = Modifier) {
-    NonContentContainer(modifier = modifier) {
-        LockedRectangle(modifier = Modifier.nameSize())
-        LockedRectangle(modifier = Modifier.amountSize())
-    }
-}
-
-@Composable
-private fun NonContentContainer(modifier: Modifier = Modifier, content: @Composable ColumnScope.() -> Unit) {
-    Column(
-        modifier = modifier,
-        verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing10),
-        content = content,
-    )
-}
-
-private fun Modifier.nameSize(): Modifier = composed {
-    return@composed size(width = TangemTheme.dimens.size72, height = TangemTheme.dimens.size12)
-}
-
-private fun Modifier.amountSize(): Modifier = composed {
-    return@composed size(width = TangemTheme.dimens.size50, height = TangemTheme.dimens.size12)
-}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenFiatAmount.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenFiatAmount.kt
new file mode 100644
index 0000000000..f223ecdcfe
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenFiatAmount.kt
@@ -0,0 +1,50 @@
+package com.tangem.feature.wallet.presentation.common.component.token
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.composed
+import androidx.compose.ui.text.style.TextOverflow
+import com.tangem.common.Strings
+import com.tangem.core.ui.components.RectangleShimmer
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.feature.wallet.presentation.common.state.TokenItemState.FiatAmountState as TokenFiatAmountState
+
+@Composable
+internal fun TokenFiatAmount(state: TokenFiatAmountState?, isBalanceHidden: Boolean, modifier: Modifier = Modifier) {
+    when (state) {
+        is TokenFiatAmountState.Content -> {
+            FiatAmountText(
+                text = if (isBalanceHidden) Strings.STARS else state.text,
+                modifier,
+            )
+        }
+        is TokenFiatAmountState.Loading -> {
+            RectangleShimmer(modifier = modifier.placeholderSize(), radius = TangemTheme.dimens.radius4)
+        }
+        is TokenFiatAmountState.Locked -> {
+            LockedRectangle(modifier = modifier.placeholderSize())
+        }
+        null -> Unit
+    }
+}
+
+@Composable
+private fun FiatAmountText(text: String, modifier: Modifier = Modifier) {
+    Text(
+        text = text,
+        modifier,
+        color = TangemTheme.colors.text.primary1,
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
+        style = TangemTheme.typography.body2,
+    )
+}
+
+private fun Modifier.placeholderSize(): Modifier = composed {
+    return@composed this
+        .padding(vertical = TangemTheme.dimens.spacing4)
+        .size(width = TangemTheme.dimens.size40, height = TangemTheme.dimens.size12)
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenFiatInfoBlock.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenFiatInfoBlock.kt
deleted file mode 100644
index ef5d0d5f72..0000000000
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenFiatInfoBlock.kt
+++ /dev/null
@@ -1,180 +0,0 @@
-package com.tangem.feature.wallet.presentation.common.component.token
-
-import androidx.compose.animation.AnimatedContent
-import androidx.compose.animation.ExperimentalAnimationApi
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.*
-import androidx.compose.material3.Icon
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.composed
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import com.tangem.core.ui.components.RectangleShimmer
-import com.tangem.core.ui.components.SpacerW4
-import com.tangem.core.ui.components.marketprice.PriceChangeConfig
-import com.tangem.core.ui.res.TangemTheme
-import com.tangem.core.ui.res.TangemTypography
-import com.tangem.feature.wallet.impl.R
-import com.tangem.feature.wallet.presentation.common.state.TokenItemState
-import com.tangem.feature.wallet.presentation.common.state.TokenItemState.Companion.DOTS
-import com.tangem.feature.wallet.presentation.common.state.TokenItemState.TokenOptionsState
-import org.burnoutcrew.reorderable.ReorderableLazyListState
-import org.burnoutcrew.reorderable.detectReorder
-
-@Composable
-internal fun TokenFiatInfoBlock(
-    state: TokenItemState,
-    modifier: Modifier = Modifier,
-    reorderableTokenListState: ReorderableLazyListState? = null,
-) {
-    when (state) {
-        is TokenItemState.Content -> ContentBlock(state = state.tokenOptions, modifier = modifier)
-        is TokenItemState.Draggable -> {
-            DraggableBlock(
-                modifier = modifier,
-                reorderableTokenListState = reorderableTokenListState,
-            )
-        }
-        is TokenItemState.Unreachable -> UnreachableBlock(modifier = modifier)
-        is TokenItemState.Loading -> LoadingBlock(modifier = modifier)
-        is TokenItemState.Locked -> LockedBlock(modifier = modifier)
-    }
-}
-
-@OptIn(ExperimentalAnimationApi::class)
-@Composable
-private fun ContentBlock(state: TokenOptionsState, modifier: Modifier = Modifier) {
-    Column(
-        modifier = modifier.requiredWidth(IntrinsicSize.Max),
-        verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing2),
-    ) {
-        AnimatedContent(
-            targetState = state,
-            label = "Update the fiat percentage block",
-            modifier = Modifier.align(Alignment.End),
-        ) {
-            Text(
-                text = when (it) {
-                    is TokenOptionsState.Visible -> it.fiatAmount
-                    is TokenOptionsState.Hidden -> DOTS
-                },
-                style = TangemTypography.body2,
-                color = TangemTheme.colors.text.primary1,
-            )
-        }
-
-        PriceChangeBlock(config = state.config)
-    }
-}
-
-@Composable
-private fun PriceChangeBlock(config: PriceChangeConfig) {
-    Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) {
-        PriceChangeIcon(type = config.type, modifier = Modifier.align(Alignment.CenterVertically))
-        SpacerW4()
-        PriceChangeText(config = config, modifier = Modifier.align(Alignment.CenterVertically))
-    }
-}
-
-@OptIn(ExperimentalAnimationApi::class)
-@Composable
-private fun PriceChangeIcon(type: PriceChangeConfig.Type, modifier: Modifier = Modifier) {
-    AnimatedContent(
-        targetState = type,
-        label = "Update the price change's arrow",
-        modifier = modifier,
-    ) {
-        Image(
-            painter = painterResource(
-                id = when (it) {
-                    PriceChangeConfig.Type.UP -> R.drawable.img_arrow_up_8
-                    PriceChangeConfig.Type.DOWN -> R.drawable.img_arrow_down_8
-                },
-            ),
-            contentDescription = null,
-        )
-    }
-}
-
-@OptIn(ExperimentalAnimationApi::class)
-@Composable
-private fun PriceChangeText(config: PriceChangeConfig, modifier: Modifier = Modifier) {
-    AnimatedContent(
-        targetState = config.type,
-        label = "Update the price change's arrow",
-        modifier = modifier,
-    ) {
-        Text(
-            text = config.valueInPercent,
-            style = TangemTypography.body2,
-            color = when (it) {
-                PriceChangeConfig.Type.UP -> TangemTheme.colors.text.accent
-                PriceChangeConfig.Type.DOWN -> TangemTheme.colors.text.warning
-            },
-        )
-    }
-}
-
-@Composable
-private fun DraggableBlock(reorderableTokenListState: ReorderableLazyListState?, modifier: Modifier = Modifier) {
-    Box(
-        modifier = modifier
-            .size(TangemTheme.dimens.size32)
-            .then(
-                other = if (reorderableTokenListState != null) {
-                    Modifier.detectReorder(reorderableTokenListState)
-                } else {
-                    Modifier
-                },
-            ),
-        contentAlignment = Alignment.Center,
-    ) {
-        Icon(
-            painter = painterResource(id = R.drawable.ic_drag_24),
-            tint = TangemTheme.colors.icon.informative,
-            contentDescription = null,
-        )
-    }
-}
-
-@Composable
-private fun UnreachableBlock(modifier: Modifier = Modifier) {
-    Text(
-        modifier = modifier,
-        text = stringResource(id = R.string.common_unreachable),
-        style = TangemTypography.body2,
-        color = TangemTheme.colors.text.tertiary,
-    )
-}
-
-@Composable
-private fun LoadingBlock(modifier: Modifier = Modifier) {
-    NonContentContainer(modifier = modifier) {
-        RectangleShimmer(modifier = Modifier.viewSize(), radius = TangemTheme.dimens.radius4)
-        RectangleShimmer(modifier = Modifier.viewSize(), radius = TangemTheme.dimens.radius4)
-    }
-}
-
-@Composable
-private fun LockedBlock(modifier: Modifier = Modifier) {
-    NonContentContainer(modifier = modifier) {
-        LockedRectangle(modifier = Modifier.viewSize())
-        LockedRectangle(modifier = Modifier.viewSize())
-    }
-}
-
-@Composable
-private fun NonContentContainer(modifier: Modifier = Modifier, content: @Composable ColumnScope.() -> Unit) {
-    Column(
-        modifier = modifier,
-        verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing10),
-        content = content,
-    )
-}
-
-private fun Modifier.viewSize(): Modifier = composed {
-    return@composed size(width = TangemTheme.dimens.size40, height = TangemTheme.dimens.size12)
-}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenIcon.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenIcon.kt
deleted file mode 100644
index 6ddfe82790..0000000000
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenIcon.kt
+++ /dev/null
@@ -1,152 +0,0 @@
-package com.tangem.feature.wallet.presentation.common.component.token
-
-import androidx.annotation.DrawableRes
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxScope
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.composed
-import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.graphics.ColorMatrix
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import coil.compose.SubcomposeAsyncImage
-import coil.request.ImageRequest
-import com.tangem.core.ui.components.CircleShimmer
-import com.tangem.core.ui.res.TangemTheme
-import com.tangem.feature.wallet.presentation.common.state.TokenItemState
-
-private const val GRAY_SCALE_SATURATION = 0f
-
-@Composable
-internal fun TokenIcon(state: TokenItemState, modifier: Modifier = Modifier) {
-    when (state) {
-        is TokenItemState.ContentState -> ContentIcon(content = state, modifier = modifier)
-        is TokenItemState.Loading -> LoadingIcon(modifier = modifier)
-        is TokenItemState.Locked -> LockedIcon(modifier = modifier)
-    }
-}
-
-@Composable
-private fun ContentIcon(content: TokenItemState.ContentState, modifier: Modifier = Modifier) {
-    BaseContainer(modifier = modifier) {
-        val isTestnet = when (content) {
-            is TokenItemState.Content -> content.isTestnet
-            is TokenItemState.Draggable -> content.isTestnet
-            is TokenItemState.Unreachable -> false
-        }
-
-        val colorFilter = remember(isTestnet) {
-            if (isTestnet) {
-                ColorFilter.colorMatrix(
-                    colorMatrix = ColorMatrix().apply { setToSaturation(GRAY_SCALE_SATURATION) },
-                )
-            } else {
-                null
-            }
-        }
-
-        Icon(
-            content = content,
-            colorFilter = colorFilter,
-            modifier = Modifier.align(Alignment.BottomStart),
-        )
-
-        NetworkBadge(
-            iconResId = content.networkBadgeIconResId,
-            colorFilter = colorFilter,
-            modifier = Modifier.align(Alignment.TopEnd),
-        )
-    }
-}
-
-@Composable
-private fun Icon(content: TokenItemState.ContentState, colorFilter: ColorFilter?, modifier: Modifier = Modifier) {
-    val iconUrl = content.tokenIconUrl
-    val iconData: Any = remember(iconUrl) {
-        if (iconUrl.isNullOrEmpty()) content.tokenIconResId else iconUrl
-    }
-
-    SubcomposeAsyncImage(
-        modifier = modifier.iconSize(),
-        model = ImageRequest.Builder(context = LocalContext.current)
-            .data(data = iconData)
-            .placeholder(drawableResId = content.tokenIconResId)
-            .error(drawableResId = content.tokenIconResId)
-            .fallback(drawableResId = content.tokenIconResId)
-            .crossfade(enable = true)
-            .build(),
-        colorFilter = colorFilter,
-        contentDescription = null,
-    )
-}
-
-@Composable
-private fun BoxScope.NetworkBadge(
-    @DrawableRes iconResId: Int?,
-    colorFilter: ColorFilter?,
-    modifier: Modifier = Modifier,
-) {
-    AnimatedVisibility(
-        visible = iconResId != null,
-        modifier = modifier
-            .size(TangemTheme.dimens.size18)
-            .background(color = TangemTheme.colors.background.primary, shape = CircleShape),
-    ) {
-        if (iconResId == null) return@AnimatedVisibility
-
-        Image(
-            modifier = Modifier
-                .padding(all = TangemTheme.dimens.spacing2)
-                .align(Alignment.Center),
-            painter = painterResource(id = iconResId),
-            colorFilter = colorFilter,
-            contentDescription = null,
-        )
-    }
-}
-
-@Composable
-private fun LoadingIcon(modifier: Modifier = Modifier) {
-    BaseContainer(modifier) {
-        CircleShimmer(
-            modifier = Modifier
-                .iconSize()
-                .align(alignment = Alignment.BottomStart),
-        )
-    }
-}
-
-@Composable
-private fun LockedIcon(modifier: Modifier = Modifier) {
-    BaseContainer(modifier) {
-        Box(
-            modifier = Modifier
-                .iconSize()
-                .align(Alignment.BottomStart),
-        ) {
-            Box(
-                modifier = Modifier
-                    .matchParentSize()
-                    .background(color = TangemTheme.colors.background.secondary, shape = CircleShape),
-            )
-        }
-    }
-}
-
-@Composable
-private inline fun BaseContainer(modifier: Modifier = Modifier, content: @Composable BoxScope.() -> Unit) {
-    Box(modifier = modifier.size(size = TangemTheme.dimens.size40), content = content)
-}
-
-private fun Modifier.iconSize(): Modifier = composed {
-    return@composed this.size(size = TangemTheme.dimens.size36)
-}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenPriceChange.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenPriceChange.kt
new file mode 100644
index 0000000000..d40de53a30
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenPriceChange.kt
@@ -0,0 +1,98 @@
+package com.tangem.feature.wallet.presentation.common.component.token
+
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+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.components.RectangleShimmer
+import com.tangem.core.ui.components.SpacerW4
+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.feature.wallet.presentation.common.state.TokenItemState
+import com.tangem.feature.wallet.presentation.common.state.TokenItemState.PriceChangeState as TokenPriceChangeState
+
+@Composable
+internal fun TokenPriceChange(state: TokenPriceChangeState?, modifier: Modifier = Modifier) {
+    when (state) {
+        is TokenPriceChangeState.Content -> {
+            PriceChangeBlock(modifier = modifier, type = state.type, text = state.valueInPercent)
+        }
+        is TokenPriceChangeState.Unknown -> {
+            PriceChangeBlock(modifier = modifier)
+        }
+        is TokenPriceChangeState.Loading -> {
+            RectangleShimmer(modifier = modifier.placeholderSize(), radius = TangemTheme.dimens.radius4)
+        }
+        is TokenPriceChangeState.Locked -> {
+            LockedRectangle(modifier = modifier.placeholderSize())
+        }
+        null -> Unit
+    }
+}
+
+@Composable
+private fun PriceChangeBlock(modifier: Modifier = Modifier, type: PriceChangeType? = null, text: String? = null) {
+    Row(
+        modifier = modifier,
+        horizontalArrangement = Arrangement.End,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        PriceChangeIcon(type = type)
+        SpacerW4()
+        PriceChangeText(type = type, text = text)
+    }
+}
+
+@OptIn(ExperimentalAnimationApi::class)
+@Composable
+private fun PriceChangeIcon(type: PriceChangeType?) {
+    AnimatedContent(targetState = type, label = "Update the price change's arrow") { animatedType ->
+        animatedType ?: return@AnimatedContent
+
+        Icon(
+            painter = painterResource(
+                id = when (animatedType) {
+                    PriceChangeType.UP -> R.drawable.ic_arrow_up_8
+                    PriceChangeType.DOWN -> R.drawable.ic_arrow_down_8
+                },
+            ),
+            tint = when (animatedType) {
+                PriceChangeType.UP -> TangemTheme.colors.icon.accent
+                PriceChangeType.DOWN -> TangemTheme.colors.icon.warning
+            },
+            contentDescription = null,
+        )
+    }
+}
+
+@OptIn(ExperimentalAnimationApi::class)
+@Composable
+private fun PriceChangeText(type: PriceChangeType?, text: String?) {
+    AnimatedContent(targetState = text, label = "Update the price change's text") { animatedText ->
+        Text(
+            text = animatedText ?: TokenItemState.UNKNOWN_AMOUNT_SIGN,
+            color = when (type) {
+                PriceChangeType.UP -> TangemTheme.colors.text.accent
+                PriceChangeType.DOWN -> TangemTheme.colors.text.warning
+                null -> TangemTheme.colors.text.primary1
+            },
+            overflow = TextOverflow.Ellipsis,
+            maxLines = 1,
+            style = TangemTheme.typography.body2,
+        )
+    }
+}
+
+private fun Modifier.placeholderSize(): Modifier = composed {
+    return@composed this
+        .padding(vertical = TangemTheme.dimens.spacing3)
+        .size(width = TangemTheme.dimens.size40, height = TangemTheme.dimens.size12)
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenTitle.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenTitle.kt
new file mode 100644
index 0000000000..e5b3050a53
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/TokenTitle.kt
@@ -0,0 +1,83 @@
+package com.tangem.feature.wallet.presentation.common.component.token
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+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.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
+
+@Composable
+internal fun TokenTitle(state: TokenTitleState?, modifier: Modifier = Modifier) {
+    when (state) {
+        is TokenTitleState.Content -> {
+            ContentTitle(name = state.text, hasPending = state.hasPending, modifier = modifier)
+        }
+        is TokenTitleState.Loading -> {
+            RectangleShimmer(modifier = modifier.placeholderSize(), radius = TangemTheme.dimens.radius4)
+        }
+        is TokenTitleState.Locked -> {
+            LockedRectangle(modifier = modifier.placeholderSize())
+        }
+        null -> Unit
+    }
+}
+
+@Composable
+private fun ContentTitle(name: String, hasPending: Boolean, modifier: Modifier = Modifier) {
+    Row(
+        modifier = modifier,
+        horizontalArrangement = Arrangement.spacedBy(space = TangemTheme.dimens.spacing6),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        /*
+         * If currency name has a long width, then it will completely displace the image.
+         * So we need to use [weight] to avoid displacement.
+         */
+        CurrencyNameText(name = name, modifier = Modifier.weight(weight = 1f, fill = false))
+
+        PendingTransactionImage(
+            hasPending = hasPending,
+            modifier = Modifier.align(alignment = Alignment.CenterVertically),
+        )
+    }
+}
+
+@Composable
+private fun CurrencyNameText(name: String, modifier: Modifier = Modifier) {
+    Text(
+        text = name,
+        modifier = modifier,
+        color = TangemTheme.colors.text.primary1,
+        overflow = TextOverflow.Ellipsis,
+        maxLines = 1,
+        style = TangemTheme.typography.subtitle2,
+    )
+}
+
+@Composable
+private fun PendingTransactionImage(hasPending: Boolean, modifier: Modifier = Modifier) {
+    AnimatedVisibility(visible = hasPending, modifier = modifier) {
+        Image(
+            painter = painterResource(id = R.drawable.img_loader_15),
+            contentDescription = null,
+        )
+    }
+}
+
+private fun Modifier.placeholderSize(): Modifier = composed {
+    return@composed this
+        .padding(vertical = TangemTheme.dimens.spacing4)
+        .size(width = TangemTheme.dimens.size70, height = TangemTheme.dimens.size12)
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/icon/ContentIcon.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/icon/ContentIcon.kt
new file mode 100644
index 0000000000..dd1be11f5a
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/icon/ContentIcon.kt
@@ -0,0 +1,175 @@
+package com.tangem.feature.wallet.presentation.common.component.token.icon
+
+import androidx.annotation.DrawableRes
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.Icon
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import coil.compose.SubcomposeAsyncImage
+import coil.request.ImageRequest
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.utils.ImageBackgroundContrastChecker
+import com.tangem.feature.wallet.impl.R
+import com.tangem.feature.wallet.presentation.common.state.TokenItemState
+import kotlinx.coroutines.launch
+
+@Composable
+internal fun ContentIcon(
+    icon: TokenItemState.IconState,
+    alpha: Float,
+    colorFilter: ColorFilter?,
+    modifier: Modifier = Modifier,
+) {
+    when (icon) {
+        is TokenItemState.IconState.CoinIcon -> CoinIcon(
+            modifier = modifier,
+            url = icon.url,
+            fallbackResId = icon.fallbackResId,
+            alpha = alpha,
+            colorFilter = colorFilter,
+        )
+        is TokenItemState.IconState.TokenIcon -> TokenIcon(
+            modifier = modifier,
+            url = icon.url,
+            alpha = alpha,
+            colorFilter = colorFilter,
+            errorIcon = {
+                CustomTokenIcon(
+                    modifier = modifier,
+                    tint = icon.fallbackTint,
+                    background = icon.fallbackBackground,
+                    alpha = alpha,
+                )
+            },
+        )
+        is TokenItemState.IconState.CustomTokenIcon -> CustomTokenIcon(
+            modifier = modifier,
+            tint = icon.tint,
+            background = icon.background,
+            alpha = alpha,
+        )
+        TokenItemState.IconState.Loading,
+        TokenItemState.IconState.Locked,
+        -> Unit
+    }
+}
+
+@Composable
+private fun CoinIcon(
+    url: String?,
+    @DrawableRes fallbackResId: Int,
+    alpha: Float,
+    colorFilter: ColorFilter?,
+    modifier: Modifier = Modifier,
+) {
+    val iconData: Any = if (url.isNullOrBlank()) fallbackResId else url
+
+    DefaultCurrencyIcon(
+        modifier = modifier,
+        iconData = iconData,
+        errorIcon = {
+            Image(
+                painter = painterResource(id = fallbackResId),
+                alpha = alpha,
+                colorFilter = colorFilter,
+                contentDescription = null,
+            )
+        },
+        alpha = alpha,
+        colorFilter = colorFilter,
+    )
+}
+
+@Composable
+private fun TokenIcon(
+    url: String?,
+    alpha: Float,
+    colorFilter: ColorFilter?,
+    errorIcon: @Composable () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    if (url == null) {
+        errorIcon()
+    } else {
+        DefaultCurrencyIcon(
+            modifier = modifier,
+            iconData = url,
+            errorIcon = errorIcon,
+            alpha = alpha,
+            colorFilter = colorFilter,
+        )
+    }
+}
+
+@Composable
+private fun CustomTokenIcon(tint: Color, background: Color, alpha: Float, modifier: Modifier = Modifier) {
+    Box(
+        modifier = modifier
+            .background(
+                color = background.copy(alpha = alpha),
+                shape = CircleShape,
+            ),
+        contentAlignment = Alignment.Center,
+    ) {
+        Icon(
+            modifier = Modifier.matchParentSize(),
+            painter = painterResource(id = R.drawable.ic_custom_token_44),
+            tint = tint.copy(alpha = alpha),
+            contentDescription = null,
+        )
+    }
+}
+
+@Composable
+private inline fun DefaultCurrencyIcon(
+    iconData: Any,
+    alpha: Float,
+    colorFilter: ColorFilter?,
+    crossinline errorIcon: @Composable () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    var iconBackgroundColor by remember { mutableStateOf(Color.Transparent) }
+    val itemBackgroundColor = TangemTheme.colors.background.primary.toArgb()
+    val isDarkTheme = isSystemInDarkTheme()
+    val coroutineScope = rememberCoroutineScope()
+
+    SubcomposeAsyncImage(
+        modifier = modifier
+            .background(
+                color = iconBackgroundColor,
+                shape = TangemTheme.shapes.roundedCorners8,
+            ),
+        model = ImageRequest.Builder(context = LocalContext.current)
+            .data(iconData)
+            .crossfade(enable = true)
+            .allowHardware(false)
+            .listener(
+                onSuccess = { _, result ->
+                    if (isDarkTheme) {
+                        coroutineScope.launch {
+                            val color = ImageBackgroundContrastChecker(
+                                drawable = result.drawable,
+                                backgroundColor = itemBackgroundColor,
+                            ).getContrastColorIfNeeded(isDarkTheme)
+                            iconBackgroundColor = color
+                        }
+                    }
+                },
+            ).build(),
+        loading = { LoadingIcon() },
+        error = { errorIcon() },
+        alpha = alpha,
+        colorFilter = colorFilter,
+        contentDescription = null,
+    )
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/icon/IconBadge.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/icon/IconBadge.kt
new file mode 100644
index 0000000000..6fd0339923
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/icon/IconBadge.kt
@@ -0,0 +1,63 @@
+package com.tangem.feature.wallet.presentation.common.component.token.icon
+
+import androidx.annotation.DrawableRes
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.res.painterResource
+import com.tangem.core.ui.res.TangemTheme
+
+@Composable
+internal fun NetworkBadge(
+    @DrawableRes iconResId: Int,
+    alpha: Float,
+    colorFilter: ColorFilter?,
+    modifier: Modifier = Modifier,
+) {
+    Box(
+        modifier = modifier
+            .size(TangemTheme.dimens.size18)
+            .background(
+                color = TangemTheme.colors.background.primary,
+                shape = CircleShape,
+            ),
+    ) {
+        Image(
+            modifier = Modifier
+                .padding(all = TangemTheme.dimens.spacing2)
+                .matchParentSize(),
+            painter = painterResource(id = iconResId),
+            colorFilter = colorFilter,
+            alpha = alpha,
+            contentDescription = null,
+        )
+    }
+}
+
+@Composable
+internal fun CustomBadge(modifier: Modifier = Modifier) {
+    Box(
+        modifier = modifier
+            .size(TangemTheme.dimens.size12)
+            .background(
+                color = TangemTheme.colors.background.primary,
+                shape = CircleShape,
+            ),
+    ) {
+        Box(
+            modifier = Modifier
+                .padding(all = TangemTheme.dimens.spacing2)
+                .matchParentSize()
+                .background(
+                    color = TangemTheme.colors.icon.informative,
+                    shape = CircleShape,
+                ),
+        )
+    }
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/icon/TokenIcon.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/icon/TokenIcon.kt
new file mode 100644
index 0000000000..275c58d54f
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/component/token/icon/TokenIcon.kt
@@ -0,0 +1,102 @@
+package com.tangem.feature.wallet.presentation.common.component.token.icon
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.ColorMatrix
+import com.tangem.core.ui.components.CircleShimmer
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.feature.wallet.presentation.common.state.TokenItemState.IconState as TokenIconState
+
+private const val GRAY_SCALE_SATURATION = 0f
+private const val GRAY_SCALE_ALPHA = 0.4f
+private const val NORMAL_ALPHA = 1f
+
+@Composable
+internal fun TokenIcon(state: TokenIconState, modifier: Modifier = Modifier) {
+    BaseContainer(modifier = modifier) {
+        val iconModifier = Modifier
+            .align(Alignment.Center)
+            .size(TangemTheme.dimens.size36)
+
+        when (state) {
+            is TokenIconState.Loading -> LoadingIcon(modifier = iconModifier)
+            is TokenIconState.Locked -> LockedIcon(modifier = iconModifier)
+            is TokenIconState.CoinIcon,
+            is TokenIconState.CustomTokenIcon,
+            is TokenIconState.TokenIcon,
+            -> {
+                ContentIconContainer(modifier = iconModifier, icon = state)
+            }
+        }
+    }
+}
+
+@Composable
+internal fun LoadingIcon(modifier: Modifier = Modifier) {
+    CircleShimmer(modifier = modifier)
+}
+
+@Composable
+private fun LockedIcon(modifier: Modifier = Modifier) {
+    Box(modifier = modifier) {
+        Box(
+            modifier = Modifier
+                .matchParentSize()
+                .background(
+                    color = TangemTheme.colors.field.primary,
+                    shape = CircleShape,
+                ),
+        )
+    }
+}
+
+@Composable
+private fun BoxScope.ContentIconContainer(icon: TokenIconState, modifier: Modifier = Modifier) {
+    val networkBadgeOffset = TangemTheme.dimens.spacing4
+    val (alpha, colorFilter) = remember(icon.isGrayscale) {
+        if (icon.isGrayscale) {
+            GRAY_SCALE_ALPHA to GrayscaleColorFilter
+        } else {
+            NORMAL_ALPHA to null
+        }
+    }
+
+    ContentIcon(
+        modifier = modifier,
+        icon = icon,
+        alpha = alpha,
+        colorFilter = colorFilter,
+    )
+
+    if (icon.networkBadgeIconResId != null) {
+        NetworkBadge(
+            modifier = Modifier
+                .offset(x = networkBadgeOffset, y = -networkBadgeOffset)
+                .align(Alignment.TopEnd),
+            iconResId = requireNotNull(icon.networkBadgeIconResId),
+            alpha = alpha,
+            colorFilter = colorFilter,
+        )
+    }
+
+    if (icon.showCustomBadge) {
+        CustomBadge(modifier = Modifier.align(Alignment.BottomEnd))
+    }
+}
+
+@Composable
+private inline fun BaseContainer(modifier: Modifier = Modifier, content: @Composable BoxScope.() -> Unit) {
+    Box(modifier = modifier.size(size = TangemTheme.dimens.size40), content = content)
+}
+
+private val GrayscaleColorFilter: ColorFilter
+    get() = ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(GRAY_SCALE_SATURATION) })
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/state/TokenItemState.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/state/TokenItemState.kt
index 8310f134d5..b9f7b9d127 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/state/TokenItemState.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/state/TokenItemState.kt
@@ -2,123 +2,242 @@ package com.tangem.feature.wallet.presentation.common.state
 
 import androidx.annotation.DrawableRes
 import androidx.compose.runtime.Immutable
-import com.tangem.core.ui.components.marketprice.PriceChangeConfig
+import androidx.compose.ui.graphics.Color
+import com.tangem.core.ui.components.marketprice.PriceChangeType
 
 /** Token item state */
 @Immutable
-internal sealed interface TokenItemState {
+internal sealed class TokenItemState {
 
-    /** Unique id */
-    val id: String
+    abstract val id: String
+
+    abstract val iconState: IconState
+
+    abstract val titleState: TitleState
+
+    abstract val fiatAmountState: FiatAmountState?
+
+    abstract val cryptoAmountState: CryptoAmountState?
+
+    abstract val priceChangeState: PriceChangeState?
 
     /** Loading token state */
-    data class Loading(override val id: String) : TokenItemState
+    data class Loading(
+        override val id: String,
+        override val iconState: IconState,
+        override val titleState: TitleState.Content,
+    ) : TokenItemState() {
+        override val fiatAmountState: FiatAmountState = FiatAmountState.Loading
+        override val cryptoAmountState: CryptoAmountState = CryptoAmountState.Loading
+        override val priceChangeState: PriceChangeState = PriceChangeState.Loading
+    }
 
     /** Locked token state */
-    data class Locked(override val id: String) : TokenItemState
-
-    /** Content state */
-    sealed class ContentState(
-        override val id: String,
-        open val tokenIconUrl: String?,
-        @DrawableRes open val tokenIconResId: Int,
-        @DrawableRes open val networkBadgeIconResId: Int?,
-        open val name: String,
-    ) : TokenItemState
+    data class Locked(override val id: String) : TokenItemState() {
+        override val iconState: IconState = IconState.Locked
+        override val titleState: TitleState = TitleState.Locked
+        override val fiatAmountState: FiatAmountState = FiatAmountState.Locked
+        override val cryptoAmountState: CryptoAmountState = CryptoAmountState.Locked
+        override val priceChangeState: PriceChangeState = PriceChangeState.Locked
+    }
 
     /**
      * Content token state
      *
      * @property id                    unique id
-     * @property tokenIconUrl          token icon url
-     * @property tokenIconResId        token icon resource id
-     * @property networkBadgeIconResId network badge icon resource id, may be null if it is a coin
-     * @property name                  token name
-     * @property amount                amount of token
-     * @property hasPending            pending tx in blockchain
-     * @property tokenOptions          state for token options
-     * @property isTestnet             indicates whether the token is from test network or not
+     * @property iconState             token icon state
+     * @property titleState            token name
      * @property onItemClick           callback which will be called when an item is clicked
      * @property onItemLongClick       callback which will be called when an item is long clicked
      */
     data class Content(
         override val id: String,
-        override val tokenIconUrl: String?,
-        @DrawableRes override val tokenIconResId: Int,
-        @DrawableRes override val networkBadgeIconResId: Int?,
-        override val name: String,
-        val amount: String,
-        val hasPending: Boolean,
-        val tokenOptions: TokenOptionsState,
-        val isTestnet: Boolean,
+        override val iconState: IconState,
+        override val titleState: TitleState,
+        override val fiatAmountState: FiatAmountState,
+        override val cryptoAmountState: CryptoAmountState.Content,
+        override val priceChangeState: PriceChangeState?,
         val onItemClick: () -> Unit,
         val onItemLongClick: () -> Unit,
-    ) : ContentState(id, tokenIconUrl, tokenIconResId, networkBadgeIconResId, name)
+    ) : TokenItemState()
 
     /**
      * Draggable token state
      *
      * @property id                    unique id
-     * @property tokenIconUrl          token icon url
-     * @property tokenIconResId        token icon resource id
-     * @property networkBadgeIconResId network badge icon resource id, may be null if it is a coin
-     * @property name                  token name
-     * @property fiatAmount            fiat amount of token
-     * @property isTestnet             indicates whether the token is from test network or not
+     * @property iconState             token icon state
+     * @property titleState            token name
      */
     data class Draggable(
         override val id: String,
-        override val tokenIconUrl: String?,
-        @DrawableRes override val tokenIconResId: Int,
-        @DrawableRes override val networkBadgeIconResId: Int?,
-        override val name: String,
-        val fiatAmount: String,
-        val isTestnet: Boolean,
-    ) : ContentState(id, tokenIconUrl, tokenIconResId, networkBadgeIconResId, name)
+        override val iconState: IconState,
+        override val titleState: TitleState,
+        override val cryptoAmountState: CryptoAmountState,
+    ) : TokenItemState() {
+        override val fiatAmountState: FiatAmountState? = null
+        override val priceChangeState: PriceChangeState? = null
+    }
 
     /**
      * Unreachable token state
      *
      * @property id                    token id
-     * @property tokenIconUrl          token icon url
-     * @property tokenIconResId        token icon resource id
-     * @property networkBadgeIconResId network badge icon resource id, may be null if it is a coin
-     * @property name                  token name
+     * @property iconState             token icon state
+     * @property titleState            token name
+     * @property onItemClick           callback which will be called when an item is clicked
+     * @property onItemLongClick       callback which will be called when an item is long clicked
      */
     data class Unreachable(
         override val id: String,
-        override val tokenIconUrl: String?,
-        @DrawableRes override val tokenIconResId: Int,
-        @DrawableRes override val networkBadgeIconResId: Int?,
-        override val name: String,
-    ) : ContentState(id, tokenIconUrl, tokenIconResId, networkBadgeIconResId, name)
+        override val iconState: IconState,
+        override val titleState: TitleState,
+        val onItemClick: () -> Unit,
+        val onItemLongClick: () -> Unit,
+    ) : TokenItemState() {
+        override val fiatAmountState: FiatAmountState? = null
+        override val cryptoAmountState: CryptoAmountState? = null
+        override val priceChangeState: PriceChangeState? = null
+    }
 
-    /** Token options state */
+    /**
+     * No derivation address state
+     *
+     * @property id                     token id
+     * @property iconState              token icon state
+     * @property titleState             token name
+     * @property onItemLongClick        callback which will be called when an item is long clicked
+     */
+    data class NoAddress(
+        override val id: String,
+        override val iconState: IconState,
+        override val titleState: TitleState,
+        val onItemLongClick: () -> Unit,
+    ) : TokenItemState() {
+        override val fiatAmountState: FiatAmountState? = null
+        override val cryptoAmountState: CryptoAmountState? = null
+        override val priceChangeState: PriceChangeState? = null
+    }
+
+    /**
+     * Represents the various states an icon can be in.
+     */
     @Immutable
-    sealed interface TokenOptionsState {
+    sealed class IconState {
 
-        val config: PriceChangeConfig
+        abstract val isGrayscale: Boolean
+        abstract val showCustomBadge: Boolean
+        abstract val networkBadgeIconResId: Int?
 
         /**
-         * Visible token options state
+         * Represents a coin icon.
          *
-         * @property fiatAmount fiat amount of token
-         * @property config     value of price changing
+         * @property url The URL where the coin icon can be fetched from. May be `null` if not found.
+         * @property fallbackResId The drawable resource ID to be used as a fallback if the URL is not available.
+         * @property isGrayscale Specifies whether to show the icon in grayscale.
+         * @property showCustomBadge Specifies whether to show the custom token badge.
          */
-        data class Visible(
-            override val config: PriceChangeConfig,
-            val fiatAmount: String,
-        ) : TokenOptionsState
+        data class CoinIcon(
+            val url: String?,
+            @DrawableRes val fallbackResId: Int,
+            override val isGrayscale: Boolean,
+            override val showCustomBadge: Boolean,
+        ) : IconState() {
+
+            override val networkBadgeIconResId: Int? = null
+        }
 
         /**
-         * Hidden token options state
+         * Represents a token icon.
          *
-         * @property config value of price changing
+         * @property url The URL where the token icon can be fetched from. May be `null` if not found.
+         * @property networkBadgeIconResId The drawable resource ID for the network badge.
+         * @property isGrayscale Specifies whether to show the icon in grayscale.
+         * @property showCustomBadge Specifies whether to show the custom token badge.
+         * @property fallbackTint The color to be used for tinting the fallback icon.
+         * @property fallbackBackground The background color to be used for the fallback icon.
          */
-        data class Hidden(override val config: PriceChangeConfig) : TokenOptionsState
+        data class TokenIcon(
+            val url: String?,
+            @DrawableRes override val networkBadgeIconResId: Int,
+            override val isGrayscale: Boolean,
+            override val showCustomBadge: Boolean,
+            val fallbackTint: Color,
+            val fallbackBackground: Color,
+        ) : IconState()
+
+        /**
+         * Represents a custom token icon.
+         *
+         * @property tint The color to be used for tinting the icon.
+         * @property background The background color to be used for the icon.
+         * @property networkBadgeIconResId The drawable resource ID for the network badge.
+         * @property isGrayscale Specifies whether to show the icon in grayscale.
+         */
+        data class CustomTokenIcon(
+            val tint: Color,
+            val background: Color,
+            @DrawableRes override val networkBadgeIconResId: Int,
+            override val isGrayscale: Boolean,
+        ) : IconState() {
+
+            override val showCustomBadge: Boolean = true
+        }
+
+        object Loading : IconState() {
+            override val isGrayscale: Boolean = false
+            override val showCustomBadge: Boolean = false
+            override val networkBadgeIconResId: Int? = null
+        }
+
+        object Locked : IconState() {
+            override val isGrayscale: Boolean = false
+            override val showCustomBadge: Boolean = false
+            override val networkBadgeIconResId: Int? = null
+        }
+    }
+
+    @Immutable
+    sealed class TitleState {
+
+        data class Content(val text: String, val hasPending: Boolean = false) : TitleState()
+
+        object Loading : TitleState()
+
+        object Locked : TitleState()
+    }
+
+    @Immutable
+    sealed class FiatAmountState {
+        data class Content(val text: String) : FiatAmountState()
+
+        object Loading : FiatAmountState()
+
+        object Locked : FiatAmountState()
+    }
+
+    @Immutable
+    sealed class CryptoAmountState {
+        data class Content(val text: String) : CryptoAmountState()
+
+        object Unreachable : CryptoAmountState()
+
+        object Loading : CryptoAmountState()
+
+        object Locked : CryptoAmountState()
+    }
+
+    sealed class PriceChangeState {
+
+        data class Content(val valueInPercent: String, val type: PriceChangeType) : PriceChangeState()
+
+        object Unknown : PriceChangeState()
+
+        object Loading : PriceChangeState()
+
+        object Locked : PriceChangeState()
     }
 
     companion object {
-        const val DOTS = "•••"
+        const val UNKNOWN_AMOUNT_SIGN = "—"
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/utils/CryptoCurrencyToIconStateConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/utils/CryptoCurrencyToIconStateConverter.kt
new file mode 100644
index 0000000000..0af718eb22
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/utils/CryptoCurrencyToIconStateConverter.kt
@@ -0,0 +1,55 @@
+package com.tangem.feature.wallet.presentation.common.utils
+
+import com.tangem.core.ui.extensions.getTintForTokenIcon
+import com.tangem.core.ui.extensions.networkIconResId
+import com.tangem.core.ui.extensions.tryGetBackgroundForTokenIcon
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.CryptoCurrencyStatus
+import com.tangem.feature.wallet.presentation.common.state.TokenItemState
+import com.tangem.utils.converter.Converter
+
+internal class CryptoCurrencyToIconStateConverter : Converter<CryptoCurrencyStatus, TokenItemState.IconState> {
+
+    override fun convert(value: CryptoCurrencyStatus): TokenItemState.IconState {
+        return when (val currency = value.currency) {
+            is CryptoCurrency.Coin -> getIconStateForCoin(currency, value.value.isError)
+            is CryptoCurrency.Token -> getIconStateForToken(currency, value.value.isError)
+        }
+    }
+
+    private fun getIconStateForCoin(
+        coin: CryptoCurrency.Coin,
+        isUnreachable: Boolean,
+    ): TokenItemState.IconState.CoinIcon {
+        return TokenItemState.IconState.CoinIcon(
+            url = coin.iconUrl,
+            fallbackResId = coin.networkIconResId,
+            isGrayscale = coin.network.isTestnet || isUnreachable,
+            showCustomBadge = coin.isCustom,
+        )
+    }
+
+    private fun getIconStateForToken(token: CryptoCurrency.Token, isErrorStatus: Boolean): TokenItemState.IconState {
+        val isGrayscale = token.network.isTestnet || isErrorStatus
+        val background = token.tryGetBackgroundForTokenIcon(isGrayscale)
+        val tint = getTintForTokenIcon(background)
+
+        return if (token.isCustom && token.iconUrl == null) {
+            TokenItemState.IconState.CustomTokenIcon(
+                tint = tint,
+                background = background,
+                networkBadgeIconResId = token.networkIconResId,
+                isGrayscale = isGrayscale,
+            )
+        } else {
+            TokenItemState.IconState.TokenIcon(
+                url = token.iconUrl,
+                networkBadgeIconResId = token.networkIconResId,
+                isGrayscale = isGrayscale,
+                fallbackTint = tint,
+                fallbackBackground = background,
+                showCustomBadge = token.isCustom, // `true` for tokens with custom derivation
+            )
+        }
+    }
+}
\ No newline at end of file
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 238ff49a18..81cfb1f7a8 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
@@ -1,8 +1,7 @@
 package com.tangem.feature.wallet.presentation.organizetokens
 
 import androidx.activity.compose.BackHandler
-import androidx.compose.animation.core.*
-import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.*
@@ -19,10 +18,15 @@ import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.res.stringResource
 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.Dp
+import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.components.PrimaryButton
 import com.tangem.core.ui.components.SecondaryButton
 import com.tangem.core.ui.components.buttons.actions.ActionButtonConfig
@@ -37,7 +41,10 @@ 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
-import org.burnoutcrew.reorderable.*
+import org.burnoutcrew.reorderable.ReorderableItem
+import org.burnoutcrew.reorderable.ReorderableLazyListState
+import org.burnoutcrew.reorderable.rememberReorderableLazyListState
+import org.burnoutcrew.reorderable.reorderable
 
 @Composable
 internal fun OrganizeTokensScreen(state: OrganizeTokensState, modifier: Modifier = Modifier) {
@@ -58,6 +65,7 @@ internal fun OrganizeTokensScreen(state: OrganizeTokensState, modifier: Modifier
                 listState = tokensListState,
                 state = state.itemsState,
                 dndConfig = state.dndConfig,
+                isBalanceHidden = state.isBalanceHidden,
             )
         },
         floatingActionButtonPosition = FabPosition.Center,
@@ -77,8 +85,10 @@ private fun TokenList(
     listState: LazyListState,
     state: OrganizeTokensListState,
     dndConfig: OrganizeTokensState.DragAndDropConfig,
+    isBalanceHidden: Boolean,
     modifier: Modifier = Modifier,
 ) {
+    val hapticFeedback = LocalHapticFeedback.current
     Box(modifier = modifier) {
         val onDragEnd: (Int, Int) -> Unit = remember {
             { _, _ ->
@@ -91,27 +101,31 @@ private fun TokenList(
             canDragOver = dndConfig.canDragItemOver,
             onDragEnd = onDragEnd,
         )
-        val items = state.items
+
+        val listContentPadding = PaddingValues(
+            top = TangemTheme.dimens.spacing12,
+            bottom = TangemTheme.dimens.spacing92,
+            start = TangemTheme.dimens.spacing16,
+            end = TangemTheme.dimens.spacing16,
+        )
 
         LazyColumn(
             modifier = Modifier
-                .reorderable(reorderableListState)
                 .align(Alignment.TopCenter)
-                .padding(horizontal = TangemTheme.dimens.spacing16)
-                .fillMaxSize(),
+                .reorderable(reorderableListState),
             state = reorderableListState.listState,
-            contentPadding = PaddingValues(
-                top = TangemTheme.dimens.spacing12,
-                bottom = TangemTheme.dimens.spacing92,
-            ),
+            contentPadding = listContentPadding,
         ) {
             itemsIndexed(
-                items = items,
+                items = state.items,
                 key = { _, item -> item.id },
             ) { index, item ->
 
                 val onDragStart = remember(item) {
-                    { dndConfig.onDragStart(item) }
+                    {
+                        dndConfig.onItemDragStart(item)
+                        hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
+                    }
                 }
 
                 DraggableItem(
@@ -119,6 +133,7 @@ private fun TokenList(
                     item = item,
                     reorderableState = reorderableListState,
                     onDragStart = onDragStart,
+                    isBalanceHidden = isBalanceHidden,
                 )
             }
         }
@@ -127,23 +142,26 @@ private fun TokenList(
     }
 }
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 private fun LazyItemScope.DraggableItem(
     index: Int,
     item: DraggableItem,
     reorderableState: ReorderableLazyListState,
     onDragStart: () -> Unit,
+    isBalanceHidden: Boolean,
 ) {
+    var isDragging by remember {
+        mutableStateOf(value = false)
+    }
+
+    val itemModifier = Modifier.applyShapeAndShadow(item.roundingMode, item.showShadow)
+
     ReorderableItem(
-        defaultDraggingModifier = Modifier.animateItemPlacement(
-            animationSpec = tween(easing = LinearOutSlowInEasing),
-        ),
-        state = reorderableState,
+        reorderableState = reorderableState,
         index = index,
         key = item.id,
-    ) { isDragging ->
-        val itemModifier = Modifier.applyShapeAndShadow(item.roundingMode, item.showShadow)
+    ) { isItemDragging ->
+        isDragging = isItemDragging
 
         when (item) {
             is DraggableItem.GroupHeader -> DraggableNetworkGroupItem(
@@ -155,12 +173,15 @@ private fun LazyItemScope.DraggableItem(
                 modifier = itemModifier,
                 state = item.tokenItemState,
                 reorderableTokenListState = reorderableState,
+                isBalanceHidden = isBalanceHidden,
             )
             // Should be presented in the list but remain invisible
-            is DraggableItem.GroupPlaceholder -> Box(modifier = Modifier.fillMaxWidth())
+            is DraggableItem.Placeholder -> Box(modifier = Modifier.fillMaxWidth())
         }
+    }
 
-        LaunchedEffect(isDragging) {
+    DisposableEffect(isDragging) {
+        onDispose {
             if (isDragging) {
                 onDragStart()
             }
@@ -234,7 +255,7 @@ private fun TopBar(
                     iconResId = R.drawable.ic_sort_24,
                     enabled = config.isEnabled,
                     onClick = config.onSortClick,
-                    dimContent = !config.isSortedByBalance,
+                    dimContent = config.isSortedByBalance,
                 ),
                 modifier = Modifier.weight(1f),
                 color = TangemTheme.colors.background.primary,
@@ -283,57 +304,71 @@ private fun Actions(config: OrganizeTokensState.ActionsConfig, modifier: Modifie
     }
 }
 
-private fun Modifier.applyShapeAndShadow(roundingMode: DraggableItem.RoundingMode, showShadow: Boolean): Modifier =
-    composed {
+private fun Modifier.applyShapeAndShadow(roundingMode: DraggableItem.RoundingMode, showShadow: Boolean): Modifier {
+    return composed {
         val radius by animateDpAsState(
-            targetValue = if (roundingMode !is DraggableItem.RoundingMode.None) {
-                TangemTheme.dimens.radius16
-            } else {
-                TangemTheme.dimens.radius0
+            targetValue = when (roundingMode) {
+                is DraggableItem.RoundingMode.None -> TangemTheme.dimens.radius0
+                is DraggableItem.RoundingMode.All -> TangemTheme.dimens.radius12
+                is DraggableItem.RoundingMode.Bottom,
+                is DraggableItem.RoundingMode.Top,
+                -> TangemTheme.dimens.radius16
             },
             label = "item_shape_radius",
         )
-        val shape = when (roundingMode) {
-            is DraggableItem.RoundingMode.None -> RectangleShape
-            is DraggableItem.RoundingMode.Top -> RoundedCornerShape(
-                topStart = radius,
-                topEnd = radius,
-            )
-            is DraggableItem.RoundingMode.Bottom -> RoundedCornerShape(
-                bottomStart = radius,
-                bottomEnd = radius,
-            )
-            is DraggableItem.RoundingMode.All -> RoundedCornerShape(
-                size = radius,
-            )
-        }
-
-        val paddingValue = TangemTheme.dimens.spacing4
-        val padding = if (roundingMode.showGap) {
-            when (roundingMode) {
-                is DraggableItem.RoundingMode.None -> null
-                is DraggableItem.RoundingMode.All -> PaddingValues(vertical = paddingValue)
-                is DraggableItem.RoundingMode.Top -> PaddingValues(top = paddingValue)
-                is DraggableItem.RoundingMode.Bottom -> PaddingValues(bottom = paddingValue)
-            }
-        } else {
-            null
-        }
+        val elevation by animateDpAsState(
+            targetValue = if (showShadow) {
+                TangemTheme.dimens.elevation8
+            } else {
+                TangemTheme.dimens.elevation0
+            },
+            label = "item_elevation",
+        )
 
         this
-            .let {
-                if (padding != null) {
-                    it.padding(padding)
-                } else {
-                    it
-                }
-            }
+            .padding(paddingValues = getItemGap(roundingMode))
             .shadow(
-                elevation = if (showShadow) TangemTheme.dimens.elevation12 else TangemTheme.dimens.elevation0,
-                shape = shape,
+                elevation = elevation,
+                shape = getItemShape(roundingMode, radius),
                 clip = true,
             )
     }
+}
+
+@Composable
+@ReadOnlyComposable
+private fun getItemGap(roundingMode: DraggableItem.RoundingMode): PaddingValues {
+    val paddingValue = TangemTheme.dimens.spacing4
+
+    return if (roundingMode.showGap) {
+        when (roundingMode) {
+            is DraggableItem.RoundingMode.None -> PaddingValues(all = 0.dp)
+            is DraggableItem.RoundingMode.All -> PaddingValues(vertical = paddingValue)
+            is DraggableItem.RoundingMode.Top -> PaddingValues(top = paddingValue)
+            is DraggableItem.RoundingMode.Bottom -> PaddingValues(bottom = paddingValue)
+        }
+    } else {
+        PaddingValues(all = 0.dp)
+    }
+}
+
+@Stable
+private fun getItemShape(roundingMode: DraggableItem.RoundingMode, radius: Dp): Shape {
+    return when (roundingMode) {
+        is DraggableItem.RoundingMode.None -> RectangleShape
+        is DraggableItem.RoundingMode.Top -> RoundedCornerShape(
+            topStart = radius,
+            topEnd = radius,
+        )
+        is DraggableItem.RoundingMode.Bottom -> RoundedCornerShape(
+            bottomStart = radius,
+            bottomEnd = radius,
+        )
+        is DraggableItem.RoundingMode.All -> RoundedCornerShape(
+            size = radius,
+        )
+    }
+}
 
 // region Preview
 
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/OrganizeTokensStateHolder.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/OrganizeTokensStateHolder.kt
index ec8c8655c2..e435b21b5e 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/OrganizeTokensStateHolder.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/OrganizeTokensStateHolder.kt
@@ -1,8 +1,8 @@
 package com.tangem.feature.wallet.presentation.organizetokens
 
 import com.tangem.common.Provider
-import com.tangem.core.ui.event.consumed
-import com.tangem.core.ui.event.triggered
+import com.tangem.core.ui.event.consumedEvent
+import com.tangem.core.ui.event.triggeredEvent
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.tokens.error.TokenListError
 import com.tangem.domain.tokens.error.TokenListSortingError
@@ -16,15 +16,14 @@ import com.tangem.feature.wallet.presentation.organizetokens.utils.converter.err
 import com.tangem.feature.wallet.presentation.organizetokens.utils.converter.items.CryptoCurrencyToDraggableItemConverter
 import com.tangem.feature.wallet.presentation.organizetokens.utils.converter.items.NetworkGroupToDraggableItemsConverter
 import com.tangem.feature.wallet.presentation.organizetokens.utils.converter.items.TokenListToListStateConverter
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.update
 
 internal class OrganizeTokensStateHolder(
     private val intents: OrganizeTokensIntents,
     private val dragAndDropIntents: DragAndDropIntents,
     private val appCurrencyProvider: Provider<AppCurrency>,
-    private val onSubscription: () -> Unit,
-    stateFlowScope: CoroutineScope,
 ) {
 
     private val stateFlowInternal: MutableStateFlow<OrganizeTokensState> = MutableStateFlow(getInitialState())
@@ -39,9 +38,7 @@ internal class OrganizeTokensStateHolder(
         TokenListToStateConverter(Provider(stateFlowInternal::value), itemsConverter)
     }
 
-    private val inProgressStateConverter by lazy {
-        InProgressStateConverter()
-    }
+    private val inProgressStateConverter by lazy { InProgressStateConverter() }
 
     private val tokenListErrorConverter by lazy {
         TokenListErrorConverter(Provider(stateFlowInternal::value), inProgressStateConverter)
@@ -52,12 +49,6 @@ internal class OrganizeTokensStateHolder(
     }
 
     val stateFlow: StateFlow<OrganizeTokensState> = stateFlowInternal
-        .onSubscription { onSubscription() }
-        .stateIn(
-            scope = stateFlowScope,
-            started = SharingStarted.WhileSubscribed(),
-            initialValue = getInitialState(),
-        )
 
     fun updateStateWithTokenList(tokenList: TokenList) {
         updateState { tokenListConverter.convert(tokenList) }
@@ -66,7 +57,7 @@ internal class OrganizeTokensStateHolder(
     fun updateStateAfterTokenListSorting(tokenList: TokenList) {
         updateState {
             tokenListConverter.convert(tokenList).copy(
-                scrollListToTop = triggered(::consumeScrollListToTopEvent),
+                scrollListToTop = triggeredEvent(Unit, ::consumeScrollListToTopEvent),
             )
         }
     }
@@ -80,12 +71,15 @@ internal class OrganizeTokensStateHolder(
     }
 
     fun updateStateWithManualSorting(itemsState: OrganizeTokensListState) {
-        updateState {
-            copy(
-                header = header.copy(isSortedByBalance = false),
-                itemsState = itemsState,
-            )
-        }
+        updateState { copy(itemsState = itemsState) }
+    }
+
+    fun disableSortingByBalance() {
+        updateState { copy(header = header.copy(isSortedByBalance = false)) }
+    }
+
+    fun updateHiddenState(isBalanceHidden: Boolean) {
+        updateState { copy(isBalanceHidden = isBalanceHidden) }
     }
 
     fun updateStateWithError(error: TokenListError) {
@@ -110,19 +104,20 @@ internal class OrganizeTokensStateHolder(
             ),
             dndConfig = OrganizeTokensState.DragAndDropConfig(
                 onItemDragged = dragAndDropIntents::onItemDragged,
-                onDragStart = dragAndDropIntents::onItemDraggingStart,
+                onItemDragStart = dragAndDropIntents::onItemDraggingStart,
                 onItemDragEnd = dragAndDropIntents::onItemDraggingEnd,
                 canDragItemOver = dragAndDropIntents::canDragItemOver,
             ),
-            scrollListToTop = consumed,
+            scrollListToTop = consumedEvent(),
+            isBalanceHidden = true,
         )
     }
 
-    private fun updateState(block: OrganizeTokensState.() -> OrganizeTokensState) {
+    private inline fun updateState(block: OrganizeTokensState.() -> OrganizeTokensState) {
         stateFlowInternal.update(block)
     }
 
     private fun consumeScrollListToTopEvent() {
-        updateState { copy(scrollListToTop = consumed) }
+        updateState { copy(scrollListToTop = consumedEvent()) }
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/OrganizeTokensViewModel.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/OrganizeTokensViewModel.kt
index 5c24a976b3..a522081e21 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/OrganizeTokensViewModel.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/OrganizeTokensViewModel.kt
@@ -1,18 +1,21 @@
 package com.tangem.feature.wallet.presentation.organizetokens
 
-import androidx.lifecycle.SavedStateHandle
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.*
 import arrow.core.getOrElse
 import com.tangem.common.Provider
+import com.tangem.core.analytics.api.AnalyticsEventHandler
+import com.tangem.core.analytics.models.AnalyticsParam
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
+import com.tangem.domain.balancehiding.IsBalanceHiddenUseCase
+import com.tangem.domain.balancehiding.ListenToFlipsUseCase
 import com.tangem.domain.tokens.ApplyTokenListSortingUseCase
 import com.tangem.domain.tokens.GetTokenListUseCase
 import com.tangem.domain.tokens.ToggleTokenListGroupingUseCase
 import com.tangem.domain.tokens.ToggleTokenListSortingUseCase
 import com.tangem.domain.tokens.model.TokenList
 import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.feature.wallet.presentation.organizetokens.analytics.PortfolioOrganizeTokensAnalyticsEvent
 import com.tangem.feature.wallet.presentation.organizetokens.model.OrganizeTokensListState
 import com.tangem.feature.wallet.presentation.organizetokens.model.OrganizeTokensState
 import com.tangem.feature.wallet.presentation.organizetokens.utils.CryptoCurrenciesIdsResolver
@@ -20,13 +23,14 @@ import com.tangem.feature.wallet.presentation.organizetokens.utils.common.disabl
 import com.tangem.feature.wallet.presentation.organizetokens.utils.dnd.DragAndDropAdapter
 import com.tangem.feature.wallet.presentation.router.InnerWalletRouter
 import com.tangem.feature.wallet.presentation.router.WalletRoute
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
+@Suppress("LongParameterList")
 @HiltViewModel
 internal class OrganizeTokensViewModel @Inject constructor(
     private val getTokenListUseCase: GetTokenListUseCase,
@@ -34,27 +38,27 @@ internal class OrganizeTokensViewModel @Inject constructor(
     private val toggleTokenListSortingUseCase: ToggleTokenListSortingUseCase,
     private val applyTokenListSortingUseCase: ApplyTokenListSortingUseCase,
     private val getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase,
+    private val isBalanceHiddenUseCase: IsBalanceHiddenUseCase,
+    private val listenToFlipsUseCase: ListenToFlipsUseCase,
+    private val analyticsEventsHandler: AnalyticsEventHandler,
+    private val dispatchers: CoroutineDispatcherProvider,
     savedStateHandle: SavedStateHandle,
-) : ViewModel(), OrganizeTokensIntents {
+) : ViewModel(), DefaultLifecycleObserver, OrganizeTokensIntents {
 
     lateinit var router: InnerWalletRouter
 
     private val selectedAppCurrencyFlow = createSelectedAppCurrencyFlow()
 
+    private var isBalanceHidden = true
+
     private val dragAndDropAdapter = DragAndDropAdapter(
         listStateProvider = Provider { uiState.value.itemsState },
-        scope = viewModelScope,
     )
 
     private val stateHolder = OrganizeTokensStateHolder(
-        stateFlowScope = viewModelScope,
         intents = this,
         dragAndDropIntents = dragAndDropAdapter,
         appCurrencyProvider = Provider(selectedAppCurrencyFlow::value),
-        onSubscription = {
-            bootstrapTokenList()
-            bootstrapDragAndDropUpdates()
-        },
     )
 
     private val userWalletId: UserWalletId by lazy {
@@ -67,14 +71,38 @@ internal class OrganizeTokensViewModel @Inject constructor(
 
     val uiState: StateFlow<OrganizeTokensState> = stateHolder.stateFlow
 
+    override fun onCreate(owner: LifecycleOwner) {
+        analyticsEventsHandler.send(PortfolioOrganizeTokensAnalyticsEvent.ScreenOpened)
+
+        isBalanceHiddenUseCase()
+            .flowWithLifecycle(owner.lifecycle)
+            .onEach { hidden ->
+                isBalanceHidden = hidden
+                stateHolder.updateHiddenState(isBalanceHidden)
+            }
+            .launchIn(viewModelScope)
+
+        viewModelScope.launch {
+            listenToFlipsUseCase()
+                .flowWithLifecycle(owner.lifecycle)
+                .collect()
+        }
+
+        bootstrapTokenList()
+        bootstrapDragAndDropUpdates()
+    }
+
     override fun onBackClick() {
         router.popBackStack()
     }
 
     override fun onSortClick() {
-        viewModelScope.launch(Dispatchers.Default) {
-            val list = tokenList ?: return@launch
+        val list = tokenList ?: return
+        if (list.sortedBy == TokenList.SortType.BALANCE) return
 
+        analyticsEventsHandler.send(PortfolioOrganizeTokensAnalyticsEvent.ByBalance)
+
+        viewModelScope.launch(dispatchers.default) {
             toggleTokenListSortingUseCase(list).fold(
                 ifLeft = stateHolder::updateStateWithError,
                 ifRight = {
@@ -86,9 +114,11 @@ internal class OrganizeTokensViewModel @Inject constructor(
     }
 
     override fun onGroupClick() {
-        viewModelScope.launch(Dispatchers.Default) {
-            val list = tokenList ?: return@launch
+        val list = tokenList ?: return
 
+        analyticsEventsHandler.send(PortfolioOrganizeTokensAnalyticsEvent.Group)
+
+        viewModelScope.launch(dispatchers.default) {
             toggleTokenListGroupingUseCase(list).fold(
                 ifLeft = stateHolder::updateStateWithError,
                 ifRight = {
@@ -100,37 +130,49 @@ internal class OrganizeTokensViewModel @Inject constructor(
     }
 
     override fun onApplyClick() {
-        viewModelScope.launch(Dispatchers.Default) {
+        viewModelScope.launch(dispatchers.default) {
             stateHolder.updateStateToDisplayProgress()
 
             val listState = uiState.value.itemsState
             val resolver = CryptoCurrenciesIdsResolver()
 
+            val isGroupedByNetwork = listState is OrganizeTokensListState.GroupedByNetwork
+            val isSortedByBalance = uiState.value.header.isSortedByBalance
+
+            sendAnalyticsEvent(
+                isGroupedByNetwork = isGroupedByNetwork,
+                isSortedByBalance = isSortedByBalance,
+            )
+
             val result = applyTokenListSortingUseCase(
                 userWalletId = userWalletId,
                 sortedTokensIds = resolver.resolve(listState, tokenList),
-                isGroupedByNetwork = listState is OrganizeTokensListState.GroupedByNetwork,
-                isSortedByBalance = uiState.value.header.isSortedByBalance,
+                isGroupedByNetwork = isGroupedByNetwork,
+                isSortedByBalance = isSortedByBalance,
             )
 
             result.fold(
                 ifLeft = stateHolder::updateStateWithError,
                 ifRight = {
                     stateHolder.updateStateToHideProgress()
-                    withContext(Dispatchers.Main) { router.popBackStack() }
+                    withContext(
+                        dispatchers.main,
+                    ) { router.popBackStack() }
                 },
             )
         }
     }
 
     override fun onCancelClick() {
+        analyticsEventsHandler.send(PortfolioOrganizeTokensAnalyticsEvent.Cancel)
+
         router.popBackStack()
     }
 
     private fun bootstrapTokenList() {
-        viewModelScope.launch(Dispatchers.Default) {
+        viewModelScope.launch(dispatchers.default) {
             val maybeTokenList = getTokenListUseCase(userWalletId)
-                .first { it.getOrNull()?.totalFiatBalance is TokenList.FiatBalance.Loaded }
+                .first { it.getOrNull()?.totalFiatBalance !is TokenList.FiatBalance.Loading }
 
             maybeTokenList.fold(
                 ifLeft = stateHolder::updateStateWithError,
@@ -143,15 +185,25 @@ internal class OrganizeTokensViewModel @Inject constructor(
     }
 
     private fun bootstrapDragAndDropUpdates() {
-        dragAndDropAdapter.stateFlow
+        dragAndDropAdapter.dragAndDropUpdates
             .distinctUntilChanged()
-            .onEach {
-                stateHolder.updateStateWithManualSorting(it)
-                tokenList = tokenList?.disableSortingByBalance()
+            .onEach { (type, updatedListState) ->
+                disableSortingByBalanceIfListChanged(type)
+
+                stateHolder.updateStateWithManualSorting(updatedListState)
             }
             .launchIn(viewModelScope)
     }
 
+    private fun disableSortingByBalanceIfListChanged(dragOperationType: DragAndDropAdapter.DragOperation.Type) {
+        if (dragOperationType !is DragAndDropAdapter.DragOperation.Type.End) return
+
+        if (uiState.value.header.isSortedByBalance && dragOperationType.isItemsOrderChanged) {
+            tokenList = tokenList?.disableSortingByBalance()
+            stateHolder.disableSortingByBalance()
+        }
+    }
+
     private fun createSelectedAppCurrencyFlow(): StateFlow<AppCurrency> {
         return getSelectedAppCurrencyUseCase()
             .map { maybeAppCurrency ->
@@ -163,4 +215,21 @@ internal class OrganizeTokensViewModel @Inject constructor(
                 initialValue = AppCurrency.Default,
             )
     }
+
+    private fun sendAnalyticsEvent(isGroupedByNetwork: Boolean, isSortedByBalance: Boolean) {
+        analyticsEventsHandler.send(
+            PortfolioOrganizeTokensAnalyticsEvent.Apply(
+                grouping = if (isGroupedByNetwork) {
+                    AnalyticsParam.OnOffState.On
+                } else {
+                    AnalyticsParam.OnOffState.Off
+                },
+                organizeSortType = if (isSortedByBalance) {
+                    AnalyticsParam.OrganizeSortType.ByBalance
+                } else {
+                    AnalyticsParam.OrganizeSortType.Manually
+                },
+            ),
+        )
+    }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/analytics/PortfolioOrganizeTokensAnalyticsEvent.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/analytics/PortfolioOrganizeTokensAnalyticsEvent.kt
new file mode 100644
index 0000000000..4d5ccf9b2c
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/analytics/PortfolioOrganizeTokensAnalyticsEvent.kt
@@ -0,0 +1,29 @@
+package com.tangem.feature.wallet.presentation.organizetokens.analytics
+
+import com.tangem.core.analytics.models.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsParam
+
+sealed class PortfolioOrganizeTokensAnalyticsEvent(
+    event: String,
+    params: Map<String, String> = mapOf(),
+) : AnalyticsEvent("Portfolio / Organize Tokens", event, params) {
+
+    object ScreenOpened : PortfolioOrganizeTokensAnalyticsEvent("Organize Tokens Screen Opened")
+
+    object ByBalance : PortfolioOrganizeTokensAnalyticsEvent("Button - By Balance")
+
+    object Group : PortfolioOrganizeTokensAnalyticsEvent("Button - Group")
+
+    class Apply(
+        grouping: AnalyticsParam.OnOffState,
+        organizeSortType: AnalyticsParam.OrganizeSortType,
+    ) : PortfolioOrganizeTokensAnalyticsEvent(
+        "Button - Apply",
+        params = mapOf(
+            "Group" to grouping.value,
+            "Sort" to organizeSortType.value,
+        ),
+    )
+
+    object Cancel : PortfolioOrganizeTokensAnalyticsEvent("Button - Cancel")
+}
\ No newline at end of file
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 5d367c0436..f7c411a377 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
@@ -13,7 +13,7 @@ import com.tangem.feature.wallet.presentation.organizetokens.model.DraggableItem
  * */
 @Immutable
 internal sealed class DraggableItem {
-    abstract val id: String
+    abstract val id: Any
     abstract val roundingMode: RoundingMode
     abstract val showShadow: Boolean
 
@@ -26,7 +26,7 @@ internal sealed class DraggableItem {
      * @property showShadow if true then item should be elevated
      * */
     data class GroupHeader(
-        override val id: String,
+        override val id: Int,
         val networkName: String,
         override val roundingMode: RoundingMode = RoundingMode.None,
         override val showShadow: Boolean = false,
@@ -43,7 +43,7 @@ internal sealed class DraggableItem {
      * */
     data class Token(
         val tokenItemState: TokenItemState.Draggable,
-        val groupId: String,
+        val groupId: Int,
         override val showShadow: Boolean = false,
         override val roundingMode: RoundingMode = RoundingMode.None,
     ) : DraggableItem() {
@@ -51,12 +51,11 @@ internal sealed class DraggableItem {
     }
 
     /**
-     * Helper item used to detect possible positions where a network group can be placed.
-     * Used only on [OrganizeTokensListState.GroupedByNetwork] and placed between network groups.
+     * Helper item used to detect possible positions where a draggable item can be placed.
      *
      * @property id ID of the placeholder
      * */
-    data class GroupPlaceholder(
+    data class Placeholder(
         override val id: String,
     ) : DraggableItem() {
         override val showShadow: Boolean = false
@@ -109,7 +108,7 @@ internal sealed class DraggableItem {
      * @return updated [DraggableItem]
      * */
     fun updateRoundingMode(mode: RoundingMode): DraggableItem = when (this) {
-        is GroupPlaceholder -> this
+        is Placeholder -> this
         is GroupHeader -> this.copy(roundingMode = mode)
         is Token -> this.copy(roundingMode = mode)
     }
@@ -122,7 +121,7 @@ internal sealed class DraggableItem {
      * @return updated [DraggableItem]
      * */
     fun updateShadowVisibility(show: Boolean): DraggableItem = when (this) {
-        is GroupPlaceholder -> this
+        is Placeholder -> this
         is GroupHeader -> this.copy(showShadow = show)
         is Token -> this.copy(showShadow = show)
     }
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/model/OrganizeTokensListState.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/model/OrganizeTokensListState.kt
index 3f87cab410..2bc9fe9dd9 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/model/OrganizeTokensListState.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/model/OrganizeTokensListState.kt
@@ -13,10 +13,18 @@ internal sealed class OrganizeTokensListState {
     ) : OrganizeTokensListState()
 
     data class Ungrouped(
-        override val items: PersistentList<DraggableItem.Token>,
+        override val items: PersistentList<DraggableItem>,
     ) : OrganizeTokensListState()
 
     object Empty : OrganizeTokensListState() {
         override val items: PersistentList<DraggableItem> = persistentListOf()
     }
+
+    fun copySealed(items: PersistentList<DraggableItem> = this.items): OrganizeTokensListState {
+        return when (this) {
+            is GroupedByNetwork -> copy(items = items)
+            is Ungrouped -> copy(items = items)
+            is Empty -> Empty
+        }
+    }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/model/OrganizeTokensState.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/model/OrganizeTokensState.kt
index 860c4c5b24..d290f81bb7 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/model/OrganizeTokensState.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/model/OrganizeTokensState.kt
@@ -11,7 +11,8 @@ internal data class OrganizeTokensState(
     val header: HeaderConfig,
     val actions: ActionsConfig,
     val dndConfig: DragAndDropConfig,
-    val scrollListToTop: StateEvent,
+    val scrollListToTop: StateEvent<Unit>,
+    val isBalanceHidden: Boolean,
 ) {
 
     data class HeaderConfig(
@@ -33,6 +34,6 @@ internal data class OrganizeTokensState(
         val onItemDragged: (ItemPosition, ItemPosition) -> Unit,
         val canDragItemOver: (ItemPosition, ItemPosition) -> Boolean,
         val onItemDragEnd: () -> Unit,
-        val onDragStart: (DraggableItem) -> Unit,
+        val onItemDragStart: (DraggableItem) -> Unit,
     )
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/CryptoCurrenciesIdsResolver.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/CryptoCurrenciesIdsResolver.kt
index 71690752fb..60af8fee15 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/CryptoCurrenciesIdsResolver.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/CryptoCurrenciesIdsResolver.kt
@@ -1,7 +1,7 @@
 package com.tangem.feature.wallet.presentation.organizetokens.utils
 
+import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.tokens.model.TokenList
-import com.tangem.domain.tokens.models.CryptoCurrency
 import com.tangem.feature.wallet.presentation.organizetokens.model.DraggableItem
 import com.tangem.feature.wallet.presentation.organizetokens.model.OrganizeTokensListState
 
@@ -11,12 +11,12 @@ internal class CryptoCurrenciesIdsResolver {
         val draggableTokens = when (listState) {
             is OrganizeTokensListState.Empty -> return emptyList()
             is OrganizeTokensListState.GroupedByNetwork -> listState.items.filterIsInstance<DraggableItem.Token>()
-            is OrganizeTokensListState.Ungrouped -> listState.items
+            is OrganizeTokensListState.Ungrouped -> listState.items.filterIsInstance<DraggableItem.Token>()
         }
         val currenciesStatuses = when (tokenList) {
             is TokenList.GroupedByNetwork -> tokenList.groups.flatMap { it.currencies }
             is TokenList.Ungrouped -> tokenList.currencies
-            is TokenList.NotInitialized,
+            is TokenList.Empty,
             null,
             -> return emptyList()
         }
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/common/DraggableItemOperations.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/common/DraggableItemOperations.kt
index acfcac13b7..1db8f4356d 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/common/DraggableItemOperations.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/common/DraggableItemOperations.kt
@@ -2,6 +2,6 @@ package com.tangem.feature.wallet.presentation.organizetokens.utils.common
 
 import com.tangem.feature.wallet.presentation.organizetokens.model.DraggableItem
 
-internal fun getGroupPlaceholder(index: Int): DraggableItem.GroupPlaceholder {
-    return DraggableItem.GroupPlaceholder(id = "placeholder_${index.inc()}")
+internal fun getGroupPlaceholder(index: Int): DraggableItem.Placeholder {
+    return DraggableItem.Placeholder(id = "placeholder_${index.inc()}")
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/common/DraggableItemsOperations.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/common/DraggableItemsOperations.kt
index fee7cb1033..7a0beac577 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/common/DraggableItemsOperations.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/common/DraggableItemsOperations.kt
@@ -3,20 +3,22 @@ package com.tangem.feature.wallet.presentation.organizetokens.utils.common
 import com.tangem.feature.wallet.presentation.organizetokens.model.DraggableItem
 
 internal fun List<DraggableItem>.uniteItems(): List<DraggableItem> {
-    val lastItemIndex = this.lastIndex
+    val items = prepareItems()
+    val lastItemIndex = items.lastIndex
 
-    return this.mapIndexed { index, item ->
+    return prepareItems().mapIndexed { index, item ->
         val mode = when (index) {
-            0 -> DraggableItem.RoundingMode.Top()
+            // 1 index is used because the first item is always a placeholder, check `prepareItems()` function
+            1 -> DraggableItem.RoundingMode.Top()
             lastItemIndex -> DraggableItem.RoundingMode.Bottom()
             else -> when (item) {
+                is DraggableItem.Placeholder -> DraggableItem.RoundingMode.None
                 is DraggableItem.GroupHeader -> DraggableItem.RoundingMode.Top(showGap = true)
-                is DraggableItem.Token -> if (this[index + 1] is DraggableItem.GroupPlaceholder) {
+                is DraggableItem.Token -> if (items[index + 1] is DraggableItem.Placeholder) {
                     DraggableItem.RoundingMode.Bottom(showGap = true)
                 } else {
                     DraggableItem.RoundingMode.None
                 }
-                is DraggableItem.GroupPlaceholder -> DraggableItem.RoundingMode.None
             }
         }
 
@@ -24,4 +26,49 @@ internal fun List<DraggableItem>.uniteItems(): List<DraggableItem> {
             .updateRoundingMode(mode)
             .updateShadowVisibility(show = false)
     }
+}
+
+internal fun List<DraggableItem>.divideMovingItem(movingItem: DraggableItem): List<DraggableItem> {
+    val mutableList = this.toMutableList()
+    val listIterator = mutableList.listIterator()
+
+    while (listIterator.hasNext()) {
+        val item = listIterator.next()
+
+        if (item.id == movingItem.id) {
+            val dividedItem = movingItem
+                .updateRoundingMode(DraggableItem.RoundingMode.All())
+                .updateShadowVisibility(show = true)
+
+            listIterator.set(dividedItem)
+            break
+        }
+    }
+
+    return mutableList
+}
+
+/**
+ * !!! Workaround !!!
+ *
+ * We need to add a [DraggableItem.Placeholder] (since it's not draggable) as the first item of the list, because the
+ * [DND library](https://github.com/aclassen/ComposeReorderable) glitches when a user tries to drag the first item.
+ *
+ * @since 07.09.2023
+ * */
+private fun List<DraggableItem>.prepareItems(): List<DraggableItem> {
+    val firstPlaceholderId = "initial_placeholder"
+    val items = this
+
+    return mutableListOf<DraggableItem>().apply {
+        add(DraggableItem.Placeholder(firstPlaceholderId))
+
+        val itemsWithoutFirstPlaceholder = if (items.firstOrNull()?.id == firstPlaceholderId) {
+            items.drop(n = 1)
+        } else {
+            items
+        }
+
+        addAll(itemsWithoutFirstPlaceholder)
+    }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/common/IdsOperations.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/common/IdsOperations.kt
index e28e32c3a8..3ea46b1752 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/common/IdsOperations.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/common/IdsOperations.kt
@@ -1,8 +1,8 @@
 package com.tangem.feature.wallet.presentation.organizetokens.utils.common
 
-import com.tangem.domain.tokens.models.CryptoCurrency
-import com.tangem.domain.tokens.models.Network
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.Network
 
 internal fun getTokenItemId(currencyId: CryptoCurrency.ID): String = currencyId.value
 
-internal fun getGroupHeaderId(networkId: Network.ID): String = networkId.value
\ No newline at end of file
+internal fun getGroupHeaderId(network: Network): Int = network.hashCode()
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/common/OrganiseTokensListStateOperations.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/common/OrganiseTokensListStateOperations.kt
index 4c041f01fe..3b6cf65d8d 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/common/OrganiseTokensListStateOperations.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/common/OrganiseTokensListStateOperations.kt
@@ -5,7 +5,6 @@ import com.tangem.feature.wallet.presentation.organizetokens.model.OrganizeToken
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.toPersistentList
 
-@Suppress("UNCHECKED_CAST")
 internal inline fun OrganizeTokensListState.updateItems(
     update: (PersistentList<DraggableItem>) -> List<DraggableItem>,
 ): OrganizeTokensListState {
@@ -13,7 +12,7 @@ internal inline fun OrganizeTokensListState.updateItems(
 
     return when (this) {
         is OrganizeTokensListState.GroupedByNetwork -> copy(items = updatedItems)
-        is OrganizeTokensListState.Ungrouped -> copy(items = updatedItems as PersistentList<DraggableItem.Token>)
+        is OrganizeTokensListState.Ungrouped -> copy(items = updatedItems)
         is OrganizeTokensListState.Empty -> this
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/common/TokenListOperations.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/common/TokenListOperations.kt
index 4e4250f5e9..38b17ef15f 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/common/TokenListOperations.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/common/TokenListOperations.kt
@@ -7,6 +7,6 @@ internal fun TokenList.disableSortingByBalance(): TokenList {
     return when (this) {
         is TokenList.GroupedByNetwork -> this.copy(sortedBy = SortType.NONE)
         is TokenList.Ungrouped -> this.copy(sortedBy = SortType.NONE)
-        is TokenList.NotInitialized -> this
+        is TokenList.Empty -> this
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/converter/InProgressStateConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/converter/InProgressStateConverter.kt
index 4c26e09a29..936385e8ea 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/converter/InProgressStateConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/converter/InProgressStateConverter.kt
@@ -10,6 +10,9 @@ internal class InProgressStateConverter : TwoWayConverter<OrganizeTokensState, O
             actions = value.actions.copy(
                 showApplyProgress = true,
             ),
+            header = value.header.copy(
+                isEnabled = false,
+            ),
         )
     }
 
@@ -18,6 +21,9 @@ internal class InProgressStateConverter : TwoWayConverter<OrganizeTokensState, O
             actions = value.actions.copy(
                 showApplyProgress = false,
             ),
+            header = value.header.copy(
+                isEnabled = true,
+            ),
         )
     }
 }
\ No newline at end of file
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 11f4747c2b..aa518deba2 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,12 +1,11 @@
 package com.tangem.feature.wallet.presentation.organizetokens.utils.converter.items
 
 import com.tangem.common.Provider
-import com.tangem.core.ui.extensions.iconResId
-import com.tangem.core.ui.extensions.networkBadgeIconResId
 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.common.utils.CryptoCurrencyToIconStateConverter
 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
@@ -16,6 +15,8 @@ internal class CryptoCurrencyToDraggableItemConverter(
     private val appCurrencyProvider: Provider<AppCurrency>,
 ) : Converter<CryptoCurrencyStatus, DraggableItem.Token> {
 
+    private val iconStateConverter = CryptoCurrencyToIconStateConverter()
+
     override fun convert(value: CryptoCurrencyStatus): DraggableItem.Token {
         return createDraggableToken(value, appCurrencyProvider())
     }
@@ -32,7 +33,7 @@ internal class CryptoCurrencyToDraggableItemConverter(
     ): DraggableItem.Token {
         return DraggableItem.Token(
             tokenItemState = createTokenItemState(currencyStatus, appCurrency),
-            groupId = getGroupHeaderId(currencyStatus.currency.network.id),
+            groupId = getGroupHeaderId(currencyStatus.currency.network),
         )
     }
 
@@ -44,12 +45,13 @@ internal class CryptoCurrencyToDraggableItemConverter(
 
         return TokenItemState.Draggable(
             id = getTokenItemId(currency.id),
-            tokenIconUrl = currency.iconUrl,
-            tokenIconResId = currencyStatus.currency.iconResId,
-            networkBadgeIconResId = currencyStatus.currency.networkBadgeIconResId,
-            name = currency.name,
-            fiatAmount = getFormattedFiatAmount(currencyStatus, appCurrency),
-            isTestnet = currencyStatus.currency.network.isTestnet,
+            iconState = iconStateConverter.convert(currencyStatus),
+            titleState = TokenItemState.TitleState.Content(text = currency.name),
+            cryptoAmountState = if (currencyStatus.value.isError) {
+                TokenItemState.CryptoAmountState.Unreachable
+            } else {
+                TokenItemState.CryptoAmountState.Content(text = getFormattedFiatAmount(currencyStatus, appCurrency))
+            },
         )
     }
 
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/converter/items/NetworkGroupToDraggableItemsConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/converter/items/NetworkGroupToDraggableItemsConverter.kt
index ddd09e1da9..0205df476a 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/converter/items/NetworkGroupToDraggableItemsConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/converter/items/NetworkGroupToDraggableItemsConverter.kt
@@ -31,11 +31,11 @@ internal class NetworkGroupToDraggableItemsConverter(
     }
 
     private fun createGroupHeader(group: NetworkGroup) = DraggableItem.GroupHeader(
-        id = getGroupHeaderId(group.network.id),
+        id = getGroupHeaderId(group.network),
         networkName = group.network.name,
     )
 
     private fun createTokens(group: NetworkGroup): List<DraggableItem.Token> {
-        return itemConverter.convertList(group.currencies.toList())
+        return itemConverter.convertList(group.currencies)
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/converter/items/TokenListToListStateConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/converter/items/TokenListToListStateConverter.kt
index dd82c1672b..455e896da9 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/converter/items/TokenListToListStateConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/converter/items/TokenListToListStateConverter.kt
@@ -17,7 +17,7 @@ internal class TokenListToListStateConverter(
         return when (value) {
             is TokenList.GroupedByNetwork -> createListState(value)
             is TokenList.Ungrouped -> createListState(value)
-            is TokenList.NotInitialized -> createEmptyListState()
+            is TokenList.Empty -> createEmptyListState()
         }
     }
 
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/dnd/DragAndDropAdapter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/dnd/DragAndDropAdapter.kt
index c73798c77e..eee81913e8 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/dnd/DragAndDropAdapter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/dnd/DragAndDropAdapter.kt
@@ -4,42 +4,39 @@ import com.tangem.common.Provider
 import com.tangem.feature.wallet.presentation.organizetokens.DragAndDropIntents
 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.utils.common.divideMovingItem
 import com.tangem.feature.wallet.presentation.organizetokens.utils.common.uniteItems
 import com.tangem.feature.wallet.presentation.organizetokens.utils.common.updateItems
 import kotlinx.collections.immutable.mutate
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.channels.BufferOverflow
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.filterNotNull
 import org.burnoutcrew.reorderable.ItemPosition
 
 internal class DragAndDropAdapter(
     private val listStateProvider: Provider<OrganizeTokensListState>,
-    private val scope: CoroutineScope,
 ) : DragAndDropIntents {
 
     private val draggableGroupsOperations = DraggableGroupsOperations()
 
-    private val currentListState: OrganizeTokensListState
+    private val externalListState: OrganizeTokensListState
         get() = listStateProvider.invoke()
 
-    private val listStateFlowInternal: MutableSharedFlow<OrganizeTokensListState> = MutableSharedFlow(
-        replay = 1,
-        onBufferOverflow = BufferOverflow.DROP_OLDEST,
-    )
+    private val dragAndDropUpdatesInternal: MutableStateFlow<DragOperation?> = MutableStateFlow(value = null)
 
-    private var currentDraggingItem: DraggableItem? = null
+    private var draggingItem: DraggableItem? = null
+    private var draggingListState: OrganizeTokensListState? = null
 
-    val stateFlow: Flow<OrganizeTokensListState>
-        get() = listStateFlowInternal
+    val dragAndDropUpdates: Flow<DragOperation>
+        get() = dragAndDropUpdatesInternal.filterNotNull()
 
     override fun canDragItemOver(dragOver: ItemPosition, dragging: ItemPosition): Boolean {
-        val items = (currentListState as? OrganizeTokensListState.GroupedByNetwork)
-            ?.items
-            ?: return true // If ungrouped then item can be moved anywhere
+        val items = when (val listState = externalListState) {
+            is OrganizeTokensListState.GroupedByNetwork -> listState.items
+            is OrganizeTokensListState.Empty,
+            is OrganizeTokensListState.Ungrouped,
+            -> return true // If ungrouped then item can be moved anywhere
+        }
 
         val (dragOverItem, draggingItem) = findItemsToMove(
             items = items,
@@ -54,55 +51,55 @@ internal class DragAndDropAdapter(
         return when (draggingItem) {
             is DraggableItem.GroupHeader -> checkCanMoveHeaderOver(dragOver, dragOverItem, items.lastIndex)
             is DraggableItem.Token -> checkCanMoveTokenOver(draggingItem, dragOverItem)
-            is DraggableItem.GroupPlaceholder -> false
+            is DraggableItem.Placeholder -> false
         }
     }
 
     override fun onItemDraggingStart(item: DraggableItem) {
-        if (currentDraggingItem != null) return
-        currentDraggingItem = item
+        if (draggingItem != null) return
+        draggingItem = item
 
-        updateListState {
+        updateListState(DragOperation.Type.Start) {
             when (item) {
-                is DraggableItem.GroupPlaceholder -> items
+                is DraggableItem.Placeholder -> items
                 is DraggableItem.GroupHeader -> draggableGroupsOperations.collapseGroup(items, item)
                 is DraggableItem.Token -> when (this) {
-                    is OrganizeTokensListState.GroupedByNetwork -> draggableGroupsOperations.divideGroups(items, item)
-                    is OrganizeTokensListState.Ungrouped -> divideTokens(items, item)
+                    is OrganizeTokensListState.GroupedByNetwork -> items.divideMovingItem(item)
+                    is OrganizeTokensListState.Ungrouped -> items.divideMovingItem(item)
                     is OrganizeTokensListState.Empty -> items
                 }
             }
         }
+
+        draggingListState = externalListState
     }
 
     override fun onItemDraggingEnd() {
-        scope.launch(Dispatchers.IO) {
-            val draggingItem = currentDraggingItem ?: return@launch
+        val draggingItem = draggingItem ?: return
 
-            delay(FINISH_DRAGGING_DELAY_MILLIS)
-
-            updateListState {
-                when (draggingItem) {
-                    is DraggableItem.GroupHeader -> draggableGroupsOperations.expandGroups(items)
-                    is DraggableItem.Token -> items.uniteItems()
-                    is DraggableItem.GroupPlaceholder -> items
-                }
+        updateListState(DragOperation.Type.End(isItemsOrderChanged = checkIsItemsOrderChanged())) {
+            when (draggingItem) {
+                is DraggableItem.GroupHeader -> draggableGroupsOperations.expandGroups(items)
+                is DraggableItem.Token -> items.uniteItems()
+                is DraggableItem.Placeholder -> items
             }
+        }
 
-            currentDraggingItem = null
+        this.draggingItem = null
+    }
+
+    override fun onItemDragged(from: ItemPosition, to: ItemPosition) {
+        updateListState(DragOperation.Type.Dragged) {
+            items.mutate {
+                it.add(to.index, it.removeAt(from.index))
+            }
         }
     }
 
-    override fun onItemDragged(from: ItemPosition, to: ItemPosition) = updateListState {
-        items.mutate {
-            it.add(to.index, it.removeAt(from.index))
-        }
-    }
+    private fun updateListState(type: DragOperation.Type, block: OrganizeTokensListState.() -> List<DraggableItem>) {
+        val updatedState = externalListState.updateItems { block(externalListState) }
 
-    private fun updateListState(block: OrganizeTokensListState.() -> List<DraggableItem>) {
-        val updatedState = currentListState.updateItems { block(currentListState) }
-
-        listStateFlowInternal.tryEmit(updatedState)
+        dragAndDropUpdatesInternal.value = DragOperation(type, updatedState)
     }
 
     private fun findItemsToMove(
@@ -137,7 +134,7 @@ internal class DragAndDropAdapter(
         return when {
             moveOverItemPosition.index == 0 -> true
             moveOverItemPosition.index == lastItemIndex -> true
-            moveOverItem is DraggableItem.GroupPlaceholder -> true
+            moveOverItem is DraggableItem.Placeholder -> true
             else -> false
         }
     }
@@ -147,23 +144,34 @@ internal class DragAndDropAdapter(
         return when (moveOverItem) {
             is DraggableItem.GroupHeader -> false // Token item can not be moved to group item
             is DraggableItem.Token -> item.groupId == moveOverItem.groupId // Token item can not be moved over its group
-            is DraggableItem.GroupPlaceholder -> false
+            is DraggableItem.Placeholder -> false
         }
     }
 
-    @Suppress("UNCHECKED_CAST") // Erased type
-    private fun divideTokens(
-        items: List<DraggableItem.Token>,
-        movingItem: DraggableItem.Token,
-    ): List<DraggableItem.Token> {
-        return items.map { token ->
-            token
-                .updateRoundingMode(DraggableItem.RoundingMode.All(showGap = true))
-                .updateShadowVisibility(show = token.id == movingItem.id)
-        } as List<DraggableItem.Token>
+    private fun checkIsItemsOrderChanged(): Boolean {
+        fun OrganizeTokensListState?.getItemsIds(): List<Any>? = this?.items?.mapNotNull { item ->
+            if (item is DraggableItem.Placeholder) {
+                null
+            } else {
+                item.id
+            }
+        }
+
+        return externalListState.getItemsIds() != draggingListState.getItemsIds()
     }
 
-    private companion object {
-        const val FINISH_DRAGGING_DELAY_MILLIS = 200L
+    data class DragOperation(
+        val type: Type,
+        val listState: OrganizeTokensListState,
+    ) {
+
+        sealed class Type {
+
+            object Start : Type()
+
+            object Dragged : Type()
+
+            data class End(val isItemsOrderChanged: Boolean) : Type()
+        }
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/dnd/DraggableGroupsOperations.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/dnd/DraggableGroupsOperations.kt
index d28133195a..3891fdea66 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/dnd/DraggableGroupsOperations.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/dnd/DraggableGroupsOperations.kt
@@ -1,12 +1,13 @@
 package com.tangem.feature.wallet.presentation.organizetokens.utils.dnd
 
 import com.tangem.feature.wallet.presentation.organizetokens.model.DraggableItem
+import com.tangem.feature.wallet.presentation.organizetokens.utils.common.divideMovingItem
 import com.tangem.feature.wallet.presentation.organizetokens.utils.common.getGroupPlaceholder
 import com.tangem.feature.wallet.presentation.organizetokens.utils.common.uniteItems
 
 internal class DraggableGroupsOperations {
 
-    private var groupIdToTokens: Map<String, List<DraggableItem.Token>>? = null
+    private var groupIdToTokens: Map<Int, List<DraggableItem.Token>>? = null
 
     fun collapseGroup(items: List<DraggableItem>, movingGroup: DraggableItem.GroupHeader): List<DraggableItem> {
         if (!groupIdToTokens.isNullOrEmpty()) return items
@@ -20,7 +21,7 @@ internal class DraggableGroupsOperations {
             it is DraggableItem.Token && it.groupId == movingGroup.id
         }
 
-        return divideGroups(itemsWithoutGroupTokens, movingGroup)
+        return itemsWithoutGroupTokens.divideMovingItem(movingGroup)
     }
 
     fun expandGroups(items: List<DraggableItem>): List<DraggableItem> {
@@ -45,62 +46,4 @@ internal class DraggableGroupsOperations {
 
         return expandedGroups
     }
-
-    fun divideGroups(items: List<DraggableItem>, movingItem: DraggableItem): List<DraggableItem> {
-        val lastItemIndex = items.lastIndex
-
-        return items.mapIndexed { index, item ->
-            when {
-                // Case when current item is the moving item
-                item.id == movingItem.id -> {
-                    item
-                        .updateRoundingMode(DraggableItem.RoundingMode.All(showGap = true))
-                        .updateShadowVisibility(show = true)
-                }
-                // Case when moving item is a token and current item is the group of the moving token
-                movingItem is DraggableItem.Token && item.id == movingItem.groupId -> {
-                    item
-                        .updateRoundingMode(DraggableItem.RoundingMode.All(showGap = true))
-                        .updateShadowVisibility(show = true)
-                }
-                // Case when both moving item and current item are tokens and belong to the same group
-                movingItem is DraggableItem.Token &&
-                    item is DraggableItem.Token && item.groupId == movingItem.groupId -> {
-                    item
-                        .updateRoundingMode(DraggableItem.RoundingMode.All(showGap = true))
-                        .updateShadowVisibility(show = false)
-                }
-                // Case when current item is the first item in the list
-                index == 0 -> {
-                    item
-                        .updateRoundingMode(DraggableItem.RoundingMode.Top())
-                        .updateShadowVisibility(show = false)
-                }
-                // Case when current item is the last item in the list
-                index == lastItemIndex -> {
-                    item
-                        .updateRoundingMode(DraggableItem.RoundingMode.Bottom())
-                        .updateShadowVisibility(show = false)
-                }
-                // Case when previous item is a GroupPlaceholder
-                items[index - 1] is DraggableItem.GroupPlaceholder -> {
-                    item
-                        .updateRoundingMode(DraggableItem.RoundingMode.Top(showGap = true))
-                        .updateShadowVisibility(show = false)
-                }
-                // Case when next item is a GroupPlaceholder
-                items[index + 1] is DraggableItem.GroupPlaceholder -> {
-                    item
-                        .updateRoundingMode(DraggableItem.RoundingMode.Bottom(showGap = true))
-                        .updateShadowVisibility(show = false)
-                }
-                // Default case when none of the above conditions are met
-                else -> {
-                    item
-                        .updateRoundingMode(DraggableItem.RoundingMode.None)
-                        .updateShadowVisibility(show = false)
-                }
-            }
-        }
-    }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/DefaultWalletRouter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/DefaultWalletRouter.kt
index ceaeead504..67b534d11d 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/DefaultWalletRouter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/DefaultWalletRouter.kt
@@ -7,7 +7,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavHostController
@@ -19,8 +18,9 @@ import androidx.navigation.navArgument
 import com.tangem.core.navigation.AppScreen
 import com.tangem.core.navigation.NavigationAction
 import com.tangem.core.navigation.ReduxNavController
-import com.tangem.domain.tokens.models.CryptoCurrency
+import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.feature.onboarding.navigation.OnboardingRouter
 import com.tangem.feature.wallet.presentation.WalletFragment
 import com.tangem.feature.wallet.presentation.organizetokens.OrganizeTokensScreen
 import com.tangem.feature.wallet.presentation.organizetokens.OrganizeTokensViewModel
@@ -33,13 +33,13 @@ import kotlin.properties.Delegates
 internal class DefaultWalletRouter(private val reduxNavController: ReduxNavController) : InnerWalletRouter {
 
     private var navController: NavHostController by Delegates.notNull()
-    private var fragmentManager: FragmentManager by Delegates.notNull()
+    private var onFinish: () -> Unit = {}
 
     override fun getEntryFragment(): Fragment = WalletFragment.create()
 
     @Composable
-    override fun Initialize(fragmentManager: FragmentManager) {
-        this.fragmentManager = fragmentManager
+    override fun Initialize(onFinish: () -> Unit) {
+        this.onFinish = onFinish
 
         NavHost(
             navController = rememberNavController().apply { navController = this },
@@ -56,10 +56,10 @@ internal class DefaultWalletRouter(private val reduxNavController: ReduxNavContr
                 WalletRoute.OrganizeTokens.route,
                 arguments = listOf(navArgument(WalletRoute.userWalletIdKey) { type = NavType.StringType }),
             ) {
-                val viewModel: OrganizeTokensViewModel = hiltViewModel<OrganizeTokensViewModel>()
-                    .apply {
-                        router = this@DefaultWalletRouter
-                    }
+                val viewModel = hiltViewModel<OrganizeTokensViewModel>().apply {
+                    router = this@DefaultWalletRouter
+                }
+                LocalLifecycleOwner.current.lifecycle.addObserver(viewModel)
 
                 val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
@@ -78,11 +78,11 @@ internal class DefaultWalletRouter(private val reduxNavController: ReduxNavContr
          * next element is wallet screen entry.
          * If backstack contains only NavGraph entry and wallet screen entry then we close the wallet fragment.
          */
-        if (navController.backQueue.size == BACKSTACK_ENTRY_COUNT_TO_CLOSE_WALLET_SCREEN) {
+        if (navController.currentBackStack.value.size == BACKSTACK_ENTRY_COUNT_TO_CLOSE_WALLET_SCREEN) {
             if (screen != null) {
                 reduxNavController.navigate(action = NavigationAction.PopBackTo(screen))
             } else {
-                fragmentManager.popBackStack()
+                onFinish.invoke()
             }
         } else {
             navController.popBackStack()
@@ -94,25 +94,30 @@ internal class DefaultWalletRouter(private val reduxNavController: ReduxNavContr
     }
 
     override fun openDetailsScreen() {
-        // FIXME: Prepare details screen (e.g. dispatch action: `DetailsAction.PrepareScreen`)
-        // [REDACTED_JIRA]
         reduxNavController.navigate(action = NavigationAction.NavigateTo(AppScreen.Details))
     }
 
     override fun openOnboardingScreen() {
-        reduxNavController.navigate(action = NavigationAction.NavigateTo(AppScreen.OnboardingWallet))
+        reduxNavController.navigate(
+            action = NavigationAction.NavigateTo(
+                screen = AppScreen.OnboardingWallet,
+                bundle = bundleOf(OnboardingRouter.CAN_SKIP_BACKUP to false),
+            ),
+        )
     }
 
-    override fun openTxHistoryWebsite(url: String) {
+    override fun openUrl(url: String) {
         reduxNavController.navigate(action = NavigationAction.OpenUrl(url))
     }
 
-    override fun openTokenDetails(currency: CryptoCurrency) {
+    override fun openTokenDetails(userWalletId: UserWalletId, currency: CryptoCurrency) {
         reduxNavController.navigate(
             action = NavigationAction.NavigateTo(
                 screen = AppScreen.WalletDetails,
-                // TODO: [REDACTED_JIRA]
-                bundle = bundleOf(TokenDetailsRouter.SELECTED_CURRENCY_KEY to currency),
+                bundle = bundleOf(
+                    TokenDetailsRouter.USER_WALLET_ID_KEY to userWalletId.stringValue,
+                    TokenDetailsRouter.CRYPTO_CURRENCY_KEY to currency,
+                ),
             ),
         )
     }
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/InnerWalletRouter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/InnerWalletRouter.kt
index b5b2ff23e1..5354359c05 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/InnerWalletRouter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/InnerWalletRouter.kt
@@ -2,9 +2,8 @@ package com.tangem.feature.wallet.presentation.router
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
-import androidx.fragment.app.FragmentManager
 import com.tangem.core.navigation.AppScreen
-import com.tangem.domain.tokens.models.CryptoCurrency
+import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.features.wallet.navigation.WalletRouter
 
@@ -22,11 +21,11 @@ internal interface InnerWalletRouter : WalletRouter {
     /**
      * Initialize router
      *
-     * @param fragmentManager fragment manager
+     * @param onFinish finish activity callback
      */
     @Suppress("TopLevelComposableFunctions")
     @Composable
-    fun Initialize(fragmentManager: FragmentManager)
+    fun Initialize(onFinish: () -> Unit)
 
     /** Pop back stack */
     fun popBackStack(screen: AppScreen? = null)
@@ -41,10 +40,10 @@ internal interface InnerWalletRouter : WalletRouter {
     fun openOnboardingScreen()
 
     /** Open transaction history website by [url] */
-    fun openTxHistoryWebsite(url: String)
+    fun openUrl(url: String)
 
     /** Open token details screen */
-    fun openTokenDetails(currency: CryptoCurrency)
+    fun openTokenDetails(userWalletId: UserWalletId, currency: CryptoCurrency)
 
     /** Open stories screen */
     fun openStoriesScreen()
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/PortfolioEvent.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/PortfolioEvent.kt
new file mode 100644
index 0000000000..85553a1445
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/PortfolioEvent.kt
@@ -0,0 +1,17 @@
+package com.tangem.feature.wallet.presentation.wallet.analytics
+
+import com.tangem.core.analytics.models.AnalyticsEvent
+
+sealed class PortfolioEvent(
+    event: String,
+    params: Map<String, String> = mapOf(),
+) : AnalyticsEvent("Portfolio", event, params) {
+
+    object Refreshed : PortfolioEvent("Refreshed")
+
+    object ButtonManageTokens : PortfolioEvent("Button - Manage Tokens")
+
+    object TokenTapped : PortfolioEvent("Token is Tapped")
+
+    object OrganizeTokens : PortfolioEvent("Button - Organize Tokens")
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/WalletScreenAnalyticsEvent.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/WalletScreenAnalyticsEvent.kt
new file mode 100644
index 0000000000..8d43c5d586
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/WalletScreenAnalyticsEvent.kt
@@ -0,0 +1,54 @@
+package com.tangem.feature.wallet.presentation.wallet.analytics
+
+import com.tangem.core.analytics.models.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsParam
+
+sealed class WalletScreenAnalyticsEvent {
+
+    sealed class Basic(
+        event: String,
+        params: Map<String, String> = mapOf(),
+        error: Throwable? = null,
+    ) : AnalyticsEvent(category = "Basic", event = event, params = params, error = error) {
+
+        object WalletOpened : Basic(event = "Wallet Opened")
+
+        class CardWasScanned(source: AnalyticsParam.ScannedFrom) : Basic(
+            event = "Card Was Scanned",
+            params = mapOf(
+                AnalyticsParam.SOURCE to source.value,
+            ),
+        )
+
+        class BalanceLoaded(balance: AnalyticsParam.CardBalanceState) : Basic(
+            event = "Balance Loaded",
+            params = mapOf(
+                AnalyticsParam.BALANCE to balance.value,
+            ),
+        )
+    }
+
+    sealed class MainScreen(
+        event: String,
+        params: Map<String, String> = mapOf(),
+    ) : AnalyticsEvent(category = "Main Screen", event = event, params = params) {
+
+        object ScreenOpened : MainScreen(event = "Screen opened")
+        object WalletSwipe : MainScreen(event = "Wallet Swipe")
+
+        class EnableBiometrics(state: AnalyticsParam.OnOffState) : MainScreen(
+            event = "Enable Biometric",
+            params = mapOf("State" to state.value),
+        )
+
+        class NoticeRateAppButton(result: AnalyticsParam.RateApp) : MainScreen(
+            event = "Notice - Rate The App Button Tapped",
+            params = mapOf("Result" to result.value),
+        )
+
+        object NoticeBackupYourWalletTapped : MainScreen(event = "Notice - Backup Your Wallet Tapped")
+        object NoticeScanYourCardTapped : MainScreen(event = "Notice - Scan Your Card Tapped")
+        object NoticeWalletLocked : MainScreen(event = "Notice - Wallet Locked")
+        object WalletUnlockTapped : MainScreen(event = "Button - Wallet Unlock Tapped")
+    }
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/UserWalletExt.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/UserWalletExt.kt
new file mode 100644
index 0000000000..ab7e236835
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/UserWalletExt.kt
@@ -0,0 +1,17 @@
+package com.tangem.feature.wallet.presentation.wallet.domain
+
+import com.tangem.domain.models.scan.CardDTO
+import com.tangem.domain.wallets.models.UserWallet
+
+fun UserWallet.getCardsCount(): Int? {
+    return if (isMultiCurrency) {
+        when (val status = scanResponse.card.backupStatus) {
+            is CardDTO.BackupStatus.Active -> status.cardCount + 1
+            is CardDTO.BackupStatus.CardLinked -> status.cardCount + 1
+            is CardDTO.BackupStatus.NoBackup -> 1
+            null -> 1 // Multi-currency wallet without backup function. Example, 4.12
+        }
+    } else {
+        null
+    }
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletAdditionalInfoFactory.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletAdditionalInfoFactory.kt
index 4b03d163f5..40ba99fbde 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletAdditionalInfoFactory.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletAdditionalInfoFactory.kt
@@ -2,11 +2,13 @@ package com.tangem.feature.wallet.presentation.wallet.domain
 
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.plus
+import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.extensions.wrappedList
 import com.tangem.core.ui.utils.BigDecimalFormatter
-import com.tangem.domain.common.CardTypesResolver
+import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.impl.R
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletAdditionalInfo
 import java.math.BigDecimal
 
 /**
@@ -16,55 +18,84 @@ import java.math.BigDecimal
  */
 internal object WalletAdditionalInfoFactory {
 
-    private val DIVIDER_RES by lazy { TextReference.Str(value = " • ") }
+    private val DIVIDER by lazy(mode = LazyThreadSafetyMode.NONE) { stringReference(value = " • ") }
 
     /**
      * Get additional info
      *
-     * @param cardTypesResolver card type resolver
      * @param wallet            current wallet
      * @param currencyAmount    amount of currency
      */
-    fun resolve(
-        cardTypesResolver: CardTypesResolver,
-        wallet: UserWallet,
-        currencyAmount: BigDecimal? = null,
-    ): TextReference {
-        return if (cardTypesResolver.isMultiwalletAllowed()) {
-            resolveMultiCurrencyInfo(cardTypesResolver, wallet)
+    fun resolve(wallet: UserWallet, currencyAmount: BigDecimal? = null): WalletAdditionalInfo {
+        return if (wallet.isMultiCurrency) {
+            wallet.resolveMultiCurrencyInfo()
         } else {
-            resolveSingleCurrencyInfo(cardTypesResolver, wallet, currencyAmount)
+            wallet.resolveSingleCurrencyInfo(currencyAmount)
         }
     }
 
-    private fun resolveMultiCurrencyInfo(cardTypeResolver: CardTypesResolver, wallet: UserWallet): TextReference {
-        val backupCardsCount = wallet.cardsInWallet.size + 1
-        val backupInfoRes = TextReference.PluralRes(
-            id = R.plurals.card_label_card_count,
-            count = backupCardsCount,
-            formatArgs = wrappedList(backupCardsCount),
-        )
-
-        return if (wallet.isLocked) {
-            backupInfoRes + DIVIDER_RES + TextReference.Res(R.string.common_locked)
+    private fun UserWallet.resolveMultiCurrencyInfo(): WalletAdditionalInfo {
+        return if (isLocked) {
+            WalletAdditionalInfo(
+                hideable = false,
+                content = getBackupInfoWithDivider(
+                    backupCardsCount = getCardsCount(),
+                ) + TextReference.Res(R.string.common_locked),
+            )
         } else {
+            val cardTypeResolver = scanResponse.cardTypesResolver
             if (cardTypeResolver.isWallet2()) {
-                backupInfoRes + DIVIDER_RES + TextReference.Res(id = R.string.common_seed_phrase)
+                resolveWallet2Info()
             } else {
-                backupInfoRes
+                getBackupInfo(backupCardsCount = getCardsCount())
             }
         }
     }
 
-    private fun resolveSingleCurrencyInfo(
-        cardTypeResolver: CardTypesResolver,
-        wallet: UserWallet,
-        currencyAmount: BigDecimal?,
-    ): TextReference {
-        return if (wallet.isLocked) {
-            TextReference.Res(R.string.common_locked)
+    private fun UserWallet.resolveWallet2Info(): WalletAdditionalInfo {
+        return if (isImported) {
+            WalletAdditionalInfo(
+                hideable = false,
+                content = getBackupInfoWithDivider(backupCardsCount = getCardsCount()) + TextReference.Res(
+                    id = R.string.common_seed_phrase,
+                ),
+            )
         } else {
-            val blockchain = cardTypeResolver.getBlockchain()
+            getBackupInfo(backupCardsCount = getCardsCount())
+        }
+    }
+
+    private fun getBackupInfoWithDivider(backupCardsCount: Int?): TextReference {
+        return if (backupCardsCount != null) {
+            getBackupInfoTextReference(count = backupCardsCount) + DIVIDER
+        } else {
+            TextReference.EMPTY
+        }
+    }
+
+    private fun getBackupInfo(backupCardsCount: Int?): WalletAdditionalInfo {
+        val content = if (backupCardsCount != null) {
+            getBackupInfoTextReference(count = backupCardsCount)
+        } else {
+            TextReference.EMPTY
+        }
+
+        return WalletAdditionalInfo(hideable = false, content = content)
+    }
+
+    private fun getBackupInfoTextReference(count: Int): TextReference {
+        return TextReference.PluralRes(
+            id = R.plurals.card_label_card_count,
+            count = count,
+            formatArgs = wrappedList(count),
+        )
+    }
+
+    private fun UserWallet.resolveSingleCurrencyInfo(currencyAmount: BigDecimal?): WalletAdditionalInfo {
+        return if (isLocked) {
+            WalletAdditionalInfo(hideable = false, content = TextReference.Res(R.string.common_locked))
+        } else {
+            val blockchain = scanResponse.cardTypesResolver.getBlockchain()
             val amount = currencyAmount?.let {
                 BigDecimalFormatter.formatCryptoAmount(
                     cryptoAmount = it,
@@ -73,7 +104,7 @@ internal object WalletAdditionalInfoFactory {
                 )
             }
 
-            TextReference.Str(value = amount.orEmpty())
+            WalletAdditionalInfo(hideable = true, content = TextReference.Str(value = amount.orEmpty()))
         }
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletImageResolver.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletImageResolver.kt
index c54155dd33..22f2970ea8 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletImageResolver.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletImageResolver.kt
@@ -2,7 +2,8 @@ package com.tangem.feature.wallet.presentation.wallet.domain
 
 import androidx.annotation.DrawableRes
 import com.tangem.blockchain.common.Blockchain
-import com.tangem.domain.common.CardTypesResolver
+import com.tangem.domain.common.util.cardTypesResolver
+import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.impl.R
 
 /**
@@ -12,34 +13,90 @@ import com.tangem.feature.wallet.impl.R
  */
 internal object WalletImageResolver {
 
-    private const val DOUBLE_WALLET_SET_BACKUP_COUNT = 1
-    private const val TRIPLE_WALLET_SET_BACKUP_COUNT = 2
+    private const val WALLET_WITHOUT_BACKUP_COUNT = 1
+    private const val WALLET_WITH_ONE_BACKUP_COUNT = 2
+    private const val WALLET_WITH_TWO_BACKUPS_COUNT = 3
 
-    /** Get image by [cardTypesResolver] */
+    /** Get a specified wallet [userWallet] image */
     @DrawableRes
-    fun resolve(cardTypesResolver: CardTypesResolver): Int? {
+    fun resolve(userWallet: UserWallet): Int? {
+        val cardTypesResolver = userWallet.scanResponse.cardTypesResolver
         return when {
-            cardTypesResolver.isWallet2() -> resolveWallet2(cardTypesResolver)
-            cardTypesResolver.isTangemWallet() -> R.drawable.ill_wallet_120_106
-            cardTypesResolver.isWhiteWallet() -> R.drawable.ill_old_wallet_120_106
-            cardTypesResolver.isTangemTwins() -> R.drawable.ill_twin_120_106
+            cardTypesResolver.isDevKit() -> R.drawable.ill_dev_120_106
+            cardTypesResolver.isTronWallet() -> userWallet.resolveTronWallet()
+            cardTypesResolver.isKaspaWallet() -> userWallet.resolveKaspaWallet()
+            cardTypesResolver.isBadWallet() -> userWallet.resolveBadWallet()
+            cardTypesResolver.isWallet2() -> userWallet.resolveWallet2()
+            cardTypesResolver.isShibaWallet() -> userWallet.resolveShibaWallet()
+            cardTypesResolver.isTangemWallet() -> userWallet.resolveWallet1()
+            cardTypesResolver.isWhiteWallet() -> R.drawable.ill_wallet_old_white_120_106
+            cardTypesResolver.isTangemTwins() -> R.drawable.ill_twins_120_106
             cardTypesResolver.isStart2Coin() -> R.drawable.ill_start2coin_120_106
-            cardTypesResolver.isTangemNote() -> resolveNote(cardTypesResolver)
-            cardTypesResolver.isDev() -> R.drawable.ill_dev_120_106
+            cardTypesResolver.isTangemNote() -> resolveNote(blockchain = cardTypesResolver.getBlockchain())
             else -> null
         }
     }
 
-    private fun resolveWallet2(cardTypesResolver: CardTypesResolver): Int? {
-        return when (cardTypesResolver.getBackupCardsCount()) {
-            DOUBLE_WALLET_SET_BACKUP_COUNT -> R.drawable.ill_wallet2_cards2_120_106
-            TRIPLE_WALLET_SET_BACKUP_COUNT -> R.drawable.ill_wallet2_cards3_120_106
-            else -> null
+    private fun UserWallet.resolveWallet2(
+        @DrawableRes oneBackupResId: Int = R.drawable.ill_wallet2_cards2_120_106,
+        @DrawableRes twoBackupResId: Int = R.drawable.ill_wallet2_cards3_120_106,
+    ): Int? {
+        return resolveWalletWithBackups { count ->
+            when (count) {
+                WALLET_WITH_ONE_BACKUP_COUNT -> oneBackupResId
+                WALLET_WITH_TWO_BACKUPS_COUNT -> twoBackupResId
+                else -> null
+            }
         }
     }
 
-    private fun resolveNote(cardTypesResolver: CardTypesResolver): Int? {
-        return when (cardTypesResolver.getBlockchain()) {
+    private fun UserWallet.resolveTronWallet(): Int? {
+        return resolveWallet2(
+            oneBackupResId = R.drawable.ill_tron_card2_120_106,
+            twoBackupResId = R.drawable.ill_tron_card3_120_106,
+        )
+    }
+
+    private fun UserWallet.resolveKaspaWallet(): Int? {
+        return resolveWallet2(
+            oneBackupResId = R.drawable.ill_kaspa_card2_120_106,
+            twoBackupResId = R.drawable.ill_kaspa_card3_120_106,
+        )
+    }
+
+    private fun UserWallet.resolveBadWallet(): Int? {
+        return resolveWallet2(
+            oneBackupResId = R.drawable.ill_bad_card2_120_106,
+            twoBackupResId = R.drawable.ill_bad_card3_120_106,
+        )
+    }
+
+    private fun UserWallet.resolveShibaWallet(): Int? {
+        return resolveWallet2(
+            oneBackupResId = R.drawable.ill_shiba_card2_120_106,
+            twoBackupResId = R.drawable.ill_shiba_card3_120_106,
+        )
+    }
+
+    private fun UserWallet.resolveWallet1(): Int? {
+        return resolveWalletWithBackups { count ->
+            when (count) {
+                WALLET_WITHOUT_BACKUP_COUNT -> R.drawable.ill_wallet1_cards1_120_106
+                WALLET_WITH_ONE_BACKUP_COUNT -> R.drawable.ill_wallet1_cards2_120_106
+                WALLET_WITH_TWO_BACKUPS_COUNT -> R.drawable.ill_wallet1_cards3_120_106
+                else -> null
+            }
+        }
+    }
+
+    private fun UserWallet.resolveWalletWithBackups(resolve: (Int) -> Int?): Int? {
+        val count = getCardsCount()
+
+        return if (count != null) resolve(count) else null
+    }
+
+    private fun resolveNote(blockchain: Blockchain): Int? {
+        return when (blockchain) {
             Blockchain.Bitcoin -> R.drawable.ill_note_btc_120_106
             Blockchain.Ethereum -> R.drawable.ill_note_ethereum_120_106
             Blockchain.BSC -> R.drawable.ill_note_binance_120_106
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/ActionsBottomSheetConfig.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/ActionsBottomSheetConfig.kt
index cb7e79cee3..42cf37464b 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/ActionsBottomSheetConfig.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/ActionsBottomSheetConfig.kt
@@ -1,17 +1,13 @@
 package com.tangem.feature.wallet.presentation.wallet.state
 
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfigContent
 import kotlinx.collections.immutable.ImmutableList
 
 /**
  * Config for the token actions bottom sheet
  *
- * @property isShow           flag that determine if bottom sheet is shown
- * @property onDismissRequest lambda be invoked when bottom sheet is dismissed
- * @property actions          actions
- *
+ * @property actions actions
  */
 internal data class ActionsBottomSheetConfig(
-    val isShow: Boolean,
-    val onDismissRequest: () -> Unit,
     val actions: ImmutableList<TokenActionButtonConfig>,
-)
\ No newline at end of file
+) : TangemBottomSheetConfigContent
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/TokenActionButtonConfig.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/TokenActionButtonConfig.kt
index 934bfd6230..2c95c35f55 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/TokenActionButtonConfig.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/TokenActionButtonConfig.kt
@@ -1,6 +1,7 @@
 package com.tangem.feature.wallet.presentation.wallet.state
 
 import androidx.annotation.DrawableRes
+import com.tangem.core.ui.extensions.TextReference
 
 /**
  * Action button config
@@ -11,7 +12,7 @@ import androidx.annotation.DrawableRes
  * @property enabled   enabled
  */
 data class TokenActionButtonConfig(
-    val text: String,
+    val text: TextReference,
     @DrawableRes val iconResId: Int,
     val onClick: () -> Unit,
     val enabled: Boolean = true,
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletAlertState.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletAlertState.kt
new file mode 100644
index 0000000000..57bfcb20c6
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletAlertState.kt
@@ -0,0 +1,35 @@
+package com.tangem.feature.wallet.presentation.wallet.state
+
+import androidx.compose.runtime.Immutable
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.feature.wallet.impl.R
+
+@Immutable
+internal sealed class WalletAlertState {
+
+    abstract val title: TextReference?
+    abstract val message: TextReference
+    open val confirmButtonText: TextReference = resourceReference(id = R.string.common_ok)
+    open val isWarningConfirmButton: Boolean = false
+    abstract val onConfirmClick: (() -> Unit)?
+
+    data class DefaultAlert(
+        override val title: TextReference,
+        override val message: TextReference,
+        override val onConfirmClick: (() -> Unit)?,
+    ) : WalletAlertState()
+
+    data class RemoveWalletAlert(override val onConfirmClick: (() -> Unit)?) : WalletAlertState() {
+        override val title: TextReference? = null
+        override val message: TextReference = resourceReference(id = R.string.user_wallet_list_delete_prompt)
+        override val confirmButtonText: TextReference = resourceReference(id = R.string.common_delete)
+        override val isWarningConfirmButton: Boolean = true
+    }
+
+    object WrongCardIsScanned : WalletAlertState() {
+        override val title: TextReference = resourceReference(R.string.common_warning)
+        override val message: TextReference = resourceReference(R.string.error_wrong_wallet_tapped)
+        override val onConfirmClick: (() -> Unit)? = null
+    }
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletEvent.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletEvent.kt
new file mode 100644
index 0000000000..9c619d9a9c
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletEvent.kt
@@ -0,0 +1,20 @@
+package com.tangem.feature.wallet.presentation.wallet.state
+
+import androidx.compose.runtime.Immutable
+import com.tangem.core.ui.extensions.TextReference
+
+@Immutable
+internal sealed class WalletEvent {
+
+    data class ChangeWallet(val index: Int) : WalletEvent()
+
+    data class ShowError(val text: TextReference) : WalletEvent()
+
+    data class ShowToast(val text: TextReference) : WalletEvent()
+
+    data class ShowAlert(val state: WalletAlertState) : WalletEvent()
+
+    data class CopyAddress(val address: String, val toast: TextReference) : WalletEvent()
+
+    data class RateApp(val onDismissClick: () -> Unit) : WalletEvent()
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletMultiCurrencyState.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletMultiCurrencyState.kt
index d22b1b6db6..109b58c2b2 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletMultiCurrencyState.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletMultiCurrencyState.kt
@@ -1,5 +1,8 @@
 package com.tangem.feature.wallet.presentation.wallet.state
 
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
+import com.tangem.core.ui.event.StateEvent
+import com.tangem.core.ui.event.consumedEvent
 import com.tangem.feature.wallet.presentation.wallet.state.components.*
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
@@ -20,9 +23,11 @@ internal sealed class WalletMultiCurrencyState : WalletState.ContentState() {
         override val walletsListConfig: WalletsListConfig,
         override val pullToRefreshConfig: WalletPullToRefreshConfig,
         override val notifications: ImmutableList<WalletNotification>,
-        override val bottomSheetConfig: WalletBottomSheetConfig?,
+        override val bottomSheetConfig: TangemBottomSheetConfig?,
         override val tokensListState: WalletTokensListState,
-        val tokenActionsBottomSheet: ActionsBottomSheetConfig?,
+        override val event: StateEvent<WalletEvent> = consumedEvent(),
+        override val isBalanceHidden: Boolean,
+        val isManageTokensAvailable: Boolean = true,
         val onManageTokensClick: () -> Unit,
     ) : WalletMultiCurrencyState()
 
@@ -36,16 +41,18 @@ internal sealed class WalletMultiCurrencyState : WalletState.ContentState() {
         override val onScanClick: () -> Unit,
         override val isBottomSheetShow: Boolean = false,
         override val onBottomSheetDismiss: () -> Unit = {},
+        override val event: StateEvent<WalletEvent> = consumedEvent(),
+        override val isBalanceHidden: Boolean,
     ) : WalletMultiCurrencyState(), WalletLockedState {
 
         override val notifications = persistentListOf(
             WalletNotification.UnlockWallets(onUnlockWalletsNotificationClick),
         )
 
-        override val bottomSheetConfig = WalletBottomSheetConfig(
+        override val bottomSheetConfig = TangemBottomSheetConfig(
             isShow = isBottomSheetShow,
             onDismissRequest = onBottomSheetDismiss,
-            content = WalletBottomSheetConfig.BottomSheetContentConfig.UnlockWallets(
+            content = WalletBottomSheetConfig.UnlockWallets(
                 onUnlockClick = onUnlockClick,
                 onScanClick = onScanClick,
             ),
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletSingleCurrencyState.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletSingleCurrencyState.kt
index 6991db467a..4bb761d008 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletSingleCurrencyState.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletSingleCurrencyState.kt
@@ -2,11 +2,15 @@ package com.tangem.feature.wallet.presentation.wallet.state
 
 import androidx.compose.runtime.Immutable
 import androidx.paging.PagingData
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
 import com.tangem.core.ui.components.marketprice.MarketPriceBlockState
 import com.tangem.core.ui.components.transactions.state.TransactionState
 import com.tangem.core.ui.components.transactions.state.TxHistoryState
+import com.tangem.core.ui.event.StateEvent
+import com.tangem.core.ui.event.consumedEvent
 import com.tangem.feature.wallet.presentation.wallet.state.components.*
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.flow.MutableStateFlow
 
@@ -19,7 +23,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 internal sealed class WalletSingleCurrencyState : WalletState.ContentState() {
 
     /** Manage buttons */
-    abstract val buttons: ImmutableList<WalletManageButton>
+    abstract val buttons: PersistentList<WalletManageButton>
 
     /** Transactions history state */
     abstract val txHistoryState: TxHistoryState
@@ -30,9 +34,11 @@ internal sealed class WalletSingleCurrencyState : WalletState.ContentState() {
         override val walletsListConfig: WalletsListConfig,
         override val pullToRefreshConfig: WalletPullToRefreshConfig,
         override val notifications: ImmutableList<WalletNotification>,
-        override val bottomSheetConfig: WalletBottomSheetConfig?,
-        override val buttons: ImmutableList<WalletManageButton>,
+        override val bottomSheetConfig: TangemBottomSheetConfig?,
+        override val buttons: PersistentList<WalletManageButton>,
         override val txHistoryState: TxHistoryState,
+        override val event: StateEvent<WalletEvent> = consumedEvent(),
+        override val isBalanceHidden: Boolean,
         val marketPriceBlockState: MarketPriceBlockState,
     ) : WalletSingleCurrencyState()
 
@@ -41,12 +47,14 @@ internal sealed class WalletSingleCurrencyState : WalletState.ContentState() {
         override val topBarConfig: WalletTopBarConfig,
         override val walletsListConfig: WalletsListConfig,
         override val pullToRefreshConfig: WalletPullToRefreshConfig,
-        override val buttons: ImmutableList<WalletManageButton>,
+        override val buttons: PersistentList<WalletManageButton>,
         override val onUnlockWalletsNotificationClick: () -> Unit,
         override val onUnlockClick: () -> Unit,
         override val onScanClick: () -> Unit,
         override val isBottomSheetShow: Boolean = false,
         override val onBottomSheetDismiss: () -> Unit = {},
+        override val event: StateEvent<WalletEvent> = consumedEvent(),
+        override val isBalanceHidden: Boolean,
         val onExploreClick: () -> Unit,
     ) : WalletSingleCurrencyState(), WalletLockedState {
 
@@ -54,10 +62,10 @@ internal sealed class WalletSingleCurrencyState : WalletState.ContentState() {
             WalletNotification.UnlockWallets(onUnlockWalletsNotificationClick),
         )
 
-        override val bottomSheetConfig = WalletBottomSheetConfig(
+        override val bottomSheetConfig = TangemBottomSheetConfig(
             isShow = isBottomSheetShow,
             onDismissRequest = onBottomSheetDismiss,
-            content = WalletBottomSheetConfig.BottomSheetContentConfig.UnlockWallets(
+            content = WalletBottomSheetConfig.UnlockWallets(
                 onUnlockClick = onUnlockClick,
                 onScanClick = onScanClick,
             ),
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletState.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletState.kt
index c9c327f540..a3e9904881 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletState.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletState.kt
@@ -1,6 +1,11 @@
 package com.tangem.feature.wallet.presentation.wallet.state
 
-import com.tangem.feature.wallet.presentation.wallet.state.components.*
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
+import com.tangem.core.ui.event.StateEvent
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletNotification
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletPullToRefreshConfig
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletTopBarConfig
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletsListConfig
 import kotlinx.collections.immutable.ImmutableList
 
 /**
@@ -29,30 +34,59 @@ internal sealed class WalletState {
         abstract val notifications: ImmutableList<WalletNotification>
 
         /** Bottom sheet config */
-        abstract val bottomSheetConfig: WalletBottomSheetConfig?
+        abstract val bottomSheetConfig: TangemBottomSheetConfig?
+
+        /** State event */
+        abstract val event: StateEvent<WalletEvent>
+
+        /** Whether balance should be hidden */
+        abstract val isBalanceHidden: Boolean
 
         /**
          * Util function that allow to make a copy
          *
          * @param walletsListConfig   wallets list config
          * @param pullToRefreshConfig pull to refresh config
+         * @param event               state event
          */
         fun copySealed(
             walletsListConfig: WalletsListConfig = this.walletsListConfig,
             pullToRefreshConfig: WalletPullToRefreshConfig = this.pullToRefreshConfig,
+            event: StateEvent<WalletEvent> = this.event,
+            isBalanceHidden: Boolean = this.isBalanceHidden,
         ): ContentState {
             return when (this) {
                 is WalletMultiCurrencyState.Content -> {
-                    copy(walletsListConfig = walletsListConfig, pullToRefreshConfig = pullToRefreshConfig)
+                    copy(
+                        walletsListConfig = walletsListConfig,
+                        pullToRefreshConfig = pullToRefreshConfig,
+                        event = event,
+                        isBalanceHidden = isBalanceHidden,
+                    )
                 }
                 is WalletMultiCurrencyState.Locked -> {
-                    copy(walletsListConfig = walletsListConfig, pullToRefreshConfig = pullToRefreshConfig)
+                    copy(
+                        walletsListConfig = walletsListConfig,
+                        pullToRefreshConfig = pullToRefreshConfig,
+                        event = event,
+                        isBalanceHidden = isBalanceHidden,
+                    )
                 }
                 is WalletSingleCurrencyState.Content -> {
-                    copy(walletsListConfig = walletsListConfig, pullToRefreshConfig = pullToRefreshConfig)
+                    copy(
+                        walletsListConfig = walletsListConfig,
+                        pullToRefreshConfig = pullToRefreshConfig,
+                        event = event,
+                        isBalanceHidden = isBalanceHidden,
+                    )
                 }
                 is WalletSingleCurrencyState.Locked -> {
-                    copy(walletsListConfig = walletsListConfig, pullToRefreshConfig = pullToRefreshConfig)
+                    copy(
+                        walletsListConfig = walletsListConfig,
+                        pullToRefreshConfig = pullToRefreshConfig,
+                        event = event,
+                        isBalanceHidden = isBalanceHidden,
+                    )
                 }
             }
         }
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletAdditionalInfo.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletAdditionalInfo.kt
new file mode 100644
index 0000000000..612f2111e5
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletAdditionalInfo.kt
@@ -0,0 +1,10 @@
+package com.tangem.feature.wallet.presentation.wallet.state.components
+
+import androidx.compose.runtime.Immutable
+import com.tangem.core.ui.extensions.TextReference
+
+@Immutable
+data class WalletAdditionalInfo(
+    val hideable: Boolean,
+    val content: TextReference,
+)
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletBottomSheetConfig.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletBottomSheetConfig.kt
index eef9a95ef0..31291aabe5 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletBottomSheetConfig.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletBottomSheetConfig.kt
@@ -1,99 +1,48 @@
 package com.tangem.feature.wallet.presentation.wallet.state.components
 
 import androidx.annotation.DrawableRes
-import androidx.compose.ui.graphics.Color
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfigContent
 import com.tangem.core.ui.extensions.TextReference
-import com.tangem.core.ui.extensions.WrappedList
-import com.tangem.core.ui.res.TangemColorPalette
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.core.ui.extensions.wrappedList
 import com.tangem.feature.wallet.impl.R
 
 /**
  * Wallet bottom sheet config
  *
- * @property isShow           flag that determine if bottom sheet is shown
- * @property onDismissRequest lambda be invoked when bottom sheet is dismissed
- * @property content          content config
- *
 [REDACTED_AUTHOR]
  */
-// TODO: Finalize notification strings [REDACTED_JIRA]
-internal data class WalletBottomSheetConfig(
-    val isShow: Boolean,
-    val onDismissRequest: () -> Unit,
-    val content: BottomSheetContentConfig,
-) {
+sealed class WalletBottomSheetConfig(
+    open val title: TextReference,
+    open val subtitle: TextReference,
+    @DrawableRes open val iconResId: Int,
+    val primaryButtonConfig: ButtonConfig,
+    val secondaryButtonConfig: ButtonConfig,
+) : TangemBottomSheetConfigContent {
 
-    sealed class BottomSheetContentConfig(
-        open val title: TextReference,
-        open val subtitle: TextReference,
-        @DrawableRes open val iconResId: Int,
-        open val tint: Color? = null,
-        val primaryButtonConfig: ButtonConfig,
-        val secondaryButtonConfig: ButtonConfig,
-    ) {
+    data class ButtonConfig(
+        val text: TextReference,
+        val onClick: () -> Unit,
+        @DrawableRes val iconResId: Int? = null,
+    )
 
-        data class ButtonConfig(
-            val text: TextReference,
-            val onClick: () -> Unit,
-            @DrawableRes val iconResId: Int? = null,
-        )
-
-        data class UnlockWallets(
-            val onUnlockClick: () -> Unit,
-            val onScanClick: () -> Unit,
-        ) : BottomSheetContentConfig(
-            title = TextReference.Str(value = "Unlock needed"),
-            subtitle = TextReference.Str(
-                value = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor " +
-                    "incididunt ut labore et dolore magna aliqua.",
+    data class UnlockWallets(val onUnlockClick: () -> Unit, val onScanClick: () -> Unit) : WalletBottomSheetConfig(
+        title = resourceReference(id = R.string.common_access_denied),
+        subtitle = resourceReference(
+            id = R.string.unlock_wallet_description_full,
+            formatArgs = wrappedList(
+                resourceReference(R.string.common_biometrics),
             ),
-            iconResId = R.drawable.ic_locked_24,
-            tint = TangemColorPalette.Black,
-            primaryButtonConfig = ButtonConfig(text = TextReference.Str(value = "Unlock"), onClick = onUnlockClick),
-            secondaryButtonConfig = ButtonConfig(
-                text = TextReference.Str(value = "Scan card"),
-                onClick = onScanClick,
-                iconResId = R.drawable.ic_tangem_24,
-            ),
-        )
-
-        data class LikeTangemApp(
-            val onRateTheAppClick: () -> Unit,
-            val onShareClick: () -> Unit,
-        ) : BottomSheetContentConfig(
-            title = TextReference.Str(value = "Like Tangem App?"),
-            subtitle = TextReference.Str(value = "How was your experience with our app? Let us know:"),
-            iconResId = R.drawable.ic_star_24,
-            tint = TangemColorPalette.Tangerine,
-            primaryButtonConfig = ButtonConfig(
-                text = TextReference.Str(value = "Rate the app"),
-                onClick = onRateTheAppClick,
-            ),
-            secondaryButtonConfig = ButtonConfig(
-                text = TextReference.Str(value = "Share feedback"),
-                onClick = onShareClick,
-            ),
-        )
-
-        data class CriticalWarningAlreadySignedHashes(
-            val onOkClick: () -> Unit,
-            val onCancelClick: () -> Unit,
-        ) : BottomSheetContentConfig(
-            title = TextReference.Res(
-                id = R.string.warning_important_security_info,
-                formatArgs = WrappedList(listOf("\u26A0")),
-            ),
-            subtitle = TextReference.Res(id = R.string.alert_signed_hashes_message),
-            iconResId = R.drawable.img_attention_20,
-            tint = null,
-            primaryButtonConfig = ButtonConfig(
-                text = TextReference.Res(id = R.string.common_ok),
-                onClick = onOkClick,
-            ),
-            secondaryButtonConfig = ButtonConfig(
-                text = TextReference.Res(id = R.string.common_cancel),
-                onClick = onCancelClick,
-            ),
-        )
-    }
+        ),
+        iconResId = R.drawable.ic_locked_24,
+        primaryButtonConfig = ButtonConfig(
+            text = resourceReference(id = R.string.user_wallet_list_unlock_all),
+            onClick = onUnlockClick,
+        ),
+        secondaryButtonConfig = ButtonConfig(
+            text = resourceReference(id = R.string.welcome_unlock_card),
+            onClick = onScanClick,
+            iconResId = R.drawable.ic_tangem_24,
+        ),
+    )
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletCardState.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletCardState.kt
index e25b851c21..094d5338c1 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletCardState.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletCardState.kt
@@ -2,6 +2,7 @@ package com.tangem.feature.wallet.presentation.wallet.state.components
 
 import androidx.annotation.DrawableRes
 import androidx.compose.runtime.Immutable
+import com.tangem.common.Strings
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.domain.wallets.models.UserWalletId
 
@@ -15,8 +16,8 @@ internal sealed interface WalletCardState {
     /** Title */
     val title: String
 
-    /** Additional text */
-    val additionalInfo: TextReference?
+    /** Wallet additional info */
+    val additionalInfo: WalletAdditionalInfo?
 
     /** Wallet image resource id */
     @get:DrawableRes
@@ -33,41 +34,24 @@ internal sealed interface WalletCardState {
      *
      * @property id             wallet id
      * @property title          wallet name
-     * @property additionalInfo wallet additional info
      * @property imageResId     wallet image resource id
      * @property onRenameClick  lambda be invoked when Rename button is clicked
      * @property onDeleteClick  lambda be invoked when Delete button is clicked
+     * @property additionalInfo wallet additional info
+     * @property cardCount      number of cards in the wallet
      * @property balance        wallet balance
      */
     data class Content(
         override val id: UserWalletId,
         override val title: String,
-        override val additionalInfo: TextReference,
+        override val additionalInfo: WalletAdditionalInfo,
         override val imageResId: Int?,
         override val onRenameClick: (UserWalletId, String) -> Unit,
         override val onDeleteClick: (UserWalletId) -> Unit,
+        val cardCount: Int?,
         val balance: String,
     ) : WalletCardState
 
-    /**
-     * Wallet card hidden content state
-     *
-     * @property id             wallet id
-     * @property title          wallet name
-     * @property additionalInfo wallet additional info
-     * @property imageResId     wallet image resource id
-     * @property onRenameClick  lambda be invoked when Rename button is clicked
-     * @property onDeleteClick  lambda be invoked when Delete button is clicked
-     */
-    data class HiddenContent(
-        override val id: UserWalletId,
-        override val title: String,
-        override val additionalInfo: TextReference = HIDDEN_BALANCE_TEXT,
-        override val imageResId: Int?,
-        override val onRenameClick: (UserWalletId, String) -> Unit,
-        override val onDeleteClick: (UserWalletId) -> Unit,
-    ) : WalletCardState
-
     /**
      * Wallet card locked state
      *
@@ -81,7 +65,7 @@ internal sealed interface WalletCardState {
     data class LockedContent(
         override val id: UserWalletId,
         override val title: String,
-        override val additionalInfo: TextReference? = null,
+        override val additionalInfo: WalletAdditionalInfo,
         override val imageResId: Int?,
         override val onRenameClick: (UserWalletId, String) -> Unit,
         override val onDeleteClick: (UserWalletId) -> Unit,
@@ -90,36 +74,40 @@ internal sealed interface WalletCardState {
     /**
      * Wallet card error state
      *
-     * @property id             wallet id
-     * @property title          wallet name
-     * @property additionalInfo wallet additional info
-     * @property imageResId     wallet image resource id
-     * @property onRenameClick  lambda be invoked when Rename button is clicked
-     * @property onDeleteClick  lambda be invoked when Delete button is clicked
+     * @property id            wallet id
+     * @property title         wallet name
+     * @property imageResId    wallet image resource id
+     * @property onRenameClick lambda be invoked when Rename button is clicked
+     * @property onDeleteClick lambda be invoked when Delete button is clicked
      */
     data class Error(
         override val id: UserWalletId,
         override val title: String,
-        override val additionalInfo: TextReference = EMPTY_BALANCE_TEXT,
+        override val additionalInfo: WalletAdditionalInfo? = defaultAdditionalInfo,
         override val imageResId: Int?,
         override val onRenameClick: (UserWalletId, String) -> Unit,
         override val onDeleteClick: (UserWalletId) -> Unit,
-    ) : WalletCardState
+    ) : WalletCardState {
+
+        private companion object {
+            val defaultAdditionalInfo: WalletAdditionalInfo
+                get() = WalletAdditionalInfo(hideable = true, content = EMPTY_BALANCE_TEXT)
+        }
+    }
 
     /**
      * Wallet card loading state
      *
-     * @property id             wallet id
-     * @property title          wallet name
-     * @property additionalInfo wallet additional info
-     * @property imageResId     wallet image resource id
-     * @property onRenameClick  lambda be invoked when Rename button is clicked
-     * @property onDeleteClick  lambda be invoked when Delete button is clicked
+     * @property id            wallet id
+     * @property title         wallet name
+     * @property imageResId    wallet image resource id
+     * @property onRenameClick lambda be invoked when Rename button is clicked
+     * @property onDeleteClick lambda be invoked when Delete button is clicked
      */
     data class Loading(
         override val id: UserWalletId,
         override val title: String,
-        override val additionalInfo: TextReference? = null,
+        override val additionalInfo: WalletAdditionalInfo? = null,
         override val imageResId: Int?,
         override val onRenameClick: (UserWalletId, String) -> Unit,
         override val onDeleteClick: (UserWalletId) -> Unit,
@@ -129,14 +117,13 @@ internal sealed interface WalletCardState {
         return when (this) {
             is Content -> copy(title = title)
             is Error -> copy(title = title)
-            is HiddenContent -> copy(title = title)
             is Loading -> copy(title = title)
             is LockedContent -> copy(title = title)
         }
     }
 
     companion object {
-        val HIDDEN_BALANCE_TEXT by lazy { TextReference.Str(value = "•••") }
+        val HIDDEN_BALANCE_TEXT by lazy { TextReference.Str(value = Strings.STARS) }
         val EMPTY_BALANCE_TEXT by lazy { TextReference.Str(value = "—") }
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletNotification.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletNotification.kt
index 60abf781ae..331ccc1502 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletNotification.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletNotification.kt
@@ -1,180 +1,169 @@
 package com.tangem.feature.wallet.presentation.wallet.state.components
 
 import androidx.compose.runtime.Immutable
-import com.tangem.core.ui.components.notifications.NotificationState
+import com.tangem.core.ui.components.notifications.NotificationConfig
 import com.tangem.core.ui.extensions.TextReference
-import com.tangem.core.ui.extensions.WrappedList
-import com.tangem.core.ui.res.TangemColorPalette
+import com.tangem.core.ui.extensions.pluralReference
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.core.ui.extensions.wrappedList
 import com.tangem.feature.wallet.impl.R
 
 /**
  * Wallet notification component state
  *
- * @property state state
+ * @property config state
  *
 [REDACTED_AUTHOR]
  */
-// TODO: Finalize notification strings [REDACTED_JIRA]
 @Immutable
-sealed class WalletNotification(open val state: NotificationState) {
+sealed class WalletNotification(val config: NotificationConfig) {
 
-    /** Clickable notification */
-    sealed interface Clickable {
+    sealed class Critical(title: TextReference, subtitle: TextReference) : WalletNotification(
+        config = NotificationConfig(
+            title = title,
+            subtitle = subtitle,
+            iconResId = R.drawable.ic_alert_circle_24,
+        ),
+    ) {
 
-        /** Lambda be invoked when notification is clicked */
-        val onClick: () -> Unit
+        object DevCard : Critical(
+            title = resourceReference(id = R.string.warning_developer_card_title),
+            subtitle = resourceReference(id = R.string.warning_developer_card_message),
+        )
+
+        object FailedCardValidation : Critical(
+            title = resourceReference(id = R.string.warning_failed_to_verify_card_title),
+            subtitle = resourceReference(id = R.string.warning_failed_to_verify_card_message),
+        )
     }
 
-    /** "Development card" notification */
-    object DevCard : WalletNotification(
-        state = NotificationState.Simple(
-            title = TextReference.Res(id = R.string.common_warning),
-            subtitle = TextReference.Res(id = R.string.alert_developer_card),
-            iconResId = R.drawable.ic_alert_circle_24,
-            tint = TangemColorPalette.Amaranth,
+    sealed class Warning(
+        title: TextReference,
+        subtitle: TextReference,
+        buttonsState: NotificationConfig.ButtonsState? = null,
+        onClick: (() -> Unit)? = null,
+        onCloseClick: (() -> Unit)? = null,
+    ) : WalletNotification(
+        config = NotificationConfig(
+            title = title,
+            subtitle = subtitle,
+            iconResId = R.drawable.img_attention_20,
+            buttonsState = buttonsState,
+            onClick = onClick,
+            onCloseClick = onCloseClick,
         ),
-    )
+    ) {
 
-    /** "Test card" notification */
-    object TestCard : WalletNotification(
-        state = NotificationState.Simple(
-            title = TextReference.Res(id = R.string.common_warning),
-            subtitle = TextReference.Res(id = R.string.warning_testnet_card_message),
-            iconResId = R.drawable.ic_alert_circle_24,
-            tint = TangemColorPalette.Amaranth,
-        ),
-    )
-
-    /** "Demo card" notification */
-    object DemoCard : WalletNotification(
-        state = NotificationState.Simple(
-            title = TextReference.Res(id = R.string.common_warning),
-            subtitle = TextReference.Res(id = R.string.alert_demo_message),
-            iconResId = R.drawable.ic_alert_circle_24,
-            tint = TangemColorPalette.Amaranth,
-        ),
-    )
-
-    /** "Card verification failed" notification */
-    object CardVerificationFailed : WalletNotification(
-        state = NotificationState.Simple(
-            title = TextReference.Res(id = R.string.warning_failed_to_verify_card_title),
-            subtitle = TextReference.Res(id = R.string.warning_failed_to_verify_card_message),
-            iconResId = R.drawable.ic_alert_circle_24,
-            tint = TangemColorPalette.Amaranth,
-        ),
-    )
-
-    /**
-     * "Remaining signatures left" notification
-     *
-     * @param count number of remaining signatures
-     */
-    class RemainingSignaturesLeft(count: Int) : WalletNotification(
-        state = NotificationState.Simple(
-            title = TextReference.Res(id = R.string.common_warning),
-            subtitle = TextReference.Res(
-                id = R.string.warning_low_signatures_format,
-                formatArgs = WrappedList(data = listOf(count)),
+        data class MissingBackup(val onStartBackupClick: () -> Unit) : Warning(
+            title = resourceReference(id = R.string.warning_no_backup_title),
+            subtitle = resourceReference(id = R.string.warning_no_backup_message),
+            buttonsState = NotificationConfig.ButtonsState.SecondaryButtonConfig(
+                text = resourceReference(id = R.string.button_start_backup_process),
+                onClick = onStartBackupClick,
             ),
-            iconResId = R.drawable.ic_alert_circle_24,
-            tint = TangemColorPalette.Amaranth,
-        ),
-    )
+        )
 
-    /**
-     * "Already topped up and signed hashes" warning notification
-     *
-     * @property onClick lambda be invoked when notification's close button is clicked
-     */
-    data class WarningAlreadySignedHashes(override val onClick: () -> Unit) : Clickable, WalletNotification(
-        state = NotificationState.Closable(
-            title = TextReference.Res(id = R.string.common_warning),
-            subtitle = TextReference.Res(id = R.string.alert_card_signed_transactions),
-            iconResId = R.drawable.img_attention_20,
-            tint = null,
-            onCloseClick = onClick,
-        ),
-    )
+        object NetworksUnreachable : Warning(
+            title = resourceReference(id = R.string.warning_network_unreachable_title),
+            subtitle = resourceReference(id = R.string.warning_network_unreachable_message),
+        )
 
-    /**
-     * "Already signed hashes" critical warning notification
-     *
-     * @property onClick lambda be invoked when notification is clicked
-     */
-    data class CriticalWarningAlreadySignedHashes(override val onClick: () -> Unit) : Clickable, WalletNotification(
-        state = NotificationState.Clickable(
-            title = TextReference.Res(
-                id = R.string.warning_important_security_info,
-                formatArgs = WrappedList(listOf("\u26A0")),
+        object SomeNetworksUnreachable : Warning(
+            title = resourceReference(id = R.string.warning_some_networks_unreachable_title),
+            subtitle = resourceReference(id = R.string.warning_some_networks_unreachable_message),
+        )
+
+        data class NumberOfSignedHashesIncorrect(val onCloseClick: () -> Unit) : Warning(
+            title = resourceReference(id = R.string.warning_number_of_signed_hashes_incorrect_title),
+            subtitle = resourceReference(id = R.string.warning_number_of_signed_hashes_incorrect_message),
+            onCloseClick = onCloseClick,
+        )
+
+        object TestNetCard : Warning(
+            title = resourceReference(id = R.string.warning_testnet_card_title),
+            subtitle = resourceReference(id = R.string.warning_testnet_card_message),
+        )
+
+        data class LowSignatures(val count: Int) : Warning(
+            title = resourceReference(id = R.string.warning_low_signatures_title),
+            subtitle = resourceReference(
+                id = R.string.warning_low_signatures_message,
+                formatArgs = wrappedList(count),
             ),
-            subtitle = TextReference.Res(id = R.string.warning_signed_tx_previously),
-            iconResId = R.drawable.img_attention_20,
-            onClick = onClick,
-            tint = null,
-        ),
-    )
+        )
+    }
 
-    /**
-     * "Backup the card" notification
-     *
-     * @property onClick lambda be invoked when notification is clicked
-     */
-    data class BackupCard(override val onClick: () -> Unit) : Clickable, WalletNotification(
-        state = NotificationState.Clickable(
-            title = TextReference.Str(value = "Backup your card"),
-            iconResId = R.drawable.img_attention_20,
-            onClick = onClick,
-            tint = null,
+    sealed class Informational(
+        title: TextReference,
+        subtitle: TextReference,
+        buttonsState: NotificationConfig.ButtonsState? = null,
+    ) : WalletNotification(
+        config = NotificationConfig(
+            title = title,
+            subtitle = subtitle,
+            iconResId = R.drawable.ic_alert_circle_24,
+            buttonsState = buttonsState,
         ),
-    )
+    ) {
 
-    /** "Unreachable networks" notification */
-    object UnreachableNetworks : WalletNotification(
-        state = NotificationState.Simple(
-            title = TextReference.Str(value = "Some networks are unreachable"),
-            iconResId = R.drawable.img_attention_20,
-            tint = null,
-        ),
-    )
+        data class MissingAddresses(val missingAddressesCount: Int, val onGenerateClick: () -> Unit) : Informational(
+            title = resourceReference(id = R.string.warning_missing_derivation_title),
+            subtitle = pluralReference(
+                id = R.plurals.warning_missing_derivation_message,
+                count = missingAddressesCount,
+                formatArgs = wrappedList(missingAddressesCount),
+            ),
+            buttonsState = NotificationConfig.ButtonsState.PrimaryButtonConfig(
+                text = resourceReference(id = R.string.common_generate_addresses),
+                iconResId = R.drawable.ic_tangem_24,
+                onClick = onGenerateClick,
+            ),
+        )
 
-    /**
-     * "Like Tangem App" notification
-     *
-     * @property onClick lambda be invoked when notification is clicked
-     */
-    data class LikeTangemApp(override val onClick: () -> Unit) : Clickable, WalletNotification(
-        state = NotificationState.Clickable(
-            title = TextReference.Str(value = "Like Tangem App?"),
-            iconResId = R.drawable.ic_star_24,
-            onClick = onClick,
-            tint = TangemColorPalette.Tangerine,
-        ),
-    )
+        data class NoAccount(val network: String, val symbol: String, val amount: String) : Informational(
+            title = resourceReference(id = R.string.warning_no_account_title),
+            subtitle = resourceReference(
+                id = R.string.no_account_generic,
+                wrappedList(network, amount, symbol),
+            ),
+        )
 
-    /**
-     * "Scan the card" notification
-     *
-     * @property onClick lambda be invoked when notification is clicked
-     */
-    data class ScanCard(override val onClick: () -> Unit) : Clickable, WalletNotification(
-        state = NotificationState.Clickable(
-            title = TextReference.Str(value = "Scan your card to continue"),
-            iconResId = R.drawable.ic_tangem_24,
-            onClick = onClick,
-        ),
-    )
+        object DemoCard : Informational(
+            title = resourceReference(id = R.string.warning_demo_mode_title),
+            subtitle = resourceReference(id = R.string.warning_demo_mode_message),
+        )
+    }
 
-    /**
-     * "Unlock wallets" notification
-     *
-     * @property onClick lambda be invoked when notification is clicked
-     */
-    data class UnlockWallets(override val onClick: () -> Unit) : Clickable, WalletNotification(
-        state = NotificationState.Clickable(
-            title = TextReference.Str(value = "Unlock needed"),
+    data class UnlockWallets(val onClick: () -> Unit) : WalletNotification(
+        config = NotificationConfig(
+            title = resourceReference(id = R.string.common_access_denied),
+            subtitle = resourceReference(
+                id = R.string.warning_access_denied_message,
+                formatArgs = wrappedList(
+                    resourceReference(R.string.common_biometrics),
+                ),
+            ),
             iconResId = R.drawable.ic_locked_24,
             onClick = onClick,
         ),
     )
+
+    data class RateApp(
+        val onLikeClick: () -> Unit,
+        val onDislikeClick: () -> Unit,
+        val onCloseClick: () -> Unit,
+    ) : WalletNotification(
+        config = NotificationConfig(
+            title = resourceReference(id = R.string.warning_rate_app_title),
+            subtitle = resourceReference(id = R.string.warning_rate_app_message),
+            iconResId = R.drawable.ic_star_24,
+            buttonsState = NotificationConfig.ButtonsState.PairButtonsConfig(
+                primaryText = resourceReference(id = R.string.warning_button_like_it),
+                onPrimaryClick = onLikeClick,
+                secondaryText = resourceReference(id = R.string.warning_button_could_be_better),
+                onSecondaryClick = onDislikeClick,
+            ),
+            onCloseClick = onCloseClick,
+        ),
+    )
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletTokensListState.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletTokensListState.kt
index 8b973054f2..fe750ba585 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletTokensListState.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletTokensListState.kt
@@ -5,6 +5,7 @@ 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
+import javax.annotation.concurrent.Immutable
 
 /**
  * Wallet tokens list state
@@ -20,11 +21,10 @@ internal sealed class WalletTokensListState {
      * Wallet content token list state
      *
      * @property items                  content items
-     * @property onOrganizeTokensClick  lambda be invoked when organize tokens button is clicked
      */
     sealed class ContentState(
         open val items: ImmutableList<TokensListItemState>,
-        open val onOrganizeTokensClick: (() -> Unit)?,
+        open val organizeTokensButton: OrganizeTokensButtonState,
     ) : WalletTokensListState()
 
     /**
@@ -33,53 +33,77 @@ internal sealed class WalletTokensListState {
      * @property items content items
      */
     data class Loading(
-        override val items: ImmutableList<TokensListItemState.Token> = persistentListOf(
-            TokensListItemState.Token(state = TokenItemState.Loading(id = FIRST_LOADING_TOKEN_ID)),
-            TokensListItemState.Token(state = TokenItemState.Loading(id = SECOND_LOADING_TOKEN_ID)),
-        ),
-    ) : ContentState(items = items, onOrganizeTokensClick = null)
+        override val items: ImmutableList<TokensListItemState.Token> = persistentListOf(),
+    ) : ContentState(items = items, organizeTokensButton = OrganizeTokensButtonState.Hidden)
 
     /**
      * Content state
      *
      * @property items                 content items
-     * @property onOrganizeTokensClick lambda be invoked when organize tokens button is clicked
+     * @property organizeTokensButton  represents the state of the 'Organize Tokens' button
      */
     data class Content(
         override val items: ImmutableList<TokensListItemState>,
-        override val onOrganizeTokensClick: (() -> Unit)?,
-    ) : ContentState(items, onOrganizeTokensClick)
+        override val organizeTokensButton: OrganizeTokensButtonState,
+    ) : ContentState(items, organizeTokensButton)
 
     /** Locked content state */
     object Locked : ContentState(
         items = persistentListOf(
-            TokensListItemState.NetworkGroupTitle(value = TextReference.Res(id = R.string.main_tokens)),
+            TokensListItemState.NetworkGroupTitle(id = 42, name = TextReference.Res(id = R.string.main_tokens)),
             TokensListItemState.Token(state = TokenItemState.Locked(id = LOCKED_TOKEN_ID)),
         ),
-        onOrganizeTokensClick = null,
+        organizeTokensButton = OrganizeTokensButtonState.Hidden,
     )
 
+    /**
+     * Represents the state of the 'Organize Tokens' button.
+     */
+    @Immutable
+    sealed class OrganizeTokensButtonState {
+
+        /** Represents the state where the 'Organize Tokens' button is hidden. */
+        object Hidden : OrganizeTokensButtonState()
+
+        /**
+         * Represents the state where the 'Organize Tokens' button is visible.
+         *
+         * @property isEnabled Indicates if the button is enabled or not.
+         * @property onClick Callback to be executed when the button is clicked.
+         */
+        data class Visible(
+            val isEnabled: Boolean,
+            val onClick: () -> Unit,
+        ) : OrganizeTokensButtonState()
+    }
+
     /** Tokens list item state */
+    @Immutable
     sealed interface TokensListItemState {
 
+        val id: Any
+
         /**
          * Network group title item
          *
-         * @property value network name
+         * @property name network name
          */
-        data class NetworkGroupTitle(val value: TextReference) : TokensListItemState
+        data class NetworkGroupTitle(
+            override val id: Int,
+            val name: TextReference,
+        ) : TokensListItemState
 
         /**
          * Token item
          *
          * @property state token item state
          */
-        data class Token(val state: TokenItemState) : TokensListItemState
+        data class Token(val state: TokenItemState) : TokensListItemState {
+            override val id: String = state.id
+        }
     }
 
     private companion object {
-        const val FIRST_LOADING_TOKEN_ID = "Loading#1"
-        const val SECOND_LOADING_TOKEN_ID = "Loading#2"
         const val LOCKED_TOKEN_ID = "Locked#1"
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletTopBarConfig.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletTopBarConfig.kt
index 52e984f940..9b3cf42edf 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletTopBarConfig.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletTopBarConfig.kt
@@ -3,7 +3,6 @@ package com.tangem.feature.wallet.presentation.wallet.state.components
 /**
  * Wallet screen top bar config
  *
- * @property onScanCardClick lambda be invoked when scan card button is clicked
- * @property onMoreClick     lambda be invoked when more button is clicked
+ * @property onDetailsClick lambda be invoked when details button is clicked
  */
-data class WalletTopBarConfig(val onScanCardClick: () -> Unit, val onMoreClick: () -> Unit)
\ No newline at end of file
+internal data class WalletTopBarConfig(val onDetailsClick: () -> Unit)
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/TokenActionsProvider.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/TokenActionsProvider.kt
index f9a7dbfc4e..b7b52537f5 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/TokenActionsProvider.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/TokenActionsProvider.kt
@@ -1,52 +1,112 @@
 package com.tangem.feature.wallet.presentation.wallet.state.factory
 
 import com.tangem.common.Provider
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.domain.common.util.cardTypesResolver
+import com.tangem.domain.tokens.model.CryptoCurrencyStatus
+import com.tangem.domain.tokens.model.TokenActionsState
+import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.common.state.TokenItemState
 import com.tangem.feature.wallet.presentation.wallet.state.TokenActionButtonConfig
-import com.tangem.feature.wallet.presentation.wallet.state.WalletState
+import com.tangem.feature.wallet.presentation.wallet.viewmodels.WalletClickIntents
+import com.tangem.utils.isNullOrZero
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 
 /**
  * Converter from loaded [TokenItemState.Content] to ImmutableList<[TokenActionButtonConfig]>
  *
- * @property currentStateProvider current ui state provider
- *
+ * @property currentWalletProvider current wallet provider
+ * @property clickIntents          screen click intents
  */
-@Suppress("UnusedPrivateMember")
 internal class TokenActionsProvider(
-    private val currentStateProvider: Provider<WalletState>,
+    private val currentWalletProvider: Provider<UserWallet>,
+    private val clickIntents: WalletClickIntents,
 ) {
 
-    @Suppress("UnusedPrivateMember")
-    fun provideActions(tokenId: String): ImmutableList<TokenActionButtonConfig> {
-        // TODO: [REDACTED_JIRA]
-        return mockTokenActionButtonConfig().toImmutableList()
+    fun provideActions(tokenActions: TokenActionsState): ImmutableList<TokenActionButtonConfig> {
+        return tokenActions.states
+            .filterIfSingleWithToken()
+            .filterIfS2C()
+            .mapNotNull {
+                mapTokenActionState(
+                    actionsState = it,
+                    cryptoCurrencyStatus = tokenActions.cryptoCurrencyStatus,
+                )
+            }
+            .toImmutableList()
     }
 
-    private fun mockTokenActionButtonConfig(): List<TokenActionButtonConfig> {
-        return listOf(
-            TokenActionButtonConfig(
-                text = "Send",
-                iconResId = R.drawable.ic_plus_24,
-                onClick = {},
-            ),
-            TokenActionButtonConfig(
-                text = "Buy",
-                iconResId = R.drawable.ic_plus_24,
-                onClick = {},
-            ),
-            TokenActionButtonConfig(
-                text = "Sell",
-                iconResId = R.drawable.ic_plus_24,
-                onClick = {},
-            ),
-            TokenActionButtonConfig(
-                text = "Swap",
-                iconResId = R.drawable.ic_plus_24,
-                onClick = {},
-            ),
+    private fun List<TokenActionsState.ActionState>.filterIfSingleWithToken(): List<TokenActionsState.ActionState> {
+        return if (currentWalletProvider().scanResponse.cardTypesResolver.isSingleWalletWithToken()) {
+            filter { it !is TokenActionsState.ActionState.HideToken }
+        } else {
+            this
+        }
+    }
+
+    private fun List<TokenActionsState.ActionState>.filterIfS2C(): List<TokenActionsState.ActionState> {
+        return if (currentWalletProvider().scanResponse.cardTypesResolver.isStart2Coin()) {
+            filterNot { it is TokenActionsState.ActionState.Buy || it is TokenActionsState.ActionState.Sell }
+        } else {
+            this
+        }
+    }
+
+    private fun mapTokenActionState(
+        actionsState: TokenActionsState.ActionState,
+        cryptoCurrencyStatus: CryptoCurrencyStatus,
+    ): TokenActionButtonConfig? {
+        if (actionsState is TokenActionsState.ActionState.Send && cryptoCurrencyStatus.value.amount.isNullOrZero()) {
+            return null
+        }
+        val title: TextReference
+        val icon: Int
+        val action: () -> Unit
+        when (actionsState) {
+            is TokenActionsState.ActionState.Buy -> {
+                title = resourceReference(R.string.common_buy)
+                icon = R.drawable.ic_plus_24
+                action = { clickIntents.onBuyClick(cryptoCurrencyStatus) }
+            }
+            is TokenActionsState.ActionState.Receive -> {
+                title = resourceReference(R.string.common_receive)
+                icon = R.drawable.ic_arrow_down_24
+                action = { clickIntents.onReceiveClick(cryptoCurrencyStatus) }
+            }
+            is TokenActionsState.ActionState.Sell -> {
+                title = resourceReference(R.string.common_sell)
+                icon = R.drawable.ic_currency_24
+                action = { clickIntents.onSellClick(cryptoCurrencyStatus) }
+            }
+            is TokenActionsState.ActionState.Send -> {
+                title = resourceReference(R.string.common_send)
+                icon = R.drawable.ic_arrow_up_24
+                action = { clickIntents.onMultiCurrencySendClick(cryptoCurrencyStatus) }
+            }
+            is TokenActionsState.ActionState.Swap -> {
+                title = resourceReference(R.string.common_swap)
+                icon = R.drawable.ic_exchange_horizontal_24
+                action = { clickIntents.onSwapClick(cryptoCurrencyStatus) }
+            }
+            is TokenActionsState.ActionState.CopyAddress -> {
+                title = resourceReference(R.string.common_copy_address)
+                icon = R.drawable.ic_copy_24
+                action = { clickIntents.onCopyAddressClick(cryptoCurrencyStatus) }
+            }
+            is TokenActionsState.ActionState.HideToken -> {
+                title = resourceReference(R.string.token_details_hide_token)
+                icon = R.drawable.ic_trash_24
+                action = { clickIntents.onHideTokensClick(cryptoCurrencyStatus) }
+            }
+        }
+        return TokenActionButtonConfig(
+            text = title,
+            iconResId = icon,
+            onClick = action,
+            enabled = actionsState.enabled,
         )
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/TokenListWithWallet.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/TokenListWithWallet.kt
new file mode 100644
index 0000000000..bd9060c2ce
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/TokenListWithWallet.kt
@@ -0,0 +1,9 @@
+package com.tangem.feature.wallet.presentation.wallet.state.factory
+
+import com.tangem.domain.tokens.model.TokenList
+import com.tangem.domain.wallets.models.UserWallet
+
+data class TokenListWithWallet(
+    val tokenList: TokenList,
+    val wallet: UserWallet,
+)
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletCryptoCurrencyActionsConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletCryptoCurrencyActionsConverter.kt
index 597680d5eb..eb2400e286 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletCryptoCurrencyActionsConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletCryptoCurrencyActionsConverter.kt
@@ -8,15 +8,15 @@ import com.tangem.feature.wallet.presentation.wallet.state.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletManageButton
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.WalletClickIntents
 import com.tangem.utils.converter.Converter
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.toImmutableList
+import kotlinx.collections.immutable.PersistentList
+import kotlinx.collections.immutable.toPersistentList
 
 internal class WalletCryptoCurrencyActionsConverter(
     private val currentStateProvider: Provider<WalletState>,
     private val clickIntents: WalletClickIntents,
-) : Converter<List<TokenActionsState.ActionState>, WalletState> {
+) : Converter<TokenActionsState, WalletState> {
 
-    override fun convert(value: List<TokenActionsState.ActionState>): WalletState {
+    override fun convert(value: TokenActionsState): WalletState {
         return when (val state = currentStateProvider()) {
             is WalletSingleCurrencyState.Content -> state.copy(buttons = value.mapToManageButtons())
             is WalletSingleCurrencyState.Locked,
@@ -26,25 +26,38 @@ internal class WalletCryptoCurrencyActionsConverter(
         }
     }
 
-    private fun List<TokenActionsState.ActionState>.mapToManageButtons(): ImmutableList<WalletManageButton> {
-        return this
+    private fun TokenActionsState.mapToManageButtons(): PersistentList<WalletManageButton> {
+        return this.states
             .mapNotNull { action ->
                 when (action) {
                     is TokenActionsState.ActionState.Buy -> {
-                        WalletManageButton.Buy(enabled = action.enabled, onClick = clickIntents::onBuyClick)
+                        WalletManageButton.Buy(
+                            enabled = action.enabled,
+                            onClick = { clickIntents.onBuyClick(cryptoCurrencyStatus) },
+                        )
                     }
                     is TokenActionsState.ActionState.Receive -> {
-                        WalletManageButton.Receive(onClick = clickIntents::onReceiveClick)
+                        WalletManageButton.Receive(
+                            onClick = { clickIntents.onReceiveClick(cryptoCurrencyStatus) },
+                        )
                     }
                     is TokenActionsState.ActionState.Sell -> {
-                        WalletManageButton.Sell(enabled = action.enabled, onClick = clickIntents::onSellClick)
+                        WalletManageButton.Sell(
+                            enabled = action.enabled,
+                            onClick = { clickIntents.onSellClick(cryptoCurrencyStatus) },
+                        )
                     }
                     is TokenActionsState.ActionState.Send -> {
-                        WalletManageButton.Send(enabled = action.enabled, onClick = clickIntents::onSendClick)
+                        WalletManageButton.Send(
+                            enabled = action.enabled,
+                            onClick = { clickIntents.onSingleCurrencySendClick(cryptoCurrencyStatus) },
+                        )
+                    }
+                    else -> {
+                        null
                     }
-                    is TokenActionsState.ActionState.Swap -> null
                 }
             }
-            .toImmutableList()
+            .toPersistentList()
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletDeleteStateConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletDeleteStateConverter.kt
new file mode 100644
index 0000000000..c6ccfcd05d
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletDeleteStateConverter.kt
@@ -0,0 +1,50 @@
+package com.tangem.feature.wallet.presentation.wallet.state.factory
+
+import com.tangem.common.Provider
+import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.feature.wallet.presentation.wallet.state.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletCardState
+import com.tangem.feature.wallet.presentation.wallet.state.factory.WalletDeleteStateConverter.DeleteWalletModel
+import com.tangem.feature.wallet.presentation.wallet.viewmodels.WalletsUpdateActionResolver
+import com.tangem.utils.converter.Converter
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
+
+/**
+ * Converter that responds on wallet deleting action. Returns [WalletState] without deleted wallet.
+ *
+ * @property currentStateProvider current state provider
+ */
+internal class WalletDeleteStateConverter(
+    private val currentStateProvider: Provider<WalletState>,
+) : Converter<DeleteWalletModel, WalletState> {
+
+    override fun convert(value: DeleteWalletModel): WalletState {
+        return when (val state = currentStateProvider()) {
+            is WalletState.ContentState -> {
+                value.cacheState.copySealed(
+                    walletsListConfig = state.walletsListConfig.copy(
+                        selectedWalletIndex = value.action.selectedWalletIndex,
+                        wallets = state.walletsListConfig.wallets.deleteWallet(id = value.action.deletedWalletId),
+                    ),
+                    pullToRefreshConfig = value.cacheState.pullToRefreshConfig.copy(isRefreshing = false),
+                )
+            }
+            is WalletState.Initial -> state
+        }
+    }
+
+    private fun List<WalletCardState>.deleteWallet(id: UserWalletId): ImmutableList<WalletCardState> {
+        return this
+            .mapIndexedNotNull { index, currentWallet ->
+                if (currentWallet.id == id) return@mapIndexedNotNull null
+                getOrNull(index) ?: return@mapIndexedNotNull null
+            }
+            .toImmutableList()
+    }
+
+    data class DeleteWalletModel(
+        val cacheState: WalletState.ContentState,
+        val action: WalletsUpdateActionResolver.Action.DeleteWallet,
+    )
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletLoadedTokensListConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletLoadedTokensListConverter.kt
index a98b75e4f8..f2d12adf65 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletLoadedTokensListConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletLoadedTokensListConverter.kt
@@ -3,13 +3,11 @@ package com.tangem.feature.wallet.presentation.wallet.state.factory
 import arrow.core.Either
 import com.tangem.common.Provider
 import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.common.CardTypesResolver
 import com.tangem.domain.tokens.error.TokenListError
 import com.tangem.domain.tokens.model.TokenList
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.state.WalletMultiCurrencyState
 import com.tangem.feature.wallet.presentation.wallet.state.WalletState
-import com.tangem.feature.wallet.presentation.wallet.state.factory.WalletLoadedTokensListConverter.LoadedTokensListModel
 import com.tangem.feature.wallet.presentation.wallet.utils.TokenListErrorConverter
 import com.tangem.feature.wallet.presentation.wallet.utils.TokenListToWalletStateConverter
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.WalletClickIntents
@@ -18,50 +16,34 @@ import com.tangem.utils.converter.Converter
 /**
  * Converter from loaded [TokenListError] or [TokenList] to [WalletMultiCurrencyState]
  *
- * @property currentStateProvider  current ui state provider
- * @param cardTypeResolverProvider card type resolver
- * @param currentWalletProvider    current wallet provider
- * @param clickIntents             screen click intents
+ * @property currentStateProvider    current ui state provider
+ * @property tokenListErrorConverter converter of tokens list
+ * @param appCurrencyProvider        app currency provider
+ * @param currentWalletProvider      current wallet provider
+ * @param clickIntents               screen click intents
  *
 [REDACTED_AUTHOR]
  */
+@Suppress("LongParameterList")
 internal class WalletLoadedTokensListConverter(
     private val currentStateProvider: Provider<WalletState>,
+    private val tokenListErrorConverter: TokenListErrorConverter,
     appCurrencyProvider: Provider<AppCurrency>,
-    cardTypeResolverProvider: Provider<CardTypesResolver>,
     currentWalletProvider: Provider<UserWallet>,
     clickIntents: WalletClickIntents,
-) : Converter<LoadedTokensListModel, WalletState> {
+) : Converter<Either<TokenListError, TokenListWithWallet>, WalletState> {
 
     private val tokenListStateConverter = TokenListToWalletStateConverter(
         currentStateProvider = currentStateProvider,
-        cardTypeResolverProvider = cardTypeResolverProvider,
         currentWalletProvider = currentWalletProvider,
         appCurrencyProvider = appCurrencyProvider,
-        isWalletContentHidden = false, // TODO: [REDACTED_JIRA]
         clickIntents = clickIntents,
     )
 
-    private val tokenListErrorStateConverter = TokenListErrorConverter(
-        currentStateProvider = currentStateProvider,
-    )
-
-    override fun convert(value: LoadedTokensListModel): WalletState {
-        return value.tokenListEither.fold(
-            ifLeft = tokenListErrorStateConverter::convert,
-            ifRight = {
-                tokenListStateConverter.convert(
-                    value = TokenListToWalletStateConverter.TokensListModel(
-                        tokenList = it,
-                        isRefreshing = value.isRefreshing,
-                    ),
-                )
-            },
+    override fun convert(value: Either<TokenListError, TokenListWithWallet>): WalletState {
+        return value.fold(
+            ifLeft = tokenListErrorConverter::convert,
+            ifRight = tokenListStateConverter::convert,
         )
     }
-
-    data class LoadedTokensListModel(
-        val tokenListEither: Either<TokenListError, TokenList>,
-        val isRefreshing: Boolean,
-    )
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletLockedConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletLockedConverter.kt
index 5ec6613bb8..8007a4cf4d 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletLockedConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletLockedConverter.kt
@@ -1,110 +1,80 @@
 package com.tangem.feature.wallet.presentation.wallet.state.factory
 
 import com.tangem.common.Provider
-import com.tangem.domain.common.CardTypesResolver
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.feature.wallet.presentation.wallet.domain.WalletAdditionalInfoFactory
 import com.tangem.feature.wallet.presentation.wallet.state.WalletMultiCurrencyState
 import com.tangem.feature.wallet.presentation.wallet.state.WalletSingleCurrencyState
 import com.tangem.feature.wallet.presentation.wallet.state.WalletState
-import com.tangem.feature.wallet.presentation.wallet.state.components.WalletCardState
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletManageButton
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletPullToRefreshConfig
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletTopBarConfig
-import com.tangem.feature.wallet.presentation.wallet.state.components.WalletsListConfig
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.WalletClickIntents
 import com.tangem.utils.converter.Converter
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toImmutableList
+import kotlinx.collections.immutable.PersistentList
+import kotlinx.collections.immutable.toPersistentList
 
 internal class WalletLockedConverter(
     private val currentStateProvider: Provider<WalletState>,
-    private val currentCardTypeResolverProvider: Provider<CardTypesResolver>,
-    private val currentWalletProvider: Provider<UserWallet>,
     private val clickIntents: WalletClickIntents,
 ) : Converter<Unit, WalletState> {
 
     override fun convert(value: Unit): WalletState {
         return when (val state = currentStateProvider()) {
-            is WalletState.ContentState -> {
-                val cardTypeResolver = currentCardTypeResolverProvider()
-
-                if (cardTypeResolver.isMultiwalletAllowed()) {
-                    state.toMultiCurrencyLockedState(cardTypeResolver)
-                } else {
-                    state.toSingleCurrencyLockedState(cardTypeResolver)
-                }
-            }
-            is WalletState.Initial -> state
+            is WalletMultiCurrencyState.Content -> state.toMultiCurrencyLockedState()
+            is WalletSingleCurrencyState.Content -> state.toSingleCurrencyLockedState()
+            is WalletMultiCurrencyState.Locked,
+            is WalletSingleCurrencyState.Locked,
+            is WalletState.Initial,
+            -> state
         }
     }
 
-    private fun WalletState.ContentState.toMultiCurrencyLockedState(
-        cardTypeResolver: CardTypesResolver,
-    ): WalletMultiCurrencyState.Locked {
+    private fun WalletMultiCurrencyState.Content.toMultiCurrencyLockedState(): WalletState {
         return WalletMultiCurrencyState.Locked(
             onBackClick = onBackClick,
-            topBarConfig = createTopBarConfig(),
-            walletsListConfig = createWalletsListConfig(cardTypeResolver),
-            pullToRefreshConfig = pullToRefreshConfig,
+            topBarConfig = topBarConfig.updateCallback(),
+            walletsListConfig = walletsListConfig,
+            pullToRefreshConfig = pullToRefreshConfig.stopRefreshing(),
             onUnlockWalletsNotificationClick = clickIntents::onUnlockWalletNotificationClick,
             onUnlockClick = clickIntents::onUnlockWalletClick,
-            onScanClick = clickIntents::onScanCardClick,
+            onScanClick = clickIntents::onScanToUnlockWalletClick,
+            isBalanceHidden = isBalanceHidden,
         )
     }
 
-    private fun WalletState.ContentState.toSingleCurrencyLockedState(
-        cardTypeResolver: CardTypesResolver,
-    ): WalletSingleCurrencyState.Locked {
+    private fun WalletSingleCurrencyState.Content.toSingleCurrencyLockedState(): WalletState {
         return WalletSingleCurrencyState.Locked(
             onBackClick = onBackClick,
-            topBarConfig = createTopBarConfig(),
-            walletsListConfig = createWalletsListConfig(cardTypeResolver),
-            pullToRefreshConfig = pullToRefreshConfig,
-            buttons = createButtons(),
+            topBarConfig = topBarConfig.updateCallback(),
+            walletsListConfig = walletsListConfig,
+            pullToRefreshConfig = pullToRefreshConfig.stopRefreshing(),
+            buttons = buttons.disableButtons(),
             onUnlockWalletsNotificationClick = clickIntents::onUnlockWalletNotificationClick,
             onUnlockClick = clickIntents::onUnlockWalletClick,
-            onScanClick = clickIntents::onScanCardClick,
+            onScanClick = clickIntents::onScanToUnlockWalletClick,
             onExploreClick = clickIntents::onExploreClick,
+            isBalanceHidden = isBalanceHidden,
         )
     }
 
-    private fun WalletState.ContentState.createTopBarConfig(): WalletTopBarConfig {
-        return topBarConfig.copy(onMoreClick = clickIntents::onUnlockWalletNotificationClick)
+    private fun WalletTopBarConfig.updateCallback(): WalletTopBarConfig {
+        return copy(onDetailsClick = clickIntents::onUnlockWalletNotificationClick)
     }
 
-    private fun WalletState.ContentState.createWalletsListConfig(
-        cardTypeResolver: CardTypesResolver,
-    ): WalletsListConfig {
-        return walletsListConfig.copy(
-            wallets = walletsListConfig.wallets
-                .map { walletCardState ->
-                    WalletCardState.LockedContent(
-                        id = walletCardState.id,
-                        title = walletCardState.title,
-                        additionalInfo = if (cardTypeResolver.isMultiwalletAllowed()) {
-                            WalletAdditionalInfoFactory.resolve(
-                                cardTypesResolver = cardTypeResolver,
-                                wallet = currentWalletProvider(),
-                            )
-                        } else {
-                            null
-                        },
-                        imageResId = walletCardState.imageResId,
-                        onRenameClick = walletCardState.onRenameClick,
-                        onDeleteClick = walletCardState.onDeleteClick,
-                    )
+    private fun WalletPullToRefreshConfig.stopRefreshing(): WalletPullToRefreshConfig {
+        return copy(isRefreshing = false)
+    }
+
+    private fun PersistentList<WalletManageButton>.disableButtons(): PersistentList<WalletManageButton> {
+        return this
+            .map { button ->
+                when (button) {
+                    is WalletManageButton.Buy -> button.copy(enabled = false)
+                    is WalletManageButton.Sell -> button.copy(enabled = false)
+                    is WalletManageButton.Send -> button.copy(enabled = false)
+                    is WalletManageButton.Swap -> button.copy(enabled = false)
+                    is WalletManageButton.Receive -> button
                 }
-                .toImmutableList(),
-        )
-    }
-
-    private fun createButtons(): ImmutableList<WalletManageButton> {
-        return persistentListOf(
-            WalletManageButton.Buy(enabled = false, onClick = {}),
-            WalletManageButton.Send(enabled = false, onClick = {}),
-            WalletManageButton.Receive(onClick = {}),
-            WalletManageButton.Sell(enabled = false, onClick = {}),
-        )
+            }
+            .toPersistentList()
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletRefreshStateConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletRefreshStateConverter.kt
index f820ff8444..2344194b89 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletRefreshStateConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletRefreshStateConverter.kt
@@ -1,124 +1,115 @@
 package com.tangem.feature.wallet.presentation.wallet.state.factory
 
 import com.tangem.common.Provider
-import com.tangem.core.ui.components.marketprice.MarketPriceBlockState
-import com.tangem.core.ui.components.transactions.state.TxHistoryState
-import com.tangem.domain.common.CardTypesResolver
-import com.tangem.feature.wallet.presentation.common.state.TokenItemState
 import com.tangem.feature.wallet.presentation.wallet.state.WalletMultiCurrencyState
 import com.tangem.feature.wallet.presentation.wallet.state.WalletSingleCurrencyState
 import com.tangem.feature.wallet.presentation.wallet.state.WalletState
-import com.tangem.feature.wallet.presentation.wallet.state.components.*
-import com.tangem.feature.wallet.presentation.wallet.state.components.WalletTokensListState.TokensListItemState
-import com.tangem.feature.wallet.presentation.wallet.viewmodels.WalletClickIntents
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletManageButton
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletPullToRefreshConfig
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletTokensListState
 import com.tangem.utils.converter.Converter
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.toImmutableList
-import kotlinx.collections.immutable.toPersistentList
-import kotlinx.coroutines.flow.update
+import kotlinx.collections.immutable.PersistentList
+import kotlinx.collections.immutable.mutate
 
 internal class WalletRefreshStateConverter(
     private val currentStateProvider: Provider<WalletState>,
-    private val currentCardTypeResolverProvider: Provider<CardTypesResolver>,
-    private val clickIntents: WalletClickIntents,
-) : Converter<Unit, WalletState> {
+) : Converter<Boolean, WalletState> {
 
-    override fun convert(value: Unit): WalletState {
-        return when (val state = currentStateProvider()) {
-            is WalletMultiCurrencyState.Content -> state.getRefreshState()
-            is WalletSingleCurrencyState.Content -> state.getRefreshState()
-            else -> state
-        }
-    }
+    override fun convert(value: Boolean): WalletState {
+        val state = currentStateProvider()
+        val contentState = state as? WalletState.ContentState ?: return state
 
-    private fun WalletMultiCurrencyState.Content.getRefreshState(): WalletMultiCurrencyState.Content {
-        return copy(
-            walletsListConfig = createWalletsListConfig(),
-            pullToRefreshConfig = createPullToRefreshConfig(),
-            tokensListState = createTokenListState(),
-        )
-    }
-
-    private fun WalletSingleCurrencyState.Content.getRefreshState(): WalletSingleCurrencyState.Content {
-        return copy(
-            walletsListConfig = createWalletsListConfig(),
-            pullToRefreshConfig = createPullToRefreshConfig(),
-            buttons = buttons.mapToDisabledButton(),
-            txHistoryState = createTxHistoryState(),
-            marketPriceBlockState = MarketPriceBlockState.Loading(currencyName = marketPriceBlockState.currencyName),
-        )
-    }
-
-    private fun WalletState.ContentState.createWalletsListConfig(): WalletsListConfig {
-        val selectedWallet = walletsListConfig.wallets[walletsListConfig.selectedWalletIndex]
-        val additionalInfo = if (currentCardTypeResolverProvider().isMultiwalletAllowed()) {
-            selectedWallet.additionalInfo
+        return if (value) {
+            contentState.getRefreshingState()
         } else {
-            null
+            contentState.getRefreshedState()
         }
+    }
 
-        return walletsListConfig.copy(
-            wallets = walletsListConfig.wallets.toPersistentList().set(
-                index = walletsListConfig.selectedWalletIndex,
-                element = WalletCardState.Loading(
-                    id = selectedWallet.id,
-                    title = selectedWallet.title,
-                    additionalInfo = additionalInfo,
-                    imageResId = selectedWallet.imageResId,
-                    onRenameClick = selectedWallet.onRenameClick,
-                    onDeleteClick = selectedWallet.onDeleteClick,
-                ),
-            ),
+    private fun WalletState.ContentState.getRefreshingState(): WalletState {
+        return when (this) {
+            is WalletMultiCurrencyState.Content -> getRefreshingState()
+            is WalletSingleCurrencyState.Content -> getRefreshingState()
+            is WalletMultiCurrencyState.Locked,
+            is WalletSingleCurrencyState.Locked,
+            -> this
+        }
+    }
+
+    private fun WalletState.ContentState.getRefreshedState(): WalletState {
+        return when (this) {
+            is WalletMultiCurrencyState.Content -> getRefreshedState()
+            is WalletSingleCurrencyState.Content -> getRefreshedState()
+            is WalletMultiCurrencyState.Locked,
+            is WalletSingleCurrencyState.Locked,
+            -> this
+        }
+    }
+
+    private fun WalletMultiCurrencyState.Content.getRefreshingState(): WalletMultiCurrencyState {
+        return copy(
+            pullToRefreshConfig = updatePullToRefreshConfig(isRefreshing = true),
+            tokensListState = updateTokenListState(isRefreshing = true),
         )
     }
 
-    private fun WalletState.ContentState.createPullToRefreshConfig(): WalletPullToRefreshConfig {
-        return pullToRefreshConfig.copy(isRefreshing = true)
+    private fun WalletSingleCurrencyState.Content.getRefreshingState(): WalletSingleCurrencyState {
+        return copy(
+            pullToRefreshConfig = updatePullToRefreshConfig(isRefreshing = true),
+            buttons = updateButtons(isRefreshing = true),
+        )
     }
 
-    private fun WalletMultiCurrencyState.Content.createTokenListState(): WalletTokensListState {
-        return when (tokensListState) {
+    private fun WalletMultiCurrencyState.Content.getRefreshedState(): WalletMultiCurrencyState {
+        return copy(
+            pullToRefreshConfig = updatePullToRefreshConfig(isRefreshing = false),
+            tokensListState = updateTokenListState(isRefreshing = false),
+        )
+    }
+
+    private fun WalletSingleCurrencyState.Content.getRefreshedState(): WalletSingleCurrencyState {
+        return copy(
+            pullToRefreshConfig = updatePullToRefreshConfig(isRefreshing = false),
+            buttons = updateButtons(isRefreshing = false),
+        )
+    }
+
+    private fun WalletMultiCurrencyState.updateTokenListState(isRefreshing: Boolean): WalletTokensListState {
+        return when (val listState = tokensListState) {
             is WalletTokensListState.Content -> {
-                WalletTokensListState.Loading(
-                    items = tokensListState.items
-                        .filterIsInstance<TokensListItemState.Token>()
-                        .mapToLoadingTokenState(),
-                )
+                when (listState.organizeTokensButton) {
+                    is WalletTokensListState.OrganizeTokensButtonState.Hidden -> listState
+                    is WalletTokensListState.OrganizeTokensButtonState.Visible -> listState.copy(
+                        organizeTokensButton = listState.organizeTokensButton.copy(
+                            isEnabled = !isRefreshing,
+                        ),
+                    )
+                }
             }
-            is WalletTokensListState.Empty -> WalletTokensListState.Loading()
-            is WalletTokensListState.Loading,
             is WalletTokensListState.Locked,
-            -> tokensListState
+            is WalletTokensListState.Loading,
+            is WalletTokensListState.Empty,
+            -> listState
         }
     }
 
-    private fun List<TokensListItemState.Token>.mapToLoadingTokenState(): ImmutableList<TokensListItemState.Token> {
-        return this
-            .map { TokensListItemState.Token(state = TokenItemState.Loading(id = it.state.id)) }
-            .toImmutableList()
-    }
+    private fun WalletSingleCurrencyState.updateButtons(isRefreshing: Boolean): PersistentList<WalletManageButton> {
+        val isButtonsEnabled = !isRefreshing
 
-    private fun ImmutableList<WalletManageButton>.mapToDisabledButton(): ImmutableList<WalletManageButton> {
-        return this
-            .mapNotNull { button ->
+        return buttons.mutate {
+            it.mapNotNull { button ->
                 when (button) {
-                    is WalletManageButton.Buy -> button.copy(enabled = false)
-                    is WalletManageButton.Send -> button.copy(enabled = false)
+                    is WalletManageButton.Buy -> button.copy(enabled = isButtonsEnabled)
+                    is WalletManageButton.Send -> button.copy(enabled = isButtonsEnabled)
+                    is WalletManageButton.Sell -> button.copy(enabled = isButtonsEnabled)
                     is WalletManageButton.Receive -> button
-                    is WalletManageButton.Sell -> button.copy(enabled = false)
                     is WalletManageButton.Swap -> null
                 }
             }
-            .toImmutableList()
+        }
     }
 
-    private fun WalletSingleCurrencyState.Content.createTxHistoryState(): TxHistoryState {
-        if (txHistoryState is TxHistoryState.Content) {
-            txHistoryState.contentItems.update {
-                TxHistoryState.getDefaultLoadingTransactions(onExploreClick = clickIntents::onExploreClick)
-            }
-        }
-
-        return txHistoryState
+    private fun WalletState.ContentState.updatePullToRefreshConfig(isRefreshing: Boolean): WalletPullToRefreshConfig {
+        return pullToRefreshConfig.copy(isRefreshing = isRefreshing)
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletRenameStateConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletRenameStateConverter.kt
new file mode 100644
index 0000000000..946afa55df
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletRenameStateConverter.kt
@@ -0,0 +1,33 @@
+package com.tangem.feature.wallet.presentation.wallet.state.factory
+
+import com.tangem.common.Provider
+import com.tangem.feature.wallet.presentation.wallet.state.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletsListConfig
+import com.tangem.utils.converter.Converter
+import kotlinx.collections.immutable.toImmutableList
+
+internal class WalletRenameStateConverter(
+    private val currentStateProvider: Provider<WalletState>,
+) : Converter<String, WalletState> {
+
+    override fun convert(value: String): WalletState {
+        return when (val state = currentStateProvider()) {
+            is WalletState.ContentState -> {
+                state.copySealed(
+                    walletsListConfig = state.walletsListConfig.renameSelectedWallet(name = value),
+                )
+            }
+            is WalletState.Initial -> state
+        }
+    }
+
+    private fun WalletsListConfig.renameSelectedWallet(name: String): WalletsListConfig {
+        return copy(
+            wallets = wallets
+                .mapIndexed { index, walletCard ->
+                    if (index == selectedWalletIndex) walletCard.copySealed(title = name) else walletCard
+                }
+                .toImmutableList(),
+        )
+    }
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletSingleCurrencyLoadedBalanceConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletSingleCurrencyLoadedBalanceConverter.kt
index 6acdd08c82..a44b929150 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletSingleCurrencyLoadedBalanceConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletSingleCurrencyLoadedBalanceConverter.kt
@@ -3,66 +3,74 @@ package com.tangem.feature.wallet.presentation.wallet.state.factory
 import arrow.core.Either
 import com.tangem.common.Provider
 import com.tangem.core.ui.components.marketprice.MarketPriceBlockState
-import com.tangem.core.ui.components.marketprice.PriceChangeConfig
+import com.tangem.core.ui.components.marketprice.PriceChangeState
+import com.tangem.core.ui.components.marketprice.PriceChangeType
 import com.tangem.core.ui.utils.BigDecimalFormatter
 import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.common.CardTypesResolver
 import com.tangem.domain.tokens.error.CurrencyStatusError
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletAdditionalInfoFactory
+import com.tangem.feature.wallet.presentation.wallet.domain.getCardsCount
+import com.tangem.feature.wallet.presentation.wallet.state.WalletMultiCurrencyState
 import com.tangem.feature.wallet.presentation.wallet.state.WalletSingleCurrencyState
 import com.tangem.feature.wallet.presentation.wallet.state.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletCardState
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletsListConfig
-import com.tangem.feature.wallet.presentation.wallet.state.factory.WalletSingleCurrencyLoadedBalanceConverter.SingleCurrencyLoadedBalanceModel
+import com.tangem.feature.wallet.presentation.wallet.utils.CurrencyStatusErrorConverter
 import com.tangem.utils.converter.Converter
 import kotlinx.collections.immutable.toPersistentList
 import java.math.BigDecimal
 
 internal class WalletSingleCurrencyLoadedBalanceConverter(
     private val currentStateProvider: Provider<WalletState>,
-    private val cardTypeResolverProvider: Provider<CardTypesResolver>,
     private val appCurrencyProvider: Provider<AppCurrency>,
     private val currentWalletProvider: Provider<UserWallet>,
-) : Converter<SingleCurrencyLoadedBalanceModel, WalletSingleCurrencyState.Content> {
+    private val currencyStatusErrorConverter: CurrencyStatusErrorConverter,
+) : Converter<Either<CurrencyStatusError, CryptoCurrencyStatus>, WalletState> {
 
-    override fun convert(value: SingleCurrencyLoadedBalanceModel): WalletSingleCurrencyState.Content {
-        return value.cryptoCurrencyEither.fold(
-            ifLeft = { convertError() },
-            ifRight = { convertContent(it, value.isRefreshing) },
+    override fun convert(value: Either<CurrencyStatusError, CryptoCurrencyStatus>): WalletState {
+        return value.fold(
+            ifLeft = currencyStatusErrorConverter::convert,
+            ifRight = ::convertContent,
         )
     }
 
-    private fun convertError(): WalletSingleCurrencyState.Content {
-        return requireNotNull(currentStateProvider() as? WalletSingleCurrencyState.Content)
-    }
+    private fun convertContent(status: CryptoCurrencyStatus): WalletState {
+        return when (val state = currentStateProvider()) {
+            is WalletSingleCurrencyState.Content -> {
+                val currencyName = state.marketPriceBlockState.currencySymbol
 
-    private fun convertContent(
-        status: CryptoCurrencyStatus,
-        isRefreshing: Boolean,
-    ): WalletSingleCurrencyState.Content {
-        val state = requireNotNull(currentStateProvider() as? WalletSingleCurrencyState.Content)
-        val currencyName = state.marketPriceBlockState.currencyName
-        return state.copy(
-            walletsListConfig = getUpdatedSelectedWallet(status = status.value, state = state),
-            pullToRefreshConfig = if (isRefreshing) {
-                state.pullToRefreshConfig.copy(isRefreshing = status.value is CryptoCurrencyStatus.Loading)
-            } else {
-                state.pullToRefreshConfig
-            },
-            marketPriceBlockState = getMarketPriceState(status = status.value, currencyName = currencyName),
-        )
+                state.copy(
+                    walletsListConfig = getUpdatedSelectedWallet(status = status.value, state = state),
+                    marketPriceBlockState = getMarketPriceState(status = status.value, currencyName = currencyName),
+                )
+            }
+            is WalletMultiCurrencyState.Content,
+            is WalletMultiCurrencyState.Locked,
+            is WalletSingleCurrencyState.Locked,
+            is WalletState.Initial,
+            -> state
+        }
     }
 
     private fun getMarketPriceState(status: CryptoCurrencyStatus.Status, currencyName: String): MarketPriceBlockState {
         return when (status) {
             is CryptoCurrencyStatus.NoQuote,
             is CryptoCurrencyStatus.Loaded,
+            is CryptoCurrencyStatus.NoAmount,
             -> MarketPriceBlockState.Content(
-                currencyName = currencyName,
+                currencySymbol = currencyName,
                 price = formatPrice(status, appCurrencyProvider()),
-                priceChangeConfig = PriceChangeConfig(
+                priceChangeConfig = PriceChangeState.Content(
+                    valueInPercent = formatPriceChange(status),
+                    type = getPriceChangeType(status),
+                ),
+            )
+            is CryptoCurrencyStatus.NoAccount -> MarketPriceBlockState.Content(
+                currencySymbol = currencyName,
+                price = formatPrice(status, appCurrencyProvider()),
+                priceChangeConfig = PriceChangeState.Content(
                     valueInPercent = formatPriceChange(status),
                     type = getPriceChangeType(status),
                 ),
@@ -70,7 +78,6 @@ internal class WalletSingleCurrencyLoadedBalanceConverter(
             is CryptoCurrencyStatus.Loading -> MarketPriceBlockState.Loading(currencyName)
             is CryptoCurrencyStatus.Custom,
             is CryptoCurrencyStatus.MissedDerivation,
-            is CryptoCurrencyStatus.NoAccount,
             is CryptoCurrencyStatus.Unreachable,
             -> MarketPriceBlockState.Error(currencyName)
         }
@@ -85,12 +92,13 @@ internal class WalletSingleCurrencyLoadedBalanceConverter(
         val updatedWallet = when (status) {
             is CryptoCurrencyStatus.NoQuote,
             is CryptoCurrencyStatus.Loaded,
+            is CryptoCurrencyStatus.NoAccount,
+            is CryptoCurrencyStatus.NoAmount,
             -> {
                 WalletCardState.Content(
                     id = selectedWallet.id,
                     title = selectedWallet.title,
                     additionalInfo = WalletAdditionalInfoFactory.resolve(
-                        cardTypesResolver = cardTypeResolverProvider(),
                         wallet = currentWalletProvider(),
                         currencyAmount = status.amount,
                     ),
@@ -98,6 +106,7 @@ internal class WalletSingleCurrencyLoadedBalanceConverter(
                     onRenameClick = selectedWallet.onRenameClick,
                     onDeleteClick = selectedWallet.onDeleteClick,
                     balance = formatFiatAmount(status = status, appCurrency = appCurrencyProvider()),
+                    cardCount = currentWalletProvider().getCardsCount(),
                 )
             }
             is CryptoCurrencyStatus.Loading -> {
@@ -110,7 +119,6 @@ internal class WalletSingleCurrencyLoadedBalanceConverter(
                 )
             }
             is CryptoCurrencyStatus.MissedDerivation,
-            is CryptoCurrencyStatus.NoAccount,
             is CryptoCurrencyStatus.Custom,
             is CryptoCurrencyStatus.Unreachable,
             -> {
@@ -130,14 +138,10 @@ internal class WalletSingleCurrencyLoadedBalanceConverter(
         )
     }
 
-    private fun getPriceChangeType(status: CryptoCurrencyStatus.Status): PriceChangeConfig.Type {
-        val priceChange = status.priceChange ?: return PriceChangeConfig.Type.DOWN
+    private fun getPriceChangeType(status: CryptoCurrencyStatus.Status): PriceChangeType {
+        val priceChange = status.priceChange ?: return PriceChangeType.DOWN
 
-        return if (priceChange > BigDecimal.ZERO) {
-            PriceChangeConfig.Type.UP
-        } else {
-            PriceChangeConfig.Type.DOWN
-        }
+        return if (priceChange > BigDecimal.ZERO) PriceChangeType.UP else PriceChangeType.DOWN
     }
 
     private fun formatPriceChange(status: CryptoCurrencyStatus.Status): String {
@@ -168,9 +172,4 @@ internal class WalletSingleCurrencyLoadedBalanceConverter(
             fiatCurrencySymbol = appCurrency.symbol,
         )
     }
-
-    data class SingleCurrencyLoadedBalanceModel(
-        val cryptoCurrencyEither: Either<CurrencyStatusError, CryptoCurrencyStatus>,
-        val isRefreshing: Boolean,
-    )
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletSkeletonStateConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletSkeletonStateConverter.kt
index 15e42f3283..974d4c6aad 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletSkeletonStateConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletSkeletonStateConverter.kt
@@ -1,10 +1,12 @@
 package com.tangem.feature.wallet.presentation.wallet.state.factory
 
+import androidx.annotation.DrawableRes
 import com.tangem.common.Provider
 import com.tangem.core.ui.components.marketprice.MarketPriceBlockState
 import com.tangem.core.ui.components.transactions.state.TxHistoryState
 import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletAdditionalInfoFactory
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletImageResolver
 import com.tangem.feature.wallet.presentation.wallet.state.WalletMultiCurrencyState
@@ -14,7 +16,7 @@ import com.tangem.feature.wallet.presentation.wallet.state.components.*
 import com.tangem.feature.wallet.presentation.wallet.state.factory.WalletSkeletonStateConverter.SkeletonModel
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.WalletClickIntents
 import com.tangem.utils.converter.Converter
-import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -29,16 +31,19 @@ import kotlinx.coroutines.flow.MutableStateFlow
  */
 internal class WalletSkeletonStateConverter(
     private val currentStateProvider: Provider<WalletState>,
+    private val isBalanceHiddenProvider: Provider<Boolean>,
     private val clickIntents: WalletClickIntents,
 ) : Converter<SkeletonModel, WalletState.ContentState> {
 
     override fun convert(value: SkeletonModel): WalletState.ContentState {
-        val cardTypeResolver = value.wallets[value.selectedWalletIndex].scanResponse.cardTypesResolver
+        val selectedWallet = value.wallets[value.selectedWalletIndex]
 
-        return if (cardTypeResolver.isMultiwalletAllowed()) {
+        val isSingleWalletWithToken = !selectedWallet.isMultiCurrency &&
+            selectedWallet.scanResponse.walletData?.token != null
+        return if (selectedWallet.isMultiCurrency || isSingleWalletWithToken) {
             createMultiCurrencyState(value = value)
         } else {
-            createSingleCurrencyState(value = value, currencyName = cardTypeResolver.getBlockchain().currency)
+            createSingleCurrencyState(value = value, currencyName = selectedWallet.getPrimaryCurrencyName())
         }
     }
 
@@ -51,8 +56,8 @@ internal class WalletSkeletonStateConverter(
             tokensListState = WalletTokensListState.Loading(),
             notifications = persistentListOf(),
             bottomSheetConfig = null,
-            tokenActionsBottomSheet = null,
             onManageTokensClick = clickIntents::onManageTokensClick,
+            isBalanceHidden = isBalanceHiddenProvider(),
         )
     }
 
@@ -65,70 +70,81 @@ internal class WalletSkeletonStateConverter(
             notifications = persistentListOf(),
             bottomSheetConfig = null,
             buttons = createButtons(),
-            marketPriceBlockState = MarketPriceBlockState.Loading(currencyName = currencyName),
+            marketPriceBlockState = MarketPriceBlockState.Loading(currencySymbol = currencyName),
             txHistoryState = TxHistoryState.Content(
                 contentItems = MutableStateFlow(
                     value = TxHistoryState.getDefaultLoadingTransactions(clickIntents::onExploreClick),
                 ),
             ),
+            isBalanceHidden = isBalanceHiddenProvider(),
         )
     }
 
+    private fun UserWallet.getPrimaryCurrencyName(): String {
+        return scanResponse.cardTypesResolver.getBlockchain().currency
+    }
+
     private fun createTopBarConfig(): WalletTopBarConfig {
-        return WalletTopBarConfig(
-            onScanCardClick = clickIntents::onScanCardClick,
-            onMoreClick = clickIntents::onDetailsClick,
-        )
+        return WalletTopBarConfig(onDetailsClick = clickIntents::onDetailsClick)
     }
 
     private fun createWalletsListConfig(value: SkeletonModel): WalletsListConfig {
         return WalletsListConfig(
             selectedWalletIndex = value.selectedWalletIndex,
-            wallets = value.wallets.map(::createWalletState).toImmutableList(),
+            wallets = value.wallets.map(::createWalletCardState).toImmutableList(),
             onWalletChange = clickIntents::onWalletChange,
         )
     }
 
-    private fun createWalletState(wallet: UserWallet): WalletCardState {
-        val state = currentStateProvider()
-
-        // If it isn't first initialization (example, when user unlocks wallet)
-        return if (state is WalletState.ContentState) {
-            val initializedWallet = state.walletsListConfig.wallets.first { it.id == wallet.walletId }
-
-            // If wallet is initialized, return it, otherwise return loading state
-            if (initializedWallet !is WalletCardState.Loading) {
-                initializedWallet.copySealed(title = wallet.name)
-            } else {
-                createWalletLoadingState(wallet)
-            }
-        } else {
-            createWalletLoadingState(wallet)
-        }
+    /**
+     * Create wallet card state by [wallet].
+     * If current wallet card state is initialized, then method returns it.
+     * Otherwise, returns loading wallet card state.
+     */
+    private fun createWalletCardState(wallet: UserWallet): WalletCardState {
+        return currentStateProvider().getInitializedWalletCardState(wallet.walletId) ?: wallet.mapToWalletCardState()
     }
 
-    private fun createWalletLoadingState(wallet: UserWallet): WalletCardState {
-        val cardTypeResolver = wallet.scanResponse.cardTypesResolver
+    private fun WalletState.getInitializedWalletCardState(walledId: UserWalletId): WalletCardState? {
+        return (this as? WalletState.ContentState)?.walletsListConfig?.wallets?.firstOrNull { it.id == walledId }
+    }
 
-        return WalletCardState.Loading(
-            id = wallet.walletId,
-            title = wallet.name,
-            additionalInfo = if (cardTypeResolver.isMultiwalletAllowed()) {
-                WalletAdditionalInfoFactory.resolve(cardTypesResolver = cardTypeResolver, wallet = wallet)
-            } else {
-                null
-            },
-            imageResId = WalletImageResolver.resolve(cardTypesResolver = cardTypeResolver),
+    private fun UserWallet.mapToWalletCardState(): WalletCardState {
+        return if (isLocked) mapToLockedWalletCardState() else mapToLoadingWalletCardState()
+    }
+
+    private fun UserWallet.mapToLockedWalletCardState(): WalletCardState {
+        return WalletCardState.LockedContent(
+            id = walletId,
+            title = name,
+            additionalInfo = WalletAdditionalInfoFactory.resolve(wallet = this),
+            imageResId = createImageResId(),
             onRenameClick = clickIntents::onRenameClick,
-            onDeleteClick = clickIntents::onDeleteClick,
+            onDeleteClick = clickIntents::onDeleteBeforeConfirmationClick,
         )
     }
 
+    private fun UserWallet.mapToLoadingWalletCardState(): WalletCardState {
+        return WalletCardState.Loading(
+            id = walletId,
+            title = name,
+            additionalInfo = if (isMultiCurrency) WalletAdditionalInfoFactory.resolve(wallet = this) else null,
+            imageResId = createImageResId(),
+            onRenameClick = clickIntents::onRenameClick,
+            onDeleteClick = clickIntents::onDeleteBeforeConfirmationClick,
+        )
+    }
+
+    @DrawableRes
+    private fun UserWallet.createImageResId(): Int? {
+        return WalletImageResolver.resolve(userWallet = this)
+    }
+
     private fun createPullToRefreshConfig(): WalletPullToRefreshConfig {
         return WalletPullToRefreshConfig(isRefreshing = false, onRefresh = clickIntents::onRefreshSwipe)
     }
 
-    private fun createButtons(): ImmutableList<WalletManageButton> {
+    private fun createButtons(): PersistentList<WalletManageButton> {
         return persistentListOf(
             WalletManageButton.Buy(enabled = false, onClick = {}),
             WalletManageButton.Send(enabled = false, onClick = {}),
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletStateFactory.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletStateFactory.kt
index 512d0d0cc0..f06c6dd7f3 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletStateFactory.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletStateFactory.kt
@@ -3,26 +3,29 @@ package com.tangem.feature.wallet.presentation.wallet.state.factory
 import androidx.paging.PagingData
 import arrow.core.Either
 import com.tangem.common.Provider
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfigContent
+import com.tangem.core.ui.event.consumedEvent
+import com.tangem.core.ui.event.triggeredEvent
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.common.CardTypesResolver
 import com.tangem.domain.tokens.error.CurrencyStatusError
 import com.tangem.domain.tokens.error.TokenListError
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
 import com.tangem.domain.tokens.model.TokenActionsState
-import com.tangem.domain.tokens.model.TokenList
 import com.tangem.domain.txhistory.models.TxHistoryItem
 import com.tangem.domain.txhistory.models.TxHistoryListError
 import com.tangem.domain.txhistory.models.TxHistoryStateError
 import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.feature.wallet.presentation.wallet.state.ActionsBottomSheetConfig
-import com.tangem.feature.wallet.presentation.wallet.state.WalletMultiCurrencyState
-import com.tangem.feature.wallet.presentation.wallet.state.WalletSingleCurrencyState
-import com.tangem.feature.wallet.presentation.wallet.state.WalletState
-import com.tangem.feature.wallet.presentation.wallet.state.components.WalletBottomSheetConfig
+import com.tangem.feature.wallet.presentation.wallet.state.*
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletNotification
 import com.tangem.feature.wallet.presentation.wallet.state.factory.txhistory.WalletLoadedTxHistoryConverter
 import com.tangem.feature.wallet.presentation.wallet.state.factory.txhistory.WalletLoadingTxHistoryConverter
+import com.tangem.feature.wallet.presentation.wallet.utils.CurrencyStatusErrorConverter
+import com.tangem.feature.wallet.presentation.wallet.utils.HiddenStateConverter
+import com.tangem.feature.wallet.presentation.wallet.utils.TokenListErrorConverter
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.WalletClickIntents
+import com.tangem.feature.wallet.presentation.wallet.viewmodels.WalletsUpdateActionResolver
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.flow.Flow
 
@@ -32,25 +35,56 @@ import kotlinx.coroutines.flow.Flow
  * @property currentStateProvider            current ui state provider
  * @property currentCardTypeResolverProvider current card type resolver
  * @property currentWalletProvider           current wallet
+ * @property appCurrencyProvider             app currency provider
  * @property clickIntents                    screen click intents
  */
+@Suppress("TooManyFunctions")
 internal class WalletStateFactory(
     private val currentStateProvider: Provider<WalletState>,
     private val currentCardTypeResolverProvider: Provider<CardTypesResolver>,
     private val currentWalletProvider: Provider<UserWallet>,
     private val appCurrencyProvider: Provider<AppCurrency>,
+    private val isBalanceHiddenProvider: Provider<Boolean>,
     private val clickIntents: WalletClickIntents,
 ) {
 
-    private val tokenActionsProvider by lazy { TokenActionsProvider(currentStateProvider = currentStateProvider) }
-    private val skeletonConverter by lazy { WalletSkeletonStateConverter(currentStateProvider, clickIntents) }
+    private val tokenActionsProvider by lazy { TokenActionsProvider(currentWalletProvider, clickIntents) }
 
+    private val skeletonConverter by lazy {
+        WalletSkeletonStateConverter(
+            currentStateProvider = currentStateProvider,
+            isBalanceHiddenProvider = isBalanceHiddenProvider,
+            clickIntents = clickIntents,
+        )
+    }
+
+    private val walletsUnlockStateConverter by lazy { WalletsUnlockStateConverter(currentStateProvider, clickIntents) }
+
+    private val walletRenameStateConverter by lazy { WalletRenameStateConverter(currentStateProvider) }
+
+    private val walletDeleteStateConverter by lazy { WalletDeleteStateConverter(currentStateProvider) }
+
+    private val hiddenStateConverter by lazy { HiddenStateConverter(currentStateProvider) }
+
+    private val walletUpdateCardCountConverter by lazy {
+        WalletUpdateCardCountConverter(
+            currentStateProvider,
+            currentWalletProvider,
+        )
+    }
+
+    private val tokenListErrorConverter by lazy {
+        TokenListErrorConverter(currentStateProvider)
+    }
+    private val currencyStatusErrorConverter by lazy {
+        CurrencyStatusErrorConverter(currentStateProvider)
+    }
     private val loadedTokensListConverter by lazy {
         WalletLoadedTokensListConverter(
             currentStateProvider = currentStateProvider,
-            cardTypeResolverProvider = currentCardTypeResolverProvider,
-            currentWalletProvider = currentWalletProvider,
+            tokenListErrorConverter = tokenListErrorConverter,
             appCurrencyProvider = appCurrencyProvider,
+            currentWalletProvider = currentWalletProvider,
             clickIntents = clickIntents,
         )
     }
@@ -73,27 +107,21 @@ internal class WalletStateFactory(
     private val singleCurrencyLoadedBalanceConverter by lazy {
         WalletSingleCurrencyLoadedBalanceConverter(
             currentStateProvider = currentStateProvider,
-            cardTypeResolverProvider = currentCardTypeResolverProvider,
             appCurrencyProvider = appCurrencyProvider,
             currentWalletProvider = currentWalletProvider,
+            currencyStatusErrorConverter = currencyStatusErrorConverter,
         )
     }
 
     private val lockedConverter by lazy {
         WalletLockedConverter(
             currentStateProvider = currentStateProvider,
-            currentCardTypeResolverProvider = currentCardTypeResolverProvider,
-            currentWalletProvider = currentWalletProvider,
             clickIntents = clickIntents,
         )
     }
 
     private val refreshStateConverter by lazy {
-        WalletRefreshStateConverter(
-            currentStateProvider = currentStateProvider,
-            currentCardTypeResolverProvider = currentCardTypeResolverProvider,
-            clickIntents = clickIntents,
-        )
+        WalletRefreshStateConverter(currentStateProvider)
     }
 
     private val cryptoCurrencyActionsConverter by lazy {
@@ -114,15 +142,31 @@ internal class WalletStateFactory(
         )
     }
 
-    fun getStateByTokensList(tokenListEither: Either<TokenListError, TokenList>, isRefreshing: Boolean): WalletState {
-        return loadedTokensListConverter.convert(
-            value = WalletLoadedTokensListConverter.LoadedTokensListModel(
-                tokenListEither = tokenListEither,
-                isRefreshing = isRefreshing,
-            ),
+    fun getStateWithUpdatedWalletName(name: String): WalletState = walletRenameStateConverter.convert(value = name)
+
+    fun getStateWithUpdatedWalletCardCount(): WalletState = walletUpdateCardCountConverter.convert(Unit)
+
+    fun getUnlockedState(action: WalletsUpdateActionResolver.Action.UnlockWallet): WalletState {
+        return walletsUnlockStateConverter.convert(value = action)
+    }
+
+    fun getStateWithoutDeletedWallet(
+        cacheState: WalletState.ContentState,
+        action: WalletsUpdateActionResolver.Action.DeleteWallet,
+    ): WalletState {
+        return walletDeleteStateConverter.convert(
+            value = WalletDeleteStateConverter.DeleteWalletModel(cacheState = cacheState, action = action),
         )
     }
 
+    fun getStateByTokensList(maybeTokenListWithWallet: Either<TokenListError, TokenListWithWallet>): WalletState {
+        return loadedTokensListConverter.convert(maybeTokenListWithWallet)
+    }
+
+    fun getStateByTokenListError(error: TokenListError): WalletState {
+        return tokenListErrorConverter.convert(error)
+    }
+
     fun getStateByNotifications(notifications: ImmutableList<WalletNotification>): WalletState {
         return when (val state = currentStateProvider()) {
             is WalletMultiCurrencyState.Content -> state.copy(notifications = notifications)
@@ -131,12 +175,14 @@ internal class WalletStateFactory(
         }
     }
 
-    fun getStateAfterContentRefreshing(): WalletState = refreshStateConverter.convert(Unit)
+    fun getRefreshingState(): WalletState = refreshStateConverter.convert(value = true)
 
-    fun getStateWithOpenWalletBottomSheet(content: WalletBottomSheetConfig.BottomSheetContentConfig): WalletState {
+    fun getRefreshedState(): WalletState = refreshStateConverter.convert(value = false)
+
+    fun getStateWithOpenWalletBottomSheet(content: TangemBottomSheetConfigContent): WalletState {
         return when (val state = currentStateProvider() as WalletState.ContentState) {
             is WalletMultiCurrencyState.Content -> state.copy(
-                bottomSheetConfig = WalletBottomSheetConfig(
+                bottomSheetConfig = TangemBottomSheetConfig(
                     isShow = true,
                     onDismissRequest = clickIntents::onDismissBottomSheet,
                     content = content,
@@ -147,7 +193,7 @@ internal class WalletStateFactory(
                 onBottomSheetDismiss = clickIntents::onDismissBottomSheet,
             )
             is WalletSingleCurrencyState.Content -> state.copy(
-                bottomSheetConfig = WalletBottomSheetConfig(
+                bottomSheetConfig = TangemBottomSheetConfig(
                     isShow = true,
                     onDismissRequest = clickIntents::onDismissBottomSheet,
                     content = content,
@@ -173,21 +219,16 @@ internal class WalletStateFactory(
         }
     }
 
-    fun getStateWithTokenActionBottomSheet(tokenId: String): WalletState {
-        return when (val state = currentStateProvider() as WalletState.ContentState) {
-            is WalletMultiCurrencyState.Content -> state.copy(
-                tokenActionsBottomSheet = ActionsBottomSheetConfig(
-                    isShow = true,
-                    actions = tokenActionsProvider.provideActions(tokenId = tokenId),
-                    onDismissRequest = clickIntents::onDismissActionsBottomSheet,
-                ),
-            )
-            else -> state
-        }
+    fun getStateWithTokenActionBottomSheet(tokenActions: TokenActionsState): WalletState {
+        return getStateWithOpenWalletBottomSheet(
+            content = ActionsBottomSheetConfig(actions = tokenActionsProvider.provideActions(tokenActions)),
+        )
     }
 
     fun getLoadingTxHistoryState(itemsCountEither: Either<TxHistoryStateError, Int>): WalletState {
-        return loadingTransactionsStateConverter.convert(value = itemsCountEither)
+        return loadingTransactionsStateConverter.convert(
+            WalletLoadingTxHistoryConverter.WalletLoadingTxHistoryModel(historyLoadingState = itemsCountEither),
+        )
     }
 
     fun getLoadedTxHistoryState(
@@ -199,18 +240,41 @@ internal class WalletStateFactory(
     fun getLockedState(): WalletState = lockedConverter.convert(Unit)
 
     fun getSingleCurrencyLoadedBalanceState(
-        cryptoCurrencyEither: Either<CurrencyStatusError, CryptoCurrencyStatus>,
-        isRefreshing: Boolean,
+        maybeCryptoCurrencyStatus: Either<CurrencyStatusError, CryptoCurrencyStatus>,
     ): WalletState {
-        return singleCurrencyLoadedBalanceConverter.convert(
-            value = WalletSingleCurrencyLoadedBalanceConverter.SingleCurrencyLoadedBalanceModel(
-                cryptoCurrencyEither = cryptoCurrencyEither,
-                isRefreshing = isRefreshing,
-            ),
-        )
+        return singleCurrencyLoadedBalanceConverter.convert(maybeCryptoCurrencyStatus)
     }
 
-    fun getSingleCurrencyManageButtonsState(actions: List<TokenActionsState.ActionState>): WalletState {
-        return cryptoCurrencyActionsConverter.convert(value = actions)
+    fun getSingleCurrencyManageButtonsState(actionsState: TokenActionsState): WalletState {
+        return cryptoCurrencyActionsConverter.convert(value = actionsState)
+    }
+
+    fun getStateByCurrencyStatusError(error: CurrencyStatusError): WalletState {
+        return currencyStatusErrorConverter.convert(error)
+    }
+
+    fun getHiddenBalanceState(isBalanceHidden: Boolean): WalletState {
+        return hiddenStateConverter.convert(isBalanceHidden)
+    }
+
+    fun getStateAndTriggerEvent(
+        state: WalletState,
+        event: WalletEvent,
+        setUiState: (WalletState) -> Unit,
+    ): WalletState {
+        return when (state) {
+            is WalletState.ContentState -> state.copySealed(
+                event = triggeredEvent(
+                    data = event,
+                    onConsume = {
+                        val currentState = currentStateProvider()
+                        if (currentState is WalletState.ContentState) {
+                            setUiState(currentState.copySealed(event = consumedEvent()))
+                        }
+                    },
+                ),
+            )
+            is WalletState.Initial -> state
+        }
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletUpdateCardCountConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletUpdateCardCountConverter.kt
new file mode 100644
index 0000000000..59a45b0f28
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletUpdateCardCountConverter.kt
@@ -0,0 +1,50 @@
+package com.tangem.feature.wallet.presentation.wallet.state.factory
+
+import com.tangem.common.Provider
+import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.feature.wallet.presentation.wallet.domain.WalletAdditionalInfoFactory
+import com.tangem.feature.wallet.presentation.wallet.domain.getCardsCount
+import com.tangem.feature.wallet.presentation.wallet.state.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletCardState
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletsListConfig
+import com.tangem.utils.converter.Converter
+import kotlinx.collections.immutable.toImmutableList
+
+internal class WalletUpdateCardCountConverter(
+    private val currentStateProvider: Provider<WalletState>,
+    private val currentWalletProvider: Provider<UserWallet>,
+) : Converter<Unit, WalletState> {
+
+    override fun convert(value: Unit): WalletState {
+        return when (val state = currentStateProvider()) {
+            is WalletState.ContentState -> {
+                state.copySealed(
+                    walletsListConfig = state.walletsListConfig.refreshCardCount(),
+                )
+            }
+            is WalletState.Initial -> state
+        }
+    }
+
+    private fun WalletsListConfig.refreshCardCount(): WalletsListConfig {
+        return copy(
+            wallets = wallets
+                .mapIndexed { index, walletCard ->
+                    if (index == selectedWalletIndex) {
+                        when (walletCard) {
+                            is WalletCardState.Content -> walletCard.copy(
+                                additionalInfo = WalletAdditionalInfoFactory.resolve(
+                                    wallet = currentWalletProvider(),
+                                ),
+                                cardCount = currentWalletProvider().getCardsCount(),
+                            )
+                            else -> walletCard
+                        }
+                    } else {
+                        walletCard
+                    }
+                }
+                .toImmutableList(),
+        )
+    }
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletsUnlockStateConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletsUnlockStateConverter.kt
new file mode 100644
index 0000000000..b6bbef70d2
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/WalletsUnlockStateConverter.kt
@@ -0,0 +1,132 @@
+package com.tangem.feature.wallet.presentation.wallet.state.factory
+
+import com.tangem.common.Provider
+import com.tangem.core.ui.components.marketprice.MarketPriceBlockState
+import com.tangem.core.ui.components.transactions.state.TxHistoryState
+import com.tangem.domain.common.util.cardTypesResolver
+import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.feature.wallet.presentation.wallet.domain.WalletImageResolver
+import com.tangem.feature.wallet.presentation.wallet.state.WalletMultiCurrencyState
+import com.tangem.feature.wallet.presentation.wallet.state.WalletSingleCurrencyState
+import com.tangem.feature.wallet.presentation.wallet.state.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state.components.*
+import com.tangem.feature.wallet.presentation.wallet.viewmodels.WalletClickIntents
+import com.tangem.utils.converter.Converter
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.flow.MutableStateFlow
+import com.tangem.feature.wallet.presentation.wallet.viewmodels.WalletsUpdateActionResolver.Action.UnlockWallet as UnlockWalletAction
+
+/**
+ * Converter that responds on wallets unlocking action. Returns [WalletState] with unlocked wallets.
+ *
+ * @property currentStateProvider current ui state provider
+ * @property clickIntents         screen click intents
+ *
+[REDACTED_AUTHOR]
+ */
+internal class WalletsUnlockStateConverter(
+    private val currentStateProvider: Provider<WalletState>,
+    private val clickIntents: WalletClickIntents,
+) : Converter<UnlockWalletAction, WalletState> {
+
+    override fun convert(value: UnlockWalletAction): WalletState {
+        return when (val state = currentStateProvider()) {
+            is WalletMultiCurrencyState.Locked -> state.toMultiCurrencyContentState(value)
+            is WalletSingleCurrencyState.Locked -> state.toSingleCurrencyContentState(value)
+            is WalletState.Initial,
+            is WalletMultiCurrencyState.Content,
+            is WalletSingleCurrencyState.Content,
+            -> state
+        }
+    }
+
+    private fun WalletMultiCurrencyState.Locked.toMultiCurrencyContentState(action: UnlockWalletAction): WalletState {
+        return WalletMultiCurrencyState.Content(
+            onBackClick = onBackClick,
+            topBarConfig = topBarConfig.updateCallback(),
+            walletsListConfig = walletsListConfig.unlockWallets(action),
+            pullToRefreshConfig = pullToRefreshConfig.stopRefreshing(),
+            tokensListState = WalletTokensListState.Loading(),
+            notifications = persistentListOf(),
+            bottomSheetConfig = null,
+            onManageTokensClick = clickIntents::onManageTokensClick,
+            isBalanceHidden = isBalanceHidden,
+        )
+    }
+
+    private fun WalletSingleCurrencyState.Locked.toSingleCurrencyContentState(action: UnlockWalletAction): WalletState {
+        return WalletSingleCurrencyState.Content(
+            onBackClick = onBackClick,
+            topBarConfig = topBarConfig.updateCallback(),
+            walletsListConfig = walletsListConfig.unlockWallets(action),
+            pullToRefreshConfig = pullToRefreshConfig.stopRefreshing(),
+            notifications = persistentListOf(),
+            bottomSheetConfig = null,
+            buttons = buttons,
+            marketPriceBlockState = MarketPriceBlockState.Loading(
+                currencySymbol = action.selectedWallet.getPrimaryCurrencyName(),
+            ),
+            txHistoryState = TxHistoryState.Content(
+                contentItems = MutableStateFlow(
+                    value = TxHistoryState.getDefaultLoadingTransactions(clickIntents::onExploreClick),
+                ),
+            ),
+            isBalanceHidden = isBalanceHidden,
+        )
+    }
+
+    private fun WalletTopBarConfig.updateCallback(): WalletTopBarConfig {
+        return copy(onDetailsClick = clickIntents::onDetailsClick)
+    }
+
+    private fun WalletsListConfig.unlockWallets(action: UnlockWalletAction): WalletsListConfig {
+        return this.copy(
+            selectedWalletIndex = action.selectedWalletIndex,
+            wallets = wallets.unlockWallets(action),
+        )
+    }
+
+    private fun List<WalletCardState>.unlockWallets(action: UnlockWalletAction): ImmutableList<WalletCardState> {
+        return this
+            .map { prevWallet ->
+                if (prevWallet is WalletCardState.LockedContent && action.isUnlockedWallet(prevWallet.id)) {
+                    prevWallet.mapToLoadingWalletCardState(
+                        userWallet = action.getUnlockWallet(prevWallet.id),
+                    )
+                } else {
+                    prevWallet
+                }
+            }
+            .toImmutableList()
+    }
+
+    private fun UnlockWalletAction.isUnlockedWallet(walletId: UserWalletId): Boolean {
+        return unlockedWallets.any { it.walletId == walletId }
+    }
+
+    private fun UnlockWalletAction.getUnlockWallet(walletId: UserWalletId): UserWallet {
+        return unlockedWallets.firstOrNull { it.walletId == walletId }
+            ?: error("Unlocked wallet with id $walletId not found")
+    }
+
+    private fun WalletCardState.mapToLoadingWalletCardState(userWallet: UserWallet): WalletCardState {
+        return WalletCardState.Loading(
+            id = id,
+            title = title,
+            imageResId = WalletImageResolver.resolve(userWallet = userWallet),
+            onRenameClick = onRenameClick,
+            onDeleteClick = onDeleteClick,
+        )
+    }
+
+    private fun WalletPullToRefreshConfig.stopRefreshing(): WalletPullToRefreshConfig {
+        return copy(isRefreshing = false)
+    }
+
+    private fun UserWallet.getPrimaryCurrencyName(): String {
+        return scanResponse.cardTypesResolver.getBlockchain().currency
+    }
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletLoadedTxHistoryConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletLoadedTxHistoryConverter.kt
index e585ac71f5..202fcc3ae5 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletLoadedTxHistoryConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletLoadedTxHistoryConverter.kt
@@ -7,6 +7,7 @@ import com.tangem.core.ui.components.transactions.state.TxHistoryState
 import com.tangem.domain.common.CardTypesResolver
 import com.tangem.domain.txhistory.models.TxHistoryItem
 import com.tangem.domain.txhistory.models.TxHistoryListError
+import com.tangem.feature.wallet.presentation.wallet.state.WalletMultiCurrencyState
 import com.tangem.feature.wallet.presentation.wallet.state.WalletSingleCurrencyState
 import com.tangem.feature.wallet.presentation.wallet.state.WalletState
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.WalletClickIntents
@@ -41,18 +42,36 @@ internal class WalletLoadedTxHistoryConverter(
     }
 
     private fun convertError(error: TxHistoryListError): WalletState {
-        return requireNotNull(currentStateProvider() as? WalletSingleCurrencyState.Content).copy(
-            txHistoryState = when (error) {
-                is TxHistoryListError.DataError -> {
-                    TxHistoryState.Error(onReloadClick = clickIntents::onReloadClick)
-                }
-            },
-        )
+        return when (val state = currentStateProvider()) {
+            is WalletSingleCurrencyState.Content -> {
+                state.copy(
+                    txHistoryState = when (error) {
+                        is TxHistoryListError.DataError -> {
+                            TxHistoryState.Error(onReloadClick = clickIntents::onReloadClick)
+                        }
+                    },
+                )
+            }
+            is WalletMultiCurrencyState.Content,
+            is WalletMultiCurrencyState.Locked,
+            is WalletSingleCurrencyState.Locked,
+            is WalletState.Initial,
+            -> state
+        }
     }
 
     private fun convert(items: Flow<PagingData<TxHistoryItem>>): WalletState {
-        return requireNotNull(currentStateProvider() as? WalletSingleCurrencyState.Content).copy(
-            txHistoryState = walletTxHistoryItemFlowConverter.convert(value = items),
-        )
+        return when (val state = currentStateProvider()) {
+            is WalletSingleCurrencyState.Content -> {
+                return state.copy(
+                    txHistoryState = walletTxHistoryItemFlowConverter.convert(value = items) ?: state.txHistoryState,
+                )
+            }
+            is WalletMultiCurrencyState.Content,
+            is WalletMultiCurrencyState.Locked,
+            is WalletSingleCurrencyState.Locked,
+            is WalletState.Initial,
+            -> state
+        }
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletLoadingTxHistoryConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletLoadingTxHistoryConverter.kt
index b8b5ab1a7d..f0db791f6f 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletLoadingTxHistoryConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletLoadingTxHistoryConverter.kt
@@ -2,6 +2,7 @@ package com.tangem.feature.wallet.presentation.wallet.state.factory.txhistory
 
 import androidx.paging.PagingData
 import arrow.core.Either
+import com.tangem.common.Converter
 import com.tangem.common.Provider
 import com.tangem.core.ui.components.transactions.state.TransactionState
 import com.tangem.core.ui.components.transactions.state.TxHistoryState.*
@@ -9,24 +10,27 @@ import com.tangem.domain.txhistory.models.TxHistoryStateError
 import com.tangem.feature.wallet.presentation.wallet.state.WalletSingleCurrencyState
 import com.tangem.feature.wallet.presentation.wallet.state.WalletState
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.WalletClickIntents
-import com.tangem.utils.converter.Converter
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update
 
 /**
  * Converter from loading tx history state to [WalletSingleCurrencyState.Content]
  *
- * @property currentStateProvider            current state provider
- * @property clickIntents                    screen click intents
+ * @property currentStateProvider                    current state provider
+ * @property clickIntents                            screen click intents
  *
 [REDACTED_AUTHOR]
  */
 internal class WalletLoadingTxHistoryConverter(
     private val currentStateProvider: Provider<WalletState>,
     private val clickIntents: WalletClickIntents,
-) : Converter<Either<TxHistoryStateError, Int>, WalletState> {
+) : Converter<WalletLoadingTxHistoryConverter.WalletLoadingTxHistoryModel, WalletState> {
 
-    override fun convert(value: Either<TxHistoryStateError, Int>): WalletState {
-        return value.fold(ifLeft = ::convertError, ifRight = ::convert)
+    override fun convert(value: WalletLoadingTxHistoryModel): WalletState {
+        return value.historyLoadingState.fold(
+            ifLeft = ::convertError,
+            ifRight = ::convertRight,
+        )
     }
 
     private fun convertError(error: TxHistoryStateError): WalletState {
@@ -35,12 +39,8 @@ internal class WalletLoadingTxHistoryConverter(
         return if (state is WalletSingleCurrencyState.Content) {
             state.copy(
                 txHistoryState = when (error) {
-                    is TxHistoryStateError.EmptyTxHistories -> {
-                        Empty(onBuyClick = clickIntents::onBuyClick)
-                    }
-                    is TxHistoryStateError.DataError -> {
-                        Error(onReloadClick = clickIntents::onReloadClick)
-                    }
+                    is TxHistoryStateError.EmptyTxHistories -> Empty
+                    is TxHistoryStateError.DataError -> Error(onReloadClick = clickIntents::onReloadClick)
                     is TxHistoryStateError.TxHistoryNotImplemented -> {
                         NotSupported(onExploreClick = clickIntents::onExploreClick)
                     }
@@ -51,24 +51,32 @@ internal class WalletLoadingTxHistoryConverter(
         }
     }
 
-    private fun convert(value: Int): WalletSingleCurrencyState.Content {
-        val state = requireNotNull(currentStateProvider() as? WalletSingleCurrencyState.Content)
-        val txHistoryContent = requireNotNull(state.txHistoryState as? Content)
-
-        txHistoryContent.contentItems.update {
-            PagingData.from(
-                data = listOf(TxHistoryItemState.Title(onExploreClick = clickIntents::onExploreClick)) +
-                    MutableList(
-                        size = value,
-                        init = {
-                            TxHistoryItemState.Transaction(
-                                state = TransactionState.Loading(it.toString()),
-                            )
-                        },
-                    ),
+    private fun convertRight(value: Int): WalletState {
+        val state = currentStateProvider()
+        val singleCurrencyContentState = state as? WalletSingleCurrencyState.Content ?: return state
+        return if (singleCurrencyContentState.txHistoryState is Content) {
+            singleCurrencyContentState.txHistoryState.contentItems.update {
+                PagingData.from(data = createLoadingItems(value))
+            }
+            state
+        } else {
+            val txHistoryContent = Content(
+                contentItems = MutableStateFlow(
+                    value = PagingData.from(data = createLoadingItems(value)),
+                ),
             )
+            state.copy(txHistoryState = txHistoryContent)
         }
-
-        return state
     }
+
+    private fun createLoadingItems(size: Int): List<TxHistoryItemState> {
+        return buildList {
+            add(TxHistoryItemState.Title(onExploreClick = clickIntents::onExploreClick))
+            (1..size).forEach {
+                add(TxHistoryItemState.Transaction(state = TransactionState.Loading(it.toString())))
+            }
+        }
+    }
+
+    data class WalletLoadingTxHistoryModel(val historyLoadingState: Either<TxHistoryStateError, Int>)
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletTxHistoryItemFlowConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletTxHistoryItemFlowConverter.kt
index 5e4a05132f..e8e5b65758 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletTxHistoryItemFlowConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletTxHistoryItemFlowConverter.kt
@@ -7,28 +7,19 @@ import com.tangem.common.Provider
 import com.tangem.core.ui.components.transactions.state.TransactionState
 import com.tangem.core.ui.components.transactions.state.TxHistoryState
 import com.tangem.core.ui.components.transactions.state.TxHistoryState.TxHistoryItemState
-import com.tangem.core.ui.extensions.TextReference
-import com.tangem.core.ui.utils.BigDecimalFormatter
+import com.tangem.core.ui.utils.DateTimeFormatters
 import com.tangem.domain.txhistory.models.TxHistoryItem
-import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.wallet.state.WalletSingleCurrencyState
 import com.tangem.feature.wallet.presentation.wallet.state.WalletState
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.WalletClickIntents
 import com.tangem.utils.converter.Converter
 import com.tangem.utils.extensions.isToday
 import com.tangem.utils.extensions.isYesterday
-import com.tangem.utils.toBriefAddressFormat
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.flow.*
 import org.joda.time.DateTime
 import org.joda.time.DateTimeZone
-import org.joda.time.format.DateTimeFormatterBuilder
-import java.math.BigDecimal
-import java.util.Locale
 
 /**
  * Convert from [Flow] of [TxHistoryItem] to [TxHistoryState]
@@ -43,33 +34,20 @@ internal class WalletTxHistoryItemFlowConverter(
     private val currentStateProvider: Provider<WalletState>,
     private val blockchain: Blockchain,
     private val clickIntents: WalletClickIntents,
-) : Converter<Flow<PagingData<TxHistoryItem>>, TxHistoryState> {
+) : Converter<Flow<PagingData<TxHistoryItem>>, TxHistoryState?> {
 
-    /** Example, 2 Aug, 2023 */
-    private val dateFormatter by lazy {
-        DateTimeFormatterBuilder()
-            .appendDayOfMonth(1)
-            .appendLiteral(' ')
-            .appendMonthOfYearShortText()
-            .appendLiteral(", ")
-            .appendYear(4, 4)
-            .toFormatter()
-            .withLocale(Locale.getDefault())
+    private val txHistoryItemConverter by lazy {
+        WalletTxHistoryTransactionStateConverter(
+            symbol = blockchain.currency,
+            decimals = blockchain.decimals(),
+            clickIntents = clickIntents,
+        )
     }
 
-    /** Example, 13:35 */
-    private val timeFormatter by lazy {
-        DateTimeFormatterBuilder()
-            .appendHourOfDay(1)
-            .appendLiteral(':')
-            .appendMinuteOfHour(2)
-            .toFormatter()
-            .withLocale(Locale.getDefault())
-    }
-
-    override fun convert(value: Flow<PagingData<TxHistoryItem>>): TxHistoryState {
-        val state = currentStateProvider() as WalletSingleCurrencyState
-        val txHistoryContent = state.txHistoryState as TxHistoryState.Content
+    override fun convert(value: Flow<PagingData<TxHistoryItem>>): TxHistoryState? {
+        val state = currentStateProvider() as? WalletSingleCurrencyState ?: return null
+        val txHistoryContent = state.txHistoryState as? TxHistoryState.Content
+            ?: TxHistoryState.Content(contentItems = MutableStateFlow(PagingData.empty()))
 
         // FIXME: TxHistoryRepository should send loading transactions
         // [REDACTED_JIRA]
@@ -95,68 +73,7 @@ internal class WalletTxHistoryItemFlowConverter(
     }
 
     private fun createTransactionState(item: TxHistoryItem): TransactionState {
-        return when (item.type) {
-            TxHistoryItem.TransactionType.Transfer -> {
-                when (val direction = item.direction) {
-                    is TxHistoryItem.TransactionDirection.Incoming -> {
-                        createIncomingTransferTransaction(item, direction, blockchain)
-                    }
-                    is TxHistoryItem.TransactionDirection.Outgoing -> {
-                        createOutgoingTransferTransaction(item, direction, blockchain)
-                    }
-                }
-            }
-        }
-    }
-
-    private fun createIncomingTransferTransaction(
-        item: TxHistoryItem,
-        direction: TxHistoryItem.TransactionDirection.Incoming,
-        blockchain: Blockchain,
-    ): TransactionState {
-        return when (item.status) {
-            TxHistoryItem.TxStatus.Confirmed -> TransactionState.Receive(
-                txHash = item.txHash,
-                address = direction.extractAddress(),
-                amount = item.amount.toCryptoCurrencyFormat(blockchain = blockchain),
-                timestamp = item.getRawTimestamp(),
-            )
-            TxHistoryItem.TxStatus.Unconfirmed -> TransactionState.Receiving(
-                txHash = item.txHash,
-                address = direction.extractAddress(),
-                amount = item.amount.toCryptoCurrencyFormat(blockchain = blockchain),
-                timestamp = item.getRawTimestamp(),
-            )
-        }
-    }
-
-    private fun createOutgoingTransferTransaction(
-        item: TxHistoryItem,
-        direction: TxHistoryItem.TransactionDirection.Outgoing,
-        blockchain: Blockchain,
-    ): TransactionState {
-        return when (item.status) {
-            TxHistoryItem.TxStatus.Confirmed -> TransactionState.Send(
-                txHash = item.txHash,
-                address = direction.extractAddress(),
-                amount = item.amount.toCryptoCurrencyFormat(blockchain = blockchain),
-                timestamp = item.getRawTimestamp(),
-            )
-            TxHistoryItem.TxStatus.Unconfirmed -> TransactionState.Sending(
-                txHash = item.txHash,
-                address = direction.extractAddress(),
-                amount = item.amount.toCryptoCurrencyFormat(blockchain = blockchain),
-                timestamp = item.getRawTimestamp(),
-            )
-        }
-    }
-
-    private fun BigDecimal.toCryptoCurrencyFormat(blockchain: Blockchain): String {
-        return BigDecimalFormatter.formatCryptoAmount(
-            cryptoAmount = this,
-            cryptoCurrency = blockchain.currency,
-            decimals = blockchain.decimals(),
-        )
+        return txHistoryItemConverter.convert(value = item)
     }
 
     private fun PagingData<TxHistoryItemState>.insertGroupTitle(): PagingData<TxHistoryItemState> {
@@ -202,14 +119,6 @@ internal class WalletTxHistoryItemFlowConverter(
         }
     }
 
-    /**
-     * Get timestamp without formatting.
-     * It's life hack that help us to add transaction's group title to flow.
-     *
-     * @see [convert]
-     */
-    private fun TxHistoryItem.getRawTimestamp() = this.timestampInMillis.toString()
-
     private fun TxHistoryItemState?.getTimestamp(): Long? {
         return if (this is TxHistoryItemState.Transaction && this.state is TransactionState.Content) {
             val txContent = this.state as TransactionState.Content
@@ -221,7 +130,7 @@ internal class WalletTxHistoryItemFlowConverter(
 
     /**
      * If [this] timestamp is today or yesterday, returns relative date,
-     * otherwise returns formatting date by [dateFormatter]
+     * otherwise returns formatting date.
      */
     private fun Long.toDateFormat(): String {
         val localDate = DateTime(this, DateTimeZone.getDefault())
@@ -233,18 +142,11 @@ internal class WalletTxHistoryItemFlowConverter(
                 DateUtils.FORMAT_ABBREV_RELATIVE,
             ).toString()
         } else {
-            dateFormatter.print(localDate)
+            DateTimeFormatters.formatDate(date = localDate)
         }
     }
 
     private fun String.toTimeFormat(): String {
-        return timeFormatter.print(
-            DateTime(this.toLong(), DateTimeZone.getDefault()),
-        )
-    }
-
-    private fun TxHistoryItem.TransactionDirection.extractAddress(): TextReference = when (val addr = address) {
-        TxHistoryItem.Address.Multiple -> TextReference.Res(R.string.transaction_history_multiple_addresses)
-        is TxHistoryItem.Address.Single -> TextReference.Str(addr.rawAddress.toBriefAddressFormat())
+        return DateTimeFormatters.formatTime(time = DateTime(this.toLong(), DateTimeZone.getDefault()))
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletTxHistoryTransactionStateConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletTxHistoryTransactionStateConverter.kt
new file mode 100644
index 0000000000..b43fbb3029
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletTxHistoryTransactionStateConverter.kt
@@ -0,0 +1,164 @@
+package com.tangem.feature.wallet.presentation.wallet.state.factory.txhistory
+
+import com.tangem.core.ui.components.transactions.state.TransactionState
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.domain.txhistory.models.TxHistoryItem
+import com.tangem.feature.wallet.impl.R
+import com.tangem.feature.wallet.presentation.wallet.viewmodels.WalletClickIntents
+import com.tangem.utils.converter.Converter
+import com.tangem.utils.toBriefAddressFormat
+import com.tangem.utils.toFormattedCurrencyString
+
+internal class WalletTxHistoryTransactionStateConverter(
+    private val symbol: String,
+    private val decimals: Int,
+    private val clickIntents: WalletClickIntents,
+) : Converter<TxHistoryItem, TransactionState> {
+
+    override fun convert(value: TxHistoryItem): TransactionState {
+        return createTransactionStateItem(item = value)
+    }
+
+    // TODO: Finalize transaction types [REDACTED_JIRA]
+    @Suppress("LongMethod")
+    private fun createTransactionStateItem(item: TxHistoryItem): TransactionState {
+        return when (val type = item.type) {
+            TxHistoryItem.TransactionType.Transfer -> mapTransfer(item)
+            TxHistoryItem.TransactionType.Approve -> mapApprove(item)
+            TxHistoryItem.TransactionType.Swap -> mapSwap(item)
+            TxHistoryItem.TransactionType.Deposit -> TransactionState.Custom(
+                txHash = item.txHash,
+                address = item.direction.extractAddress(),
+                amount = item.getAmount(),
+                timestamp = item.getRawTimestamp(),
+                status = item.status.tiUiStatus(),
+                direction = item.direction.toUiDirection(),
+                title = TextReference.Str("Deposit"),
+                subtitle = item.direction.extractAddress(),
+                onClick = { clickIntents.onTransactionClick(item.txHash) },
+            )
+            TxHistoryItem.TransactionType.Submit -> TransactionState.Custom(
+                txHash = item.txHash,
+                address = item.direction.extractAddress(),
+                amount = item.getAmount(),
+                timestamp = item.getRawTimestamp(),
+                status = item.status.tiUiStatus(),
+                direction = item.direction.toUiDirection(),
+                title = TextReference.Str("Submit"),
+                subtitle = item.direction.extractAddress(),
+                onClick = { clickIntents.onTransactionClick(item.txHash) },
+            )
+            TxHistoryItem.TransactionType.Supply -> TransactionState.Custom(
+                txHash = item.txHash,
+                address = item.direction.extractAddress(),
+                amount = item.getAmount(),
+                timestamp = item.getRawTimestamp(),
+                status = item.status.tiUiStatus(),
+                direction = item.direction.toUiDirection(),
+                title = TextReference.Str("Supply"),
+                subtitle = item.direction.extractAddress(),
+                onClick = { clickIntents.onTransactionClick(item.txHash) },
+            )
+            TxHistoryItem.TransactionType.Unoswap -> TransactionState.Custom(
+                txHash = item.txHash,
+                address = item.direction.extractAddress(),
+                amount = item.getAmount(),
+                timestamp = item.getRawTimestamp(),
+                status = item.status.tiUiStatus(),
+                direction = item.direction.toUiDirection(),
+                title = TextReference.Str("Unoswap"),
+                subtitle = item.direction.extractAddress(),
+                onClick = { clickIntents.onTransactionClick(item.txHash) },
+            )
+            TxHistoryItem.TransactionType.Withdraw -> TransactionState.Custom(
+                txHash = item.txHash,
+                address = item.direction.extractAddress(),
+                amount = item.getAmount(),
+                timestamp = item.getRawTimestamp(),
+                status = item.status.tiUiStatus(),
+                direction = item.direction.toUiDirection(),
+                title = TextReference.Str("Withdraw"),
+                subtitle = item.direction.extractAddress(),
+                onClick = { clickIntents.onTransactionClick(item.txHash) },
+            )
+            is TxHistoryItem.TransactionType.Custom -> TransactionState.Custom(
+                txHash = item.txHash,
+                address = item.direction.extractAddress(),
+                amount = item.getAmount(),
+                timestamp = item.getRawTimestamp(),
+                status = item.status.tiUiStatus(),
+                direction = item.direction.toUiDirection(),
+                title = TextReference.Str(type.id),
+                subtitle = item.direction.extractAddress(),
+                onClick = { clickIntents.onTransactionClick(item.txHash) },
+            )
+        }
+    }
+
+    private fun mapTransfer(item: TxHistoryItem): TransactionState {
+        return TransactionState.Transfer(
+            txHash = item.txHash,
+            address = item.direction.extractAddress(),
+            amount = item.getAmount(),
+            timestamp = item.getRawTimestamp(),
+            status = item.status.tiUiStatus(),
+            direction = item.direction.toUiDirection(),
+            onClick = { clickIntents.onTransactionClick(item.txHash) },
+        )
+    }
+
+    private fun mapApprove(item: TxHistoryItem): TransactionState {
+        return TransactionState.Approve(
+            txHash = item.txHash,
+            address = item.direction.extractAddress(),
+            amount = item.getAmount(),
+            timestamp = item.getRawTimestamp(),
+            status = item.status.tiUiStatus(),
+            direction = item.direction.toUiDirection(),
+            onClick = { clickIntents.onTransactionClick(item.txHash) },
+        )
+    }
+    private fun mapSwap(item: TxHistoryItem): TransactionState {
+        return TransactionState.Swap(
+            txHash = item.txHash,
+            address = item.direction.extractAddress(),
+            amount = item.getAmount(),
+            timestamp = item.getRawTimestamp(),
+            status = item.status.tiUiStatus(),
+            direction = item.direction.toUiDirection(),
+            onClick = { clickIntents.onTransactionClick(item.txHash) },
+        )
+    }
+
+    /**
+     * Get timestamp without formatting.
+     * It's life hack that help us to add transaction's group title to flow.
+     *
+     * @see [convert]
+     */
+    private fun TxHistoryItem.getRawTimestamp() = this.timestampInMillis.toString()
+
+    private fun TxHistoryItem.TransactionDirection.extractAddress(): TextReference = when (val addr = address) {
+        TxHistoryItem.Address.Multiple -> TextReference.Res(R.string.transaction_history_multiple_addresses)
+        is TxHistoryItem.Address.Single -> TextReference.Str(addr.rawAddress.toBriefAddressFormat())
+    }
+
+    private fun TxHistoryItem.TransactionStatus.tiUiStatus() = when (this) {
+        TxHistoryItem.TransactionStatus.Confirmed -> TransactionState.Content.Status.Confirmed
+        TxHistoryItem.TransactionStatus.Failed -> TransactionState.Content.Status.Failed
+        TxHistoryItem.TransactionStatus.Unconfirmed -> TransactionState.Content.Status.Unconfirmed
+    }
+
+    private fun TxHistoryItem.TransactionDirection.toUiDirection() = when (this) {
+        is TxHistoryItem.TransactionDirection.Incoming -> TransactionState.Content.Direction.INCOMING
+        is TxHistoryItem.TransactionDirection.Outgoing -> TransactionState.Content.Direction.OUTGOING
+    }
+
+    private fun TxHistoryItem.getAmount(): String {
+        val prefix = when (direction) {
+            is TxHistoryItem.TransactionDirection.Incoming -> "+"
+            is TxHistoryItem.TransactionDirection.Outgoing -> "-"
+        }
+        return prefix + amount.toFormattedCurrencyString(currency = symbol, decimals = decimals)
+    }
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletAlert.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletAlert.kt
new file mode 100644
index 0000000000..1edcb46df5
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletAlert.kt
@@ -0,0 +1,51 @@
+package com.tangem.feature.wallet.presentation.wallet.ui
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import com.tangem.core.ui.components.BasicDialog
+import com.tangem.core.ui.components.DialogButton
+import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.feature.wallet.impl.R
+import com.tangem.feature.wallet.presentation.wallet.state.WalletAlertState
+
+@Composable
+internal fun WalletAlert(state: WalletAlertState, onDismiss: () -> Unit) {
+    DefaultAlert(state = state, onDismiss = onDismiss)
+}
+
+@Composable
+private fun DefaultAlert(state: WalletAlertState, onDismiss: () -> Unit) {
+    val confirmButton: DialogButton
+    val dismissButton: DialogButton?
+
+    val onActionClick = state.onConfirmClick
+    if (onActionClick != null) {
+        confirmButton = DialogButton(
+            title = state.confirmButtonText.resolveReference(),
+            warning = state.isWarningConfirmButton,
+            onClick = {
+                onActionClick()
+                onDismiss()
+            },
+        )
+        dismissButton = DialogButton(
+            title = stringResource(id = R.string.common_cancel),
+            onClick = onDismiss,
+        )
+    } else {
+        confirmButton = DialogButton(
+            title = state.confirmButtonText.resolveReference(),
+            warning = state.isWarningConfirmButton,
+            onClick = onDismiss,
+        )
+        dismissButton = null
+    }
+
+    BasicDialog(
+        message = state.message.resolveReference(),
+        confirmButton = confirmButton,
+        onDismissDialog = onDismiss,
+        title = state.title?.resolveReference(),
+        dismissButton = dismissButton,
+    )
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletEventEffect.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletEventEffect.kt
new file mode 100644
index 0000000000..ea7437eeb8
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletEventEffect.kt
@@ -0,0 +1,88 @@
+package com.tangem.feature.wallet.presentation.wallet.ui
+
+import android.app.Activity
+import android.widget.Toast
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.AnnotatedString
+import com.google.android.play.core.review.ReviewInfo
+import com.google.android.play.core.review.ReviewManager
+import com.google.android.play.core.review.ReviewManagerFactory
+import com.google.android.play.core.tasks.Task
+import com.tangem.core.ui.event.EventEffect
+import com.tangem.core.ui.event.StateEvent
+import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.feature.wallet.presentation.wallet.state.WalletAlertState
+import com.tangem.feature.wallet.presentation.wallet.state.WalletEvent
+import timber.log.Timber
+
+@Composable
+internal fun WalletEventEffect(
+    walletsListState: LazyListState,
+    snackbarHostState: SnackbarHostState,
+    event: StateEvent<WalletEvent>,
+    onAutoScrollSet: () -> Unit,
+    onAlertConfigSet: (WalletAlertState) -> Unit,
+) {
+    val context = LocalContext.current
+    val resources = LocalContext.current.resources
+    val clipboardManager = LocalClipboardManager.current
+    EventEffect(
+        event = event,
+        onTrigger = { value ->
+            when (value) {
+                is WalletEvent.ChangeWallet -> {
+                    onAutoScrollSet()
+                    walletsListState.animateScrollToItem(index = value.index)
+                }
+                is WalletEvent.ShowError -> {
+                    snackbarHostState.showSnackbar(message = value.text.resolveReference(resources))
+                }
+                is WalletEvent.ShowToast -> {
+                    Toast.makeText(context, value.text.resolveReference(resources), Toast.LENGTH_SHORT).show()
+                }
+                is WalletEvent.CopyAddress -> {
+                    clipboardManager.setText(AnnotatedString(value.address))
+                    Toast.makeText(context, value.toast.resolveReference(resources), Toast.LENGTH_SHORT).show()
+                }
+                is WalletEvent.ShowAlert -> onAlertConfigSet(value.state)
+                is WalletEvent.RateApp -> {
+                    val reviewManager = ReviewManagerFactory.create(context)
+                    val requestTask = reviewManager.requestReviewFlow()
+
+                    requestTask
+                        .addOnCompleteListener {
+                            handleOnCompleteRequestTask(
+                                reviewManager = reviewManager,
+                                activity = context as? Activity ?: return@addOnCompleteListener,
+                                task = it,
+                                onDismissClick = value.onDismissClick,
+                            )
+                        }
+                        .addOnFailureListener(Timber::e)
+                }
+            }
+        },
+    )
+}
+
+private fun handleOnCompleteRequestTask(
+    reviewManager: ReviewManager,
+    activity: Activity,
+    task: Task<ReviewInfo>,
+    onDismissClick: () -> Unit,
+) {
+    if (task.isSuccessful) {
+        val reviewFlow = reviewManager.launchReviewFlow(activity, task.result)
+        reviewFlow
+            .addOnCompleteListener { resultReviewTask ->
+                if (!resultReviewTask.isSuccessful) onDismissClick()
+            }
+            .addOnFailureListener(Timber::e)
+    } else {
+        Timber.e(task.exception)
+    }
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen.kt
index fca76604c4..f2720ee831 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen.kt
@@ -1,14 +1,18 @@
 package com.tangem.feature.wallet.presentation.wallet.ui
 
 import androidx.activity.compose.BackHandler
-import androidx.compose.animation.*
-import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListScope
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.pullrefresh.pullRefresh
 import androidx.compose.material.pullrefresh.rememberPullRefreshState
-import androidx.compose.material3.*
+import androidx.compose.material3.FabPosition
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -18,18 +22,21 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
 import androidx.paging.compose.collectAsLazyPagingItems
 import com.tangem.core.ui.components.PrimaryButton
+import com.tangem.core.ui.components.bottomsheets.tokenreceive.TokenReceiveBottomSheet
+import com.tangem.core.ui.components.bottomsheets.tokenreceive.TokenReceiveBottomSheetConfig
 import com.tangem.core.ui.components.transactions.state.TxHistoryState
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.common.WalletPreviewData
-import com.tangem.feature.wallet.presentation.wallet.state.WalletMultiCurrencyState
-import com.tangem.feature.wallet.presentation.wallet.state.WalletSingleCurrencyState
-import com.tangem.feature.wallet.presentation.wallet.state.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state.*
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletBottomSheetConfig
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletPullToRefreshConfig
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletTokensListState
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletTokensListState.OrganizeTokensButtonState
 import com.tangem.feature.wallet.presentation.wallet.ui.components.TokenActionsBottomSheet
 import com.tangem.feature.wallet.presentation.wallet.ui.components.WalletsList
 import com.tangem.feature.wallet.presentation.wallet.ui.components.common.*
-import com.tangem.feature.wallet.presentation.wallet.ui.components.multicurrency.organizeButton
+import com.tangem.feature.wallet.presentation.wallet.ui.components.multicurrency.organizeTokensButton
 import com.tangem.feature.wallet.presentation.wallet.ui.components.singlecurrency.controlButtons
 import com.tangem.feature.wallet.presentation.wallet.ui.components.singlecurrency.marketPriceBlock
 import com.tangem.feature.wallet.presentation.wallet.ui.utils.changeWalletAnimator
@@ -46,27 +53,53 @@ internal fun WalletScreen(state: WalletState) {
     BackHandler(onBack = state.onBackClick)
 
     when (state) {
-        is WalletState.ContentState -> WalletContent(state = state)
+        is WalletState.ContentState -> {
+            val walletsListState = rememberLazyListState(
+                initialFirstVisibleItemIndex = state.walletsListConfig.selectedWalletIndex,
+            )
+            val snackbarHostState = remember { SnackbarHostState() }
+            val isAutoScroll = remember { mutableStateOf(value = false) }
+
+            WalletContent(
+                state = state,
+                walletsListState = walletsListState,
+                snackbarHostState = snackbarHostState,
+                isAutoScroll = isAutoScroll,
+                onAutoScrollReset = { isAutoScroll.value = false },
+            )
+
+            var alertConfig by remember { mutableStateOf<WalletAlertState?>(value = null) }
+
+            WalletEventEffect(
+                walletsListState = walletsListState,
+                snackbarHostState = snackbarHostState,
+                event = state.event,
+                onAutoScrollSet = { isAutoScroll.value = true },
+                onAlertConfigSet = { alertConfig = it },
+            )
+
+            alertConfig?.let {
+                WalletAlert(state = it, onDismiss = { alertConfig = null })
+            }
+        }
         is WalletState.Initial -> Unit
     }
 }
 
-@OptIn(ExperimentalMaterialApi::class)
 @Composable
-private fun WalletContent(state: WalletState.ContentState) {
-    val walletsListState = rememberLazyListState()
-
-    BaseScaffold(state = state) { scaffoldPaddings ->
+private fun WalletContent(
+    state: WalletState.ContentState,
+    walletsListState: LazyListState,
+    snackbarHostState: SnackbarHostState,
+    isAutoScroll: State<Boolean>,
+    onAutoScrollReset: () -> Unit,
+) {
+    BaseScaffold(state = state, snackbarHostState) { scaffoldPaddings ->
         val movableItemModifier = Modifier.changeWalletAnimator(walletsListState)
-        val pullRefreshState = rememberPullRefreshState(
-            refreshing = state.pullToRefreshConfig.isRefreshing,
-            onRefresh = state.pullToRefreshConfig.onRefresh,
-        )
 
-        Box(
-            modifier = Modifier
-                .padding(paddingValues = scaffoldPaddings)
-                .pullRefresh(pullRefreshState),
+        UpdatableContainer(
+            pullToRefreshConfig = state.pullToRefreshConfig,
+            modifier = Modifier.padding(paddingValues = scaffoldPaddings),
         ) {
             val txHistoryItems = if (state is WalletSingleCurrencyState &&
                 state.txHistoryState is TxHistoryState.Content
@@ -91,12 +124,17 @@ private fun WalletContent(state: WalletState.ContentState) {
                 horizontalAlignment = Alignment.CenterHorizontally,
             ) {
                 item {
-                    WalletsList(config = state.walletsListConfig, lazyListState = walletsListState)
+                    WalletsList(
+                        config = state.walletsListConfig,
+                        lazyListState = walletsListState,
+                        isBalanceHidden = state.isBalanceHidden,
+                    )
                 }
 
                 if (state is WalletSingleCurrencyState) {
                     controlButtons(
                         configs = state.buttons,
+                        selectedWalletIndex = state.walletsListConfig.selectedWalletIndex,
                         modifier = movableItemModifier.padding(top = betweenItemsPadding),
                     )
                 }
@@ -107,35 +145,77 @@ private fun WalletContent(state: WalletState.ContentState) {
                     marketPriceBlock(state = state.marketPriceBlockState, modifier = itemModifier)
                 }
 
-                contentItems(state = state, txHistoryItems = txHistoryItems, modifier = movableItemModifier)
+                contentItems(
+                    state = state,
+                    txHistoryItems = txHistoryItems,
+                    isBalanceHidden = state.isBalanceHidden,
+                    modifier = movableItemModifier,
+                )
 
-                if (state is WalletMultiCurrencyState) {
-                    val tokensListState = state.tokensListState
-                    if (tokensListState is WalletTokensListState.ContentState) {
-                        organizeButton(onClick = tokensListState.onOrganizeTokensClick, modifier = itemModifier)
-                    }
-                }
+                organizeTokens(state = state, itemModifier = itemModifier)
             }
-
-            WalletPullToRefreshIndicator(
-                isRefreshing = state.pullToRefreshConfig.isRefreshing,
-                state = pullRefreshState,
-                modifier = Modifier.align(Alignment.TopCenter),
-            )
         }
     }
 
     WalletBottomSheets(state = state)
 
-    WalletSideEffects(lazyListState = walletsListState, walletsListConfig = state.walletsListConfig)
+    WalletsListEffects(
+        lazyListState = walletsListState,
+        walletsListConfig = state.walletsListConfig,
+        isAutoScroll = isAutoScroll,
+        onAutoScrollReset = onAutoScrollReset,
+    )
+}
+
+internal fun LazyListScope.organizeTokens(state: WalletState.ContentState, itemModifier: Modifier) {
+    if (state is WalletMultiCurrencyState) {
+        val contentTokenListState = state.tokensListState as? WalletTokensListState.ContentState
+        val organizeTokensButton = contentTokenListState?.organizeTokensButton
+
+        if (organizeTokensButton is OrganizeTokensButtonState.Visible) {
+            organizeTokensButton(
+                modifier = itemModifier,
+                isEnabled = organizeTokensButton.isEnabled,
+                onClick = organizeTokensButton.onClick,
+            )
+        }
+    }
+}
+
+@OptIn(ExperimentalMaterialApi::class)
+@Composable
+private fun UpdatableContainer(
+    pullToRefreshConfig: WalletPullToRefreshConfig,
+    modifier: Modifier = Modifier,
+    content: @Composable BoxScope.() -> Unit,
+) {
+    val pullRefreshState = rememberPullRefreshState(
+        refreshing = pullToRefreshConfig.isRefreshing,
+        onRefresh = pullToRefreshConfig.onRefresh,
+    )
+
+    Box(modifier = modifier.pullRefresh(pullRefreshState)) {
+        content()
+
+        WalletPullToRefreshIndicator(
+            isRefreshing = pullToRefreshConfig.isRefreshing,
+            state = pullRefreshState,
+            modifier = Modifier.align(Alignment.TopCenter),
+        )
+    }
 }
 
 @Composable
-private fun BaseScaffold(state: WalletState.ContentState, content: @Composable (PaddingValues) -> Unit) {
+private fun BaseScaffold(
+    state: WalletState.ContentState,
+    snackbarHostState: SnackbarHostState,
+    content: @Composable (PaddingValues) -> Unit,
+) {
     Scaffold(
         topBar = { WalletTopBar(config = state.topBarConfig) },
+        snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
         floatingActionButton = {
-            if (state is WalletMultiCurrencyState.Content) {
+            if (state is WalletMultiCurrencyState.Content && state.isManageTokensAvailable) {
                 ManageTokensButton(onManageTokensClick = state.onManageTokensClick)
             }
         },
@@ -159,13 +239,11 @@ private fun ManageTokensButton(onManageTokensClick: () -> Unit) {
 @Composable
 private fun WalletBottomSheets(state: WalletState) {
     val bottomSheetConfig = (state as? WalletState.ContentState)?.bottomSheetConfig
-    if (bottomSheetConfig != null && bottomSheetConfig.isShow) {
-        WalletBottomSheet(config = bottomSheetConfig)
-    }
-
-    (state as? WalletMultiCurrencyState.Content)?.let { multiCurrencyState ->
-        if (multiCurrencyState.tokenActionsBottomSheet != null && multiCurrencyState.tokenActionsBottomSheet.isShow) {
-            TokenActionsBottomSheet(config = multiCurrencyState.tokenActionsBottomSheet)
+    if (bottomSheetConfig != null) {
+        when (bottomSheetConfig.content) {
+            is WalletBottomSheetConfig -> WalletBottomSheet(config = bottomSheetConfig)
+            is TokenReceiveBottomSheetConfig -> TokenReceiveBottomSheet(config = bottomSheetConfig)
+            is ActionsBottomSheetConfig -> TokenActionsBottomSheet(config = bottomSheetConfig)
         }
     }
 }
@@ -175,7 +253,7 @@ private fun WalletBottomSheets(state: WalletState) {
 @Composable
 private fun WalletScreenPreview_Light(@PreviewParameter(WalletScreenParameterProvider::class) state: WalletState) {
     TangemTheme {
-        WalletScreen(state)
+        WalletScreen(state = state)
     }
 }
 
@@ -183,7 +261,7 @@ private fun WalletScreenPreview_Light(@PreviewParameter(WalletScreenParameterPro
 @Composable
 private fun WalletScreenPreview_Dark(@PreviewParameter(WalletScreenParameterProvider::class) state: WalletState) {
     TangemTheme(isDark = true) {
-        WalletScreen(state)
+        WalletScreen(state = state)
     }
 }
 
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletsListEffects.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletsListEffects.kt
new file mode 100644
index 0000000000..482d206fbf
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletsListEffects.kt
@@ -0,0 +1,35 @@
+package com.tangem.feature.wallet.presentation.wallet.ui
+
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.State
+import androidx.compose.runtime.snapshotFlow
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletsListConfig
+import com.tangem.feature.wallet.presentation.wallet.ui.utils.ScrollOffsetCollector
+import com.tangem.feature.wallet.presentation.wallet.ui.utils.WalletsListInteractionsCollector
+
+@Composable
+internal fun WalletsListEffects(
+    lazyListState: LazyListState,
+    walletsListConfig: WalletsListConfig,
+    isAutoScroll: State<Boolean>,
+    onAutoScrollReset: () -> Unit,
+) {
+    LaunchedEffect(key1 = lazyListState, key2 = walletsListConfig.onWalletChange) {
+        snapshotFlow { lazyListState.layoutInfo.visibleItemsInfo }
+            .collect(
+                collector = ScrollOffsetCollector(
+                    lazyListState = lazyListState,
+                    walletsListConfig = walletsListConfig,
+                    isAutoScroll = isAutoScroll,
+                ),
+            )
+    }
+
+    LaunchedEffect(Unit) {
+        lazyListState.interactionSource.interactions.collect(
+            collector = WalletsListInteractionsCollector(onDragStart = onAutoScrollReset),
+        )
+    }
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/TokenActionsBottomSheet.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/TokenActionsBottomSheet.kt
index a79d41bb23..c729131842 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/TokenActionsBottomSheet.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/TokenActionsBottomSheet.kt
@@ -2,47 +2,40 @@ package com.tangem.feature.wallet.presentation.wallet.ui.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
-import androidx.compose.material3.BottomSheetDefaults
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.ModalBottomSheet
-import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
 import com.tangem.core.ui.components.SimpleSettingsRow
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheet
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
+import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.feature.wallet.presentation.common.WalletPreviewData
 import com.tangem.feature.wallet.presentation.wallet.state.ActionsBottomSheetConfig
 import com.tangem.feature.wallet.presentation.wallet.state.TokenActionButtonConfig
 import kotlinx.collections.immutable.ImmutableList
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
-internal fun TokenActionsBottomSheet(config: ActionsBottomSheetConfig) {
-    ModalBottomSheet(
-        onDismissRequest = config.onDismissRequest,
-        sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
-        containerColor = TangemTheme.colors.background.primary,
-        dragHandle = { BottomSheetDefaults.DragHandle() },
-    ) {
-        ActionsBottomSheetContent(config.actions)
+internal fun TokenActionsBottomSheet(config: TangemBottomSheetConfig) {
+    TangemBottomSheet<ActionsBottomSheetConfig>(config = config) {
+        ActionsBottomSheetContent(actions = it.actions)
     }
 }
 
 @Composable
 private fun ActionsBottomSheetContent(actions: ImmutableList<TokenActionButtonConfig>) {
-    Column(
-        modifier = Modifier.background(TangemTheme.colors.background.primary),
-    ) {
+    Column(modifier = Modifier.background(TangemTheme.colors.background.primary)) {
         actions.forEach { action ->
-            SimpleSettingsRow(
-                title = action.text,
-                icon = action.iconResId,
-                enabled = action.enabled,
-                onItemsClick = action.onClick,
-            )
+            if (action.enabled) {
+                SimpleSettingsRow(
+                    title = action.text.resolveReference(),
+                    icon = action.iconResId,
+                    enabled = action.enabled,
+                    onItemsClick = action.onClick,
+                )
+            }
         }
     }
 }
@@ -65,7 +58,7 @@ private fun ActionsBottomSheetContent_Dark(
     @PreviewParameter(ActionsBottomSheetContentConfigProvider::class)
     config: ActionsBottomSheetConfig,
 ) {
-    TangemTheme(isDark = false) {
+    TangemTheme(isDark = true) {
         // Use preview of content because ModalBottomSheet isn't supported in Preview mode
         ActionsBottomSheetContent(actions = config.actions)
     }
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/WalletsList.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/WalletsList.kt
index 09acf941f4..7caf718821 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/WalletsList.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/WalletsList.kt
@@ -1,7 +1,11 @@
 package com.tangem.feature.wallet.presentation.wallet.ui.components
 
+import androidx.compose.animation.core.*
+import androidx.compose.animation.rememberSplineBasedDecay
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
+import androidx.compose.foundation.gestures.snapping.SnapFlingBehavior
+import androidx.compose.foundation.gestures.snapping.SnapLayoutInfoProvider
 import androidx.compose.foundation.gestures.snapping.rememberSnapFlingBehavior
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
@@ -10,19 +14,20 @@ import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.derivedStateOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.feature.wallet.presentation.common.WalletPreviewData
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletsListConfig
 import com.tangem.feature.wallet.presentation.wallet.ui.components.common.WalletCard
 
+private const val SHORT_SNAP_ELEMENT_COUNT = 50
+
 /**
  * Wallets list component
  *
@@ -33,7 +38,7 @@ import com.tangem.feature.wallet.presentation.wallet.ui.components.common.Wallet
  */
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
-internal fun WalletsList(config: WalletsListConfig, lazyListState: LazyListState) {
+internal fun WalletsList(config: WalletsListConfig, lazyListState: LazyListState, isBalanceHidden: Boolean) {
     val horizontalCardPadding = TangemTheme.dimens.spacing16
     val screenWidth = LocalConfiguration.current.screenWidthDp.dp
     val itemWidth by remember(screenWidth) { derivedStateOf { screenWidth - horizontalCardPadding * 2 } }
@@ -43,7 +48,7 @@ internal fun WalletsList(config: WalletsListConfig, lazyListState: LazyListState
         state = lazyListState,
         contentPadding = PaddingValues(horizontal = TangemTheme.dimens.spacing16),
         horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing8),
-        flingBehavior = rememberSnapFlingBehavior(lazyListState = lazyListState),
+        flingBehavior = rememberWalletsFlingBehaviour(lazyListState = lazyListState, itemWidth = itemWidth),
     ) {
         items(
             items = config.wallets,
@@ -52,6 +57,7 @@ internal fun WalletsList(config: WalletsListConfig, lazyListState: LazyListState
         ) { state ->
             WalletCard(
                 state = state,
+                isBalanceHidden = isBalanceHidden,
                 modifier = Modifier
                     .animateItemPlacement()
                     .width(itemWidth),
@@ -60,11 +66,44 @@ internal fun WalletsList(config: WalletsListConfig, lazyListState: LazyListState
     }
 }
 
+/**
+ * Custom implementation of fling behaviour that overrides 'shortSnapVelocityThreshold'.
+ * Every user's drag action will similar to a short snap
+ * if drag offset is less than [SHORT_SNAP_ELEMENT_COUNT] * item width.
+ *
+ * @param lazyListState lazy list state
+ * @param itemWidth     list item width
+ *
+ * @see rememberSnapFlingBehavior
+ */
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+private fun rememberWalletsFlingBehaviour(lazyListState: LazyListState, itemWidth: Dp): SnapFlingBehavior {
+    val snappingLayout = remember(lazyListState) { SnapLayoutInfoProvider(lazyListState) }
+    val density = LocalDensity.current
+    val highVelocityApproachSpec: DecayAnimationSpec<Float> = rememberSplineBasedDecay()
+
+    return remember(key1 = snappingLayout, key2 = highVelocityApproachSpec, key3 = density) {
+        SnapFlingBehavior(
+            snapLayoutInfoProvider = snappingLayout,
+            lowVelocityAnimationSpec = tween(durationMillis = 1000, easing = LinearEasing),
+            highVelocityAnimationSpec = highVelocityApproachSpec,
+            snapAnimationSpec = spring(stiffness = Spring.StiffnessMediumLow),
+            density = density,
+            shortSnapVelocityThreshold = itemWidth * SHORT_SNAP_ELEMENT_COUNT,
+        )
+    }
+}
+
 @Preview
 @Composable
 private fun Preview_WalletsList_LightTheme() {
     TangemTheme(isDark = false) {
-        WalletsList(config = WalletPreviewData.walletListConfig, lazyListState = rememberLazyListState())
+        WalletsList(
+            config = WalletPreviewData.walletListConfig,
+            lazyListState = rememberLazyListState(),
+            isBalanceHidden = false,
+        )
     }
 }
 
@@ -72,6 +111,10 @@ private fun Preview_WalletsList_LightTheme() {
 @Composable
 private fun Preview_WalletsList_DarkTheme() {
     TangemTheme(isDark = true) {
-        WalletsList(config = WalletPreviewData.walletListConfig, lazyListState = rememberLazyListState())
+        WalletsList(
+            config = WalletPreviewData.walletListConfig,
+            lazyListState = rememberLazyListState(),
+            isBalanceHidden = false,
+        )
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletBottomSheet.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletBottomSheet.kt
index bf78b633da..b77393f8d6 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletBottomSheet.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletBottomSheet.kt
@@ -1,6 +1,5 @@
 package com.tangem.feature.wallet.presentation.wallet.ui.components.common
 
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.*
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
@@ -15,6 +14,8 @@ import com.tangem.core.ui.components.PrimaryButton
 import com.tangem.core.ui.components.PrimaryButtonIconStart
 import com.tangem.core.ui.components.SecondaryButton
 import com.tangem.core.ui.components.SecondaryButtonIconStart
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheet
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
 import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.feature.wallet.presentation.common.WalletPreviewData
@@ -27,21 +28,15 @@ import com.tangem.feature.wallet.presentation.wallet.state.components.WalletBott
  *
 [REDACTED_AUTHOR]
  */
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
-internal fun WalletBottomSheet(config: WalletBottomSheetConfig) {
-    ModalBottomSheet(
-        onDismissRequest = config.onDismissRequest,
-        sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
-        containerColor = TangemTheme.colors.background.primary,
-        dragHandle = { BottomSheetDefaults.DragHandle() },
-    ) {
-        BottomSheetContent(config = config.content)
+internal fun WalletBottomSheet(config: TangemBottomSheetConfig) {
+    TangemBottomSheet(config) { content: WalletBottomSheetConfig ->
+        BottomSheetContent(config = content)
     }
 }
 
 @Composable
-private fun BottomSheetContent(config: WalletBottomSheetConfig.BottomSheetContentConfig) {
+private fun BottomSheetContent(config: WalletBottomSheetConfig) {
     Column(
         modifier = Modifier
             .padding(horizontal = TangemTheme.dimens.spacing16)
@@ -49,21 +44,14 @@ private fun BottomSheetContent(config: WalletBottomSheetConfig.BottomSheetConten
         verticalArrangement = Arrangement.spacedBy(space = TangemTheme.dimens.spacing40),
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
-        val iconTint = config.tint
-        if (iconTint != null) {
-            Icon(
-                painter = painterResource(id = config.iconResId),
-                contentDescription = null,
-                modifier = Modifier.size(size = TangemTheme.dimens.size48),
-                tint = iconTint,
-            )
-        } else {
-            Image(
-                painter = painterResource(id = config.iconResId),
-                contentDescription = null,
-                modifier = Modifier.size(size = TangemTheme.dimens.size48),
-            )
-        }
+        Icon(
+            painter = painterResource(id = config.iconResId),
+            contentDescription = null,
+            modifier = Modifier.size(size = TangemTheme.dimens.size48),
+            tint = when (config) {
+                is WalletBottomSheetConfig.UnlockWallets -> TangemTheme.colors.icon.primary1
+            },
+        )
 
         Text(
             text = config.title.resolveReference(),
@@ -90,10 +78,7 @@ private fun BottomSheetContent(config: WalletBottomSheetConfig.BottomSheetConten
 }
 
 @Composable
-private fun PrimaryButton(
-    config: WalletBottomSheetConfig.BottomSheetContentConfig.ButtonConfig,
-    modifier: Modifier = Modifier,
-) {
+private fun PrimaryButton(config: WalletBottomSheetConfig.ButtonConfig, modifier: Modifier = Modifier) {
     if (config.iconResId == null) {
         PrimaryButton(
             text = config.text.resolveReference(),
@@ -111,10 +96,7 @@ private fun PrimaryButton(
 }
 
 @Composable
-private fun SecondaryButton(
-    config: WalletBottomSheetConfig.BottomSheetContentConfig.ButtonConfig,
-    modifier: Modifier = Modifier,
-) {
+private fun SecondaryButton(config: WalletBottomSheetConfig.ButtonConfig, modifier: Modifier = Modifier) {
     if (config.iconResId == null) {
         SecondaryButton(
             text = config.text.resolveReference(),
@@ -139,7 +121,7 @@ private fun WalletBottomSheetContent_Light(
 ) {
     TangemTheme(isDark = false) {
         // Use preview of content because ModalBottomSheet isn't supported in Preview mode
-        BottomSheetContent(config = config.content)
+        BottomSheetContent(config = config)
     }
 }
 
@@ -151,10 +133,10 @@ private fun WalletBottomSheetContent_Dark(
 ) {
     TangemTheme(isDark = false) {
         // Use preview of content because ModalBottomSheet isn't supported in Preview mode
-        BottomSheetContent(config = config.content)
+        BottomSheetContent(config = config)
     }
 }
 
-private class WalletBottomSheetConfigProvider : CollectionPreviewParameterProvider<WalletBottomSheetConfig>(
+private class WalletBottomSheetConfigProvider : CollectionPreviewParameterProvider<TangemBottomSheetConfig>(
     collection = listOf(WalletPreviewData.bottomSheet),
 )
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletCard.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletCard.kt
index 494e36cee2..47d6b066db 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletCard.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletCard.kt
@@ -2,9 +2,8 @@ package com.tangem.feature.wallet.presentation.wallet.ui.components.common
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
-import androidx.compose.animation.AnimatedContent
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.animation.*
+import androidx.compose.animation.core.tween
 import androidx.compose.foundation.*
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -28,28 +27,27 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
 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.DpOffset
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.constraintlayout.compose.ConstraintLayout
-import androidx.constraintlayout.compose.ConstraintLayoutScope
-import androidx.constraintlayout.compose.Dimension
+import androidx.compose.ui.unit.*
+import androidx.constraintlayout.compose.*
+import com.tangem.common.Strings
 import com.tangem.core.ui.components.FontSizeRange
 import com.tangem.core.ui.components.RectangleShimmer
 import com.tangem.core.ui.components.ResizableText
 import com.tangem.core.ui.components.wallets.RenameWalletDialogContent
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resolveReference
-import com.tangem.core.ui.res.TangemColorPalette
 import com.tangem.core.ui.res.TangemDimens
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.common.WalletPreviewData
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletCardState
 
+private const val HALF_OF_ITEM_WIDTH = 0.5
+
 /**
  * Wallet card
  *
@@ -59,56 +57,80 @@ import com.tangem.feature.wallet.presentation.wallet.state.components.WalletCard
 [REDACTED_AUTHOR]
  */
 @Composable
-internal fun WalletCard(state: WalletCardState, modifier: Modifier = Modifier) {
+internal fun WalletCard(state: WalletCardState, isBalanceHidden: Boolean, modifier: Modifier = Modifier) {
     @Suppress("DestructuringDeclarationWithTooManyEntries")
     CardContainer(
         name = state.title,
         onDeleteClick = { state.onDeleteClick(state.id) },
         onRenameClick = { state.onRenameClick(state.id, it) },
+        isLockedState = state is WalletCardState.LockedContent,
         modifier = modifier,
-    ) {
-        val (title, balance, additionalText, image) = createRefs()
+    ) { itemSize ->
+        val (titleRef, balanceRef, additionalTextRef, imageRef) = createRefs()
 
         val contentVerticalMargin = TangemTheme.dimens.spacing12
-        Title(
-            state = state,
-            modifier = Modifier.constrainAs(title) {
+        TitleText(
+            text = state.title,
+            modifier = Modifier.constrainAs(titleRef) {
                 start.linkTo(parent.start)
                 top.linkTo(anchor = parent.top, margin = contentVerticalMargin)
-                end.linkTo(image.start)
+                end.linkTo(imageRef.start)
                 width = Dimension.fillToConstraints
             },
         )
 
-        val betweenContentMargin = TangemTheme.dimens.spacing8
+        var balanceWidth by remember { mutableIntStateOf(value = Int.MIN_VALUE) }
         Balance(
             state = state,
-            modifier = Modifier.constrainAs(balance) {
-                start.linkTo(parent.start)
-                top.linkTo(anchor = title.bottom, margin = betweenContentMargin)
-                bottom.linkTo(anchor = additionalText.top, margin = betweenContentMargin)
-            },
+            isBalanceHidden = isBalanceHidden,
+            modifier = Modifier
+                .onSizeChanged { balanceWidth = it.width }
+                .padding(vertical = TangemTheme.dimens.spacing8)
+                .constrainAs(balanceRef) {
+                    start.linkTo(parent.start)
+                    top.linkTo(anchor = titleRef.bottom)
+                    bottom.linkTo(anchor = additionalTextRef.top)
+                },
         )
 
         AdditionalInfo(
-            state = state,
-            modifier = Modifier.constrainAs(additionalText) {
+            text = if (state.additionalInfo?.hideable == true && isBalanceHidden) {
+                WalletCardState.HIDDEN_BALANCE_TEXT
+            } else {
+                state.additionalInfo?.content
+            },
+            modifier = Modifier.constrainAs(additionalTextRef) {
                 start.linkTo(parent.start)
+                top.linkTo(balanceRef.bottom)
                 bottom.linkTo(anchor = parent.bottom, margin = contentVerticalMargin)
+
+                when (state) {
+                    is WalletCardState.Content,
+                    is WalletCardState.Error,
+                    -> {
+                        end.linkTo(imageRef.start)
+                        width = Dimension.fillToConstraints
+                    }
+                    else -> Unit
+                }
             },
         )
 
-        val imageWidth = TangemTheme.dimens.size120
-        Image(
-            id = state.imageResId,
-            modifier = Modifier.constrainAs(image) {
-                centerVerticallyTo(parent)
-                top.linkTo(parent.top)
-                end.linkTo(parent.end)
-                height = Dimension.fillToConstraints
-                width = Dimension.value(imageWidth)
-            },
-        )
+        // If balance has a large width then image must be hidden
+        val hasSpaceForImage by remember(key1 = balanceWidth, key2 = itemSize.width) {
+            mutableStateOf(value = balanceWidth < itemSize.width * HALF_OF_ITEM_WIDTH)
+        }
+
+        if (hasSpaceForImage) {
+            Image(
+                id = state.imageResId,
+                modifier = Modifier.constrainAs(imageRef) {
+                    end.linkTo(parent.end)
+                    bottom.linkTo(parent.bottom)
+                    height = Dimension.fillToConstraints
+                },
+            )
+        }
     }
 }
 
@@ -117,12 +139,13 @@ private fun CardContainer(
     name: String,
     onDeleteClick: () -> Unit,
     onRenameClick: (String) -> Unit,
+    isLockedState: Boolean,
     modifier: Modifier = Modifier,
-    content: @Composable (ConstraintLayoutScope.() -> Unit),
+    content: @Composable (ConstraintLayoutScope.(IntSize) -> Unit),
 ) {
     var isMenuVisible by rememberSaveable { mutableStateOf(value = false) }
     var pressOffset by remember { mutableStateOf(value = DpOffset.Zero) }
-    var itemHeight by remember { mutableStateOf(value = 0.dp) }
+    var itemSize by remember { mutableStateOf(value = IntSize.Zero) }
 
     val density = LocalDensity.current
     val interactionSource = remember { MutableInteractionSource() }
@@ -131,24 +154,31 @@ private fun CardContainer(
     Surface(
         modifier = modifier
             .defaultMinSize(minHeight = TangemTheme.dimens.size108)
-            .onSizeChanged { itemHeight = with(density) { it.height.toDp() } }
-            .clip(shape = TangemTheme.shapes.roundedCornersXMedium)
-            .indication(interactionSource = interactionSource, indication = LocalIndication.current)
-            .pointerInput(true) {
-                detectTapGestures(
-                    onLongPress = {
-                        haptic.performHapticFeedback(HapticFeedbackType.LongPress)
-                        isMenuVisible = true
-                        pressOffset = DpOffset(x = it.x.toDp(), y = it.y.toDp())
-                    },
-                    onPress = {
-                        val press = PressInteraction.Press(it)
-                        interactionSource.emit(press)
-                        tryAwaitRelease()
-                        interactionSource.emit(PressInteraction.Release(press))
-                    },
-                )
-            },
+            .onSizeChanged { itemSize = it }
+            .then(
+                if (isLockedState) {
+                    Modifier
+                } else {
+                    Modifier
+                        .clip(shape = TangemTheme.shapes.roundedCornersXMedium)
+                        .indication(interactionSource = interactionSource, indication = LocalIndication.current)
+                        .pointerInput(true) {
+                            detectTapGestures(
+                                onLongPress = {
+                                    haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+                                    isMenuVisible = true
+                                    pressOffset = DpOffset(x = it.x.toDp(), y = it.y.toDp())
+                                },
+                                onPress = {
+                                    val press = PressInteraction.Press(it)
+                                    interactionSource.emit(press)
+                                    tryAwaitRelease()
+                                    interactionSource.emit(PressInteraction.Release(press))
+                                },
+                            )
+                        }
+                },
+            ),
         shape = TangemTheme.shapes.roundedCornersXMedium,
         color = TangemTheme.colors.background.primary,
     ) {
@@ -157,28 +187,23 @@ private fun CardContainer(
                 .fillMaxWidth()
                 .padding(horizontal = TangemTheme.dimens.spacing14),
         ) {
-            content()
+            content(itemSize)
         }
     }
 
     var isRenameWalletDialogVisible by rememberSaveable { mutableStateOf(value = false) }
 
-    DropdownMenu(
-        expanded = isMenuVisible,
-        onDismissRequest = { isMenuVisible = false },
-        modifier = Modifier.background(color = TangemTheme.colors.background.secondary),
-        offset = pressOffset.copy(y = pressOffset.y - itemHeight),
-    ) {
-        MenuItem(
-            textResId = R.string.common_rename,
-            imageVector = Icons.Outlined.Edit,
-            onClick = {
-                isMenuVisible = false
-                isRenameWalletDialogVisible = true
-            },
-        )
-        MenuItem(textResId = R.string.common_delete, imageVector = Icons.Outlined.Delete, onClick = onDeleteClick)
+    val itemHeight by remember(itemSize.height) {
+        mutableStateOf(value = with(density) { itemSize.height.toDp() })
     }
+    ManageWalletContextMenu(
+        isMenuVisible = isMenuVisible,
+        pressOffset = pressOffset,
+        itemHeight = itemHeight,
+        onDismissRequest = { isMenuVisible = false },
+        onShowRenameWalletDialogClick = { isRenameWalletDialogVisible = true },
+        onDeleteClick = onDeleteClick,
+    )
 
     if (isRenameWalletDialogVisible) {
         RenameWalletDialogContent(
@@ -192,6 +217,41 @@ private fun CardContainer(
     }
 }
 
+@Suppress("LongParameterList")
+@Composable
+private fun ManageWalletContextMenu(
+    isMenuVisible: Boolean,
+    pressOffset: DpOffset,
+    itemHeight: Dp,
+    onDismissRequest: () -> Unit,
+    onShowRenameWalletDialogClick: () -> Unit,
+    onDeleteClick: () -> Unit,
+) {
+    DropdownMenu(
+        expanded = isMenuVisible,
+        onDismissRequest = onDismissRequest,
+        modifier = Modifier.background(color = TangemTheme.colors.background.secondary),
+        offset = pressOffset.copy(y = pressOffset.y - itemHeight),
+    ) {
+        MenuItem(
+            textResId = R.string.common_rename,
+            imageVector = Icons.Outlined.Edit,
+            onClick = {
+                onDismissRequest()
+                onShowRenameWalletDialogClick()
+            },
+        )
+        MenuItem(
+            textResId = R.string.common_delete,
+            imageVector = Icons.Outlined.Delete,
+            onClick = {
+                onDismissRequest()
+                onDeleteClick()
+            },
+        )
+    }
+}
+
 @Composable
 private fun MenuItem(@StringRes textResId: Int, imageVector: ImageVector, onClick: () -> Unit) {
     DropdownMenuItem(
@@ -201,60 +261,49 @@ private fun MenuItem(@StringRes textResId: Int, imageVector: ImageVector, onClic
         onClick = onClick,
         colors = MenuDefaults.itemColors(
             textColor = TangemTheme.colors.text.primary1,
-            trailingIconColor = TangemColorPalette.Dark6,
+            trailingIconColor = TangemTheme.colors.icon.primary1,
         ),
     )
 }
 
 @Composable
-private fun Title(state: WalletCardState, modifier: Modifier = Modifier) {
-    Row(
-        modifier = modifier,
-        horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing4),
-    ) {
-        TitleText(title = state.title)
-
-        AnimatedVisibility(visible = state is WalletCardState.HiddenContent, label = "Update the hidden icon") {
-            Icon(
-                modifier = Modifier.size(size = TangemTheme.dimens.size20),
-                painter = painterResource(id = R.drawable.ic_eye_off_24),
-                contentDescription = null,
-                tint = TangemTheme.colors.icon.informative,
-            )
-        }
-    }
-}
-
-@Composable
-private fun TitleText(title: String) {
+private fun TitleText(text: String, modifier: Modifier = Modifier) {
     Text(
-        text = title,
+        text = text,
+        modifier = modifier,
         color = TangemTheme.colors.text.tertiary,
-        style = TangemTheme.typography.body2,
         maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
+        style = TangemTheme.typography.button,
     )
 }
 
-@OptIn(ExperimentalAnimationApi::class)
 @Composable
-private fun Balance(state: WalletCardState, modifier: Modifier = Modifier) {
+private fun Balance(state: WalletCardState, isBalanceHidden: Boolean, modifier: Modifier = Modifier) {
     AnimatedContent(
         targetState = state,
         label = "Update the balance",
         modifier = modifier,
+        transitionSpec = {
+            fadeIn(animationSpec = tween(durationMillis = 220, delayMillis = 90)) togetherWith
+                fadeOut(animationSpec = tween(durationMillis = 90))
+        },
     ) { walletCardState ->
         when (walletCardState) {
             is WalletCardState.Content -> {
                 ResizableText(
-                    text = walletCardState.balance,
+                    text = if (isBalanceHidden) Strings.STARS else walletCardState.balance,
                     fontSizeRange = FontSizeRange(min = 16.sp, max = TangemTheme.typography.h2.fontSize),
                     modifier = Modifier.defaultMinSize(minHeight = TangemTheme.dimens.size32),
                     color = TangemTheme.colors.text.primary1,
+                    overflow = TextOverflow.Ellipsis,
+                    maxLines = 1,
                     style = TangemTheme.typography.h2,
                 )
             }
-            is WalletCardState.HiddenContent -> NonContentBalanceText(text = WalletCardState.HIDDEN_BALANCE_TEXT)
-            is WalletCardState.Error -> NonContentBalanceText(text = WalletCardState.EMPTY_BALANCE_TEXT)
+            is WalletCardState.Error -> NonContentBalanceText(
+                text = if (isBalanceHidden) WalletCardState.HIDDEN_BALANCE_TEXT else WalletCardState.EMPTY_BALANCE_TEXT,
+            )
             is WalletCardState.Loading -> {
                 RectangleShimmer(modifier = Modifier.nonContentBalanceSize(TangemTheme.dimens))
             }
@@ -275,29 +324,26 @@ private fun NonContentBalanceText(text: TextReference) {
 }
 
 private fun Modifier.nonContentBalanceSize(dimens: TangemDimens): Modifier {
-    return size(width = dimens.size102, height = dimens.size32)
+    return this
+        .padding(vertical = dimens.spacing4)
+        .size(width = dimens.size102, height = dimens.size24)
 }
 
-@OptIn(ExperimentalAnimationApi::class)
 @Composable
-private fun AdditionalInfo(state: WalletCardState, modifier: Modifier = Modifier) {
+private fun AdditionalInfo(text: TextReference?, modifier: Modifier = Modifier) {
     AnimatedContent(
-        targetState = state.additionalInfo,
+        targetState = text,
         label = "Update the additional text",
         modifier = modifier,
-    ) { additionalInfo ->
-        if (additionalInfo != null) {
-            AdditionalInfoText(text = additionalInfo)
+        transitionSpec = {
+            fadeIn(animationSpec = tween(durationMillis = 220, delayMillis = 90)) togetherWith
+                fadeOut(animationSpec = tween(durationMillis = 90))
+        },
+    ) { animatedText ->
+        if (animatedText != null) {
+            AdditionalInfoText(text = animatedText)
         } else {
-            when (state) {
-                is WalletCardState.Loading -> {
-                    RectangleShimmer(modifier = Modifier.nonContentAdditionalInfoSize(TangemTheme.dimens))
-                }
-                is WalletCardState.LockedContent -> {
-                    LockedContent(modifier = Modifier.nonContentAdditionalInfoSize(TangemTheme.dimens))
-                }
-                else -> Unit
-            }
+            RectangleShimmer(modifier = Modifier.nonContentAdditionalInfoSize(dimens = TangemTheme.dimens))
         }
     }
 }
@@ -306,8 +352,10 @@ private fun AdditionalInfo(state: WalletCardState, modifier: Modifier = Modifier
 private fun AdditionalInfoText(text: TextReference) {
     Text(
         text = text.resolveReference(),
-        color = TangemTheme.colors.text.disabled,
-        style = TangemTheme.typography.caption,
+        color = TangemTheme.colors.text.tertiary,
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
+        style = TangemTheme.typography.caption2,
     )
 }
 
@@ -328,9 +376,12 @@ private fun LockedContent(modifier: Modifier = Modifier) {
 @Composable
 private fun Image(@DrawableRes id: Int?, modifier: Modifier = Modifier) {
     AnimatedVisibility(visible = id != null, modifier = modifier) {
+        val imageRes = id ?: return@AnimatedVisibility
+
         Image(
-            painter = painterResource(id = requireNotNull(id)),
+            painter = painterResource(id = imageRes),
             contentDescription = null,
+            modifier = Modifier.width(width = TangemTheme.dimens.size120),
             contentScale = ContentScale.FillWidth,
         )
     }
@@ -345,7 +396,7 @@ private fun Preview_WalletCard_LightTheme(
     state: WalletCardState,
 ) {
     TangemTheme(isDark = false) {
-        WalletCard(state = state)
+        WalletCard(state = state, isBalanceHidden = false)
     }
 }
 
@@ -353,7 +404,7 @@ private fun Preview_WalletCard_LightTheme(
 @Composable
 private fun Preview_WalletCard_DarkTheme(@PreviewParameter(WalletCardStateProvider::class) state: WalletCardState) {
     TangemTheme(isDark = true) {
-        WalletCard(state)
+        WalletCard(state = state, isBalanceHidden = false)
     }
 }
 
@@ -361,7 +412,6 @@ private class WalletCardStateProvider : CollectionPreviewParameterProvider<Walle
     collection = listOf(
         WalletPreviewData.walletCardContentState,
         WalletPreviewData.walletCardLoadingState,
-        WalletPreviewData.walletCardHiddenContentState,
         WalletPreviewData.walletCardErrorState,
     ),
 )
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletContent.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletContent.kt
index 211ad0e75f..13ff628917 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletContent.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletContent.kt
@@ -22,10 +22,11 @@ import com.tangem.feature.wallet.presentation.wallet.ui.components.multicurrency
 internal fun LazyListScope.contentItems(
     state: WalletState.ContentState,
     txHistoryItems: LazyPagingItems<TxHistoryState.TxHistoryItemState>?,
+    isBalanceHidden: Boolean,
     modifier: Modifier = Modifier,
 ) {
     when (state) {
-        is WalletMultiCurrencyState -> tokensListItems(state.tokensListState, modifier)
-        is WalletSingleCurrencyState -> txHistoryItems(state.txHistoryState, txHistoryItems, modifier)
+        is WalletMultiCurrencyState -> tokensListItems(state.tokensListState, modifier, isBalanceHidden)
+        is WalletSingleCurrencyState -> txHistoryItems(state.txHistoryState, txHistoryItems, isBalanceHidden, modifier)
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletNotifications.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletNotifications.kt
index c6ef7f89ef..e60ec4b043 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletNotifications.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletNotifications.kt
@@ -5,6 +5,7 @@ import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.items
 import androidx.compose.ui.Modifier
 import com.tangem.core.ui.components.notifications.Notification
+import com.tangem.core.ui.res.TangemTheme
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletNotification
 import kotlinx.collections.immutable.ImmutableList
 
@@ -20,8 +21,20 @@ import kotlinx.collections.immutable.ImmutableList
 internal fun LazyListScope.notifications(configs: ImmutableList<WalletNotification>, modifier: Modifier = Modifier) {
     items(
         items = configs,
-        key = { it.state.title.hashCode() },
-        contentType = { it.state::class.java },
-        itemContent = { Notification(state = it.state, modifier = modifier.animateItemPlacement()) },
+        key = { it::class.java },
+        contentType = { it.config::class.java },
+        itemContent = {
+            Notification(
+                config = it.config,
+                modifier = modifier.animateItemPlacement(),
+                iconTint = when (it) {
+                    is WalletNotification.Critical -> TangemTheme.colors.icon.warning
+                    is WalletNotification.Informational -> TangemTheme.colors.icon.accent
+                    is WalletNotification.RateApp -> TangemTheme.colors.icon.attention
+                    is WalletNotification.UnlockWallets -> TangemTheme.colors.icon.primary1
+                    is WalletNotification.Warning -> null
+                },
+            )
+        },
     )
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletSideEffects.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletSideEffects.kt
deleted file mode 100644
index 0d415eaa74..0000000000
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletSideEffects.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.tangem.feature.wallet.presentation.wallet.ui.components.common
-
-import androidx.compose.foundation.lazy.LazyListState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.snapshotFlow
-import com.tangem.feature.wallet.presentation.wallet.state.components.WalletsListConfig
-import com.tangem.feature.wallet.presentation.wallet.ui.utils.ScrollOffsetCollector
-
-/**
- * Wallet screen side effects
- *
- * @param lazyListState     lazy list state
- * @param walletsListConfig wallets list config
- *
-[REDACTED_AUTHOR]
- */
-@Composable
-internal fun WalletSideEffects(lazyListState: LazyListState, walletsListConfig: WalletsListConfig) {
-    LaunchedEffect(key1 = walletsListConfig.selectedWalletIndex) {
-        lazyListState.scrollToItem(walletsListConfig.selectedWalletIndex)
-    }
-
-    val dragInteraction = lazyListState.interactionSource.interactions.collectAsState(initial = null)
-    LaunchedEffect(key1 = lazyListState, key2 = walletsListConfig.onWalletChange) {
-        snapshotFlow { lazyListState.layoutInfo.visibleItemsInfo }
-            .collect(
-                collector = ScrollOffsetCollector(
-                    lazyListState = lazyListState,
-                    dragInteraction = dragInteraction,
-                    callback = walletsListConfig.onWalletChange,
-                ),
-            )
-    }
-}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletTopBar.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletTopBar.kt
index 5b809bf2e7..d22e971baf 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletTopBar.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletTopBar.kt
@@ -12,7 +12,7 @@ import com.tangem.feature.wallet.presentation.wallet.state.components.WalletTopB
 /**
  * Wallet screen top bar
  *
- * @param config top bar config
+ * @param config component config
  */
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -22,11 +22,8 @@ internal fun WalletTopBar(config: WalletTopBarConfig) {
             Icon(painter = painterResource(id = R.drawable.img_tangem_logo_90_24), contentDescription = null)
         },
         actions = {
-            IconButton(onClick = config.onScanCardClick) {
-                Icon(painter = painterResource(id = R.drawable.ic_tap_card_24), contentDescription = "Scan card")
-            }
-            IconButton(onClick = config.onMoreClick) {
-                Icon(painter = painterResource(id = R.drawable.ic_more_vertical_24), contentDescription = "More")
+            IconButton(onClick = config.onDetailsClick) {
+                Icon(painter = painterResource(id = R.drawable.ic_more_vertical_24), contentDescription = null)
             }
         },
         colors = TopAppBarDefaults.topAppBarColors(
@@ -42,7 +39,7 @@ internal fun WalletTopBar(config: WalletTopBarConfig) {
 @Composable
 private fun Preview_WalletTopBar_LightTheme() {
     TangemTheme(isDark = false) {
-        WalletTopBar(config = WalletPreviewData.walletTopBarConfig)
+        WalletTopBar(config = WalletPreviewData.topBarConfig)
     }
 }
 
@@ -50,6 +47,6 @@ private fun Preview_WalletTopBar_LightTheme() {
 @Composable
 private fun Preview_WalletTopBar_DarkTheme() {
     TangemTheme(isDark = true) {
-        WalletTopBar(config = WalletPreviewData.walletTopBarConfig)
+        WalletTopBar(config = WalletPreviewData.topBarConfig)
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyContent.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyContent.kt
index 350cb95ecf..58fe5ebc3c 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyContent.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyContent.kt
@@ -30,36 +30,38 @@ private const val NON_CONTENT_TOKENS_LIST_KEY = "NON_CONTENT_TOKENS_LIST"
  *
 [REDACTED_AUTHOR]
  */
-internal fun LazyListScope.tokensListItems(state: WalletTokensListState, modifier: Modifier = Modifier) {
+internal fun LazyListScope.tokensListItems(
+    state: WalletTokensListState,
+    modifier: Modifier = Modifier,
+    isBalanceHidden: Boolean,
+) {
     when (state) {
-        is WalletTokensListState.ContentState -> contentItems(items = state.items, modifier = modifier)
+        is WalletTokensListState.ContentState -> contentItems(
+            items = state.items,
+            isBalanceHidden = isBalanceHidden,
+            modifier = modifier,
+        )
         WalletTokensListState.Empty -> nonContentItem(modifier = modifier)
     }
 }
 
-@OptIn(ExperimentalFoundationApi::class)
 private fun LazyListScope.contentItems(
     items: ImmutableList<WalletTokensListState.TokensListItemState>,
     modifier: Modifier = Modifier,
+    isBalanceHidden: Boolean,
 ) {
     itemsIndexed(
         items = items,
-        key = { _, item ->
-            when (item) {
-                is WalletTokensListState.TokensListItemState.NetworkGroupTitle -> item.value.hashCode()
-                is WalletTokensListState.TokensListItemState.Token -> item.state.id
-            }
-        },
+        key = { _, item -> item.id },
         contentType = { _, item -> item::class.java },
         itemContent = { index, item ->
             MultiCurrencyContentItem(
                 state = item,
-                modifier = modifier
-                    .animateItemPlacement()
-                    .roundedShapeItemDecoration(
-                        currentIndex = index,
-                        lastIndex = items.lastIndex,
-                    ),
+                isBalanceHidden = isBalanceHidden,
+                modifier = modifier.roundedShapeItemDecoration(
+                    currentIndex = index,
+                    lastIndex = items.lastIndex,
+                ),
             )
         },
     )
@@ -90,7 +92,7 @@ private fun LazyListScope.nonContentItem(modifier: Modifier = Modifier) {
                 modifier = Modifier.padding(horizontal = TangemTheme.dimens.spacing48),
                 color = TangemTheme.colors.text.tertiary,
                 textAlign = TextAlign.Center,
-                style = TangemTheme.typography.caption,
+                style = TangemTheme.typography.caption2,
             )
         }
     }
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 a9ac43d4ab..9678a22d13 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
@@ -16,13 +16,17 @@ import com.tangem.feature.wallet.presentation.wallet.state.components.WalletToke
 [REDACTED_AUTHOR]
  */
 @Composable
-internal fun MultiCurrencyContentItem(state: WalletTokensListState.TokensListItemState, modifier: Modifier = Modifier) {
+internal fun MultiCurrencyContentItem(
+    state: WalletTokensListState.TokensListItemState,
+    isBalanceHidden: Boolean,
+    modifier: Modifier = Modifier,
+) {
     when (state) {
         is WalletTokensListState.TokensListItemState.NetworkGroupTitle -> {
-            NetworkGroupItem(networkName = state.value.resolveReference(), modifier = modifier)
+            NetworkGroupItem(networkName = state.name.resolveReference(), modifier = modifier)
         }
         is WalletTokensListState.TokensListItemState.Token -> {
-            TokenItem(state = state.state, modifier = modifier)
+            TokenItem(state = state.state, isBalanceHidden = isBalanceHidden, modifier = modifier)
         }
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyOrganizeButton.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyOrganizeButton.kt
index 210bfd423c..8b981deeb7 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyOrganizeButton.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyOrganizeButton.kt
@@ -1,8 +1,11 @@
 package com.tangem.feature.wallet.presentation.wallet.ui.components.multicurrency
 
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.ui.Modifier
+import com.tangem.core.ui.components.buttons.actions.ActionButtonConfig
+import com.tangem.core.ui.components.buttons.actions.RoundedActionButton
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.feature.wallet.impl.R
 
 private const val ORGANIZE_BUTTON_CONTENT_TYPE = "OrganizeTokensButton"
 
@@ -14,9 +17,20 @@ private const val ORGANIZE_BUTTON_CONTENT_TYPE = "OrganizeTokensButton"
  *
 [REDACTED_AUTHOR]
  */
-@OptIn(ExperimentalFoundationApi::class)
-internal fun LazyListScope.organizeButton(onClick: (() -> Unit)?, modifier: Modifier = Modifier) {
+internal fun LazyListScope.organizeTokensButton(
+    isEnabled: Boolean,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
     item(key = ORGANIZE_BUTTON_CONTENT_TYPE, contentType = ORGANIZE_BUTTON_CONTENT_TYPE) {
-        OrganizeTokensButton(onClick = onClick, modifier = modifier.animateItemPlacement())
+        RoundedActionButton(
+            modifier = modifier,
+            config = ActionButtonConfig(
+                text = resourceReference(id = R.string.organize_tokens_title),
+                iconResId = R.drawable.ic_filter_24,
+                onClick = onClick,
+                enabled = isEnabled,
+            ),
+        )
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/OrganizeTokensButton.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/OrganizeTokensButton.kt
deleted file mode 100644
index 53aeef026b..0000000000
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/OrganizeTokensButton.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.tangem.feature.wallet.presentation.wallet.ui.components.multicurrency
-
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import com.tangem.core.ui.components.buttons.actions.ActionButtonConfig
-import com.tangem.core.ui.components.buttons.actions.RoundedActionButton
-import com.tangem.core.ui.extensions.TextReference
-import com.tangem.feature.wallet.impl.R
-
-/**
- * Organize tokens button
- *
- * @param onClick  callback, if null button is disabled
- * @param modifier modifier
- *
-[REDACTED_AUTHOR]
- */
-@Composable
-internal fun OrganizeTokensButton(onClick: (() -> Unit)?, modifier: Modifier = Modifier) {
-    RoundedActionButton(
-        config = ActionButtonConfig(
-            text = TextReference.Res(id = R.string.organize_tokens_title),
-            iconResId = R.drawable.ic_filter_24,
-            onClick = onClick ?: {},
-            enabled = onClick != null,
-        ),
-        modifier = modifier,
-    )
-}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/singlecurrency/SingleCurrencyControlButtons.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/singlecurrency/SingleCurrencyControlButtons.kt
index 4843bd9dc4..af4d8c17ae 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/singlecurrency/SingleCurrencyControlButtons.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/singlecurrency/SingleCurrencyControlButtons.kt
@@ -15,14 +15,19 @@ private const val CONTROL_BUTTONS_CONTENT_TYPE = "ControlButtons"
 /**
  * Single currency control buttons. Like, "Buy", "Sell", etc
  *
- * @param configs  list of buttons
- * @param modifier modifier
+ * @param configs             list of buttons
+ * @param selectedWalletIndex selected wallet index for creating a unique key
+ * @param modifier            modifier
  *
 [REDACTED_AUTHOR]
  */
 @OptIn(ExperimentalFoundationApi::class)
-internal fun LazyListScope.controlButtons(configs: ImmutableList<WalletManageButton>, modifier: Modifier = Modifier) {
-    item(key = CONTROL_BUTTONS_CONTENT_TYPE, contentType = CONTROL_BUTTONS_CONTENT_TYPE) {
+internal fun LazyListScope.controlButtons(
+    configs: ImmutableList<WalletManageButton>,
+    selectedWalletIndex: Int,
+    modifier: Modifier = Modifier,
+) {
+    item(key = CONTROL_BUTTONS_CONTENT_TYPE + selectedWalletIndex, contentType = CONTROL_BUTTONS_CONTENT_TYPE) {
         HorizontalActionChips(
             buttons = configs.map(WalletManageButton::config).toImmutableList(),
             modifier = modifier.animateItemPlacement(),
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/utils/ChangeWalletAnimator.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/utils/ChangeWalletAnimator.kt
new file mode 100644
index 0000000000..d211e051f1
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/utils/ChangeWalletAnimator.kt
@@ -0,0 +1,83 @@
+package com.tangem.feature.wallet.presentation.wallet.ui.utils
+
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.foundation.layout.absoluteOffset
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.composed
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.coerceIn
+import androidx.compose.ui.unit.dp
+import kotlin.math.sin
+
+private val minOffset = 0.dp
+private val maxOffset = 40.dp
+
+private const val MIN_ALPHA = 0f
+private const val MAX_ALPHA = 1f
+
+private const val PI = Math.PI.toFloat()
+private const val HALF_PI = PI / 2
+private const val DOUBLE_PI = 2 * PI
+
+private const val Y_AXIS_OFFSET = 0.5f
+private const val AMPLITUDE_MULTIPLIER = 0.5f
+
+/**
+ * Modifier extension for setting [absoluteOffset] and [alpha] animations of wallet change
+ *
+ * @param lazyListState lazy list state
+ *
+[REDACTED_AUTHOR]
+ */
+internal fun Modifier.changeWalletAnimator(lazyListState: LazyListState) = composed {
+    val offset by remember(lazyListState) { derivedStateOf { lazyListState.firstVisibleItemScrollOffset } }
+
+    val size by remember(lazyListState) {
+        derivedStateOf { lazyListState.layoutInfo.visibleItemsInfo.firstOrNull()?.size ?: 1 }
+    }
+
+    val contentOffsetY by rememberOffsetY(offset = offset, size = size)
+    val contentAlpha by rememberAlpha(offset = offset, size = size)
+
+    val animatedOffsetY by animateDpAsState(targetValue = contentOffsetY, label = "offsetY")
+    val animatedContentAlpha by animateFloatAsState(targetValue = contentAlpha, label = "alpha")
+
+    this
+        .absoluteOffset(y = animatedOffsetY)
+        .alpha(alpha = animatedContentAlpha)
+}
+
+/**
+ * y = ANIMATION_MAX_OFFSET_IN_DP.dp * sin(π / size * offset)
+ *
+ * @see <a href="https://www.wolframalpha.com/input?i=plot%2820+*+sin%28pi+%2F+100+*+x%29%2C0..100%29">Graphic</a>
+ */
+@Composable
+private fun rememberOffsetY(offset: Int, size: Int): State<Dp> {
+    return remember(offset) {
+        derivedStateOf {
+            val y = maxOffset * sin(x = PI / size * offset)
+            y.coerceIn(minimumValue = minOffset, maximumValue = maxOffset)
+        }
+    }
+}
+
+/**
+ * y = 0.5 * sin(2 * pi / size * offset + pi / 2) + 0.5
+ *
+ * @see <a href="https://www.wolframalpha.com/input?i=plot%280.5+*+sin%282pi+%2F+100+*+x+%2B+pi%2F2%29+%2B+0.5%2C0..100%29"
+ * >Graphic</a>
+ */
+@Composable
+private fun rememberAlpha(offset: Int, size: Int): State<Float> {
+    return remember(offset) {
+        derivedStateOf {
+            val y = AMPLITUDE_MULTIPLIER * sin(x = DOUBLE_PI / size * offset + HALF_PI) + Y_AXIS_OFFSET
+            y.coerceIn(MIN_ALPHA, MAX_ALPHA)
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/utils/ScrollOffsetCollector.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/utils/ScrollOffsetCollector.kt
index 1cfc37798f..2119079f09 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/utils/ScrollOffsetCollector.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/utils/ScrollOffsetCollector.kt
@@ -1,40 +1,57 @@
 package com.tangem.feature.wallet.presentation.wallet.ui.utils
 
-import androidx.compose.foundation.interaction.Interaction
 import androidx.compose.foundation.lazy.LazyListItemInfo
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.State
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletsListConfig
 import kotlinx.coroutines.flow.FlowCollector
 import kotlin.math.abs
 
 /**
  * Flow collector for scroll items tracking.
- * If first visible item offset is greater than half item size, then [callback] be invoked.
- * If last visible item offset is greater than half item size, then [callback] be invoked.
+ * If first visible item offset is greater than half item size, then change selected wallet index.
+ * If last visible item offset is greater than half item size, then change selected wallet index.
  *
- * @property lazyListState   lazy list state
- * @property dragInteraction current drag interaction
- * @property callback        lambda be invoked when current scroll items is changed
+ * @property lazyListState     lazy list state
+ * @property walletsListConfig wallets list config
+ * @property isAutoScroll      check if last scrolling is auto scroll
  *
 [REDACTED_AUTHOR]
  */
 internal class ScrollOffsetCollector(
     private val lazyListState: LazyListState,
-    private val dragInteraction: State<Interaction?>,
-    private val callback: (Int) -> Unit,
+    private val walletsListConfig: WalletsListConfig,
+    private val isAutoScroll: State<Boolean>,
 ) : FlowCollector<List<LazyListItemInfo>> {
 
-    private val LazyListItemInfo.halfItemSize get() = size.div(other = 2)
+    private val LazyListItemInfo.halfItemSize
+        get() = size.div(other = 2)
+
+    private var currentIndex = walletsListConfig.selectedWalletIndex
 
     override suspend fun emit(value: List<LazyListItemInfo>) {
-        if (!lazyListState.isScrollInProgress || dragInteraction.value == null || value.size <= 1) return
+        // Auto scroll must not change wallet
+        if (isAutoScroll.value) {
+            currentIndex = walletsListConfig.selectedWalletIndex
+            return
+        }
+
+        if (!lazyListState.isScrollInProgress || value.size <= 1) return
+
         val firstItem = value.firstOrNull() ?: return
         val lastItem = value.lastOrNull() ?: return
 
         if (abs(firstItem.offset) > firstItem.halfItemSize) {
-            callback(firstItem.index + 1)
+            onWalletChange(newIndex = firstItem.index + 1)
         } else if (abs(lastItem.offset) > lastItem.halfItemSize) {
-            callback(lastItem.index - 1)
+            onWalletChange(newIndex = lastItem.index - 1)
+        }
+    }
+
+    private fun onWalletChange(newIndex: Int) {
+        if (currentIndex != newIndex) {
+            currentIndex = newIndex
+            walletsListConfig.onWalletChange(newIndex)
         }
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/utils/WalletContentItemAnimator.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/utils/WalletContentItemAnimator.kt
deleted file mode 100644
index 61a190a01f..0000000000
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/utils/WalletContentItemAnimator.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.tangem.feature.wallet.presentation.wallet.ui.utils
-
-import androidx.compose.animation.core.animateDpAsState
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.foundation.layout.absoluteOffset
-import androidx.compose.foundation.lazy.LazyListState
-import androidx.compose.runtime.derivedStateOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.composed
-import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.unit.dp
-
-private const val ANIMATION_MAX_OFFSET_IN_DP = 80
-private const val ANIMATION_MAX_ALPHA = 1f
-
-/**
- * Modifier extension for setting [absoluteOffset] and [alpha] animations of wallet change
- *
- * @param lazyListState lazy list state
- *
-[REDACTED_AUTHOR]
- */
-internal fun Modifier.changeWalletAnimator(lazyListState: LazyListState) = composed {
-    val walletItemOffset by remember(lazyListState) { derivedStateOf { lazyListState.firstVisibleItemScrollOffset } }
-
-    val walletItemSize by remember(lazyListState) {
-        derivedStateOf { lazyListState.layoutInfo.visibleItemsInfo.firstOrNull()?.size ?: 1 }
-    }
-
-    val walletHalfItemSize by remember {
-        derivedStateOf { walletItemSize / 2 }
-    }
-
-    val contentOffsetY by remember {
-        derivedStateOf {
-            /*
-             * Until [walletItemOffset] is less than [walletHalfItemSize],
-             * then content offset animation has positive value (downward movement).
-             * Otherwise, it has negative value (upward movement).
-             */
-            val position = if (walletItemOffset < walletHalfItemSize) {
-                walletItemOffset
-            } else {
-                walletItemSize - walletItemOffset
-            }
-
-            ANIMATION_MAX_OFFSET_IN_DP.dp / walletItemSize * position
-        }
-    }
-
-    val contentAlpha by remember {
-        derivedStateOf {
-            /*
-             * Until [walletItemOffset] is less than [walletHalfItemSize],
-             * then content alpha animation has negative value (fade out).
-             * Otherwise, it has positive value (fade in).
-             */
-            val position = if (walletItemOffset < walletHalfItemSize) {
-                walletHalfItemSize - walletItemOffset
-            } else {
-                walletItemOffset - walletHalfItemSize
-            }
-
-            ANIMATION_MAX_ALPHA / walletHalfItemSize * position
-        }
-    }
-
-    val animatedOffsetY by animateDpAsState(targetValue = contentOffsetY)
-    val animatedContentAlpha by animateFloatAsState(targetValue = contentAlpha)
-
-    this
-        .absoluteOffset(y = animatedOffsetY)
-        .alpha(alpha = animatedContentAlpha)
-}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/utils/WalletsListInteractionsCollector.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/utils/WalletsListInteractionsCollector.kt
new file mode 100644
index 0000000000..49ade64a90
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/utils/WalletsListInteractionsCollector.kt
@@ -0,0 +1,14 @@
+package com.tangem.feature.wallet.presentation.wallet.ui.utils
+
+import androidx.compose.foundation.interaction.DragInteraction
+import androidx.compose.foundation.interaction.Interaction
+import kotlinx.coroutines.flow.FlowCollector
+
+internal class WalletsListInteractionsCollector(
+    private val onDragStart: () -> Unit,
+) : FlowCollector<Interaction?> {
+
+    override suspend fun emit(value: Interaction?) {
+        if (value is DragInteraction.Start) onDragStart()
+    }
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/CryptoCurrencyStatusToTokenItemConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/CryptoCurrencyStatusToTokenItemConverter.kt
index b19dcf646a..59b3b14b1e 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/CryptoCurrencyStatusToTokenItemConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/CryptoCurrencyStatusToTokenItemConverter.kt
@@ -1,69 +1,72 @@
 package com.tangem.feature.wallet.presentation.wallet.utils
 
 import com.tangem.common.Provider
-import com.tangem.core.ui.components.marketprice.PriceChangeConfig
-import com.tangem.core.ui.extensions.iconResId
-import com.tangem.core.ui.extensions.networkBadgeIconResId
+import com.tangem.core.ui.components.marketprice.PriceChangeType
 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.common.utils.CryptoCurrencyToIconStateConverter
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.WalletClickIntents
 import com.tangem.utils.converter.Converter
 import java.math.BigDecimal
 
 internal class CryptoCurrencyStatusToTokenItemConverter(
     private val appCurrencyProvider: Provider<AppCurrency>,
-    private val isWalletContentHidden: Boolean,
     private val clickIntents: WalletClickIntents,
 ) : Converter<CryptoCurrencyStatus, TokenItemState> {
 
+    private val iconStateConverter by lazy(::CryptoCurrencyToIconStateConverter)
+
     override fun convert(value: CryptoCurrencyStatus): TokenItemState {
         return when (value.value) {
-            is CryptoCurrencyStatus.Loading -> TokenItemState.Loading(id = value.currency.id.value)
+            is CryptoCurrencyStatus.Loading -> value.mapToLoadingState()
             is CryptoCurrencyStatus.Loaded,
             is CryptoCurrencyStatus.Custom,
             is CryptoCurrencyStatus.NoQuote,
-            -> value.mapToTokenItemState()
-            // TODO: Add other token item states, currently not designed
-            is CryptoCurrencyStatus.MissedDerivation,
             is CryptoCurrencyStatus.NoAccount,
+            -> value.mapToTokenItemState()
+            is CryptoCurrencyStatus.MissedDerivation -> value.mapToNoAddressTokenItemState()
             is CryptoCurrencyStatus.Unreachable,
+            is CryptoCurrencyStatus.NoAmount,
             -> value.mapToUnreachableTokenItemState()
         }
     }
 
+    private fun CryptoCurrencyStatus.mapToLoadingState(): TokenItemState.Loading {
+        return TokenItemState.Loading(
+            id = currency.id.value,
+            iconState = iconStateConverter.convert(value = this),
+            titleState = TokenItemState.TitleState.Content(text = currency.name),
+        )
+    }
+
     private fun CryptoCurrencyStatus.mapToTokenItemState(): TokenItemState.Content {
         return TokenItemState.Content(
             id = currency.id.value,
-            name = currency.name,
-            tokenIconUrl = currency.iconUrl,
-            tokenIconResId = currency.iconResId,
-            networkBadgeIconResId = currency.networkBadgeIconResId,
-            amount = getFormattedAmount(),
-            hasPending = value.hasCurrentNetworkTransactions,
-            tokenOptions = if (isWalletContentHidden) {
-                TokenItemState.TokenOptionsState.Hidden(getPriceChangeConfig())
-            } else {
-                TokenItemState.TokenOptionsState.Visible(
-                    fiatAmount = getFormattedFiatAmount(),
-                    config = getPriceChangeConfig(),
-                )
-            },
-            isTestnet = currency.network.isTestnet,
+            iconState = iconStateConverter.convert(value = this),
+            titleState = TokenItemState.TitleState.Content(
+                text = currency.name,
+                hasPending = value.hasCurrentNetworkTransactions,
+            ),
+            fiatAmountState = TokenItemState.FiatAmountState.Content(
+                text = getFormattedFiatAmount(),
+            ),
+            cryptoAmountState = TokenItemState.CryptoAmountState.Content(text = getFormattedAmount()),
+            priceChangeState = getPriceChangeConfig(),
             onItemClick = { clickIntents.onTokenItemClick(currency) },
-            onItemLongClick = { clickIntents.onTokenItemLongClick(currency) },
+            onItemLongClick = { clickIntents.onTokenItemLongClick(cryptoCurrencyStatus = this) },
         )
     }
 
     private fun CryptoCurrencyStatus.getFormattedAmount(): String {
-        val amount = value.amount ?: return UNKNOWN_AMOUNT_SIGN
+        val amount = value.amount ?: return TokenItemState.UNKNOWN_AMOUNT_SIGN
 
         return BigDecimalFormatter.formatCryptoAmount(amount, currency.symbol, currency.decimals)
     }
 
     private fun CryptoCurrencyStatus.getFormattedFiatAmount(): String {
-        val fiatAmount = value.fiatAmount ?: return UNKNOWN_AMOUNT_SIGN
+        val fiatAmount = value.fiatAmount ?: return TokenItemState.UNKNOWN_AMOUNT_SIGN
         val appCurrency = appCurrencyProvider()
 
         return BigDecimalFormatter.formatFiatAmount(fiatAmount, appCurrency.code, appCurrency.symbol)
@@ -71,31 +74,38 @@ internal class CryptoCurrencyStatusToTokenItemConverter(
 
     private fun CryptoCurrencyStatus.mapToUnreachableTokenItemState() = TokenItemState.Unreachable(
         id = currency.id.value,
-        name = currency.name,
-        tokenIconUrl = currency.iconUrl,
-        tokenIconResId = currency.iconResId,
-        networkBadgeIconResId = currency.networkBadgeIconResId,
+        iconState = iconStateConverter.convert(value = this),
+        titleState = TokenItemState.TitleState.Content(text = currency.name),
+        onItemClick = { clickIntents.onTokenItemClick(currency) },
+        onItemLongClick = { clickIntents.onTokenItemLongClick(cryptoCurrencyStatus = this) },
     )
 
-    private fun CryptoCurrencyStatus.getPriceChangeConfig(): PriceChangeConfig {
+    private fun CryptoCurrencyStatus.mapToNoAddressTokenItemState() = TokenItemState.NoAddress(
+        id = currency.id.value,
+        iconState = iconStateConverter.convert(this),
+        titleState = TokenItemState.TitleState.Content(text = currency.name),
+        onItemLongClick = { clickIntents.onTokenItemLongClick(cryptoCurrencyStatus = this) },
+    )
+
+    private fun CryptoCurrencyStatus.getPriceChangeConfig(): TokenItemState.PriceChangeState {
         val priceChange = value.priceChange
-            ?: return PriceChangeConfig(UNKNOWN_AMOUNT_SIGN, PriceChangeConfig.Type.DOWN)
 
-        return PriceChangeConfig(
-            valueInPercent = BigDecimalFormatter.formatPercent(priceChange, useAbsoluteValue = true),
-            type = priceChange.getPriceChangeType(),
-        )
-    }
-
-    private fun BigDecimal?.getPriceChangeType(): PriceChangeConfig.Type {
-        return when {
-            this == null -> PriceChangeConfig.Type.DOWN
-            this < BigDecimal.ZERO -> PriceChangeConfig.Type.DOWN
-            else -> PriceChangeConfig.Type.UP
+        return if (priceChange != null) {
+            TokenItemState.PriceChangeState.Content(
+                valueInPercent = BigDecimalFormatter.formatPercent(
+                    percent = priceChange,
+                    useAbsoluteValue = true,
+                    maxFractionDigits = 1,
+                    minFractionDigits = 1,
+                ),
+                type = priceChange.getPriceChangeType(),
+            )
+        } else {
+            TokenItemState.PriceChangeState.Unknown
         }
     }
 
-    private companion object {
-        const val UNKNOWN_AMOUNT_SIGN = "—"
+    private fun BigDecimal.getPriceChangeType(): PriceChangeType {
+        return if (this > BigDecimal.ZERO) PriceChangeType.UP else PriceChangeType.DOWN
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/CurrencyStatusErrorConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/CurrencyStatusErrorConverter.kt
new file mode 100644
index 0000000000..352f9f4739
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/CurrencyStatusErrorConverter.kt
@@ -0,0 +1,17 @@
+package com.tangem.feature.wallet.presentation.wallet.utils
+
+import com.tangem.common.Converter
+import com.tangem.common.Provider
+import com.tangem.domain.tokens.error.CurrencyStatusError
+import com.tangem.feature.wallet.presentation.wallet.state.WalletSingleCurrencyState
+import com.tangem.feature.wallet.presentation.wallet.state.WalletState
+
+// TODO: Implement this
+internal class CurrencyStatusErrorConverter(
+    private val currentStateProvider: Provider<WalletState>,
+) : Converter<CurrencyStatusError, WalletSingleCurrencyState.Content> {
+
+    override fun convert(value: CurrencyStatusError): WalletSingleCurrencyState.Content {
+        return requireNotNull(currentStateProvider() as? WalletSingleCurrencyState.Content)
+    }
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/FiatBalanceToWalletCardConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/FiatBalanceToWalletCardConverter.kt
index 05340d37ed..7c479d0c98 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/FiatBalanceToWalletCardConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/FiatBalanceToWalletCardConverter.kt
@@ -3,19 +3,17 @@ package com.tangem.feature.wallet.presentation.wallet.utils
 import com.tangem.common.Provider
 import com.tangem.core.ui.utils.BigDecimalFormatter.formatFiatAmount
 import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.common.CardTypesResolver
 import com.tangem.domain.tokens.model.TokenList.FiatBalance
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletAdditionalInfoFactory
+import com.tangem.feature.wallet.presentation.wallet.domain.getCardsCount
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletCardState
 import com.tangem.utils.converter.Converter
 
 internal class FiatBalanceToWalletCardConverter(
     private val currentState: WalletCardState,
-    private val cardTypeResolverProvider: Provider<CardTypesResolver>,
     private val appCurrencyProvider: Provider<AppCurrency>,
     private val currentWalletProvider: Provider<UserWallet>,
-    private val isWalletContentHidden: Boolean,
 ) : Converter<FiatBalance, WalletCardState> {
 
     override fun convert(value: FiatBalance): WalletCardState {
@@ -34,45 +32,29 @@ internal class FiatBalanceToWalletCardConverter(
         return WalletCardState.Error(
             id = id,
             title = title,
+            additionalInfo = additionalInfo,
             imageResId = imageResId,
             onDeleteClick = onDeleteClick,
             onRenameClick = onRenameClick,
-            additionalInfo = WalletAdditionalInfoFactory.resolve(
-                cardTypesResolver = cardTypeResolverProvider(),
-                wallet = currentWalletProvider(),
-            ),
         )
     }
 
     private fun FiatBalance.Loaded.convertToWalletCardState(): WalletCardState {
-        return if (isWalletContentHidden) {
-            WalletCardState.HiddenContent(
-                id = currentState.id,
-                title = currentState.title,
-                additionalInfo = currentState.additionalInfo ?: WalletCardState.HIDDEN_BALANCE_TEXT,
-                imageResId = currentState.imageResId,
-                onRenameClick = currentState.onRenameClick,
-                onDeleteClick = currentState.onDeleteClick,
-            )
-        } else {
-            val appCurrency = appCurrencyProvider()
+        val appCurrency = appCurrencyProvider()
 
-            WalletCardState.Content(
-                id = currentState.id,
-                title = currentState.title,
-                additionalInfo = WalletAdditionalInfoFactory.resolve(
-                    cardTypesResolver = cardTypeResolverProvider(),
-                    wallet = currentWalletProvider(),
-                ),
-                imageResId = currentState.imageResId,
-                onRenameClick = currentState.onRenameClick,
-                onDeleteClick = currentState.onDeleteClick,
-                balance = formatFiatAmount(
-                    fiatAmount = this.amount,
-                    fiatCurrencyCode = appCurrency.code,
-                    fiatCurrencySymbol = appCurrency.symbol,
-                ),
-            )
-        }
+        return WalletCardState.Content(
+            id = currentState.id,
+            title = currentState.title,
+            additionalInfo = WalletAdditionalInfoFactory.resolve(wallet = currentWalletProvider()),
+            imageResId = currentState.imageResId,
+            onRenameClick = currentState.onRenameClick,
+            onDeleteClick = currentState.onDeleteClick,
+            balance = formatFiatAmount(
+                fiatAmount = this.amount,
+                fiatCurrencyCode = appCurrency.code,
+                fiatCurrencySymbol = appCurrency.symbol,
+            ),
+            cardCount = currentWalletProvider().getCardsCount(),
+        )
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/HiddenStateConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/HiddenStateConverter.kt
new file mode 100644
index 0000000000..67e39880dd
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/HiddenStateConverter.kt
@@ -0,0 +1,26 @@
+package com.tangem.feature.wallet.presentation.wallet.utils
+
+import com.tangem.common.Converter
+import com.tangem.common.Provider
+import com.tangem.feature.wallet.presentation.wallet.state.WalletMultiCurrencyState
+import com.tangem.feature.wallet.presentation.wallet.state.WalletSingleCurrencyState
+import com.tangem.feature.wallet.presentation.wallet.state.WalletState
+
+internal class HiddenStateConverter(
+    private val currentStateProvider: Provider<WalletState>,
+) : Converter<Boolean, WalletState> {
+
+    override fun convert(value: Boolean): WalletState {
+        return when (val state = currentStateProvider() as? WalletState.ContentState) {
+            is WalletMultiCurrencyState.Content -> {
+                state.copy(isBalanceHidden = value)
+            }
+
+            is WalletSingleCurrencyState.Content -> {
+                state.copy(isBalanceHidden = value)
+            }
+
+            else -> currentStateProvider()
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/LoadingItemsProvider.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/LoadingItemsProvider.kt
deleted file mode 100644
index c7e545dec3..0000000000
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/LoadingItemsProvider.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.tangem.feature.wallet.presentation.wallet.utils
-
-import com.tangem.feature.wallet.presentation.common.state.TokenItemState
-import com.tangem.feature.wallet.presentation.wallet.state.components.WalletTokensListState
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.toImmutableList
-
-internal object LoadingItemsProvider {
-
-    fun getLoadingMultiCurrencyTokens(): ImmutableList<WalletTokensListState.TokensListItemState.Token> {
-        val items = mutableListOf<WalletTokensListState.TokensListItemState.Token>()
-        repeat(times = 5) {
-            items.add(
-                WalletTokensListState.TokensListItemState.Token(
-                    state = TokenItemState.Loading(id = "Loading#$it"),
-                ),
-            )
-        }
-        return items.toImmutableList()
-    }
-}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/TokenListErrorConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/TokenListErrorConverter.kt
index 82709f83a7..2620d59797 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/TokenListErrorConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/TokenListErrorConverter.kt
@@ -7,27 +7,29 @@ import com.tangem.feature.wallet.presentation.wallet.state.WalletSingleCurrencyS
 import com.tangem.feature.wallet.presentation.wallet.state.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletTokensListState
 import com.tangem.utils.converter.Converter
-import kotlinx.collections.immutable.persistentListOf
 
 internal class TokenListErrorConverter(
     private val currentStateProvider: Provider<WalletState>,
 ) : Converter<TokenListError, WalletState> {
 
     override fun convert(value: TokenListError): WalletState {
-        return when (val state = currentStateProvider()) {
-            is WalletMultiCurrencyState.Content -> {
-                state.copy(
-                    tokensListState = WalletTokensListState.Content(
-                        items = persistentListOf(),
-                        onOrganizeTokensClick = null,
-                    ),
-                )
-            }
+        val state = currentStateProvider()
+        return when (value) {
+            is TokenListError.EmptyTokens -> state.mapToEmptyTokensState()
+            is TokenListError.DataError,
+            is TokenListError.UnableToSortTokenList,
+            -> state
+        }
+    }
+
+    private fun WalletState.mapToEmptyTokensState(): WalletState {
+        return when (this) {
+            is WalletMultiCurrencyState.Content -> copy(tokensListState = WalletTokensListState.Empty)
             is WalletMultiCurrencyState.Locked,
             is WalletSingleCurrencyState.Content,
             is WalletSingleCurrencyState.Locked,
             is WalletState.Initial,
-            -> state
+            -> this
         }
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/TokenListToContentItemsConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/TokenListToContentItemsConverter.kt
index ca50986a37..13626e2988 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/TokenListToContentItemsConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/TokenListToContentItemsConverter.kt
@@ -1,14 +1,15 @@
 package com.tangem.feature.wallet.presentation.wallet.utils
 
 import com.tangem.common.Provider
-import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.stringReference
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
 import com.tangem.domain.tokens.model.NetworkGroup
 import com.tangem.domain.tokens.model.TokenList
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletTokensListState
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletTokensListState.OrganizeTokensButtonState
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletTokensListState.TokensListItemState
-import com.tangem.feature.wallet.presentation.wallet.utils.LoadingItemsProvider.getLoadingMultiCurrencyTokens
+import com.tangem.feature.wallet.presentation.wallet.state.factory.TokenListWithWallet
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.WalletClickIntents
 import com.tangem.utils.converter.Converter
 import kotlinx.collections.immutable.PersistentList
@@ -17,37 +18,26 @@ import kotlinx.collections.immutable.persistentListOf
 
 internal class TokenListToContentItemsConverter(
     appCurrencyProvider: Provider<AppCurrency>,
-    isWalletContentHidden: Boolean,
     private val clickIntents: WalletClickIntents,
-) : Converter<TokenList, WalletTokensListState> {
+) : Converter<TokenListWithWallet, WalletTokensListState> {
 
     private val tokenStatusConverter = CryptoCurrencyStatusToTokenItemConverter(
-        isWalletContentHidden = isWalletContentHidden,
         appCurrencyProvider = appCurrencyProvider,
         clickIntents = clickIntents,
     )
 
-    override fun convert(value: TokenList): WalletTokensListState {
-        val isEmptyList = when (value) {
-            is TokenList.GroupedByNetwork -> value.groups.isEmpty()
-            is TokenList.NotInitialized -> false
-            is TokenList.Ungrouped -> value.currencies.isEmpty()
-        }
-
-        return if (isEmptyList) {
-            WalletTokensListState.Empty
-        } else {
-            WalletTokensListState.Content(
-                items = when (value) {
-                    is TokenList.GroupedByNetwork -> value.mapToMultiCurrencyItems()
-                    is TokenList.Ungrouped -> value.mapToMultiCurrencyItems()
-                    is TokenList.NotInitialized -> getLoadingMultiCurrencyTokens()
-                },
-                onOrganizeTokensClick = if (value.totalFiatBalance is TokenList.FiatBalance.Loaded) {
-                    clickIntents::onOrganizeTokensClick
-                } else {
-                    null
-                },
+    override fun convert(value: TokenListWithWallet): WalletTokensListState {
+        val isSingleCurrencyWalletWithToken = !value.wallet.isMultiCurrency &&
+            value.wallet.scanResponse.walletData?.token != null
+        return when (val tokenList = value.tokenList) {
+            is TokenList.Empty -> WalletTokensListState.Empty
+            is TokenList.GroupedByNetwork -> WalletTokensListState.Content(
+                items = tokenList.mapToMultiCurrencyItems(),
+                organizeTokensButton = tokenList.mapToOrganizeTokensButtonState(isSingleCurrencyWalletWithToken),
+            )
+            is TokenList.Ungrouped -> WalletTokensListState.Content(
+                items = tokenList.mapToMultiCurrencyItems(),
+                organizeTokensButton = tokenList.mapToOrganizeTokensButtonState(isSingleCurrencyWalletWithToken),
             )
         }
     }
@@ -64,8 +54,33 @@ internal class TokenListToContentItemsConverter(
         }
     }
 
+    private fun TokenList.GroupedByNetwork.mapToOrganizeTokensButtonState(
+        isSingleCurrencyWithTokenWallet: Boolean,
+    ): OrganizeTokensButtonState {
+        return getOrganizeTokensButtonState(
+            isLoading = totalFiatBalance is TokenList.FiatBalance.Loading,
+            currenciesSize = groups.flatMap(NetworkGroup::currencies).size,
+            isSingleCurrencyWithTokenWallet = isSingleCurrencyWithTokenWallet,
+        )
+    }
+
+    private fun TokenList.Ungrouped.mapToOrganizeTokensButtonState(
+        isSingleCurrencyWithTokenWallet: Boolean,
+    ): OrganizeTokensButtonState {
+        return getOrganizeTokensButtonState(
+            isLoading = totalFiatBalance is TokenList.FiatBalance.Loading,
+            currenciesSize = currencies.size,
+            isSingleCurrencyWithTokenWallet = isSingleCurrencyWithTokenWallet,
+        )
+    }
+
     private fun MutableList<TokensListItemState>.addGroup(group: NetworkGroup): List<TokensListItemState> {
-        this.add(TokensListItemState.NetworkGroupTitle(TextReference.Str(group.network.name)))
+        val groupTitle = TokensListItemState.NetworkGroupTitle(
+            id = group.network.hashCode(),
+            name = stringReference(group.network.name),
+        )
+
+        this.add(groupTitle)
 
         group.currencies.forEach { token ->
             this.addToken(token)
@@ -81,4 +96,19 @@ internal class TokenListToContentItemsConverter(
 
         return this
     }
+
+    private fun getOrganizeTokensButtonState(
+        isLoading: Boolean,
+        currenciesSize: Int,
+        isSingleCurrencyWithTokenWallet: Boolean,
+    ): OrganizeTokensButtonState {
+        return if (currenciesSize > 1 && !isSingleCurrencyWithTokenWallet) {
+            OrganizeTokensButtonState.Visible(
+                isEnabled = !isLoading,
+                onClick = clickIntents::onOrganizeTokensClick,
+            )
+        } else {
+            OrganizeTokensButtonState.Hidden
+        }
+    }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/TokenListToWalletStateConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/TokenListToWalletStateConverter.kt
index 35aa99598f..2228f63598 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/TokenListToWalletStateConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/TokenListToWalletStateConverter.kt
@@ -2,13 +2,13 @@ package com.tangem.feature.wallet.presentation.wallet.utils
 
 import com.tangem.common.Provider
 import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.common.CardTypesResolver
 import com.tangem.domain.tokens.model.TokenList
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.state.WalletMultiCurrencyState
+import com.tangem.feature.wallet.presentation.wallet.state.WalletSingleCurrencyState
 import com.tangem.feature.wallet.presentation.wallet.state.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletsListConfig
-import com.tangem.feature.wallet.presentation.wallet.utils.TokenListToWalletStateConverter.TokensListModel
+import com.tangem.feature.wallet.presentation.wallet.state.factory.TokenListWithWallet
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.WalletClickIntents
 import com.tangem.utils.converter.Converter
 import kotlinx.collections.immutable.toPersistentList
@@ -16,30 +16,34 @@ import kotlinx.collections.immutable.toPersistentList
 @Suppress("LongParameterList")
 internal class TokenListToWalletStateConverter(
     private val currentStateProvider: Provider<WalletState>,
-    private val cardTypeResolverProvider: Provider<CardTypesResolver>,
     private val currentWalletProvider: Provider<UserWallet>,
     private val appCurrencyProvider: Provider<AppCurrency>,
-    private val isWalletContentHidden: Boolean,
     clickIntents: WalletClickIntents,
-) : Converter<TokensListModel, WalletMultiCurrencyState.Content> {
+) : Converter<TokenListWithWallet, WalletState> {
 
     private val tokenListToContentConverter = TokenListToContentItemsConverter(
-        isWalletContentHidden = isWalletContentHidden,
         appCurrencyProvider = appCurrencyProvider,
         clickIntents = clickIntents,
     )
 
-    override fun convert(value: TokensListModel): WalletMultiCurrencyState.Content {
-        val state = requireNotNull(currentStateProvider() as? WalletMultiCurrencyState.Content)
-        return state.copy(
-            walletsListConfig = state.updateSelectedWallet(fiatBalance = value.tokenList.totalFiatBalance),
-            pullToRefreshConfig = if (value.isRefreshing) {
-                state.pullToRefreshConfig.copy(isRefreshing = getRefreshingStatus(tokenList = value.tokenList))
-            } else {
-                state.pullToRefreshConfig
-            },
-            tokensListState = tokenListToContentConverter.convert(value = value.tokenList),
-        )
+    override fun convert(value: TokenListWithWallet): WalletState {
+        val tokenList = value.tokenList
+        val isSingleCurrencyWalletWithToken = !value.wallet.isMultiCurrency &&
+            value.wallet.scanResponse.walletData?.token != null
+        return when (val state = currentStateProvider()) {
+            is WalletMultiCurrencyState.Content -> {
+                state.copy(
+                    walletsListConfig = state.updateSelectedWallet(fiatBalance = tokenList.totalFiatBalance),
+                    tokensListState = tokenListToContentConverter.convert(value = value),
+                    isManageTokensAvailable = !isSingleCurrencyWalletWithToken,
+                )
+            }
+            is WalletMultiCurrencyState.Locked,
+            is WalletSingleCurrencyState.Content,
+            is WalletSingleCurrencyState.Locked,
+            is WalletState.Initial,
+            -> state
+        }
     }
 
     private fun WalletMultiCurrencyState.updateSelectedWallet(fiatBalance: TokenList.FiatBalance): WalletsListConfig {
@@ -48,9 +52,7 @@ internal class TokenListToWalletStateConverter(
         val converter = FiatBalanceToWalletCardConverter(
             currentState = selectedWalletCard,
             currentWalletProvider = currentWalletProvider,
-            cardTypeResolverProvider = cardTypeResolverProvider,
             appCurrencyProvider = appCurrencyProvider,
-            isWalletContentHidden = isWalletContentHidden,
         )
 
         return walletsListConfig.copy(
@@ -58,10 +60,4 @@ internal class TokenListToWalletStateConverter(
                 .set(index = selectedWalletIndex, element = converter.convert(fiatBalance)),
         )
     }
-
-    private fun getRefreshingStatus(tokenList: TokenList): Boolean {
-        return tokenList.totalFiatBalance is TokenList.FiatBalance.Loading
-    }
-
-    data class TokensListModel(val tokenList: TokenList, val isRefreshing: Boolean)
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletClickIntents.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletClickIntents.kt
index c3ba714c76..5c390dcb0b 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletClickIntents.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletClickIntents.kt
@@ -1,29 +1,29 @@
 package com.tangem.feature.wallet.presentation.wallet.viewmodels
 
-import com.tangem.core.ui.components.transactions.intents.TxHistoryClickIntents
-import com.tangem.domain.tokens.models.CryptoCurrency
+import com.tangem.domain.tokens.model.CryptoCurrency
+import com.tangem.domain.tokens.model.CryptoCurrencyStatus
 import com.tangem.domain.wallets.models.UserWalletId
 
 @Suppress("TooManyFunctions")
-internal interface WalletClickIntents : TxHistoryClickIntents {
+internal interface WalletClickIntents {
 
     fun onBackClick()
 
-    fun onScanCardClick()
+    fun onGenerateMissedAddressesClick(missedAddressCurrencies: List<CryptoCurrency>)
+
+    fun onScanToUnlockWalletClick()
 
     fun onDetailsClick()
 
     fun onBackupCardClick()
 
-    fun onCriticalWarningAlreadySignedHashesClick()
+    fun onSignedHashesNotificationCloseClick()
 
-    fun onCloseWarningAlreadySignedHashesClick()
+    fun onLikeAppClick()
 
-    fun onLikeTangemAppClick()
+    fun onDislikeAppClick()
 
-    fun onRateTheAppClick()
-
-    fun onShareClick()
+    fun onCloseRateAppNotificationClick()
 
     fun onWalletChange(index: Int)
 
@@ -39,19 +39,37 @@ internal interface WalletClickIntents : TxHistoryClickIntents {
 
     fun onTokenItemClick(currency: CryptoCurrency)
 
-    fun onTokenItemLongClick(currency: CryptoCurrency)
-
-    fun onDismissActionsBottomSheet()
+    fun onTokenItemLongClick(cryptoCurrencyStatus: CryptoCurrencyStatus)
 
     fun onRenameClick(userWalletId: UserWalletId, name: String)
 
-    fun onDeleteClick(userWalletId: UserWalletId)
+    fun onDeleteBeforeConfirmationClick(userWalletId: UserWalletId)
 
-    fun onSendClick()
+    fun onDeleteAfterConfirmationClick(userWalletId: UserWalletId)
 
-    fun onReceiveClick()
+    fun onSingleCurrencySendClick(cryptoCurrencyStatus: CryptoCurrencyStatus? = null)
 
-    fun onSellClick()
+    fun onMultiCurrencySendClick(cryptoCurrencyStatus: CryptoCurrencyStatus)
+
+    fun onReceiveClick(cryptoCurrencyStatus: CryptoCurrencyStatus)
+
+    fun onCopyAddressClick(cryptoCurrencyStatus: CryptoCurrencyStatus)
+
+    fun onHideTokensClick(cryptoCurrencyStatus: CryptoCurrencyStatus)
+
+    fun onPerformHideToken(cryptoCurrencyStatus: CryptoCurrencyStatus)
+
+    fun onSellClick(cryptoCurrencyStatus: CryptoCurrencyStatus)
 
     fun onManageTokensClick()
+
+    fun onBuyClick(cryptoCurrencyStatus: CryptoCurrencyStatus)
+
+    fun onSwapClick(cryptoCurrencyStatus: CryptoCurrencyStatus)
+
+    fun onReloadClick()
+
+    fun onExploreClick()
+
+    fun onTransactionClick(txHash: String)
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletNotificationsListFactory.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletNotificationsListFactory.kt
index fb70c489e4..dc6fce13fd 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletNotificationsListFactory.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletNotificationsListFactory.kt
@@ -1,138 +1,210 @@
 package com.tangem.feature.wallet.presentation.wallet.viewmodels
 
+import arrow.core.Either
+import com.tangem.domain.card.WasCardScannedUseCase
 import com.tangem.domain.common.CardTypesResolver
+import com.tangem.domain.demo.IsDemoCardUseCase
+import com.tangem.domain.settings.IsReadyToShowRateAppUseCase
+import com.tangem.domain.tokens.GetMissedAddressesCryptoCurrenciesUseCase
+import com.tangem.domain.tokens.error.GetCurrenciesError
+import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
-import com.tangem.domain.tokens.model.NetworkGroup
-import com.tangem.domain.tokens.model.TokenList
+import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.wallets.usecase.IsNeedToBackupUseCase
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletNotification
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.conflate
 
 /**
  * Wallet notifications list factory
  *
- * @property wasCardScannedCallback         callback that check if card was scanned
- * @property isUserAlreadyRateAppCallback   callback that check if card is user already rate app
- * @property isDemoCardCallback             callback that check if card is demo
- * @property clickIntents                   screen click intents
+ * @property isDemoCardUseCase           use case that checks if card is demo
+ * @property isReadyToShowRateAppUseCase use case that checks if card is user already rate app
+ * @property wasCardScannedUseCase       use case that checks if card was scanned
+ * @property isNeedToBackupUseCase       use case that checks if wallet need backup cards
+ * @property clickIntents                screen click intents
  *
 [REDACTED_AUTHOR]
  */
 internal class WalletNotificationsListFactory(
-    private val wasCardScannedCallback: suspend (String) -> Boolean,
-    private val isUserAlreadyRateAppCallback: suspend () -> Boolean,
-    private val isDemoCardCallback: (String) -> Boolean,
+    private val isDemoCardUseCase: IsDemoCardUseCase,
+    private val isReadyToShowRateAppUseCase: IsReadyToShowRateAppUseCase,
+    private val wasCardScannedUseCase: WasCardScannedUseCase,
+    private val isNeedToBackupUseCase: IsNeedToBackupUseCase,
+    private val getMissedAddressCryptoCurrenciesUseCase: GetMissedAddressesCryptoCurrenciesUseCase,
     private val clickIntents: WalletClickIntents,
 ) {
 
-    fun create(cardTypesResolver: CardTypesResolver, tokenList: TokenList?): Flow<ImmutableList<WalletNotification>> {
-        // TODO: [REDACTED_JIRA] order
-        return flow {
-            emit(
-                buildList {
-                    if (cardTypesResolver.isTestCard()) {
-                        add(element = WalletNotification.TestCard)
-                        return@buildList
-                    }
+    private var readyForRateAppNotification = false
 
-                    addRemainingSignaturesLeftNotifications(cardTypesResolver)
+    fun create(
+        selectedWalletId: UserWalletId,
+        cardTypesResolver: CardTypesResolver,
+        cryptoCurrencyList: List<CryptoCurrencyStatus>,
+    ): Flow<ImmutableList<WalletNotification>> {
+        return combine(
+            flow = wasCardScannedUseCase(cardTypesResolver.getCardId()).conflate(),
+            flow2 = isReadyToShowRateAppUseCase().conflate(),
+            flow3 = isNeedToBackupUseCase(selectedWalletId).conflate(),
+            flow4 = getMissedAddressCryptoCurrenciesUseCase(selectedWalletId).conflate(),
+        ) { wasCardScanned, isReadyToShowRating, isNeedToBackup, maybeMissedAddressCurrencies ->
+            readyForRateAppNotification = true
+            buildList {
+                addCriticalNotifications(cardTypesResolver)
 
-                    val isDemo = isDemoCardCallback(cardTypesResolver.getCardId())
-                    if (!cardTypesResolver.isReleaseFirmwareType()) {
-                        add(element = WalletNotification.DevCard)
-                    } else {
-                        addReleaseSpecialNotifications(cardTypesResolver = cardTypesResolver, isDemo = isDemo)
-                    }
+                addInformationalNotifications(cardTypesResolver, maybeMissedAddressCurrencies)
 
-                    if (isDemo) {
-                        add(element = WalletNotification.DemoCard)
-                    }
+                addWarningNotifications(cardTypesResolver, cryptoCurrencyList, wasCardScanned, isNeedToBackup)
 
-                    if (hasUnreachableNetworks(tokenList)) {
-                        add(element = WalletNotification.UnreachableNetworks)
-                    }
+                addRateTheAppNotification(isReadyToShowRating)
+            }.toImmutableList()
+        }
+    }
 
-                    if (!cardTypesResolver.isBackupForbidden() && !cardTypesResolver.hasBackup()) {
-                        add(element = WalletNotification.BackupCard(onClick = clickIntents::onBackupCardClick))
-                    }
+    private fun MutableList<WalletNotification>.addCriticalNotifications(cardTypesResolver: CardTypesResolver) {
+        addIf(
+            element = WalletNotification.Critical.DevCard,
+            condition = !cardTypesResolver.isReleaseFirmwareType(),
+        )
 
-                    if (tokenList != null && tokenList.hasMissedDerivations()) {
-                        add(element = WalletNotification.ScanCard(onClick = clickIntents::onScanCardClick))
-                    }
+        addIf(
+            element = WalletNotification.Critical.FailedCardValidation,
+            condition = cardTypesResolver.isReleaseFirmwareType() && cardTypesResolver.isAttestationFailed(),
+        )
 
-                    if (isUserAlreadyRateAppCallback()) {
-                        add(element = WalletNotification.LikeTangemApp(onClick = clickIntents::onLikeTangemAppClick))
-                    }
-                }.toImmutableList(),
+        cardTypesResolver.getRemainingSignatures()?.let { remainingSignatures ->
+            addIf(
+                element = WalletNotification.Warning.LowSignatures(count = remainingSignatures),
+                condition = remainingSignatures <= MAX_REMAINING_SIGNATURES_COUNT,
             )
         }
     }
 
-    private fun MutableList<WalletNotification>.addRemainingSignaturesLeftNotifications(
+    private fun MutableList<WalletNotification>.addRateTheAppNotification(isReadyToShowRating: Boolean) {
+        addIf(
+            element = WalletNotification.RateApp(
+                onLikeClick = clickIntents::onLikeAppClick,
+                onDislikeClick = clickIntents::onDislikeAppClick,
+                onCloseClick = clickIntents::onCloseRateAppNotificationClick,
+            ),
+            condition = isReadyToShowRating && readyForRateAppNotification,
+        )
+    }
+
+    private fun MutableList<WalletNotification>.addWarningNotifications(
         cardTypesResolver: CardTypesResolver,
+        cryptoCurrencyList: List<CryptoCurrencyStatus>,
+        wasCardScanned: Boolean,
+        isNeedToBackup: Boolean,
     ) {
-        val remainingSignatures = cardTypesResolver.getRemainingSignatures()
-        if (remainingSignatures != null && remainingSignatures <= MAX_REMAINING_SIGNATURES_COUNT) {
-            add(element = WalletNotification.RemainingSignaturesLeft(remainingSignatures))
+        addIf(
+            element = WalletNotification.Warning.MissingBackup(
+                onStartBackupClick = clickIntents::onBackupCardClick,
+            ),
+            condition = isNeedToBackup,
+        )
+
+        addIf(
+            element = WalletNotification.Warning.TestNetCard,
+            condition = cardTypesResolver.isTestCard(),
+        )
+
+        val isDemo = isDemoCardUseCase(cardId = cardTypesResolver.getCardId())
+        if (cardTypesResolver.isMultiwalletAllowed()) {
+            addIf(
+                element = WalletNotification.Warning.SomeNetworksUnreachable,
+                condition = cryptoCurrencyList.hasUnreachableNetworks(),
+            )
+        } else {
+            addIf(
+                element = WalletNotification.Warning.NetworksUnreachable,
+                condition = cryptoCurrencyList.hasUnreachableNetworks(),
+            )
+
+            addNoAccountWarning(cryptoCurrencyList)
+
+            addIf(
+                element = WalletNotification.Warning.NumberOfSignedHashesIncorrect(
+                    onCloseClick = clickIntents::onSignedHashesNotificationCloseClick,
+                ),
+                condition = checkSignedHashes(
+                    cardTypesResolver = cardTypesResolver,
+                    isDemo = isDemo,
+                    wasCardScanned = wasCardScanned,
+                ),
+            )
         }
     }
 
-    private suspend fun MutableList<WalletNotification>.addReleaseSpecialNotifications(
+    private fun MutableList<WalletNotification>.addInformationalNotifications(
+        cardTypesResolver: CardTypesResolver,
+        maybeMissedAddressCurrencies: Either<GetCurrenciesError, List<CryptoCurrency>>,
+    ) {
+        addIf(
+            element = WalletNotification.Informational.DemoCard,
+            condition = isDemoCardUseCase(cardId = cardTypesResolver.getCardId()),
+        )
+
+        addMissingAddressesNotification(maybeMissedAddressCurrencies)
+    }
+
+    private fun MutableList<WalletNotification>.addIf(element: WalletNotification, condition: Boolean) {
+        if (condition) {
+            add(element = element)
+            if (element is WalletNotification.Critical || element is WalletNotification.Warning) {
+                readyForRateAppNotification = false
+            }
+        }
+    }
+
+    private fun MutableList<WalletNotification>.addMissingAddressesNotification(
+        maybeCurrencies: Either<GetCurrenciesError, List<CryptoCurrency>>,
+    ) {
+        val missingAddressCurrencies = (maybeCurrencies as? Either.Right)?.value ?: return
+
+        addIf(
+            element = WalletNotification.Informational.MissingAddresses(
+                missingAddressesCount = missingAddressCurrencies.count(),
+                onGenerateClick = {
+                    clickIntents.onGenerateMissedAddressesClick(missedAddressCurrencies = missingAddressCurrencies)
+                },
+            ),
+            condition = missingAddressCurrencies.isNotEmpty(),
+        )
+    }
+
+    private fun List<CryptoCurrencyStatus>.hasUnreachableNetworks(): Boolean {
+        return any { it.value is CryptoCurrencyStatus.Unreachable }
+    }
+
+    private fun MutableList<WalletNotification>.addNoAccountWarning(cryptoCurrencyList: List<CryptoCurrencyStatus>) {
+        val noAccountNetwork = cryptoCurrencyList.firstOrNull { it.value is CryptoCurrencyStatus.NoAccount }
+        if (noAccountNetwork != null) {
+            val amountToCreateAccount = (noAccountNetwork.value as? CryptoCurrencyStatus.NoAccount)
+                ?.amountToCreateAccount.toString()
+            add(
+                element = WalletNotification.Informational.NoAccount(
+                    network = noAccountNetwork.currency.name,
+                    amount = amountToCreateAccount,
+                    symbol = noAccountNetwork.currency.symbol,
+                ),
+            )
+        }
+    }
+
+    /**
+     * Warning is being shown for single wallet cards only
+     */
+    private fun checkSignedHashes(
         cardTypesResolver: CardTypesResolver,
         isDemo: Boolean,
-    ) {
-        if (!wasCardScannedCallback(cardTypesResolver.getCardId()) && cardTypesResolver.isMultiwalletAllowed() &&
-            !isDemo
-        ) {
-            if (cardTypesResolver.isBackupForbidden() && cardTypesResolver.hasWalletSignedHashes()) {
-                add(
-                    element = WalletNotification.CriticalWarningAlreadySignedHashes(
-                        onClick = clickIntents::onCriticalWarningAlreadySignedHashesClick,
-                    ),
-                )
-            } else if (cardTypesResolver.hasWalletSignedHashes()) {
-                add(
-                    element = WalletNotification.WarningAlreadySignedHashes(
-                        onClick = clickIntents::onCloseWarningAlreadySignedHashesClick,
-                    ),
-                )
-            }
-        }
-
-        if (cardTypesResolver.isAttestationFailed()) {
-            add(element = WalletNotification.CardVerificationFailed)
-        }
-    }
-
-    private fun hasUnreachableNetworks(tokenList: TokenList?): Boolean {
-        return when (tokenList) {
-            is TokenList.GroupedByNetwork -> {
-                tokenList.groups
-                    .flatMap(NetworkGroup::currencies)
-                    .map(CryptoCurrencyStatus::value)
-                    .any { it is CryptoCurrencyStatus.Unreachable }
-            }
-            is TokenList.Ungrouped -> {
-                tokenList.currencies
-                    .map(CryptoCurrencyStatus::value)
-                    .any { it is CryptoCurrencyStatus.Unreachable }
-            }
-            is TokenList.NotInitialized,
-            null,
-            -> false
-        }
-    }
-
-    private fun TokenList.hasMissedDerivations(): Boolean {
-        val statuses = when (this) {
-            is TokenList.GroupedByNetwork -> groups.flatMap(NetworkGroup::currencies).map(CryptoCurrencyStatus::value)
-            is TokenList.Ungrouped -> currencies.map(CryptoCurrencyStatus::value)
-            TokenList.NotInitialized -> emptyList()
-        }
-
-        return statuses.any { it is CryptoCurrencyStatus.MissedDerivation }
+        wasCardScanned: Boolean,
+    ): Boolean {
+        return cardTypesResolver.isReleaseFirmwareType() && !cardTypesResolver.isTangemTwins() &&
+            cardTypesResolver.hasWalletSignedHashes() && !isDemo && !wasCardScanned
     }
 
     private companion object {
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletStateCache.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletStateCache.kt
index c5d4e10424..0c81b8e3ee 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletStateCache.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletStateCache.kt
@@ -10,13 +10,20 @@ import com.tangem.feature.wallet.presentation.wallet.state.WalletState
  */
 internal object WalletStateCache {
 
-    private val states = mutableMapOf<UserWalletId, WalletState>()
+    private val states = mutableMapOf<UserWalletId, WalletState.ContentState>()
 
     /** Get state by [userWalletId] */
-    fun getState(userWalletId: UserWalletId): WalletState? = states[userWalletId]
+    fun getState(userWalletId: UserWalletId): WalletState.ContentState? = states[userWalletId]
 
     /** Add or update [state] by [userWalletId]  */
-    fun update(userWalletId: UserWalletId, state: WalletState) {
+    fun update(userWalletId: UserWalletId, state: WalletState.ContentState) {
         states[userWalletId] = state
     }
+
+    /** Update all content states  */
+    fun updateAll(block: (WalletState.ContentState.() -> WalletState.ContentState)) {
+        states.keys.forEach {
+            states[it] = block(requireNotNull(states[it]))
+        }
+    }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletViewModel.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletViewModel.kt
index 509377d260..52ba8578cd 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletViewModel.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletViewModel.kt
@@ -2,56 +2,84 @@ package com.tangem.feature.wallet.presentation.wallet.viewmodels
 
 import androidx.lifecycle.*
 import androidx.paging.cachedIn
+import arrow.core.Either
 import arrow.core.getOrElse
+import arrow.core.right
+import com.tangem.blockchain.blockchains.cardano.CardanoUtils
 import com.tangem.blockchain.common.Blockchain
-import com.tangem.blockchain.common.derivation.DerivationStyle
+import com.tangem.blockchain.common.address.AddressType
 import com.tangem.common.Provider
-import com.tangem.common.doOnFailure
+import com.tangem.common.card.EllipticCurve
 import com.tangem.common.doOnSuccess
+import com.tangem.common.extensions.ByteArrayKey
+import com.tangem.common.extensions.isZero
+import com.tangem.common.extensions.toMapKey
+import com.tangem.core.analytics.api.AnalyticsEventHandler
+import com.tangem.core.analytics.models.AnalyticsParam
 import com.tangem.core.navigation.AppScreen
-import com.tangem.core.ui.components.marketprice.MarketPriceBlockState
+import com.tangem.core.ui.components.bottomsheets.tokenreceive.AddressModel
+import com.tangem.core.ui.components.bottomsheets.tokenreceive.TokenReceiveBottomSheetConfig
+import com.tangem.core.ui.components.transactions.state.TxHistoryState
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.WrappedList
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.crypto.hdWallet.DerivationPath
+import com.tangem.domain.analytics.ChangeCardAnalyticsContextUseCase
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.card.*
+import com.tangem.domain.balancehiding.IsBalanceHiddenUseCase
+import com.tangem.domain.balancehiding.ListenToFlipsUseCase
+import com.tangem.domain.card.DerivePublicKeysUseCase
+import com.tangem.domain.card.ScanCardProcessor
+import com.tangem.domain.card.SetCardWasScannedUseCase
+import com.tangem.domain.card.WasCardScannedUseCase
 import com.tangem.domain.common.CardTypesResolver
+import com.tangem.domain.common.configs.CardConfig
 import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.common.util.derivationStyleProvider
 import com.tangem.domain.demo.IsDemoCardUseCase
+import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.domain.redux.LegacyAction
 import com.tangem.domain.redux.ReduxStateHolder
-import com.tangem.domain.settings.CanUseBiometryUseCase
-import com.tangem.domain.settings.IsUserAlreadyRateAppUseCase
-import com.tangem.domain.settings.ShouldShowSaveWalletScreenUseCase
-import com.tangem.domain.tokens.GetCryptoCurrencyActionsUseCase
-import com.tangem.domain.tokens.GetPrimaryCurrencyStatusUpdatesUseCase
-import com.tangem.domain.tokens.GetTokenListUseCase
+import com.tangem.domain.settings.*
+import com.tangem.domain.tokens.*
+import com.tangem.domain.tokens.error.TokenListError
 import com.tangem.domain.tokens.legacy.TradeCryptoAction
+import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
+import com.tangem.domain.tokens.model.NetworkGroup
 import com.tangem.domain.tokens.model.TokenList
-import com.tangem.domain.tokens.models.CryptoCurrency
-import com.tangem.domain.tokens.models.Network
+import com.tangem.domain.tokens.models.analytics.TokenReceiveAnalyticsEvent
+import com.tangem.domain.tokens.models.analytics.TokenScreenAnalyticsEvent
+import com.tangem.domain.txhistory.usecase.GetExplorerTransactionUrlUseCase
 import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsCountUseCase
 import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsUseCase
 import com.tangem.domain.userwallets.UserWalletBuilder
+import com.tangem.domain.walletconnect.WalletConnectActions
+import com.tangem.domain.walletmanager.WalletManagersFacade
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.domain.wallets.usecase.*
-import com.tangem.feature.wallet.presentation.common.state.TokenItemState
+import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.router.InnerWalletRouter
-import com.tangem.feature.wallet.presentation.wallet.state.WalletLockedState
-import com.tangem.feature.wallet.presentation.wallet.state.WalletMultiCurrencyState
-import com.tangem.feature.wallet.presentation.wallet.state.WalletSingleCurrencyState
-import com.tangem.feature.wallet.presentation.wallet.state.WalletState
-import com.tangem.feature.wallet.presentation.wallet.state.components.WalletBottomSheetConfig
+import com.tangem.feature.wallet.presentation.wallet.analytics.PortfolioEvent
+import com.tangem.feature.wallet.presentation.wallet.analytics.WalletScreenAnalyticsEvent
+import com.tangem.feature.wallet.presentation.wallet.state.*
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletCardState
-import com.tangem.feature.wallet.presentation.wallet.state.components.WalletTokensListState
+import com.tangem.feature.wallet.presentation.wallet.state.factory.TokenListWithWallet
 import com.tangem.feature.wallet.presentation.wallet.state.factory.WalletStateFactory
+import com.tangem.operations.derivation.ExtendedPublicKeysMap
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import com.tangem.utils.coroutines.JobHolder
 import com.tangem.utils.coroutines.saveIn
+import com.tangem.utils.extensions.DELAY_SDK_DIALOG_CLOSE
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.math.BigDecimal
 import javax.inject.Inject
 import kotlin.properties.Delegates
 
@@ -63,21 +91,22 @@ import kotlin.properties.Delegates
 @Suppress("LargeClass", "LongParameterList", "TooManyFunctions")
 @HiltViewModel
 internal class WalletViewModel @Inject constructor(
+    // region Parameters
     private val getWalletsUseCase: GetWalletsUseCase,
     private val saveWalletUseCase: SaveWalletUseCase,
-    private val getSelectedWalletUseCase: GetSelectedWalletUseCase,
+    getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase,
     private val selectWalletUseCase: SelectWalletUseCase,
     private val updateWalletUseCase: UpdateWalletUseCase,
     private val deleteWalletUseCase: DeleteWalletUseCase,
-    private val getBiometricsStatusUseCase: GetBiometricsStatusUseCase,
-    private val setAccessCodeRequestPolicyUseCase: SetAccessCodeRequestPolicyUseCase,
-    private val getAccessCodeSavingStatusUseCase: GetAccessCodeSavingStatusUseCase,
     private val getTokenListUseCase: GetTokenListUseCase,
-    private val getPrimaryCurrencyUseCase: GetPrimaryCurrencyStatusUpdatesUseCase,
-    private val getCardWasScannedUseCase: GetCardWasScannedUseCase,
-    private val isUserAlreadyRateAppUseCase: IsUserAlreadyRateAppUseCase,
-    private val isDemoCardUseCase: IsDemoCardUseCase,
+    private val getCardTokensListUseCase: GetCardTokensListUseCase,
+    private val fetchTokenListUseCase: FetchTokenListUseCase,
+    private val fetchCardTokenListUseCase: FetchCardTokenListUseCase,
+    private val getPrimaryCurrencyStatusUpdatesUseCase: GetPrimaryCurrencyStatusUpdatesUseCase,
+    private val fetchCurrencyStatusUseCase: FetchCurrencyStatusUseCase,
+    private val getNetworkCoinStatusUseCase: GetNetworkCoinStatusUseCase,
     private val scanCardProcessor: ScanCardProcessor,
+    private val derivePublicKeysUseCase: DerivePublicKeysUseCase,
     private val txHistoryItemsCountUseCase: GetTxHistoryItemsCountUseCase,
     private val txHistoryItemsUseCase: GetTxHistoryItemsUseCase,
     private val getExploreUrlUseCase: GetExploreUrlUseCase,
@@ -87,8 +116,26 @@ internal class WalletViewModel @Inject constructor(
     private val shouldShowSaveWalletScreenUseCase: ShouldShowSaveWalletScreenUseCase,
     private val canUseBiometryUseCase: CanUseBiometryUseCase,
     private val shouldSaveUserWalletsUseCase: ShouldSaveUserWalletsUseCase,
+    private val isBalanceHiddenUseCase: IsBalanceHiddenUseCase,
+    private val listenToFlipsUseCase: ListenToFlipsUseCase,
+    private val removeCurrencyUseCase: RemoveCurrencyUseCase,
+    private val isCryptoCurrencyCoinCouldHide: IsCryptoCurrencyCoinCouldHideUseCase,
+    private val walletManagersFacade: WalletManagersFacade,
     private val reduxStateHolder: ReduxStateHolder,
     private val dispatchers: CoroutineDispatcherProvider,
+    private val analyticsEventsHandler: AnalyticsEventHandler,
+    private val changeCardAnalyticsContextUseCase: ChangeCardAnalyticsContextUseCase,
+    private val setCardWasScannedUseCase: SetCardWasScannedUseCase,
+    private val remindToRateAppLaterUseCase: RemindToRateAppLaterUseCase,
+    private val neverToSuggestRateAppUseCase: NeverToSuggestRateAppUseCase,
+    private val setWalletWithFundsFoundUseCase: SetWalletWithFundsFoundUseCase,
+    private val getExplorerTransactionUrlUseCase: GetExplorerTransactionUrlUseCase,
+    private val isDemoCardUseCase: IsDemoCardUseCase,
+    wasCardScannedUseCase: WasCardScannedUseCase,
+    isReadyToShowRateAppUseCase: IsReadyToShowRateAppUseCase,
+    isNeedToBackupUseCase: IsNeedToBackupUseCase,
+    getMissedAddressesCryptoCurrenciesUseCase: GetMissedAddressesCryptoCurrenciesUseCase,
+    // endregion Parameters
 ) : ViewModel(), DefaultLifecycleObserver, WalletClickIntents {
 
     /** Feature router */
@@ -97,12 +144,16 @@ internal class WalletViewModel @Inject constructor(
     private val selectedAppCurrencyFlow: StateFlow<AppCurrency> = createSelectedAppCurrencyFlow()
 
     private val notificationsListFactory = WalletNotificationsListFactory(
-        wasCardScannedCallback = getCardWasScannedUseCase::invoke,
-        isUserAlreadyRateAppCallback = isUserAlreadyRateAppUseCase::invoke,
-        isDemoCardCallback = isDemoCardUseCase::invoke,
+        wasCardScannedUseCase = wasCardScannedUseCase,
+        isReadyToShowRateAppUseCase = isReadyToShowRateAppUseCase,
+        isDemoCardUseCase = isDemoCardUseCase,
+        isNeedToBackupUseCase = isNeedToBackupUseCase,
+        getMissedAddressCryptoCurrenciesUseCase = getMissedAddressesCryptoCurrenciesUseCase,
         clickIntents = this,
     )
 
+    private var isBalanceHidden = true
+
     private val stateFactory = WalletStateFactory(
         currentStateProvider = Provider { uiState },
         currentCardTypeResolverProvider = Provider {
@@ -114,6 +165,7 @@ internal class WalletViewModel @Inject constructor(
             wallets[requireNotNull(uiState as? WalletState.ContentState).walletsListConfig.selectedWalletIndex]
         },
         appCurrencyProvider = Provider(selectedAppCurrencyFlow::value),
+        isBalanceHiddenProvider = Provider { isBalanceHidden },
         clickIntents = this,
     )
 
@@ -121,14 +173,24 @@ internal class WalletViewModel @Inject constructor(
     var uiState: WalletState by uiStateHolder(initialState = stateFactory.getInitialState())
 
     private var wallets: List<UserWallet> by Delegates.notNull()
-    private var cryptoCurrencyStatus: CryptoCurrencyStatus? = null
+    private var singleWalletCryptoCurrencyStatus: CryptoCurrencyStatus? = null
 
     private val tokensJobHolder = JobHolder()
+    private val updateWcJobHolder = JobHolder()
     private val marketPriceJobHolder = JobHolder()
     private val buttonsJobHolder = JobHolder()
     private val notificationsJobHolder = JobHolder()
+    private val refreshContentJobHolder = JobHolder()
+    private val onWalletChangeJobHolder = JobHolder()
+
+    private val walletsUpdateActionResolver = WalletsUpdateActionResolver(
+        currentStateProvider = Provider { uiState },
+        getSelectedWalletSyncUseCase = getSelectedWalletSyncUseCase,
+    )
 
     override fun onCreate(owner: LifecycleOwner) {
+        analyticsEventsHandler.send(WalletScreenAnalyticsEvent.MainScreen.ScreenOpened)
+
         viewModelScope.launch(dispatchers.main) {
             delay(timeMillis = 1_800)
 
@@ -137,308 +199,401 @@ internal class WalletViewModel @Inject constructor(
             }
         }
 
-        getWalletsUseCase()
+        viewModelScope.launch(dispatchers.io) {
+            shouldSaveUserWalletsUseCase()
+                .flowWithLifecycle(owner.lifecycle)
+                .collectLatest {
+                    getWalletsUseCase()
+                        .flowWithLifecycle(owner.lifecycle)
+                        .distinctUntilChanged()
+                        .onEach(::updateWallets)
+                        .flowOn(dispatchers.io)
+                        .launchIn(viewModelScope)
+                }
+        }
+
+        isBalanceHiddenUseCase()
             .flowWithLifecycle(owner.lifecycle)
-            .distinctUntilChanged()
-            .onEach(::updateWallets)
-            .flowOn(dispatchers.io)
+            .onEach { hidden ->
+                isBalanceHidden = hidden
+                WalletStateCache.updateAll { copySealed(isBalanceHidden = hidden) }
+                uiState = stateFactory.getHiddenBalanceState(isBalanceHidden = hidden)
+            }
             .launchIn(viewModelScope)
+
+        viewModelScope.launch {
+            listenToFlipsUseCase()
+                .flowWithLifecycle(owner.lifecycle)
+                .collect()
+        }
     }
 
     private fun updateWallets(sourceList: List<UserWallet>) {
-        if (sourceList.isEmpty()) return
-
         wallets = sourceList
 
-        val currentState = uiState
-        val selectedWalletIndex = if (currentState is WalletLockedState) {
-            currentState.getSelectedWalletIndex()
+        if (sourceList.isEmpty()) return
+
+        when (val action = walletsUpdateActionResolver.resolve(sourceList)) {
+            is WalletsUpdateActionResolver.Action.Initialize -> {
+                initializeAndLoadState(selectedWalletIndex = action.selectedWalletIndex)
+            }
+            is WalletsUpdateActionResolver.Action.UpdateWalletName -> {
+                uiState = stateFactory.getStateWithUpdatedWalletName(name = action.name)
+            }
+            is WalletsUpdateActionResolver.Action.UnlockWallet -> {
+                uiState = stateFactory.getUnlockedState(action)
+
+                getContentItemsUpdates(index = action.selectedWalletIndex)
+            }
+            is WalletsUpdateActionResolver.Action.DeleteWallet -> {
+                deleteWalletAndUpdateState(action = action)
+            }
+            is WalletsUpdateActionResolver.Action.AddWallet -> {
+                scrollAndUpdateState(action.selectedWalletIndex)
+            }
+            is WalletsUpdateActionResolver.Action.UpdateWalletCardCount -> {
+                uiState = stateFactory.getStateWithUpdatedWalletCardCount()
+            }
+            is WalletsUpdateActionResolver.Action.Unknown -> Unit
+        }
+    }
+
+    private fun initializeAndLoadState(selectedWalletIndex: Int) {
+        uiState = stateFactory.getSkeletonState(wallets = wallets, selectedWalletIndex = selectedWalletIndex)
+
+        getContentItemsUpdates(index = selectedWalletIndex)
+    }
+
+    private fun deleteWalletAndUpdateState(action: WalletsUpdateActionResolver.Action.DeleteWallet) {
+        val cacheState = WalletStateCache.getState(userWalletId = action.selectedWalletId)
+        if (cacheState != null) {
+            uiState = stateFactory.getStateWithoutDeletedWallet(cacheState, action)
+
+            uiState = stateFactory.getStateAndTriggerEvent(
+                state = uiState,
+                event = WalletEvent.ChangeWallet(action.selectedWalletIndex),
+                setUiState = { uiState = it },
+            )
+            getContentItemsUpdates(action.selectedWalletIndex)
         } else {
-            val selectedWallet = getSelectedWalletUseCase().fold(
-                ifLeft = { error("Selected wallet is null") },
-                ifRight = { it },
-            )
-            sourceList.indexOfFirst { it.walletId == selectedWallet.walletId }
-        }
-
-        uiState = stateFactory.getSkeletonState(wallets = sourceList, selectedWalletIndex = selectedWalletIndex)
-
-        updateContentItems(index = selectedWalletIndex)
-    }
-
-    private fun updateContentItems(index: Int, isRefreshing: Boolean = false) {
-        val cardTypeResolver = getCardTypeResolver(index)
-        when {
-            getWallet(index).isLocked -> uiState = stateFactory.getLockedState()
-            cardTypeResolver.isMultiwalletAllowed() -> updateMultiCurrencyContent(index, isRefreshing)
-            !cardTypeResolver.isMultiwalletAllowed() -> updateSingleCurrencyContent(index, isRefreshing)
+            /* It's impossible case because user can delete only visible state, but we support this case */
+            scrollAndUpdateState(selectedWalletIndex = action.selectedWalletIndex)
         }
     }
 
-    private fun updateMultiCurrencyContent(index: Int, isRefreshing: Boolean = false) {
-        val state = requireNotNull(uiState as? WalletMultiCurrencyState) {
-            "Impossible to update tokens list if state isn't WalletMultiCurrencyState"
-        }
-
-        getTokenListUseCase(userWalletId = state.walletsListConfig.wallets[index].id)
-            .distinctUntilChanged()
-            .onEach { tokenListEither ->
-                uiState = stateFactory.getStateByTokensList(
-                    tokenListEither = tokenListEither,
-                    isRefreshing = isRefreshing,
-                )
-
-                updateNotifications(
-                    index = index,
-                    tokenList = tokenListEither.fold(ifLeft = { null }, ifRight = { it }),
-                )
-            }
-            .flowOn(dispatchers.io)
-            .launchIn(viewModelScope)
-            .saveIn(tokensJobHolder)
-    }
-
-    private fun updateSingleCurrencyContent(index: Int, isRefreshing: Boolean) {
-        val wallet = getWallet(index)
-        val blockchain = getCardTypeResolver(index).getBlockchain()
-        updateButtons(userWalletId = wallet.walletId, currencyId = blockchain.id)
-        updateTxHistory(
-            blockchain = blockchain,
-            derivationStyle = wallet.scanResponse.derivationStyleProvider.getDerivationStyle(),
+    private fun scrollAndUpdateState(selectedWalletIndex: Int) {
+        uiState = stateFactory.getSkeletonState(
+            wallets = wallets,
+            selectedWalletIndex = selectedWalletIndex,
         )
-        updateMarketPrice(userWalletId = wallet.walletId, isRefreshing = isRefreshing)
-        updateNotifications(index)
-    }
 
-    private fun updateTxHistory(blockchain: Blockchain, derivationStyle: DerivationStyle?) {
-        viewModelScope.launch(dispatchers.io) {
-            val derivationPath = blockchain.derivationPath(style = derivationStyle)?.rawPath
-
-            val txHistoryItemsCountEither = txHistoryItemsCountUseCase(
-                networkId = Network.ID(blockchain.id),
-                derivationPath = derivationPath,
-            )
-
-            uiState = stateFactory.getLoadingTxHistoryState(itemsCountEither = txHistoryItemsCountEither)
-
-            txHistoryItemsCountEither.onRight {
-                uiState = stateFactory.getLoadedTxHistoryState(
-                    txHistoryEither = txHistoryItemsUseCase(
-                        networkId = Network.ID(blockchain.id),
-                        derivationPath = derivationPath,
-                    ).map {
-                        it.cachedIn(viewModelScope)
-                    },
-                )
-            }
-        }
-    }
-
-    // It also update wallet balance
-    private fun updateMarketPrice(userWalletId: UserWalletId, isRefreshing: Boolean) {
-        getPrimaryCurrencyUseCase(userWalletId = userWalletId)
-            .distinctUntilChanged()
-            .onEach { either ->
-                uiState = stateFactory.getSingleCurrencyLoadedBalanceState(
-                    cryptoCurrencyEither = either,
-                    isRefreshing = isRefreshing,
-                )
-
-                either.onRight { status -> cryptoCurrencyStatus = status }
-            }
-            .flowOn(dispatchers.io)
-            .launchIn(viewModelScope)
-            .saveIn(marketPriceJobHolder)
-    }
-
-    private fun updateButtons(userWalletId: UserWalletId, currencyId: String) {
-        getCryptoCurrencyActionsUseCase(userWalletId = userWalletId, tokenId = currencyId)
-            .distinctUntilChanged()
-            .onEach { uiState = stateFactory.getSingleCurrencyManageButtonsState(actions = it.states) }
-            .flowOn(dispatchers.io)
-            .launchIn(viewModelScope)
-            .saveIn(buttonsJobHolder)
-    }
-
-    private fun updateNotifications(index: Int, tokenList: TokenList? = null) {
-        notificationsListFactory.create(
-            cardTypesResolver = getCardTypeResolver(index = index),
-            tokenList = tokenList,
+        uiState = stateFactory.getStateAndTriggerEvent(
+            state = uiState,
+            event = WalletEvent.ChangeWallet(index = selectedWalletIndex),
+            setUiState = { uiState = it },
         )
-            .distinctUntilChanged()
-            .onEach { uiState = stateFactory.getStateByNotifications(notifications = it) }
-            .flowOn(dispatchers.io)
-            .launchIn(viewModelScope)
-            .saveIn(notificationsJobHolder)
-    }
 
-    override fun onStop(owner: LifecycleOwner) {
-        viewModelScope.launch(dispatchers.io) {
-            saveSelectedWallet()
-        }
+        getContentItemsUpdates(index = selectedWalletIndex)
     }
 
-    private suspend fun saveSelectedWallet() {
-        val state = uiState
-        if (state is WalletState.ContentState) {
-            selectWalletUseCase(getWallet(index = state.walletsListConfig.selectedWalletIndex).walletId)
-        }
-    }
-
-    private fun getWallet(index: Int): UserWallet {
-        return requireNotNull(
-            value = wallets.getOrNull(index),
-            lazyMessage = { "WalletsList doesn't contain element with index = $index" },
-        )
-    }
-
-    private fun getCardTypeResolver(index: Int): CardTypesResolver = getWallet(index).scanResponse.cardTypesResolver
-
     override fun onBackClick() {
-        viewModelScope.launch(dispatchers.main) {
-            router.popBackStack(screen = if (shouldSaveUserWalletsUseCase()) AppScreen.Welcome else AppScreen.Home)
+        router.popBackStack()
+    }
+
+    override fun onGenerateMissedAddressesClick(missedAddressCurrencies: List<CryptoCurrency>) {
+        val state = uiState as? WalletState.ContentState ?: return
+
+        analyticsEventsHandler.send(WalletScreenAnalyticsEvent.Basic.CardWasScanned(AnalyticsParam.ScannedFrom.Main))
+        analyticsEventsHandler.send(WalletScreenAnalyticsEvent.MainScreen.NoticeScanYourCardTapped)
+
+        viewModelScope.launch(dispatchers.io) {
+            val userWallet = getWallet(index = state.walletsListConfig.selectedWalletIndex)
+
+            deriveMissingCurrencies(
+                scanResponse = userWallet.scanResponse,
+                currencyList = missedAddressCurrencies,
+            ) { scannedCardResponse ->
+                updateWalletUseCase(
+                    userWalletId = userWallet.walletId,
+                    update = { it.copy(scanResponse = scannedCardResponse) },
+                )
+                    .onRight {
+                        fetchTokenListUseCase(userWalletId = it.walletId)
+                    }
+            }
         }
     }
 
-    override fun onScanCardClick() {
-        val prevRequestPolicyStatus = getBiometricsStatusUseCase()
+    // TODO: [REDACTED_JIRA]
+    private fun deriveMissingCurrencies(
+        scanResponse: ScanResponse,
+        currencyList: List<CryptoCurrency>,
+        onSuccess: suspend (ScanResponse) -> Unit,
+    ) {
+        val config = CardConfig.createConfig(scanResponse.card)
+        val derivationDataList = currencyList.mapNotNull {
+            config.primaryCurve(blockchain = Blockchain.fromId(it.network.id.value))?.let { curve ->
+                getNewDerivations(curve, scanResponse, it)
+            }
+        }
 
-        // Update access the code policy according access code saving status
-        setAccessCodeRequestPolicyUseCase(isBiometricsRequestPolicy = getAccessCodeSavingStatusUseCase())
+        val derivations = buildMap<ByteArrayKey, MutableList<DerivationPath>> {
+            derivationDataList.forEach {
+                val current = this[it.derivations.first]
+                if (current != null) {
+                    current.addAll(it.derivations.second)
+                    current.distinct()
+                } else {
+                    this[it.derivations.first] = it.derivations.second.toMutableList()
+                }
+            }
+        }.ifEmpty { return }
 
         viewModelScope.launch(dispatchers.io) {
-            scanCardProcessor.scan(allowsRequestAccessCodeFromRepository = true)
-                .doOnSuccess {
-                    // If card's public key is null then user wallet will be null
-                    val userWallet = UserWalletBuilder(scanResponse = it).build()
+            derivePublicKeysUseCase(cardId = null, derivations = derivations)
+                .onRight {
+                    val newDerivedKeys = it.entries
+                    val oldDerivedKeys = scanResponse.derivedKeys
 
-                    if (userWallet != null) {
-                        saveWalletUseCase(userWallet)
-                            .onLeft {
-                                // Rollback policy if card saving was failed
-                                setAccessCodeRequestPolicyUseCase(prevRequestPolicyStatus)
-                            }
-                    } else {
-                        // Rollback policy if card saving was failed
-                        setAccessCodeRequestPolicyUseCase(prevRequestPolicyStatus)
+                    val walletKeys = (newDerivedKeys.keys + oldDerivedKeys.keys).toSet()
+
+                    val updatedDerivedKeys = walletKeys.associateWith { walletKey ->
+                        val oldDerivations = ExtendedPublicKeysMap(oldDerivedKeys[walletKey] ?: emptyMap())
+                        val newDerivations = newDerivedKeys[walletKey] ?: ExtendedPublicKeysMap(emptyMap())
+                        ExtendedPublicKeysMap(oldDerivations + newDerivations)
                     }
+                    val updatedScanResponse = scanResponse.copy(derivedKeys = updatedDerivedKeys)
+
+                    onSuccess(updatedScanResponse)
                 }
-                .doOnFailure {
-                    // Rollback policy if card scanning was failed
-                    setAccessCodeRequestPolicyUseCase(prevRequestPolicyStatus)
+        }
+    }
+
+    private fun getNewDerivations(
+        curve: EllipticCurve,
+        scanResponse: ScanResponse,
+        currency: CryptoCurrency,
+    ): DerivationData? {
+        val wallet = scanResponse.card.wallets.firstOrNull { it.curve == curve } ?: return null
+
+        val blockchain = Blockchain.fromId(currency.network.id.value)
+        val supportedCurves = blockchain.getSupportedCurves()
+        val path = blockchain.derivationPath(scanResponse.derivationStyleProvider.getDerivationStyle())
+            .takeIf { supportedCurves.contains(curve) }
+
+        val customPath = currency.network.derivationPath.value?.let {
+            DerivationPath(it)
+        }.takeIf { supportedCurves.contains(curve) }
+
+        val bothCandidates = listOfNotNull(path, customPath).distinct().toMutableList()
+        if (bothCandidates.isEmpty()) return null
+
+        if (currency is CryptoCurrency.Coin && blockchain == Blockchain.Cardano) {
+            currency.network.derivationPath.value?.let {
+                bothCandidates.add(CardanoUtils.extendedDerivationPath(DerivationPath(it)))
+            }
+        }
+
+        val mapKeyOfWalletPublicKey = wallet.publicKey.toMapKey()
+        val alreadyDerivedKeys: ExtendedPublicKeysMap =
+            scanResponse.derivedKeys[mapKeyOfWalletPublicKey] ?: ExtendedPublicKeysMap(emptyMap())
+        val alreadyDerivedPaths = alreadyDerivedKeys.keys.toList()
+
+        val toDerive = bothCandidates.filterNot { alreadyDerivedPaths.contains(it) }
+        if (toDerive.isEmpty()) return null
+
+        return DerivationData(derivations = mapKeyOfWalletPublicKey to toDerive)
+    }
+
+    class DerivationData(val derivations: Pair<ByteArrayKey, List<DerivationPath>>)
+
+    override fun onScanToUnlockWalletClick() {
+        val state = uiState as? WalletState.ContentState ?: return
+
+        analyticsEventsHandler.send(event = WalletScreenAnalyticsEvent.MainScreen.WalletUnlockTapped)
+
+        val lockedWallet = getWallet(index = state.walletsListConfig.selectedWalletIndex)
+
+        viewModelScope.launch(dispatchers.io) {
+            scanCardProcessor.scan()
+                .doOnSuccess { scanResponse ->
+                    // If card's public key is null then user wallet will be null
+                    val scannedWallet = UserWalletBuilder(scanResponse = scanResponse).build()
+
+                    if (lockedWallet.walletId == scannedWallet?.walletId) {
+                        saveWalletUseCase(userWallet = scannedWallet, canOverride = true)
+                    } else {
+                        delay(timeMillis = DELAY_SDK_DIALOG_CLOSE)
+
+                        uiState = stateFactory.getStateAndTriggerEvent(
+                            state = uiState,
+                            event = WalletEvent.ShowAlert(state = WalletAlertState.WrongCardIsScanned),
+                            setUiState = { uiState = it },
+                        )
+                    }
                 }
         }
     }
 
     override fun onDetailsClick() = router.openDetailsScreen()
 
-    override fun onBackupCardClick() = router.openOnboardingScreen()
+    override fun onBackupCardClick() {
+        analyticsEventsHandler.send(WalletScreenAnalyticsEvent.MainScreen.NoticeBackupYourWalletTapped)
+        router.openOnboardingScreen()
+    }
 
-    override fun onCriticalWarningAlreadySignedHashesClick() {
-        uiState = stateFactory.getStateWithOpenWalletBottomSheet(
-            content = WalletBottomSheetConfig.BottomSheetContentConfig.CriticalWarningAlreadySignedHashes(
-                onOkClick = {},
-                onCancelClick = {},
+    override fun onSignedHashesNotificationCloseClick() {
+        val state = uiState as? WalletState.ContentState ?: return
+        viewModelScope.launch(dispatchers.main) {
+            setCardWasScannedUseCase(
+                cardId = getWallet(index = state.walletsListConfig.selectedWalletIndex).cardId,
+            )
+        }
+    }
+
+    override fun onLikeAppClick() {
+        analyticsEventsHandler.send(
+            WalletScreenAnalyticsEvent.MainScreen.NoticeRateAppButton(AnalyticsParam.RateApp.Liked),
+        )
+        uiState = stateFactory.getStateAndTriggerEvent(
+            state = uiState,
+            event = WalletEvent.RateApp(
+                onDismissClick = {
+                    viewModelScope.launch(dispatchers.main) {
+                        neverToSuggestRateAppUseCase()
+                    }
+                },
             ),
+            setUiState = { uiState = it },
         )
     }
 
-    override fun onCloseWarningAlreadySignedHashesClick() {
-        // TODO: [REDACTED_JIRA]
-    }
-
-    override fun onLikeTangemAppClick() {
-        uiState = stateFactory.getStateWithOpenWalletBottomSheet(
-            content = WalletBottomSheetConfig.BottomSheetContentConfig.LikeTangemApp(
-                onRateTheAppClick = ::onRateTheAppClick,
-                onShareClick = ::onShareClick,
-            ),
+    override fun onDislikeAppClick() {
+        analyticsEventsHandler.send(
+            WalletScreenAnalyticsEvent.MainScreen.NoticeRateAppButton(AnalyticsParam.RateApp.Disliked),
         )
+        viewModelScope.launch(dispatchers.main) {
+            neverToSuggestRateAppUseCase()
+
+            reduxStateHolder.dispatch(LegacyAction.SendEmailRateCanBeBetter)
+        }
     }
 
-    override fun onRateTheAppClick() {
-        // TODO: [REDACTED_JIRA]
-    }
-
-    override fun onShareClick() {
-        // TODO: [REDACTED_JIRA]
+    override fun onCloseRateAppNotificationClick() {
+        analyticsEventsHandler.send(
+            WalletScreenAnalyticsEvent.MainScreen.NoticeRateAppButton(AnalyticsParam.RateApp.Closed),
+        )
+        viewModelScope.launch(dispatchers.main) {
+            remindToRateAppLaterUseCase()
+        }
     }
 
     override fun onWalletChange(index: Int) {
-        val state = requireNotNull(uiState as? WalletState.ContentState) {
-            "Impossible to change wallet if state isn't WalletState.ContentState"
-        }
-
+        val state = uiState as? WalletState.ContentState ?: return
         if (state.walletsListConfig.selectedWalletIndex == index) return
 
+        changeCardAnalyticsContextUseCase(scanResponse = getWallet(index).scanResponse)
+        analyticsEventsHandler.send(WalletScreenAnalyticsEvent.MainScreen.WalletSwipe)
+
+        // Reset the job to avoid a redundant state updating
+        onWalletChangeJobHolder.update(null)
+
         /*
          * When wallet is changed it's necessary to stop the last jobs.
          * If jobs aren't stopped and wallet is changed then it will update state for the prev wallet.
          */
         tokensJobHolder.update(job = null)
+        updateWcJobHolder.update(job = null)
         marketPriceJobHolder.update(job = null)
         buttonsJobHolder.update(job = null)
         notificationsJobHolder.update(job = null)
+        refreshContentJobHolder.update(job = null)
 
-        val cacheState = WalletStateCache.getState(userWalletId = state.walletsListConfig.wallets[index].id)
-        if (cacheState != null) {
-            uiState = if (cacheState is WalletState.ContentState) {
-                cacheState.copySealed(
-                    walletsListConfig = state.walletsListConfig.copy(selectedWalletIndex = index),
-                    pullToRefreshConfig = state.pullToRefreshConfig.copy(isRefreshing = false),
-                )
-            } else {
-                cacheState
+        viewModelScope.launch(dispatchers.main) {
+            val userWallet = state.walletsListConfig.wallets[index]
+            withContext(dispatchers.io) {
+                if (userWallet !is WalletCardState.LockedContent) {
+                    selectWalletUseCase(userWalletId = userWallet.id)
+                }
             }
 
-            if (cacheState.isLoadingState()) updateContentItems(index)
-        } else {
-            uiState = stateFactory.getSkeletonState(wallets = wallets, selectedWalletIndex = index)
-            updateContentItems(index = index)
+            val cacheState = WalletStateCache.getState(userWalletId = userWallet.id)
+            if (cacheState != null && cacheState !is WalletLockedState) {
+                uiState = cacheState.copySealed(
+                    walletsListConfig = state.walletsListConfig.copy(
+                        selectedWalletIndex = index,
+                        wallets = state.walletsListConfig.wallets
+                            .mapIndexed { mapIndex, currentWallet ->
+                                val cacheWallet = cacheState.walletsListConfig.wallets.getOrNull(mapIndex)
+
+                                if (currentWallet is WalletCardState.Loading && cacheWallet != null &&
+                                    cacheWallet.isLoaded()
+                                ) {
+                                    cacheWallet
+                                } else {
+                                    currentWallet
+                                }
+                            }
+                            .toImmutableList(),
+                    ),
+                    pullToRefreshConfig = cacheState.pullToRefreshConfig.copy(isRefreshing = false),
+                )
+
+                getContentItemsUpdates(index)
+            } else {
+                initializeAndLoadState(selectedWalletIndex = index)
+            }
         }
+            .saveIn(onWalletChangeJobHolder)
     }
 
-    private fun WalletState.isLoadingState(): Boolean {
-        // Check the base components
-        if (this is WalletState.ContentState) {
-            walletsListConfig.wallets[walletsListConfig.selectedWalletIndex] is WalletCardState.Loading ||
-                notifications.isEmpty()
-        }
-
-        // Check the special components
-        return when (this) {
-            is WalletMultiCurrencyState -> {
-                val hasLoadingTokens = tokensListState is WalletTokensListState.ContentState &&
-                    (tokensListState as WalletTokensListState.ContentState).items
-                        .filterIsInstance<WalletTokensListState.TokensListItemState.Token>()
-                        .any { it.state is TokenItemState.Loading }
-
-                tokensListState is WalletTokensListState.Loading || hasLoadingTokens
-            }
-            is WalletSingleCurrencyState -> {
-                this is WalletSingleCurrencyState.Content && marketPriceBlockState is MarketPriceBlockState.Loading
-            }
-            is WalletState.Initial -> false
-        }
+    private fun WalletCardState.isLoaded(): Boolean {
+        return this !is WalletCardState.Loading && this !is WalletCardState.LockedContent
     }
 
     override fun onRefreshSwipe() {
-        if (uiState is WalletState.Initial || uiState is WalletLockedState) return
+        val selectedWalletIndex = (uiState as? WalletState.ContentState)
+            ?.walletsListConfig
+            ?.selectedWalletIndex
+            ?: return
 
-        viewModelScope.launch(dispatchers.io) {
-            uiState = stateFactory.getStateAfterContentRefreshing()
-
-            // TODO: [REDACTED_JIRA]
-            delay(timeMillis = 500)
-
-            updateContentItems(
-                index = requireNotNull(uiState as? WalletState.ContentState).walletsListConfig.selectedWalletIndex,
-                isRefreshing = true,
-            )
+        when (uiState) {
+            is WalletMultiCurrencyState.Content -> {
+                analyticsEventsHandler.send(PortfolioEvent.Refreshed)
+                refreshMultiCurrencyContent(selectedWalletIndex)
+            }
+            is WalletSingleCurrencyState.Content -> {
+                analyticsEventsHandler.send(PortfolioEvent.Refreshed)
+                refreshSingleCurrencyContent(selectedWalletIndex)
+            }
+            is WalletState.Initial,
+            is WalletMultiCurrencyState.Locked,
+            is WalletSingleCurrencyState.Locked,
+            -> Unit
         }
     }
 
+    private fun refreshMultiCurrencyContent(walletIndex: Int) {
+        uiState = stateFactory.getRefreshingState()
+
+        viewModelScope.launch(dispatchers.main) {
+            val wallet = getWallet(walletIndex)
+
+            val maybeFetchResult = if (wallet.scanResponse.cardTypesResolver.isSingleWalletWithToken()) {
+                fetchCardTokenListUseCase(userWalletId = wallet.walletId, refresh = true)
+            } else {
+                fetchTokenListUseCase(userWalletId = wallet.walletId, refresh = true)
+            }
+
+            maybeFetchResult.onLeft { uiState = stateFactory.getStateByTokenListError(it) }
+
+            uiState = stateFactory.getRefreshedState()
+        }.saveIn(refreshContentJobHolder)
+    }
+
     override fun onOrganizeTokensClick() {
+        analyticsEventsHandler.send(PortfolioEvent.OrganizeTokens)
+
         val state = requireNotNull(uiState as? WalletState.ContentState)
         val index = state.walletsListConfig.selectedWalletIndex
         val walletId = state.walletsListConfig.wallets[index].id
@@ -446,70 +601,255 @@ internal class WalletViewModel @Inject constructor(
         router.openOrganizeTokensScreen(walletId)
     }
 
-    override fun onBuyClick() {
+    override fun onBuyClick(cryptoCurrencyStatus: CryptoCurrencyStatus) {
         val state = uiState as? WalletState.ContentState ?: return
-        val status = cryptoCurrencyStatus ?: return
-        val wallet = getWallet(index = state.walletsListConfig.selectedWalletIndex)
 
-        reduxStateHolder.dispatch(
-            TradeCryptoAction.New.Buy(
-                userWallet = wallet,
-                cryptoCurrencyStatus = status,
-                appCurrencyCode = selectedAppCurrencyFlow.value.code,
-            ),
+        analyticsEventsHandler.send(
+            event = TokenScreenAnalyticsEvent.ButtonBuy(cryptoCurrencyStatus.currency.symbol),
         )
-    }
 
-    override fun onSendClick() {
-        reduxStateHolder.dispatch(TradeCryptoAction.New.Send)
-    }
-
-    override fun onReceiveClick() {
-        // TODO: [REDACTED_JIRA]
-    }
-
-    override fun onSellClick() {
-        val status = cryptoCurrencyStatus ?: return
-
-        reduxStateHolder.dispatch(
-            TradeCryptoAction.New.Sell(
-                cryptoCurrencyStatus = status,
-                appCurrencyCode = selectedAppCurrencyFlow.value.code,
-            ),
-        )
-    }
-
-    override fun onManageTokensClick() {
-        router.openManageTokensScreen()
-    }
-
-    override fun onReloadClick() {
-        uiState = stateFactory.getStateAfterContentRefreshing()
-        updateSingleCurrencyContent(
-            index = requireNotNull(uiState as? WalletState.ContentState).walletsListConfig.selectedWalletIndex,
-            isRefreshing = true,
-        )
-    }
-
-    override fun onExploreClick() {
-        viewModelScope.launch(dispatchers.io) {
-            val wallet = getWallet(
-                index = requireNotNull(uiState as? WalletState.ContentState).walletsListConfig.selectedWalletIndex,
-            )
-            router.openTxHistoryWebsite(
-                url = getExploreUrlUseCase(
-                    userWalletId = wallet.walletId,
-                    networkId = Network.ID(
-                        value = wallet.scanResponse.cardTypesResolver.getBlockchain().id,
-                    ),
+        showErrorIfDemoModeOrElse {
+            reduxStateHolder.dispatch(
+                TradeCryptoAction.New.Buy(
+                    userWallet = getWallet(index = state.walletsListConfig.selectedWalletIndex),
+                    cryptoCurrencyStatus = cryptoCurrencyStatus,
+                    appCurrencyCode = selectedAppCurrencyFlow.value.code,
                 ),
             )
         }
     }
 
-    override fun onUnlockWalletClick() {
+    override fun onSwapClick(cryptoCurrencyStatus: CryptoCurrencyStatus) {
+        analyticsEventsHandler.send(
+            event = TokenScreenAnalyticsEvent.ButtonExchange(cryptoCurrencyStatus.currency.symbol),
+        )
+
+        reduxStateHolder.dispatch(TradeCryptoAction.New.Swap(cryptoCurrencyStatus.currency))
+    }
+
+    override fun onSingleCurrencySendClick(cryptoCurrencyStatus: CryptoCurrencyStatus?) {
+        val state = uiState as? WalletState.ContentState ?: return
+
+        val userWallet = getWallet(index = state.walletsListConfig.selectedWalletIndex)
+        val coinStatus = if (userWallet.isMultiCurrency) cryptoCurrencyStatus else singleWalletCryptoCurrencyStatus
+        coinStatus ?: return
+
+        analyticsEventsHandler.send(
+            event = TokenScreenAnalyticsEvent.ButtonSend(coinStatus.currency.symbol),
+        )
+
+        reduxStateHolder.dispatch(
+            action = TradeCryptoAction.New.SendCoin(userWallet = userWallet, coinStatus = coinStatus),
+        )
+    }
+
+    override fun onMultiCurrencySendClick(cryptoCurrencyStatus: CryptoCurrencyStatus) {
+        if (cryptoCurrencyStatus.currency is CryptoCurrency.Coin) {
+            onSingleCurrencySendClick(cryptoCurrencyStatus = cryptoCurrencyStatus)
+            return
+        }
+
+        val state = uiState as? WalletState.ContentState ?: return
+
+        analyticsEventsHandler.send(
+            event = TokenScreenAnalyticsEvent.ButtonSend(cryptoCurrencyStatus.currency.symbol),
+        )
+
         viewModelScope.launch(dispatchers.io) {
-            unlockWalletsUseCase()
+            val userWallet = getWallet(index = state.walletsListConfig.selectedWalletIndex)
+
+            val isSingleWalletWithTokens = !userWallet.isMultiCurrency &&
+                userWallet.scanResponse.walletData?.token != null
+
+            getNetworkCoinStatusUseCase(
+                userWalletId = userWallet.walletId,
+                networkId = cryptoCurrencyStatus.currency.network.id,
+                derivationPath = cryptoCurrencyStatus.currency.network.derivationPath,
+                isSingleWalletWithTokens = isSingleWalletWithTokens,
+            )
+                .take(count = 1)
+                .collectLatest {
+                    it.onRight { coinStatus ->
+                        reduxStateHolder.dispatch(
+                            action = TradeCryptoAction.New.SendToken(
+                                userWallet = getWallet(index = state.walletsListConfig.selectedWalletIndex),
+                                tokenStatus = cryptoCurrencyStatus,
+                                coinFiatRate = coinStatus.value.fiatRate,
+                            ),
+                        )
+                    }
+                }
+        }
+    }
+
+    override fun onReceiveClick(cryptoCurrencyStatus: CryptoCurrencyStatus) {
+        val state = uiState as? WalletState.ContentState ?: return
+
+        analyticsEventsHandler.send(
+            event = TokenScreenAnalyticsEvent.ButtonReceive(cryptoCurrencyStatus.currency.symbol),
+        )
+
+        viewModelScope.launch(dispatchers.io) {
+            val userWallet = getWallet(index = state.walletsListConfig.selectedWalletIndex)
+
+            val addresses = walletManagersFacade.getAddress(
+                userWalletId = userWallet.walletId,
+                network = cryptoCurrencyStatus.currency.network,
+            )
+
+            analyticsEventsHandler.send(event = TokenReceiveAnalyticsEvent.ReceiveScreenOpened)
+
+            val currency = cryptoCurrencyStatus.currency
+            uiState = stateFactory.getStateWithOpenWalletBottomSheet(
+                content = TokenReceiveBottomSheetConfig(
+                    name = currency.name,
+                    symbol = currency.symbol,
+                    network = currency.network.name,
+                    addresses = addresses.map {
+                        AddressModel(
+                            value = it.value,
+                            type = AddressModel.Type.valueOf(it.type.name),
+                        )
+                    },
+                    onCopyClick = {
+                        analyticsEventsHandler.send(TokenReceiveAnalyticsEvent.ButtonCopyAddress(currency.symbol))
+                    },
+                    onShareClick = {
+                        analyticsEventsHandler.send(TokenReceiveAnalyticsEvent.ButtonShareAddress(currency.symbol))
+                    },
+                ),
+            )
+        }
+    }
+
+    override fun onCopyAddressClick(cryptoCurrencyStatus: CryptoCurrencyStatus) {
+        val state = uiState as? WalletState.ContentState ?: return
+
+        analyticsEventsHandler.send(
+            event = TokenScreenAnalyticsEvent.ButtonCopyAddress(cryptoCurrencyStatus.currency.symbol),
+        )
+
+        viewModelScope.launch(dispatchers.main) {
+            val userWallet = getWallet(index = state.walletsListConfig.selectedWalletIndex)
+
+            val defaultAddress = walletManagersFacade.getAddress(
+                userWalletId = userWallet.walletId,
+                network = cryptoCurrencyStatus.currency.network,
+            ).find { it.type == AddressType.Default }
+
+            defaultAddress?.value?.let { address ->
+                uiState = stateFactory.getStateAndTriggerEvent(
+                    state = uiState,
+                    event = WalletEvent.CopyAddress(
+                        address = address,
+                        toast = resourceReference(R.string.wallet_notification_address_copied),
+                    ),
+                    setUiState = { uiState = it },
+                )
+            }
+        }
+    }
+
+    override fun onSellClick(cryptoCurrencyStatus: CryptoCurrencyStatus) {
+        analyticsEventsHandler.send(
+            event = TokenScreenAnalyticsEvent.ButtonSell(cryptoCurrencyStatus.currency.symbol),
+        )
+
+        showErrorIfDemoModeOrElse {
+            reduxStateHolder.dispatch(
+                action = TradeCryptoAction.New.Sell(
+                    cryptoCurrencyStatus = cryptoCurrencyStatus,
+                    appCurrencyCode = selectedAppCurrencyFlow.value.code,
+                ),
+            )
+        }
+    }
+
+    override fun onManageTokensClick() {
+        analyticsEventsHandler.send(PortfolioEvent.ButtonManageTokens)
+        reduxStateHolder.dispatch(action = TokensAction.SetArgs.ManageAccess)
+        router.openManageTokensScreen()
+    }
+
+    override fun onReloadClick() {
+        val selectedWalletIndex = (uiState as? WalletSingleCurrencyState)
+            ?.walletsListConfig
+            ?.selectedWalletIndex
+            ?: return
+
+        refreshSingleCurrencyContent(selectedWalletIndex)
+    }
+
+    private fun refreshSingleCurrencyContent(walletIndex: Int) {
+        uiState = stateFactory.getRefreshingState()
+        val wallet = getWallet(walletIndex)
+
+        viewModelScope.launch(dispatchers.main) {
+            singleWalletCryptoCurrencyStatus?.let {
+                updateButtons(wallet.walletId, it)
+            }
+            val result = fetchCurrencyStatusUseCase(wallet.walletId, refresh = true)
+
+            uiState = stateFactory.getRefreshedState()
+            uiState = result.fold(stateFactory::getStateByCurrencyStatusError) { uiState }
+
+            singleWalletCryptoCurrencyStatus?.let {
+                val singleCurrencyState = uiState as WalletSingleCurrencyState
+                if (singleCurrencyState.txHistoryState !is TxHistoryState.Content) {
+                    // show loading indicator while refreshing in non content state
+                    uiState = stateFactory.getLoadingTxHistoryState(1.right())
+                }
+                updateTxHistory(wallet.walletId, it.currency, refresh = true)
+            }
+        }.saveIn(refreshContentJobHolder)
+    }
+
+    override fun onExploreClick() {
+        showErrorIfDemoModeOrElse(action = ::openExplorer)
+    }
+
+    private fun openExplorer() {
+        val state = uiState as? WalletState.ContentState ?: return
+
+        viewModelScope.launch(dispatchers.main) {
+            val currencyStatus = singleWalletCryptoCurrencyStatus ?: return@launch
+
+            router.openUrl(
+                url = getExploreUrlUseCase(
+                    userWalletId = getWallet(index = state.walletsListConfig.selectedWalletIndex).walletId,
+                    network = currencyStatus.currency.network,
+                ),
+            )
+        }
+    }
+
+    private fun showErrorIfDemoModeOrElse(action: () -> Unit) {
+        val state = uiState as? WalletState.ContentState ?: return
+        val cardId = getWallet(index = state.walletsListConfig.selectedWalletIndex).cardId
+
+        if (isDemoCardUseCase(cardId = cardId)) {
+            uiState = stateFactory.getStateWithClosedBottomSheet()
+            uiState = stateFactory.getStateAndTriggerEvent(
+                state = uiState,
+                event = WalletEvent.ShowError(
+                    text = resourceReference(id = R.string.alert_demo_feature_disabled),
+                ),
+                setUiState = { uiState = it },
+            )
+        } else {
+            action()
+        }
+    }
+
+    override fun onUnlockWalletClick() {
+        val state = uiState as? WalletState.ContentState ?: return
+
+        analyticsEventsHandler.send(WalletScreenAnalyticsEvent.MainScreen.NoticeWalletLocked)
+
+        viewModelScope.launch(dispatchers.main) {
+            unlockWalletsUseCase(
+                selectedWalletId = state.walletsListConfig.wallets[state.walletsListConfig.selectedWalletIndex].id,
+            )
         }
     }
 
@@ -527,13 +867,20 @@ internal class WalletViewModel @Inject constructor(
     }
 
     override fun onTokenItemClick(currency: CryptoCurrency) {
-        router.openTokenDetails(currency = currency)
+        analyticsEventsHandler.send(PortfolioEvent.TokenTapped)
+        router.openTokenDetails(getSelectedWallet().walletId, currency)
     }
 
-    override fun onTokenItemLongClick(currency: CryptoCurrency) {
-        uiState = stateFactory.getStateWithTokenActionBottomSheet(
-            tokenId = currency.id.value,
-        )
+    override fun onTokenItemLongClick(cryptoCurrencyStatus: CryptoCurrencyStatus) {
+        val state = uiState as? WalletState.ContentState ?: return
+        val userWallet = getWallet(state.walletsListConfig.selectedWalletIndex)
+        viewModelScope.launch(dispatchers.io) {
+            getCryptoCurrencyActionsUseCase(userWallet.walletId, cryptoCurrencyStatus)
+                .take(count = 1)
+                .collectLatest {
+                    uiState = stateFactory.getStateWithTokenActionBottomSheet(it)
+                }
+        }
     }
 
     override fun onRenameClick(userWalletId: UserWalletId, name: String) {
@@ -542,15 +889,404 @@ internal class WalletViewModel @Inject constructor(
         }
     }
 
-    override fun onDeleteClick(userWalletId: UserWalletId) {
-        viewModelScope.launch(dispatchers.io) {
-            val either = deleteWalletUseCase(userWalletId)
+    override fun onDeleteBeforeConfirmationClick(userWalletId: UserWalletId) {
+        uiState = stateFactory.getStateAndTriggerEvent(
+            state = uiState,
+            event = WalletEvent.ShowAlert(
+                state = WalletAlertState.RemoveWalletAlert(
+                    onConfirmClick = { onDeleteAfterConfirmationClick(userWalletId) },
+                ),
+            ),
+            setUiState = { uiState = it },
+        )
+    }
 
-            val state = requireNotNull(uiState as? WalletState.ContentState)
-            if (state.walletsListConfig.wallets.size <= 1 && either.isRight()) onBackClick()
+    override fun onDeleteAfterConfirmationClick(userWalletId: UserWalletId) {
+        val state = uiState as? WalletState.ContentState ?: return
+        viewModelScope.launch(dispatchers.io) {
+            deleteWalletUseCase(userWalletId)
+
+            popBackIfAllWalletsIsLocked(wallets = state.walletsListConfig.wallets)
         }
     }
 
+    private fun popBackIfAllWalletsIsLocked(wallets: List<WalletCardState>) {
+        val unlockedWallet = wallets.count { it !is WalletCardState.LockedContent }
+
+        if (unlockedWallet == 1) {
+            router.popBackStack(
+                screen = if (wallets.size > 1) AppScreen.Welcome else AppScreen.Home,
+            )
+        }
+    }
+
+    override fun onPerformHideToken(cryptoCurrencyStatus: CryptoCurrencyStatus) {
+        val state = uiState as? WalletState.ContentState ?: return
+        val userWallet = getWallet(state.walletsListConfig.selectedWalletIndex)
+        viewModelScope.launch(dispatchers.io) {
+            removeCurrencyUseCase(userWallet.walletId, cryptoCurrencyStatus.currency)
+                .fold(
+                    ifLeft = { showToast(resourceReference(R.string.common_error)) },
+                    ifRight = { uiState = stateFactory.getStateWithClosedBottomSheet() },
+                )
+        }
+    }
+
+    override fun onHideTokensClick(cryptoCurrencyStatus: CryptoCurrencyStatus) {
+        analyticsEventsHandler.send(
+            event = TokenScreenAnalyticsEvent.ButtonRemoveToken(cryptoCurrencyStatus.currency.symbol),
+        )
+
+        viewModelScope.launch(dispatchers.main) {
+            val state = uiState as? WalletState.ContentState ?: return@launch
+            val userWallet = getWallet(state.walletsListConfig.selectedWalletIndex)
+            uiState = stateFactory.getStateAndTriggerEvent(
+                state = uiState,
+                event = getHideTokeAlert(userWallet.walletId, cryptoCurrencyStatus),
+                setUiState = { uiState = it },
+            )
+        }
+    }
+
+    override fun onDismissBottomSheet() {
+        uiState = stateFactory.getStateWithClosedBottomSheet()
+    }
+
+    override fun onTransactionClick(txHash: String) {
+        singleWalletCryptoCurrencyStatus?.let { currencyStatus ->
+            router.openUrl(
+                url = getExplorerTransactionUrlUseCase(
+                    txHash = txHash,
+                    networkId = currencyStatus.currency.network.id,
+                ),
+            )
+        }
+    }
+
+    private suspend fun getHideTokeAlert(
+        userWalletId: UserWalletId,
+        cryptoCurrencyStatus: CryptoCurrencyStatus,
+    ): WalletEvent.ShowAlert {
+        val currency = cryptoCurrencyStatus.currency
+        return if (currency is CryptoCurrency.Coin && !isCryptoCurrencyCoinCouldHide(userWalletId, currency)) {
+            WalletEvent.ShowAlert(
+                state = WalletAlertState.DefaultAlert(
+                    title = resourceReference(
+                        id = R.string.token_details_unable_hide_alert_title,
+                        formatArgs = WrappedList(listOf(cryptoCurrencyStatus.currency.name)),
+                    ),
+                    message = resourceReference(
+                        id = R.string.token_details_unable_hide_alert_message,
+                        formatArgs = WrappedList(
+                            listOf(
+                                cryptoCurrencyStatus.currency.name,
+                                cryptoCurrencyStatus.currency.network.name,
+                            ),
+                        ),
+                    ),
+                    onConfirmClick = null,
+                ),
+            )
+        } else {
+            WalletEvent.ShowAlert(
+                state = WalletAlertState.DefaultAlert(
+                    title = resourceReference(
+                        id = R.string.token_details_hide_alert_title,
+                        formatArgs = WrappedList(listOf(cryptoCurrencyStatus.currency.name)),
+                    ),
+                    message = resourceReference(R.string.token_details_hide_alert_message),
+                    onConfirmClick = { onPerformHideToken(cryptoCurrencyStatus) },
+                ),
+            )
+        }
+    }
+
+    private fun showToast(message: TextReference) {
+        uiState = stateFactory.getStateAndTriggerEvent(
+            state = uiState,
+            event = WalletEvent.ShowToast(message),
+            setUiState = { uiState = it },
+        )
+    }
+
+    private fun getContentItemsUpdates(index: Int) {
+        /*
+         * When wallet is changed it's necessary to stop the last jobs.
+         * If jobs aren't stopped and wallet is changed then it will update state for the prev wallet.
+         */
+        tokensJobHolder.update(job = null)
+        updateWcJobHolder.update(job = null)
+        marketPriceJobHolder.update(job = null)
+        buttonsJobHolder.update(job = null)
+        notificationsJobHolder.update(job = null)
+        refreshContentJobHolder.update(job = null)
+
+        val wallet = getWallet(index)
+
+        when {
+            wallet.isLocked -> {
+                uiState = stateFactory.getLockedState()
+            }
+            wallet.isMultiCurrency -> getMultiCurrencyContent(wallet, index)
+            wallet.scanResponse.cardTypesResolver.isSingleWalletWithToken() -> getSingleCurrencyWithTokenContent(index)
+            !wallet.isMultiCurrency -> getSingleCurrencyContent(index)
+        }
+    }
+
+    private fun getMultiCurrencyContent(wallet: UserWallet, walletIndex: Int) {
+        val state = requireNotNull(uiState as? WalletMultiCurrencyState) {
+            "Impossible to get a token list updates if state isn't WalletMultiCurrencyState"
+        }
+
+        val tokenListFlow = getTokenListUseCase(userWalletId = state.walletsListConfig.wallets[walletIndex].id)
+            .shareIn(viewModelScope, SharingStarted.WhileSubscribed())
+
+        initAndSetupWc(tokenListFlow, wallet)
+
+        tokenListFlow
+            .conflate()
+            .distinctUntilChanged()
+            .onEach { maybeTokenList ->
+                uiState = stateFactory.getStateByTokensList(maybeTokenList.getTokenListWithWallet(wallet))
+
+                maybeTokenList.onRight {
+                    analyticsEventsHandler.sendBalanceLoadedEvent(fiatBalance = it.totalFiatBalance)
+                    checkMultiWalletWithFunds(it)
+                }
+
+                updateNotifications(
+                    index = walletIndex,
+                    tokenList = maybeTokenList.fold(ifLeft = { null }, ifRight = { it }),
+                )
+            }
+            .flowOn(dispatchers.io)
+            .launchIn(viewModelScope)
+            .saveIn(tokensJobHolder)
+    }
+
+    private suspend fun checkMultiWalletWithFunds(tokenList: TokenList) {
+        val hasNonZeroWallets = when (tokenList) {
+            is TokenList.GroupedByNetwork -> {
+                tokenList.groups
+                    .flatMap(NetworkGroup::currencies)
+                    .hasNonZeroWallets()
+            }
+            is TokenList.Ungrouped -> tokenList.currencies.hasNonZeroWallets()
+            is TokenList.Empty -> false
+        }
+
+        if (hasNonZeroWallets) {
+            setWalletWithFundsFoundUseCase()
+        }
+    }
+
+    private fun initAndSetupWc(tokenListFlow: MaybeTokenListFlow, wallet: UserWallet) {
+        viewModelScope
+            .launch(dispatchers.main) {
+                initWalletConnectForWallet(wallet)
+
+                tokenListFlow
+                    .filterLoadedTokenList()
+                    .take(count = 1)
+                    .collect { setupWalletConnectOnWallet(wallet) }
+            }
+            .saveIn(updateWcJobHolder)
+    }
+
+    private fun initWalletConnectForWallet(userWallet: UserWallet) {
+        reduxStateHolder.dispatch(
+            action = WalletConnectActions.New.Initialize(userWallet = userWallet),
+        )
+    }
+
+    private fun setupWalletConnectOnWallet(userWallet: UserWallet) {
+        reduxStateHolder.dispatch(
+            action = WalletConnectActions.New.SetupUserChains(userWallet = userWallet),
+        )
+    }
+
+    private fun List<CryptoCurrencyStatus>.isAllCurrenciesLoaded(): Boolean {
+        return !this.any { it.value is CryptoCurrencyStatus.Loading }
+    }
+
+    private fun MaybeTokenListFlow.filterLoadedTokenList(): MaybeTokenListFlow {
+        return filter { either ->
+            either.fold(
+                ifRight = { list ->
+                    when (list) {
+                        is TokenList.Ungrouped -> {
+                            list.currencies.isAllCurrenciesLoaded()
+                        }
+                        is TokenList.GroupedByNetwork -> {
+                            list.groups.flatMap(NetworkGroup::currencies).isAllCurrenciesLoaded()
+                        }
+                        else -> false
+                    }
+                },
+                ifLeft = { false },
+            )
+        }
+    }
+
+    private fun List<CryptoCurrencyStatus>.hasNonZeroWallets(): Boolean {
+        return any {
+            val amount = it.value.amount ?: return@any false
+            !amount.isZero()
+        }
+    }
+
+    private fun Either<TokenListError, TokenList>.getTokenListWithWallet(
+        userWallet: UserWallet,
+    ): Either<TokenListError, TokenListWithWallet> {
+        return this.map {
+            TokenListWithWallet(it, userWallet)
+        }
+    }
+
+    private fun getSingleCurrencyContent(index: Int) {
+        val wallet = getWallet(index)
+        getPrimaryCurrencyStatusUpdatesUseCase(wallet.walletId)
+            .conflate()
+            .distinctUntilChanged()
+            .onEach { maybeCryptoCurrencyStatus ->
+                uiState = stateFactory.getSingleCurrencyLoadedBalanceState(maybeCryptoCurrencyStatus)
+
+                maybeCryptoCurrencyStatus.onRight { status ->
+                    val fiatAmount = status.value.fiatAmount
+                    analyticsEventsHandler.send(
+                        event = WalletScreenAnalyticsEvent.Basic.BalanceLoaded(
+                            balance = when {
+                                fiatAmount == null -> AnalyticsParam.CardBalanceState.BlockchainError
+                                fiatAmount.isZero() -> AnalyticsParam.CardBalanceState.Empty
+                                else -> AnalyticsParam.CardBalanceState.Full
+                            },
+                        ),
+                    )
+
+                    singleWalletCryptoCurrencyStatus = status
+
+                    if (status.value.amount?.isZero() == false) {
+                        setWalletWithFundsFoundUseCase()
+                    }
+
+                    updateNotifications(index)
+                    updateButtons(wallet.walletId, status)
+                    updateTxHistory(wallet.walletId, status.currency, refresh = false)
+                }
+            }
+            .flowOn(dispatchers.io)
+            .launchIn(viewModelScope)
+            .saveIn(marketPriceJobHolder)
+    }
+
+    private fun getSingleCurrencyWithTokenContent(walletIndex: Int) {
+        val state = requireNotNull(uiState as? WalletMultiCurrencyState) {
+            "Impossible to get a token list updates if state isn't WalletMultiCurrencyState"
+        }
+
+        val wallet = getWallet(walletIndex)
+
+        getCardTokensListUseCase(userWalletId = state.walletsListConfig.wallets[walletIndex].id)
+            .conflate()
+            .distinctUntilChanged()
+            .onEach { maybeTokenList ->
+                uiState = stateFactory.getStateByTokensList(maybeTokenList.getTokenListWithWallet(wallet))
+
+                maybeTokenList.onRight { tokenList ->
+                    analyticsEventsHandler.sendBalanceLoadedEvent(tokenList.totalFiatBalance)
+                    checkMultiWalletWithFunds(tokenList)
+                }
+
+                updateNotifications(
+                    index = walletIndex,
+                    tokenList = maybeTokenList.fold(ifLeft = { null }, ifRight = { it }),
+                )
+            }
+            .flowOn(dispatchers.io)
+            .launchIn(viewModelScope)
+            .saveIn(tokensJobHolder)
+    }
+
+    private fun AnalyticsEventHandler.sendBalanceLoadedEvent(fiatBalance: TokenList.FiatBalance) {
+        val cardBalanceState = when (fiatBalance) {
+            is TokenList.FiatBalance.Failed -> AnalyticsParam.CardBalanceState.BlockchainError
+            is TokenList.FiatBalance.Loaded -> {
+                if (fiatBalance.amount > BigDecimal.ZERO) {
+                    AnalyticsParam.CardBalanceState.Full
+                } else if (fiatBalance.amount.isZero()) {
+                    AnalyticsParam.CardBalanceState.Empty
+                } else {
+                    null
+                }
+            }
+            else -> null
+        }
+
+        cardBalanceState?.let {
+            send(event = WalletScreenAnalyticsEvent.Basic.BalanceLoaded(balance = it))
+        }
+    }
+
+    private fun updateTxHistory(userWalletId: UserWalletId, currency: CryptoCurrency, refresh: Boolean) {
+        viewModelScope.launch(dispatchers.io) {
+            val txHistoryItemsCountEither = txHistoryItemsCountUseCase(
+                userWalletId = userWalletId,
+                network = currency.network,
+            )
+
+            uiState = stateFactory.getLoadingTxHistoryState(
+                itemsCountEither = txHistoryItemsCountEither,
+            )
+
+            txHistoryItemsCountEither.onRight {
+                uiState = stateFactory.getLoadedTxHistoryState(
+                    txHistoryEither = txHistoryItemsUseCase(
+                        userWalletId = userWalletId,
+                        currency = currency,
+                        refresh = refresh,
+                    ).map {
+                        it.cachedIn(viewModelScope)
+                    },
+                )
+            }
+        }
+    }
+
+    private fun updateButtons(userWalletId: UserWalletId, currencyStatus: CryptoCurrencyStatus) {
+        getCryptoCurrencyActionsUseCase(userWalletId = userWalletId, cryptoCurrencyStatus = currencyStatus)
+            .conflate()
+            .distinctUntilChanged()
+            .onEach { uiState = stateFactory.getSingleCurrencyManageButtonsState(actionsState = it) }
+            .flowOn(dispatchers.io)
+            .launchIn(viewModelScope)
+            .saveIn(buttonsJobHolder)
+    }
+
+    private fun updateNotifications(index: Int, tokenList: TokenList? = null) {
+        notificationsListFactory.create(
+            selectedWalletId = getWallet(index).walletId,
+            cardTypesResolver = getCardTypeResolver(index = index),
+            cryptoCurrencyList = if (tokenList != null) {
+                when (tokenList) {
+                    is TokenList.GroupedByNetwork -> {
+                        tokenList.groups
+                            .flatMap(NetworkGroup::currencies)
+                    }
+                    is TokenList.Ungrouped -> tokenList.currencies
+                    is TokenList.Empty -> emptyList()
+                }
+            } else {
+                listOfNotNull(singleWalletCryptoCurrencyStatus)
+            },
+        )
+            .conflate()
+            .distinctUntilChanged()
+            .onEach { uiState = stateFactory.getStateByNotifications(notifications = it) }
+            .flowOn(dispatchers.io)
+            .launchIn(viewModelScope)
+            .saveIn(notificationsJobHolder)
+    }
+
     private fun createSelectedAppCurrencyFlow(): StateFlow<AppCurrency> {
         return getSelectedAppCurrencyUseCase()
             .map { maybeAppCurrency ->
@@ -563,17 +1299,21 @@ internal class WalletViewModel @Inject constructor(
             )
     }
 
-    override fun onDismissBottomSheet() {
-        uiState = stateFactory.getStateWithClosedBottomSheet()
+    private fun getWallet(index: Int): UserWallet {
+        return requireNotNull(
+            value = wallets.getOrNull(index),
+            lazyMessage = { "WalletsList doesn't contain element with index = $index" },
+        )
     }
 
-    override fun onDismissActionsBottomSheet() {
-        (uiState as? WalletMultiCurrencyState.Content)?.let { state ->
-            uiState = state.copy(
-                tokenActionsBottomSheet = state.tokenActionsBottomSheet?.copy(
-                    isShow = false,
-                ),
-            )
-        }
+    private fun getSelectedWallet(): UserWallet {
+        val state = uiState as? WalletState.ContentState
+            ?: error("Unable to get selected user wallet")
+
+        return getWallet(state.walletsListConfig.selectedWalletIndex)
     }
-}
\ No newline at end of file
+
+    private fun getCardTypeResolver(index: Int): CardTypesResolver = getWallet(index).scanResponse.cardTypesResolver
+}
+
+typealias MaybeTokenListFlow = Flow<Either<TokenListError, TokenList>>
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletsUpdateActionResolver.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletsUpdateActionResolver.kt
new file mode 100644
index 0000000000..f3cdc837f5
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletsUpdateActionResolver.kt
@@ -0,0 +1,178 @@
+package com.tangem.feature.wallet.presentation.wallet.viewmodels
+
+import com.tangem.common.Provider
+import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
+import com.tangem.feature.wallet.presentation.wallet.domain.getCardsCount
+import com.tangem.feature.wallet.presentation.wallet.state.WalletLockedState
+import com.tangem.feature.wallet.presentation.wallet.state.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletCardState
+
+/**
+ * Resolver that determines which update action will be performed
+ *
+ * @property currentStateProvider         current state provider
+ * @property getSelectedWalletSyncUseCase use case that returns selected wallet
+ */
+internal class WalletsUpdateActionResolver(
+    private val currentStateProvider: Provider<WalletState>,
+    private val getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase,
+) {
+
+    fun resolve(wallets: List<UserWallet>): Action {
+        val selectedWallet = wallets.getSelectedWallet()
+
+        return when (val state = currentStateProvider()) {
+            is WalletState.Initial -> {
+                Action.Initialize(
+                    selectedWalletIndex = wallets.indexOfWallet(id = selectedWallet.walletId),
+                )
+            }
+            is WalletState.ContentState -> {
+                getActionToUpdateContent(state = state, wallets = wallets, selectedWallet = selectedWallet)
+            }
+        }
+    }
+
+    private fun List<UserWallet>.getSelectedWallet(): UserWallet {
+        val hasUnlockedWallet = any { !it.isLocked }
+        return if (hasUnlockedWallet) {
+            val selectedWalletId = getSelectedWalletSyncUseCase().fold(ifLeft = ::error, ifRight = UserWallet::walletId)
+
+            firstOrNull { it.walletId == selectedWalletId }
+                ?: error("Wallets don't contain a wallet with id: $selectedWalletId")
+        } else {
+            lastOrNull() ?: error("Wallets is empty")
+        }
+    }
+
+    private fun getActionToUpdateContent(
+        state: WalletState.ContentState,
+        wallets: List<UserWallet>,
+        selectedWallet: UserWallet,
+    ): Action {
+        return when {
+            isWalletsCountChanged(state, wallets) -> {
+                getActionToChangeWallets(state = state, wallets = wallets, selectedWallet = selectedWallet)
+            }
+            isSelectedWalletChanged(state, selectedWallet) -> {
+                Action.Initialize(wallets.indexOfWallet(selectedWallet.walletId))
+            }
+            else -> getActionToUpdateCurrentWallet(state = state, wallets = wallets, selectedWallet = selectedWallet)
+        }
+    }
+
+    private fun isWalletsCountChanged(state: WalletState.ContentState, wallets: List<UserWallet>): Boolean {
+        val prevWalletsSize = state.walletsListConfig.wallets.size
+        val walletsSize = wallets.size
+
+        return prevWalletsSize != walletsSize
+    }
+
+    private fun getActionToChangeWallets(
+        state: WalletState.ContentState,
+        wallets: List<UserWallet>,
+        selectedWallet: UserWallet,
+    ): Action {
+        val prevWalletsSize = state.walletsListConfig.wallets.size
+
+        return when {
+            prevWalletsSize > wallets.size -> {
+                Action.DeleteWallet(
+                    selectedWalletId = selectedWallet.walletId,
+                    selectedWalletIndex = wallets.indexOfWallet(id = selectedWallet.walletId),
+                    deletedWalletId = state.walletsListConfig.wallets.getDeletedWalletId(wallets),
+                )
+            }
+            prevWalletsSize < wallets.size -> {
+                Action.AddWallet(
+                    selectedWalletIndex = wallets.indexOfWallet(id = selectedWallet.walletId),
+                )
+            }
+            else -> Action.Unknown
+        }
+    }
+
+    private fun List<WalletCardState>.getDeletedWalletId(wallets: List<UserWallet>): UserWalletId {
+        return this
+            .map(WalletCardState::id)
+            .firstOrNull { !wallets.map(UserWallet::walletId).contains(it) }
+            ?: error("Deleted wallet id is not found. Wallets contains all previous wallets ids")
+    }
+
+    private fun isSelectedWalletChanged(state: WalletState.ContentState, selectedWallet: UserWallet): Boolean {
+        return state.getPrevSelectedWallet().id != selectedWallet.walletId
+    }
+
+    private fun getActionToUpdateCurrentWallet(
+        state: WalletState.ContentState,
+        wallets: List<UserWallet>,
+        selectedWallet: UserWallet,
+    ): Action {
+        val selectedWalletName = selectedWallet.name
+        val previousWalletState = state.getPrevSelectedWallet()
+        return when {
+            previousWalletState.title != selectedWalletName -> {
+                Action.UpdateWalletName(selectedWalletName)
+            }
+
+            state is WalletLockedState && !selectedWallet.isLocked -> {
+                Action.UnlockWallet(
+                    selectedWalletIndex = wallets.indexOfWallet(id = selectedWallet.walletId),
+                    selectedWallet = selectedWallet,
+                    unlockedWallets = wallets.filterNot(UserWallet::isLocked),
+                )
+            }
+
+            previousWalletState is WalletCardState.Content &&
+                previousWalletState.cardCount != selectedWallet.getCardsCount() -> {
+                Action.UpdateWalletCardCount
+            }
+
+            else -> Action.Unknown
+        }
+    }
+
+    private fun WalletState.ContentState.getPrevSelectedWallet(): WalletCardState {
+        val prevSelectedWalletIndex = walletsListConfig.selectedWalletIndex
+
+        return walletsListConfig.wallets.getOrNull(prevSelectedWalletIndex)
+            ?: error("Previous selected wallet is not found")
+    }
+
+    private fun List<UserWallet>.indexOfWallet(id: UserWalletId): Int {
+        val selectedIndex = indexOfFirst { it.walletId == id }
+
+        return if (selectedIndex == -1) {
+            error("Wallets don't contain a wallet with id: $id")
+        } else {
+            selectedIndex
+        }
+    }
+
+    sealed class Action {
+
+        data class Initialize(val selectedWalletIndex: Int) : Action()
+
+        data class UpdateWalletName(val name: String) : Action()
+
+        data class UnlockWallet(
+            val selectedWalletIndex: Int,
+            val selectedWallet: UserWallet,
+            val unlockedWallets: List<UserWallet>,
+        ) : Action()
+
+        data class DeleteWallet(
+            val selectedWalletId: UserWalletId,
+            val selectedWalletIndex: Int,
+            val deletedWalletId: UserWalletId,
+        ) : Action()
+
+        data class AddWallet(val selectedWalletIndex: Int) : Action()
+
+        object UpdateWalletCardCount : Action()
+
+        object Unknown : Action()
+    }
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/res/drawable/ill_bad_card2_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_bad_card2_120_106.webp
new file mode 100644
index 0000000000..cb046b7ce2
Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_bad_card2_120_106.webp differ
diff --git a/features/wallet/impl/src/main/res/drawable/ill_bad_card3_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_bad_card3_120_106.webp
new file mode 100644
index 0000000000..2acc73e1f5
Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_bad_card3_120_106.webp differ
diff --git a/features/wallet/impl/src/main/res/drawable/ill_kaspa_card2_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_kaspa_card2_120_106.webp
new file mode 100644
index 0000000000..9fa7ac2b7f
Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_kaspa_card2_120_106.webp differ
diff --git a/features/wallet/impl/src/main/res/drawable/ill_kaspa_card3_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_kaspa_card3_120_106.webp
new file mode 100644
index 0000000000..c2347fd636
Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_kaspa_card3_120_106.webp differ
diff --git a/features/wallet/impl/src/main/res/drawable/ill_shiba_card2_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_shiba_card2_120_106.webp
new file mode 100644
index 0000000000..4bb9688be5
Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_shiba_card2_120_106.webp differ
diff --git a/features/wallet/impl/src/main/res/drawable/ill_shiba_card3_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_shiba_card3_120_106.webp
new file mode 100644
index 0000000000..e774f1b087
Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_shiba_card3_120_106.webp differ
diff --git a/features/wallet/impl/src/main/res/drawable/ill_tron_card2_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_tron_card2_120_106.webp
new file mode 100644
index 0000000000..b838e8308b
Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_tron_card2_120_106.webp differ
diff --git a/features/wallet/impl/src/main/res/drawable/ill_tron_card3_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_tron_card3_120_106.webp
new file mode 100644
index 0000000000..8bbda73d2e
Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_tron_card3_120_106.webp differ
diff --git a/features/wallet/impl/src/main/res/drawable/ill_twin_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_twin_120_106.webp
deleted file mode 100644
index c70a8526de..0000000000
Binary files a/features/wallet/impl/src/main/res/drawable/ill_twin_120_106.webp and /dev/null differ
diff --git a/features/wallet/impl/src/main/res/drawable/ill_twins_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_twins_120_106.webp
new file mode 100644
index 0000000000..58e2196ccf
Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_twins_120_106.webp differ
diff --git a/features/wallet/impl/src/main/res/drawable/ill_wallet1_cards1_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_wallet1_cards1_120_106.webp
new file mode 100644
index 0000000000..afd5f31fda
Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_wallet1_cards1_120_106.webp differ
diff --git a/features/wallet/impl/src/main/res/drawable/ill_wallet1_cards2_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_wallet1_cards2_120_106.webp
new file mode 100644
index 0000000000..93f451d3e8
Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_wallet1_cards2_120_106.webp differ
diff --git a/features/wallet/impl/src/main/res/drawable/ill_wallet1_cards3_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_wallet1_cards3_120_106.webp
new file mode 100644
index 0000000000..ae1f21e142
Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_wallet1_cards3_120_106.webp differ
diff --git a/features/wallet/impl/src/main/res/drawable/ill_wallet_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_wallet_120_106.webp
deleted file mode 100644
index 890ad12eae..0000000000
Binary files a/features/wallet/impl/src/main/res/drawable/ill_wallet_120_106.webp and /dev/null differ
diff --git a/features/wallet/impl/src/main/res/drawable/ill_old_wallet_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_wallet_old_white_120_106.webp
similarity index 100%
rename from features/wallet/impl/src/main/res/drawable/ill_old_wallet_120_106.webp
rename to features/wallet/impl/src/main/res/drawable/ill_wallet_old_white_120_106.webp
diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml
index c99a8f89b6..3b52258884 100644
--- a/gradle/dependencies.toml
+++ b/gradle/dependencies.toml
@@ -10,7 +10,7 @@ kotlin = "1.8.21"
 # endregion Classpath
 
 # region AndroidX
-androidxActivityCompose = "1.5.0"
+androidxActivityCompose = "1.8.0"
 androidxAppCompat = "1.5.1"
 androidxBrowser = "1.4.0"
 androidxConstraintLayout = "2.1.4"
@@ -19,20 +19,21 @@ androidxSplashScreen = "1.0.1"
 androidxFragment = "1.5.3"
 androidxLifecycle = "2.5.1"
 androidx-paging = "3.1.1"
+androidx-palette = "1.0.0"
 # endregion AndroidX
 
 # region Compose
 compose-compiler = "1.4.7"
-compose-runtime = "1.4.3"
-compose-foundation = "1.4.3"
-compose-material = "1.4.3"
-compose-material3 = "1.1.0"
+compose-runtime = "1.5.3"
+compose-foundation = "1.5.3"
+compose-material = "1.5.3"
+compose-material3 = "1.1.2"
 compose-constraint = "1.0.1"
-compose-navigation = "2.5.3"
+compose-navigation = "2.7.4"
 compose-accompanist = "0.30.1"
-compose-paging = "3.2.0"
+compose-paging = "3.2.1"
 compose-reorderable = "0.9.6"
-compoese-lifecycle-runtime = "2.6.1"
+compoese-lifecycle-runtime = "2.6.2"
 # endregion Compose
 
 # region Other libraries
@@ -82,9 +83,9 @@ spr-client = "3.6.2"
 # endregion Other libraries
 
 # region Tangem
-tangemBlockchainSdk = "release-app_4.11-360"
+tangemBlockchainSdk = "release-app_5.0-363"
 #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds
-tangemCardSdk = "release-app_4.11-305"
+tangemCardSdk = "release-app_5.0-307"
 #tangemCardSdk = "0.0.1" # Keep it! - used for local builds
 # endregion Tangem
 
@@ -135,11 +136,13 @@ lifecycle-common-java8 = { module = "androidx.lifecycle:lifecycle-common-java8",
 lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidxLifecycle" }
 lifecycle-viewModel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidxLifecycle" }
 lifecycle-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "compoese-lifecycle-runtime" }
+androidx-palette = { module = "androidx.palette:palette", version.ref = "androidx-palette" }
 # region AndroidX
 
 # region Compose
 compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose-runtime" }
 compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose-runtime" }
+compose-ui-utils = { module = "androidx.compose.ui:ui-util", version.ref = "compose-runtime" }
 compose-animation = { module = "androidx.compose.animation:animation", version.ref = "compose-runtime" }
 compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose-foundation" }
 compose-material = { module = "androidx.compose.material:material", version.ref = "compose-material" }
diff --git a/libs/crypto/src/main/java/com/tangem/lib/crypto/DerivationManager.kt b/libs/crypto/src/main/java/com/tangem/lib/crypto/DerivationManager.kt
index 7dd3d51970..bf9803cbb2 100644
--- a/libs/crypto/src/main/java/com/tangem/lib/crypto/DerivationManager.kt
+++ b/libs/crypto/src/main/java/com/tangem/lib/crypto/DerivationManager.kt
@@ -22,4 +22,9 @@ interface DerivationManager {
      * Checks that given [networkId] has derivations for [derivationPath]
      */
     fun hasDerivation(networkId: String, derivationPath: String): Boolean
+
+    /**
+     * Makes derivation for [Currency] if it is missing and adds token to wallet
+     */
+    suspend fun deriveAndAddTokens(currency: Currency): String
 }
\ No newline at end of file
diff --git a/libs/crypto/src/main/java/com/tangem/lib/crypto/UserWalletManager.kt b/libs/crypto/src/main/java/com/tangem/lib/crypto/UserWalletManager.kt
index 72f8074791..0a489b3498 100644
--- a/libs/crypto/src/main/java/com/tangem/lib/crypto/UserWalletManager.kt
+++ b/libs/crypto/src/main/java/com/tangem/lib/crypto/UserWalletManager.kt
@@ -51,7 +51,7 @@ interface UserWalletManager {
      * @param derivationPath if null uses default
      */
     @Throws(IllegalStateException::class)
-    fun getWalletAddress(networkId: String, derivationPath: String?): String
+    suspend fun getWalletAddress(networkId: String, derivationPath: String?): String
 
     /**
      * Return balances from wallet found by networkId
@@ -69,7 +69,7 @@ interface UserWalletManager {
     ): Map<String, ProxyAmount>
 
     @Throws(IllegalStateException::class)
-    fun getNativeTokenBalance(networkId: String, derivationPath: String?): ProxyAmount?
+    suspend fun getNativeTokenBalance(networkId: String, derivationPath: String?): ProxyAmount?
 
     /**
      * @param networkId
@@ -84,5 +84,5 @@ interface UserWalletManager {
     fun getUserAppCurrency(): ProxyFiatCurrency
 
     @Throws(IllegalStateException::class)
-    fun getLastTransactionHash(networkId: String, derivationPath: String?): String?
+    suspend fun getLastTransactionHash(networkId: String, derivationPath: String?): String?
 }
\ No newline at end of file
diff --git a/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/AppConfig.kt b/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/AppConfig.kt
index 39b4f01925..c8bfbff0f1 100644
--- a/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/AppConfig.kt
+++ b/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/AppConfig.kt
@@ -5,6 +5,6 @@ internal object AppConfig {
     const val versionCode = 1
     const val versionName = "1.0.0-SNAPSHOT"
     const val minSdkVersion = 23
-    const val targetSdkVersion = 33
-    const val compileSdkVersion = 33
+    const val targetSdkVersion = 34
+    const val compileSdkVersion = 34
 }
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7e4c66d7d8..df1029f7b1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -92,6 +92,8 @@ include(":features:tokendetails:impl")
 
 include(":features:learn2earn:api")
 include(":features:learn2earn:impl")
+
+include(":features:send:api")
 // endregion Feature modules
 
 // region Domain modules
@@ -113,11 +115,15 @@ include(":domain:app-currency")
 include(":domain:app-currency:models")
 include(":domain:app-theme")
 include(":domain:app-theme:models")
+include(":domain:balance-hiding")
+include(":domain:balance-hiding:models")
+
 // endregion Domain modules
 
 // region Data modules
 include(":data:app-currency")
 include(":data:app-theme")
+include(":data:balance-hiding")
 include(":data:common")
 include(":data:card")
 include(":data:tokens")