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 91558d9f57..5646eee001 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
@@ -4,7 +4,7 @@ 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.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
@@ -27,13 +27,12 @@ internal fun SettingsScreensScaffold(
     addBottomInsets: Boolean = true,
     fab: @Composable () -> Unit = {},
 ) {
-    val state = rememberScaffoldState(snackbarHostState = snackbarHostState)
     val backgroundColor = TangemTheme.colors.background.secondary
 
     BackHandler(onBack = onBackClick)
 
     Scaffold(
-        scaffoldState = state,
+        snackbarHost = { SnackbarHost(snackbarHostState) },
         topBar = {
             EmptyTopBarWithNavigation(
                 modifier = Modifier.statusBarsPadding(),
@@ -43,7 +42,7 @@ internal fun SettingsScreensScaffold(
         },
         modifier = modifier,
         contentWindowInsets = WindowInsetsZero,
-        backgroundColor = backgroundColor,
+        containerColor = backgroundColor,
         floatingActionButton = {
             Box(modifier = Modifier.navigationBarsPadding()) {
                 fab()
@@ -89,6 +88,7 @@ internal fun ScreenTitle(titleRes: Int, modifier: Modifier = Modifier) {
     )
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 internal fun EmptyTopBarWithNavigation(
     onBackClick: () -> Unit,
@@ -108,8 +108,9 @@ internal fun EmptyTopBarWithNavigation(
                 )
             }
         },
-        backgroundColor = backgroundColor,
-        elevation = 0.dp,
+        colors = TopAppBarDefaults.topAppBarColors(
+            containerColor = backgroundColor,
+        ),
     )
 }
 
diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletBottomSheetFragment.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletBottomSheetFragment.kt
index d0d7c64fb5..7062719124 100644
--- a/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletBottomSheetFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletBottomSheetFragment.kt
@@ -4,8 +4,8 @@ import android.content.DialogInterface
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.SnackbarHost
-import androidx.compose.material.SnackbarHostState
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
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 c34497d9f0..968b3776fa 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
@@ -6,8 +6,8 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBarsPadding
-import androidx.compose.material.SnackbarHost
-import androidx.compose.material.SnackbarHostState
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
diff --git a/app/src/main/java/com/tangem/tap/features/welcome/ui/components/WelcomeScreen.kt b/app/src/main/java/com/tangem/tap/features/welcome/ui/components/WelcomeScreen.kt
index 8b90cbbdc9..ee1a00bb48 100644
--- a/app/src/main/java/com/tangem/tap/features/welcome/ui/components/WelcomeScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/welcome/ui/components/WelcomeScreen.kt
@@ -7,8 +7,8 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBarsPadding
-import androidx.compose.material.SnackbarHost
-import androidx.compose.material.SnackbarHostState
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/preview/SwapSuccessStatePreview.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/preview/SwapSuccessStatePreview.kt
new file mode 100644
index 0000000000..1be63f7e6f
--- /dev/null
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/preview/SwapSuccessStatePreview.kt
@@ -0,0 +1,27 @@
+package com.tangem.feature.swap.preview
+
+import com.tangem.core.ui.components.currency.icon.CurrencyIconState
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.feature.swap.domain.models.domain.ExchangeProviderType
+import com.tangem.feature.swap.models.SwapSuccessStateHolder
+
+internal data object SwapSuccessStatePreview {
+    val state = SwapSuccessStateHolder(
+        timestamp = 0L,
+        txUrl = "https://www.google.com/#q=nam",
+        fee = TextReference.Str("1 000 DAI ~ 1 000 MATIC"),
+        providerName = TextReference.Str("1inch"),
+        providerType = TextReference.Str(ExchangeProviderType.DEX.providerName),
+        showStatusButton = false,
+        providerIcon = "",
+        fromTokenAmount = TextReference.Str("1 000 DAI"),
+        toTokenAmount = TextReference.Str("1 000 MATIC"),
+        fromTokenFiatAmount = TextReference.Str("1 000 $"),
+        toTokenFiatAmount = TextReference.Str("1 000 $"),
+        fromTokenIconState = CurrencyIconState.Loading,
+        toTokenIconState = CurrencyIconState.Loading,
+        rate = TextReference.Str("1 000 DAI ~ 1 000 MATIC"),
+        onExploreButtonClick = {},
+        onStatusButtonClick = {},
+    )
+}
\ 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 c1cafdc166..7e4d9649bf 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
@@ -4,7 +4,7 @@ import android.content.res.Configuration
 import androidx.annotation.StringRes
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
-import androidx.compose.material.Scaffold
+import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -24,15 +24,15 @@ import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.core.ui.utils.DateTimeFormatters
 import com.tangem.core.ui.utils.toTimeFormat
-import com.tangem.feature.swap.domain.models.domain.ExchangeProviderType
 import com.tangem.feature.swap.models.SwapSuccessStateHolder
 import com.tangem.feature.swap.presentation.R
+import com.tangem.feature.swap.preview.SwapSuccessStatePreview
 
 @Composable
 fun SwapSuccessScreen(state: SwapSuccessStateHolder, onBack: () -> Unit) {
     Scaffold(
         modifier = Modifier.systemBarsPadding(),
-        backgroundColor = TangemTheme.colors.background.secondary,
+        containerColor = TangemTheme.colors.background.secondary,
         content = { padding ->
             SwapSuccessScreenContent(padding = padding, state = state)
         },
@@ -162,32 +162,12 @@ private fun SwapSuccessScreenButtons(
 }
 
 // region preview
-
-private val state = SwapSuccessStateHolder(
-    timestamp = 0L,
-    txUrl = "https://www.google.com/#q=nam",
-    fee = TextReference.Str("1 000 DAI ~ 1 000 MATIC"),
-    providerName = TextReference.Str("1inch"),
-    providerType = TextReference.Str(ExchangeProviderType.DEX.providerName),
-    showStatusButton = false,
-    providerIcon = "",
-    fromTokenAmount = TextReference.Str("1 000 DAI"),
-    toTokenAmount = TextReference.Str("1 000 MATIC"),
-    fromTokenFiatAmount = TextReference.Str("1 000 $"),
-    toTokenFiatAmount = TextReference.Str("1 000 $"),
-    fromTokenIconState = CurrencyIconState.Loading,
-    toTokenIconState = CurrencyIconState.Loading,
-    rate = TextReference.Str("1 000 DAI ~ 1 000 MATIC"),
-    onExploreButtonClick = {},
-    onStatusButtonClick = {},
-)
-
 @Preview(showBackground = true)
 @Preview(showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
 @Composable
 private fun Preview_Success() {
     TangemThemePreview {
-        SwapSuccessScreen(state) {}
+        SwapSuccessScreen(SwapSuccessStatePreview.state) {}
     }
 }
 // endregion preview
\ No newline at end of file