diff --git a/common/ui/src/main/java/com/tangem/common/ui/expressStatus/ExpressProvider.kt b/common/ui/src/main/java/com/tangem/common/ui/expressStatus/ExpressProvider.kt
index 1f8f4f8eb3..11fb6924e5 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/expressStatus/ExpressProvider.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/expressStatus/ExpressProvider.kt
@@ -39,6 +39,7 @@ fun ExpressProvider(
     val hapticFeedback = LocalHapticFeedback.current
     val context = LocalContext.current
     Column(
+        verticalArrangement = Arrangement.spacedBy(2.dp),
         modifier = Modifier
             .clip(TangemTheme.shapes.roundedCornersXMedium)
             .background(TangemTheme.colors.background.action),
diff --git a/common/ui/src/main/java/com/tangem/common/ui/expressStatus/ExpressStatusBlock.kt b/common/ui/src/main/java/com/tangem/common/ui/expressStatus/ExpressStatusBlock.kt
index d31f527a9d..ad3c3c1c94 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/expressStatus/ExpressStatusBlock.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/expressStatus/ExpressStatusBlock.kt
@@ -19,16 +19,16 @@ 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.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import com.tangem.common.ui.R
 import com.tangem.common.ui.expressStatus.state.ExpressLinkUM
 import com.tangem.common.ui.expressStatus.state.ExpressStatusItemState
 import com.tangem.common.ui.expressStatus.state.ExpressStatusItemUM
 import com.tangem.common.ui.expressStatus.state.ExpressStatusUM
 import com.tangem.core.ui.components.SpacerWMax
-import com.tangem.core.ui.extensions.resolveReference
-import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.core.ui.extensions.stringReference
+import com.tangem.core.ui.extensions.*
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
 import kotlinx.collections.immutable.persistentListOf
@@ -53,6 +53,7 @@ fun ExpressStatusBlock(state: ExpressStatusUM, modifier: Modifier = Modifier) {
     ) {
         Row(
             verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
             modifier = Modifier
                 .padding(bottom = TangemTheme.dimens.spacing16),
         ) {
@@ -77,8 +78,14 @@ fun ExpressStatusBlock(state: ExpressStatusUM, modifier: Modifier = Modifier) {
                             .padding(end = TangemTheme.dimens.spacing2),
                     )
                     Text(
-                        text = link.text.resolveReference(),
-                        style = TangemTheme.typography.body2,
+                        modifier = Modifier.align(Alignment.CenterVertically),
+                        text = resourceReference(
+                            id = R.string.express_transaction_id,
+                            formatArgs = wrappedList(link.text),
+                        ).resolveReference(),
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                        style = TangemTheme.typography.subtitle2,
                         color = TangemTheme.colors.text.tertiary,
                     )
                 }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowBestRate.kt b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowBestRate.kt
index df498f267a..03201dcd0a 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowBestRate.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowBestRate.kt
@@ -20,6 +20,7 @@ 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.PreviewParameterProvider
+import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.R
 import com.tangem.core.ui.components.SpacerWMax
 import com.tangem.core.ui.components.inputrow.inner.DividerContainer
@@ -76,7 +77,7 @@ fun InputRowBestRate(
                     text = subtitle.resolveReference(),
                     style = TangemTheme.typography.body2,
                     color = TangemTheme.colors.text.tertiary,
-                    modifier = Modifier.padding(top = TangemTheme.dimens.spacing8),
+                    modifier = Modifier.padding(top = 2.dp),
                 )
             }
             SpacerWMax()
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsOnrampTransactionStateConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsOnrampTransactionStateConverter.kt
index 1403cc08fc..06644ff6e6 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsOnrampTransactionStateConverter.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsOnrampTransactionStateConverter.kt
@@ -223,7 +223,7 @@ internal class TokenDetailsOnrampTransactionStateConverter(
             this == OnrampStatus.Status.RefundInProgress ||
                 this == OnrampStatus.Status.Refunded -> ExpressStatusItemState.Error
             else -> getStatusState(OnrampStatus.Status.Paid)
-        }
+        },
     )
 
     private fun OnrampStatus.Status.getSendingItem() = ExpressStatusItemUM(
@@ -255,7 +255,7 @@ internal class TokenDetailsOnrampTransactionStateConverter(
         },
         state = when {
             this == OnrampStatus.Status.RefundInProgress -> ExpressStatusItemState.Active
-            this == OnrampStatus.Status.Refunded -> ExpressStatusItemState.Error
+            this == OnrampStatus.Status.Refunded -> ExpressStatusItemState.Done
             else -> getStatusState(OnrampStatus.Status.Sending)
         },
     )