diff --git a/core/res/src/main/res/values-de/strings.xml b/core/res/src/main/res/values-de/strings.xml
index c182833574..aa67dcb376 100644
--- a/core/res/src/main/res/values-de/strings.xml
+++ b/core/res/src/main/res/values-de/strings.xml
@@ -150,6 +150,9 @@
   <string name="balance_hidden_do_not_show_button">Nicht mehr anzeigen</string>
   <string name="balance_hidden_got_it_button">Verstanden</string>
   <string name="balance_hidden_title">Guthaben sind ausgeblendet</string>
+  <string name="banner.swap.firsttime.button">Swap starten</string>
+  <string name="banner.swap.firsttime.subtitletitle">Tauschen Sie ein Asset gegen ein anderes – in wenigen Schritten</string>
+  <string name="banner.swap.firsttime.title">Führen Sie Ihren ersten Swap durch</string>
   <string name="beta_mode_warning_message">Laut den Blockchain-Entwicklern befinden sich der Kaspa-Token derzeit in der Betaphase. Bleibe dran für Updates!</string>
   <string name="beta_mode_warning_title">Beta-Phase</string>
   <string name="biometric_disabled_warning_description">Die Biometrie ist auf Deinem Gerät deaktiviert, daher kannst Du sie nicht zum Entsperren Deiner Wallets verwenden. Aktiviere die Biometrie in den Geräteeinstellungen, um diese Methode wieder nutzen zu können.</string>
diff --git a/core/res/src/main/res/values-es/strings.xml b/core/res/src/main/res/values-es/strings.xml
index 380471b947..cfebaed199 100644
--- a/core/res/src/main/res/values-es/strings.xml
+++ b/core/res/src/main/res/values-es/strings.xml
@@ -146,6 +146,9 @@
   <string name="balance_hidden_do_not_show_button">No mostrar de nuevo</string>
   <string name="balance_hidden_got_it_button">Entendido</string>
   <string name="balance_hidden_title">Los saldos están ocultos</string>
+  <string name="banner.swap.firsttime.button">Iniciar intercambio</string>
+  <string name="banner.swap.firsttime.subtitletitle">Convierte un activo en otro con solo unos toques</string>
+  <string name="banner.swap.firsttime.title">Realiza tu primer intercambio</string>
   <string name="beta_mode_warning_message">Según los desarrolladores de la blockchain, los tokens de Kaspa se encuentran actualmente en fase beta. ¡Estén atentos a las actualizaciones!</string>
   <string name="beta_mode_warning_title">Modo Beta</string>
   <string name="biometric_disabled_warning_description">La biometría está desactivada en su dispositivo, por lo que no puede utilizarla para desbloquear sus billeteras. Active la biometría en los ajustes de su dispositivo para volver a utilizar este método.</string>
diff --git a/core/res/src/main/res/values-fr/strings.xml b/core/res/src/main/res/values-fr/strings.xml
index 3114f14a53..b400dc3a12 100644
--- a/core/res/src/main/res/values-fr/strings.xml
+++ b/core/res/src/main/res/values-fr/strings.xml
@@ -146,6 +146,9 @@
   <string name="balance_hidden_do_not_show_button">Ne plus afficher</string>
   <string name="balance_hidden_got_it_button">Compris</string>
   <string name="balance_hidden_title">Les soldes sont masqués</string>
+  <string name="banner.swap.firsttime.button">Lancer l\'échange</string>
+  <string name="banner.swap.firsttime.subtitletitle">Convertissez un actif en un autre en quelques touches</string>
+  <string name="banner.swap.firsttime.title">Effectuez votre premier échange</string>
   <string name="beta_mode_warning_message">Selon les développeurs de la blockchain, les jetons Kaspa sont actuellement en version bêta. Restez à l\'écoute des mises à jour !</string>
   <string name="beta_mode_warning_title">Mode bêta</string>
   <string name="biometric_disabled_warning_description">La biométrie est désactivée sur votre appareil, vous ne pouvez donc pas l\'utiliser pour déverrouiller vos portefeuilles. Activez la biométrie dans les paramètres de votre appareil pour pouvoir à nouveau utiliser cette méthode.</string>
diff --git a/core/res/src/main/res/values-it/strings.xml b/core/res/src/main/res/values-it/strings.xml
index 22cdd2be2d..4576e967ff 100644
--- a/core/res/src/main/res/values-it/strings.xml
+++ b/core/res/src/main/res/values-it/strings.xml
@@ -3,6 +3,9 @@
   <string name="address_type_default">Default</string>
   <string name="address_type_legacy">Legacy</string>
   <string name="alert_unsupported_card">Questa carta non è progettata per funzionare con Tangem</string>
+  <string name="banner.swap.firsttime.button">Avvia lo scambio</string>
+  <string name="banner.swap.firsttime.subtitletitle">Converti un asset in un altro con pochi tocchi</string>
+  <string name="banner.swap.firsttime.title">Esegui il tuo primo scambio</string>
   <string name="cardano_low_ada">L\'importo inviato e il cambio non può essere inferiore a 1 ADA</string>
   <string name="common_accept">Accetta</string>
   <string name="common_amount">Importo</string>
diff --git a/core/res/src/main/res/values-ja/strings.xml b/core/res/src/main/res/values-ja/strings.xml
index bc306eab97..3002f624e7 100644
--- a/core/res/src/main/res/values-ja/strings.xml
+++ b/core/res/src/main/res/values-ja/strings.xml
@@ -149,6 +149,9 @@
   <string name="balance_hidden_do_not_show_button">今後表示しない</string>
   <string name="balance_hidden_got_it_button">わかりました</string>
   <string name="balance_hidden_title">残高は非表示</string>
+  <string name="banner.swap.firsttime.button">スワップを開始</string>
+  <string name="banner.swap.firsttime.subtitletitle">数タップで1つの資産を別の資産に交換できます</string>
+  <string name="banner.swap.firsttime.title">はじめてのスワップ</string>
   <string name="beta_mode_warning_message">ブロックチェーン開発者によると、Kaspaトークンは現在ベータ版です。アップデートをお楽しみに！</string>
   <string name="beta_mode_warning_title">ベータモード</string>
   <string name="biometric_disabled_warning_description">この端末では生体認証がオフになっているため、ウォレットの解除に使用できません。再度この方法を使用するには、端末の設定で生体認証を有効にしてください。</string>
diff --git a/core/res/src/main/res/values-pt-rBR/strings.xml b/core/res/src/main/res/values-pt-rBR/strings.xml
index 2aaf2c0bcc..6d21e97a04 100644
--- a/core/res/src/main/res/values-pt-rBR/strings.xml
+++ b/core/res/src/main/res/values-pt-rBR/strings.xml
@@ -150,6 +150,9 @@
   <string name="balance_hidden_do_not_show_button">Não mostrar novamente</string>
   <string name="balance_hidden_got_it_button">Entendi</string>
   <string name="balance_hidden_title">Os saldos estão ocultos.</string>
+  <string name="banner.swap.firsttime.button">Iniciar swap</string>
+  <string name="banner.swap.firsttime.subtitletitle">Converta um ativo em outro com apenas alguns toques</string>
+  <string name="banner.swap.firsttime.title">Faça seu primeiro swap</string>
   <string name="beta_mode_warning_message">Segundo os desenvolvedores da blockchain, os tokens Kaspa estão atualmente em fase beta. Fique atento para mais novidades!</string>
   <string name="beta_mode_warning_title">Modo Beta</string>
   <string name="biometric_disabled_warning_description">A biometria está desativada no seu dispositivo, portanto, você não pode usá-la para desbloquear suas carteiras. Ative a biometria nas configurações do seu dispositivo para usar esse método novamente.</string>
diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml
index 91dd3fa436..2eeccb50d5 100644
--- a/core/res/src/main/res/values-ru/strings.xml
+++ b/core/res/src/main/res/values-ru/strings.xml
@@ -152,6 +152,9 @@
   <string name="balance_hidden_do_not_show_button">Больше не показывать</string>
   <string name="balance_hidden_got_it_button">Понятно</string>
   <string name="balance_hidden_title">Балансы скрыты</string>
+  <string name="banner.swap.firsttime.button">Начать обмен</string>
+  <string name="banner.swap.firsttime.subtitletitle">Превратите один актив в другой всего за несколько касаний</string>
+  <string name="banner.swap.firsttime.title">Совершите первый обмен</string>
   <string name="beta_mode_warning_message">Согласно информации от разработчиков сети, токены Kaspa находятся в режиме бета. Следите за обновлениями!</string>
   <string name="beta_mode_warning_title">Бета режим</string>
   <string name="biometric_disabled_warning_description">Биометрия отключена на вашем устройстве, поэтому вы не можете использовать её для разблокировки кошельков. Включите биометрию в настройках устройства, чтобы снова использовать этот способ.</string>
@@ -2080,7 +2083,7 @@
   <string name="wc_common_loading">Загрузка</string>
   <string name="wc_common_network">Сеть</string>
   <string name="wc_common_networks">Сети</string>
-  <string name="wc_common_unlimited">Без лимитно</string>
+  <string name="wc_common_unlimited">Безлимитно</string>
   <string name="wc_common_wallet">Кошелек</string>
   <string name="wc_connected_app_title">Подключенное приложение</string>
   <string name="wc_connected_networks">Подключенные сети</string>
diff --git a/core/res/src/main/res/values-uk-rUA/strings.xml b/core/res/src/main/res/values-uk-rUA/strings.xml
index fee0598cb0..ec724bbcf2 100644
--- a/core/res/src/main/res/values-uk-rUA/strings.xml
+++ b/core/res/src/main/res/values-uk-rUA/strings.xml
@@ -148,6 +148,9 @@
   <string name="balance_hidden_do_not_show_button">Більше не показувати</string>
   <string name="balance_hidden_got_it_button">Зрозуміло</string>
   <string name="balance_hidden_title">Баланси приховані</string>
+  <string name="banner.swap.firsttime.button">Почати обмін</string>
+  <string name="banner.swap.firsttime.subtitletitle">Перетворіть один актив на інший лише кількома дотиками</string>
+  <string name="banner.swap.firsttime.title">Здійсніть перший обмін</string>
   <string name="beta_mode_warning_message">Згідно інформації від розробників мережі, токени Kaspa знаходяться у режимі бета. Слідкуйте за оновленнями!</string>
   <string name="beta_mode_warning_title">Бета режим</string>
   <string name="biometric_disabled_warning_description">Біометрія на вашому пристрої вимкнена, тому ви не можете використовувати її для розблокування гаманців. Увімкніть біометрію в налаштуваннях пристрою, щоб знову використовувати цей метод.</string>
diff --git a/core/res/src/main/res/values-zh-rCN/strings.xml b/core/res/src/main/res/values-zh-rCN/strings.xml
index b93bb9d6e6..f89300a11d 100644
--- a/core/res/src/main/res/values-zh-rCN/strings.xml
+++ b/core/res/src/main/res/values-zh-rCN/strings.xml
@@ -149,6 +149,9 @@
   <string name="balance_hidden_do_not_show_button">不要再次显示</string>
   <string name="balance_hidden_got_it_button">明白</string>
   <string name="balance_hidden_title">余额已隐藏</string>
+  <string name="banner.swap.firsttime.button">开始兑换</string>
+  <string name="banner.swap.firsttime.subtitletitle">完成您的首次兑换</string>
+  <string name="banner.swap.firsttime.title">完成您的首次兑换</string>
   <string name="beta_mode_warning_message">据区块链开发者称，Kaspa代币目前处于测试阶段。敬请关注后续更新！</string>
   <string name="beta_mode_warning_title">测试模式</string>
   <string name="biometric_disabled_warning_description">您的设备已关闭生物识别功能，因此无法使用此功能解锁钱包。请在设备设置中启用生物识别功能，即可再次使用此方法。</string>
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 a6205964b9..0059be3867 100644
--- a/core/res/src/main/res/values-zh-rTW/strings.xml
+++ b/core/res/src/main/res/values-zh-rTW/strings.xml
@@ -22,6 +22,9 @@
   <string name="app_settings_saved_wallet">將錢包保存在應用程序中</string>
   <string name="app_settings_saved_wallet_footer">啟用以將所有錢包鏈接到 Tangem 應用程序。解鎖應用程序需要生物識別身份驗證。交易簽名需要輕觸您的 Tangem 卡片</string>
   <string name="app_settings_title">APP設置</string>
+  <string name="banner.swap.firsttime.button">開始兌換</string>
+  <string name="banner.swap.firsttime.subtitletitle">完成您的首次兌換</string>
+  <string name="banner.swap.firsttime.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>
diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
index 61d9d800cd..db56f3b0a1 100644
--- a/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
+++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
@@ -25,6 +25,7 @@ import com.tangem.feature.swap.domain.models.ExpressDataError
 import com.tangem.feature.swap.domain.models.SwapAmount
 import com.tangem.feature.swap.domain.models.domain.ExchangeProviderType
 import com.tangem.feature.swap.domain.models.domain.IncludeFeeInAmount
+import com.tangem.feature.swap.domain.models.domain.RateType
 import com.tangem.feature.swap.domain.models.domain.SwapProvider
 import com.tangem.feature.swap.domain.models.ui.*
 import com.tangem.feature.swap.model.SwapNotificationsFactory
@@ -255,7 +256,7 @@ internal class StateBuilder(
                 inputError = TransactionCardType.InputError.Empty,
                 accountTitleUM = AccountTitleUM.Text(
                     title = resourceReference(
-                        if (isFromCard) R.string.swapping_from_title else R.string.swapping_to_title,
+                        if (isFromCard) R.string.swapping_from_title_v2 else R.string.swapping_to_title,
                     ),
                 ),
             ),
@@ -816,6 +817,7 @@ internal class StateBuilder(
         val toFiatAmount = getFormattedFiatAmount(toSwapCurrencyStatus.status.value.fiatRate?.multiply(toAmount))
 
         val shouldShowStatus = providerState.type == ExchangeProviderType.CEX.providerName
+        val isFloatRate = dataState.selectedProvider?.rateTypes?.contains(RateType.FLOAT) == true
         return uiState.copy(
             successState = SwapSuccessStateHolder(
                 timestamp = swapTransactionState.timestamp,
@@ -831,7 +833,10 @@ internal class StateBuilder(
                 fromTitle = getCardAccountTitle(fromSwapCurrencyStatus.account, isFromCard = true),
                 toTitle = getCardAccountTitle(toSwapCurrencyStatus.account, isFromCard = false),
                 fromTokenAmount = stringReference(swapTransactionState.fromAmount.orEmpty()),
-                toTokenAmount = stringReference(swapTransactionState.toAmount.orEmpty()),
+                toTokenAmount = stringReference(
+                    swapTransactionState.toAmount.orEmpty()
+                        .let { if (isFloatRate) it.appendApproximateSign() else it },
+                ),
                 fromTokenFiatAmount = fromFiatAmount,
                 toTokenFiatAmount = toFiatAmount,
                 fromTokenIconState = iconStateConverter.convert(fromSwapCurrencyStatus.status),
@@ -1205,9 +1210,9 @@ internal class StateBuilder(
 
     private fun getCardAccountTitle(account: Account?, isFromCard: Boolean): AccountTitleUM {
         val (prefix, placeholder) = if (isFromCard) {
-            R.string.common_from to R.string.swapping_from_title
+            R.string.swapping_from_account_title to R.string.swapping_from_title_v2
         } else {
-            R.string.common_to to R.string.swapping_to_title
+            R.string.swapping_to_account_title to R.string.swapping_to_title
         }
         return if (account != null && isAccountsModeProvider()) {
             AccountTitleUM.Account(
diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt
index 9caf68f4c0..55f583d61e 100644
--- a/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt
+++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt
@@ -73,7 +73,7 @@ private fun SwapSuccessScreenContent(
             .padding(horizontal = TangemTheme.dimens.spacing16),
     ) {
         TransactionDoneTitle(
-            title = resourceReference(R.string.common_in_progress),
+            title = resourceReference(R.string.swap_in_progress),
             subtitle = resourceReference(
                 R.string.send_date_format,
                 wrappedList(
@@ -190,7 +190,7 @@ private fun SwapSuccessScreenButtons(
                 if (shouldShowStatusButton) {
                     SpacerW12()
                     SecondaryButtonIconStart(
-                        text = stringResourceSafe(id = R.string.express_cex_status_button_title),
+                        text = stringResourceSafe(id = R.string.express_provider),
                         iconResId = R.drawable.ic_arrow_top_right_24,
                         onClick = onStatusClick,
                         modifier = Modifier.weight(1f),