diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/express/TangemExpressApi.kt b/core/datasource/src/main/java/com/tangem/datasource/api/express/TangemExpressApi.kt
index 4d63fd4b3a..04f464e255 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/express/TangemExpressApi.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/express/TangemExpressApi.kt
@@ -70,7 +70,7 @@ interface TangemExpressApi {
         @Query("refundExtraId") refundExtraId: String?, // for cex only
         @Query("partnerOperationType") partnerOperationType: String?, // swap/ swap-and-send
         @Query("toExtraId") toExtraId: String?, // swap-and-send memo
-        @Query("quoteId") quoteId: String?, // swap-and-send memo
+        @Query("quoteId") quoteId: String?, // fixed rate quoteId
     ): ApiResponse<ExchangeDataResponse>
 
     @GET("exchange-status")
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/model/converter/SwapFromSubtitleConverter.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/model/converter/SwapFromSubtitleConverter.kt
index ed5c112fd0..696f92438a 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/model/converter/SwapFromSubtitleConverter.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/model/converter/SwapFromSubtitleConverter.kt
@@ -6,6 +6,7 @@ import com.tangem.core.ui.format.bigdecimal.crypto
 import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.features.swap.v2.impl.R
+import com.tangem.utils.StringsSigns.DOT
 import java.math.BigDecimal
 
 /**
@@ -15,7 +16,7 @@ import java.math.BigDecimal
  * |--------------------------------|-----------------------------------|-----------------------------------|------------------------|
  * | Entering (float), any          | "Balance: " (empty param)         | "{balance}" masked                | OffsetEnd(symbol)      |
  * | Viewing (fixed), empty         | "Balance: " (empty param)         | "{balance}" masked (crypto only)  | End                    |
- * | Viewing (fixed), not empty     | send_from_title                   | "{displayStr}" masked             | OffsetEnd(symbol)      |
+ * | Viewing (fixed), not empty     | "{balance}" masked               | "• Send {displayStr}" masked       | OffsetEnd(symbol)      |
  */
 internal object SwapFromSubtitleConverter {
 
@@ -52,9 +53,13 @@ internal object SwapFromSubtitleConverter {
                 ellipsisLeft = TextEllipsis.End
             }
             else -> {
-                subtitleLeft = resourceReference(R.string.send_from_title)
-                subtitleRight = combinedReference(stringReference(displayStr))
+                subtitleLeft = stringReference(balance)
                     .orMaskWithStars(isBalanceHidden)
+                subtitleRight = combinedReference(
+                    stringReference("$DOT "),
+                    resourceReference(R.string.common_send),
+                    stringReference(" $displayStr"),
+                ).orMaskWithStars(isBalanceHidden)
                 ellipsisLeft = TextEllipsis.OffsetEnd(symbol.length)
             }
         }
diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt
index 968145424e..deff8ff1f2 100644
--- a/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt
@@ -344,7 +344,7 @@ internal class DefaultSwapRepository(
                         appPreferencesStore = appPreferencesStore,
                     ),
                     toExtraId = toExtraId?.ifEmpty { null },
-                    quoteId = null,
+                    quoteId = null, // TODO add when implementing fixed rate in swap
                 ).getOrThrow()
                 if (dataSignatureVerifier.verifySignature(response.signature, response.txDetailsJson)) {
                     val txDetails = parseTxDetails(response.txDetailsJson)