diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/swaptx/SwapTransactionStatusStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/swaptx/SwapTransactionStatusStore.kt
index 59bd30030e..2bcb9a3dbb 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/swaptx/SwapTransactionStatusStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/swaptx/SwapTransactionStatusStore.kt
@@ -15,4 +15,5 @@ enum class ExchangeAnalyticsStatus(val value: String) {
     Fail("Fail"),
     KYC("KYC"),
     Refunded("Refunded"),
+    Cancelled("Canceled"),
 }
\ No newline at end of file
diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml
index bf64538d4b..8665fe2aa8 100644
--- a/core/res/src/main/res/values/strings.xml
+++ b/core/res/src/main/res/values/strings.xml
@@ -579,7 +579,7 @@
     <string name="token_item_no_rate">No rate</string>
     <string name="token_swap_promotion_message">Exchange this token for other assets in your portfolio</string>
     <string name="token_swap_promotion_title">Introducing cross-chain swaps</string>
-    <string name="token_swap_promotion_button">Exchange now</string>
+    <string name="token_swap_promotion_button">Swap now</string>
     <string name="transaction_history_contract_address">contract: %s</string>
     <string name="transaction_history_empty_transactions">You don\'t have any transactions yet</string>
     <string name="transaction_history_error_failed_to_load">Failed to load transaction history.\nClick on reload button to update the information.</string>
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 d2c890aad3..f87f80fe61 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
@@ -175,7 +175,7 @@ private fun darkThemeColors(): TangemColors {
             key = TangemColorPalette.White,
         ),
         stroke = TangemColors.Stroke(
-            primary = TangemColorPalette.Dark5,
+            primary = TangemColorPalette.Dark4,
             secondary = TangemColorPalette.Dark1,
             transparency = TangemColorPalette.Dark6,
         ),
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/TokenDetailsActionButton.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/TokenDetailsActionButton.kt
index 3575d02e0f..8af1d13a13 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/TokenDetailsActionButton.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/TokenDetailsActionButton.kt
@@ -78,7 +78,7 @@ internal sealed class TokenDetailsActionButton(val config: ActionButtonConfig) {
      */
     data class Swap(val enabled: Boolean, override val onClick: () -> Unit) : TokenDetailsActionButton(
         config = ActionButtonConfig(
-            text = TextReference.Res(id = R.string.common_exchange),
+            text = TextReference.Res(id = R.string.common_swap),
             iconResId = R.drawable.ic_exchange_vertical_24,
             onClick = onClick,
             enabled = enabled,
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/viewmodels/ExchangeStatusFactory.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/viewmodels/ExchangeStatusFactory.kt
index 8ff627eaec..ffb90e01de 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/viewmodels/ExchangeStatusFactory.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/viewmodels/ExchangeStatusFactory.kt
@@ -171,6 +171,7 @@ internal class ExchangeStatusFactory(
             ExchangeStatus.Failed -> ExchangeAnalyticsStatus.Fail
             ExchangeStatus.Finished -> ExchangeAnalyticsStatus.Done
             ExchangeStatus.Refunded -> ExchangeAnalyticsStatus.Refunded
+            ExchangeStatus.Cancelled -> ExchangeAnalyticsStatus.Cancelled
             else -> null
         }
     }
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletManageButton.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletManageButton.kt
index 2628469375..fabf18401f 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletManageButton.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/components/WalletManageButton.kt
@@ -88,7 +88,7 @@ internal sealed class WalletManageButton(val config: ActionButtonConfig) {
      */
     data class Swap(override val enabled: Boolean, override val onClick: () -> Unit) : WalletManageButton(
         config = ActionButtonConfig(
-            text = TextReference.Res(id = R.string.common_exchange),
+            text = TextReference.Res(id = R.string.common_swap),
             iconResId = R.drawable.ic_exchange_vertical_24,
             onClick = onClick,
             enabled = enabled,
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 7a452a255c..df989ef9b8 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
@@ -78,7 +78,7 @@ internal class TokenActionsProvider(
                 action = { clickIntents.onMultiCurrencySendClick(cryptoCurrencyStatus) }
             }
             is TokenActionsState.ActionState.Swap -> {
-                title = resourceReference(R.string.common_exchange)
+                title = resourceReference(R.string.common_swap)
                 icon = R.drawable.ic_exchange_horizontal_24
                 action = { clickIntents.onSwapClick(cryptoCurrencyStatus) }
             }