diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/fields/AmountTextField.kt b/core/ui/src/main/java/com/tangem/core/ui/components/fields/AmountTextField.kt
index 2713162e91..9db1abac3b 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/fields/AmountTextField.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/fields/AmountTextField.kt
@@ -160,10 +160,10 @@ private fun String.preserveDecimalSymbol(newValue: String, decimalSymbol: Char)
 
 private fun String.preserveTrailingZeros(newValue: String, parsedDecimal: BigDecimal?, decimalSymbol: Char): String {
     val trailingZeros = newValue.split(decimalSymbol).getOrNull(1)?.takeLastWhile { it == '0' }.orEmpty()
-    return if (parsedDecimal?.scale() == 0 && trailingZeros.isNotEmpty()) {
-        "$this$decimalSymbol$trailingZeros"
-    } else {
-        this.plus(trailingZeros)
+    return when {
+        this.endsWith('0') -> this
+        parsedDecimal?.scale() == 0 && trailingZeros.isNotEmpty() -> "$this$decimalSymbol$trailingZeros"
+        else -> this.plus(trailingZeros)
     }
 }
 
diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/previewdata/RecipientStatePreviewData.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/previewdata/RecipientStatePreviewData.kt
index f3008dc000..65ab1d68bf 100644
--- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/previewdata/RecipientStatePreviewData.kt
+++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/previewdata/RecipientStatePreviewData.kt
@@ -2,12 +2,25 @@ package com.tangem.features.send.impl.presentation.state.previewdata
 
 import androidx.compose.foundation.text.KeyboardOptions
 import com.tangem.core.ui.extensions.stringReference
+import com.tangem.features.send.impl.R
+import com.tangem.features.send.impl.presentation.domain.SendRecipientListContent
 import com.tangem.features.send.impl.presentation.state.SendStates
 import com.tangem.features.send.impl.presentation.state.fields.SendTextField
 import kotlinx.collections.immutable.persistentListOf
 
 internal object RecipientStatePreviewData {
 
+    private val defaultRecentItem = SendRecipientListContent(
+        id = "sanctus",
+        title = stringReference("address"),
+        subtitle = stringReference("0.001 BTC"),
+        timestamp = stringReference("1.01.1970, 00:00"),
+        subtitleEndOffset = 0,
+        subtitleIconRes = R.drawable.ic_arrow_down_24,
+        isVisible = true,
+        isLoading = false,
+    )
+
     val recipientState = SendStates.RecipientState(
         addressTextField = SendTextField.RecipientAddress(
             value = "0x23948239805671983476598176",
@@ -19,8 +32,14 @@ internal object RecipientStatePreviewData {
             error = null,
         ),
         memoTextField = null,
-        recent = persistentListOf(),
-        wallets = persistentListOf(),
+        recent = persistentListOf(
+            defaultRecentItem.copy(id = "1"),
+            defaultRecentItem.copy(id = "2"),
+            defaultRecentItem.copy(id = "3"),
+        ),
+        wallets = persistentListOf(
+            defaultRecentItem.copy(id = "4", subtitle = stringReference("Wallet")),
+        ),
         network = "Ethereum",
         isValidating = false,
         isPrimaryButtonEnabled = true,
diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/recipient/ListItemWithIcon.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/recipient/ListItemWithIcon.kt
index 9ef9f60a21..153a2686a1 100644
--- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/recipient/ListItemWithIcon.kt
+++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/recipient/ListItemWithIcon.kt
@@ -95,11 +95,13 @@ private fun ListItemWithIcon(
             address = title,
             modifier = Modifier
                 .padding(vertical = TangemTheme.dimens.spacing8)
-                .size(TangemTheme.dimens.size36)
-                .clip(RoundedCornerShape(TangemTheme.dimens.radius18)),
+                .size(TangemTheme.dimens.size40)
+                .clip(RoundedCornerShape(TangemTheme.dimens.radius20)),
         )
         Column(
-            modifier = Modifier.padding(start = TangemTheme.dimens.spacing12),
+            modifier = Modifier
+                .height(TangemTheme.dimens.size36)
+                .padding(start = TangemTheme.dimens.spacing12),
             verticalArrangement = Arrangement.SpaceBetween,
         ) {
             EllipsisText(
@@ -118,7 +120,8 @@ private fun ListItemWithIcon(
                         tint = TangemTheme.colors.icon.informative,
                         modifier = Modifier
                             .size(TangemTheme.dimens.size16)
-                            .background(TangemTheme.colors.background.tertiary, CircleShape),
+                            .background(TangemTheme.colors.background.tertiary, CircleShape)
+                            .padding(TangemTheme.dimens.spacing2),
                     )
                 }
                 val (text, offset) = remember(subtitle, info) {
@@ -152,11 +155,11 @@ private fun ListItemLoading(modifier: Modifier = Modifier) {
         CircleShimmer(
             modifier = Modifier
                 .padding(vertical = TangemTheme.dimens.spacing8)
-                .size(TangemTheme.dimens.size36),
+                .size(TangemTheme.dimens.size40),
         )
         Column(
             modifier = Modifier
-                .height(TangemTheme.dimens.size32)
+                .height(TangemTheme.dimens.size36)
                 .padding(start = TangemTheme.dimens.spacing12),
             verticalArrangement = Arrangement.SpaceBetween,
         ) {
diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/recipient/SendRecipientContent.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/recipient/SendRecipientContent.kt
index e37a0ced3d..66fca69ea6 100644
--- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/recipient/SendRecipientContent.kt
+++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/recipient/SendRecipientContent.kt
@@ -17,6 +17,9 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import com.tangem.common.Strings.STARS
 import com.tangem.core.ui.components.inputrow.InputRowRecipient
 import com.tangem.core.ui.extensions.resolveReference
@@ -26,6 +29,8 @@ import com.tangem.features.send.impl.presentation.analytics.EnterAddressSource
 import com.tangem.features.send.impl.presentation.domain.SendRecipientListContent
 import com.tangem.features.send.impl.presentation.state.SendStates
 import com.tangem.features.send.impl.presentation.state.fields.SendTextField
+import com.tangem.features.send.impl.presentation.state.previewdata.RecipientStatePreviewData
+import com.tangem.features.send.impl.presentation.state.previewdata.SendClickIntentsStub
 import com.tangem.features.send.impl.presentation.ui.common.FooterContainer
 import com.tangem.features.send.impl.presentation.viewmodel.SendClickIntents
 import kotlinx.collections.immutable.ImmutableList
@@ -150,7 +155,7 @@ private fun LazyListScope.listHeaderItem(@StringRes titleRes: Int, isVisible: Bo
                 TangemTheme.dimens.spacing0 to TangemTheme.dimens.spacing8
             }
             val topRadius = if (isFirst) {
-                TangemTheme.dimens.radius12
+                TangemTheme.dimens.radius16
             } else {
                 TangemTheme.dimens.radius0
             }
@@ -170,7 +175,7 @@ private fun LazyListScope.listHeaderItem(@StringRes titleRes: Int, isVisible: Bo
                     .background(TangemTheme.colors.background.action)
                     .padding(
                         top = paddingFromTop,
-                        bottom = TangemTheme.dimens.spacing8,
+                        bottom = TangemTheme.dimens.spacing12,
                         start = TangemTheme.dimens.spacing12,
                         end = TangemTheme.dimens.spacing12,
                     ),
@@ -242,4 +247,25 @@ private fun AnimateRecentAppearance(isVisible: Boolean, content: @Composable ()
             Box(modifier = Modifier.fillMaxWidth())
         }
     }
+}
+
+@Preview(widthDp = 360, heightDp = 800)
+@Composable
+private fun SendRecipientContent_Preview(
+    @PreviewParameter(SendRecipientContentPreviewProvider::class) recipientState: SendStates.RecipientState,
+) {
+    TangemTheme(isDark = false) {
+        SendRecipientContent(
+            uiState = recipientState,
+            clickIntents = SendClickIntentsStub,
+            isBalanceHidden = false,
+        )
+    }
+}
+
+private class SendRecipientContentPreviewProvider : PreviewParameterProvider<SendStates.RecipientState> {
+    override val values: Sequence<SendStates.RecipientState>
+        get() = sequenceOf(
+            RecipientStatePreviewData.recipientState,
+        )
 }
\ No newline at end of file