diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnter.kt b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnter.kt
index 4d1490891f..6a1b07ab53 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnter.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnter.kt
@@ -72,7 +72,7 @@ fun InputRowEnter(
             Column(modifier = Modifier.weight(1f)) {
                 Text(
                     text = title.resolveReference(),
-                    style = TangemTheme.typography.caption2,
+                    style = TangemTheme.typography.subtitle2,
                     color = titleColor,
                 )
                 SimpleTextField(
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterAmount.kt b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterAmount.kt
index 28c9082f90..a4759a11e2 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterAmount.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterAmount.kt
@@ -72,7 +72,7 @@ fun InputRowEnterAmount(
             Column(modifier = Modifier.weight(1f)) {
                 Text(
                     text = title.resolveReference(),
-                    style = TangemTheme.typography.caption2,
+                    style = TangemTheme.typography.subtitle2,
                     color = titleColor,
                 )
                 AmountTextField(
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterInfo.kt b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterInfo.kt
index c9e01fd85f..cde9e9b0dd 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterInfo.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterInfo.kt
@@ -62,7 +62,7 @@ fun InputRowEnterInfo(
         ) {
             Text(
                 text = title.resolveReference(),
-                style = TangemTheme.typography.caption2,
+                style = TangemTheme.typography.subtitle2,
                 color = titleColor,
             )
             Row {
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterInfoAmount.kt b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterInfoAmount.kt
index f3d8a0c1cc..bf0e7bb5ed 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterInfoAmount.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterInfoAmount.kt
@@ -70,7 +70,7 @@ fun InputRowEnterInfoAmount(
         ) {
             Text(
                 text = title.resolveReference(),
-                style = TangemTheme.typography.caption2,
+                style = TangemTheme.typography.subtitle2,
                 color = titleColor,
             )
             Row {
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowImage.kt b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowImage.kt
index 58a61bb00e..d816d77bf6 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowImage.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowImage.kt
@@ -70,7 +70,7 @@ fun InputRowImage(
         ) {
             Text(
                 text = title.resolveReference(),
-                style = TangemTheme.typography.caption2,
+                style = TangemTheme.typography.subtitle2,
                 color = titleColor,
             )
             Row(
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowImageBase.kt b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowImageBase.kt
index 417a7edbec..9af3516af2 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowImageBase.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowImageBase.kt
@@ -15,7 +15,7 @@ import com.tangem.core.ui.res.TangemTheme
 @Composable
 internal fun InputRowImageBase(
     subtitle: TextReference,
-    caption: TextReference,
+    caption: TextReference?,
     imageUrl: String,
     modifier: Modifier = Modifier,
     subtitleColor: Color = TangemTheme.colors.text.primary1,
@@ -40,12 +40,14 @@ internal fun InputRowImageBase(
                 style = TangemTheme.typography.subtitle2,
                 color = subtitleColor,
             )
-            Text(
-                text = caption.resolveAnnotatedReference(),
-                style = TangemTheme.typography.caption2,
-                color = captionColor,
-                modifier = Modifier.padding(top = TangemTheme.dimens.spacing2),
-            )
+            if (caption != null) {
+                Text(
+                    text = caption.resolveAnnotatedReference(),
+                    style = TangemTheme.typography.caption2,
+                    color = captionColor,
+                    modifier = Modifier.padding(top = TangemTheme.dimens.spacing2),
+                )
+            }
         }
         extraContent()
     }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowRecipient.kt b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowRecipient.kt
index b1df3b3e40..8d5363d3cc 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowRecipient.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowRecipient.kt
@@ -75,7 +75,7 @@ fun InputRowRecipient(
             AnimatedContent(targetState = titleText, label = "Title Change") {
                 Text(
                     text = it.resolveReference(),
-                    style = TangemTheme.typography.caption2,
+                    style = TangemTheme.typography.subtitle2,
                     color = color,
                 )
             }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowRecipientDefault.kt b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowRecipientDefault.kt
index 94f75c6a56..f9941fcb9a 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowRecipientDefault.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowRecipientDefault.kt
@@ -50,7 +50,7 @@ fun InputRowRecipientDefault(
         ) {
             Text(
                 text = title.resolveReference(),
-                style = TangemTheme.typography.caption2,
+                style = TangemTheme.typography.subtitle2,
                 color = titleColor,
             )
             Row(
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 cf63542cee..75729e23b1 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
@@ -141,7 +141,7 @@ private fun LazyListScope.memoField(memoField: SendTextField.RecipientMemo?, onM
                 onValueChange = memoField.onValueChange,
                 onPasteClick = onMemoChange,
                 modifier = Modifier.padding(top = TangemTheme.dimens.spacing20),
-                labelStyle = TangemTheme.typography.caption2,
+                labelStyle = TangemTheme.typography.subtitle2,
                 isError = memoField.isError,
                 error = memoField.error,
                 isReadOnly = !memoField.isEnabled,
diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/send/FeeBlock.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/send/FeeBlock.kt
index 0339ddc783..1c8e735b07 100644
--- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/send/FeeBlock.kt
+++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/send/FeeBlock.kt
@@ -39,7 +39,7 @@ internal fun FeeBlock(feeState: SendStates.FeeState, isClickDisabled: Boolean, o
     ) {
         Text(
             text = stringResource(R.string.common_network_fee_title),
-            style = TangemTheme.typography.caption2,
+            style = TangemTheme.typography.subtitle2,
             color = TangemTheme.colors.text.secondary,
         )
 
diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/send/RecipientBlock.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/send/RecipientBlock.kt
index 4839b83690..313451a067 100644
--- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/send/RecipientBlock.kt
+++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/send/RecipientBlock.kt
@@ -52,7 +52,7 @@ internal fun RecipientBlock(
 private fun AddressBlock(address: SendTextField.RecipientAddress) {
     Text(
         text = address.label.resolveReference(),
-        style = TangemTheme.typography.caption2,
+        style = TangemTheme.typography.subtitle2,
         color = TangemTheme.colors.text.secondary,
     )
     Row(
diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/block/StakingFeeBlock.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/block/StakingFeeBlock.kt
index 4dff5385fb..c552ca2fbc 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/block/StakingFeeBlock.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/block/StakingFeeBlock.kt
@@ -39,7 +39,7 @@ internal fun StakingFeeBlock(feeState: FeeState) {
     ) {
         Text(
             text = stringResource(R.string.common_network_fee_title),
-            style = TangemTheme.typography.caption2,
+            style = TangemTheme.typography.subtitle2,
             color = TangemTheme.colors.text.secondary,
         )
 
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/preview/FeeItemStatePreview.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/preview/FeeItemStatePreview.kt
new file mode 100644
index 0000000000..4d066c82d2
--- /dev/null
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/preview/FeeItemStatePreview.kt
@@ -0,0 +1,20 @@
+package com.tangem.feature.swap.preview
+
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.feature.swap.domain.models.ui.FeeType
+import com.tangem.feature.swap.models.states.FeeItemState
+
+object FeeItemStatePreview {
+
+    val state = FeeItemState.Content(
+        feeType = FeeType.NORMAL,
+        title = stringReference("Fee"),
+        amountCrypto = "1000",
+        symbolCrypto = "MATIC",
+        amountFiatFormatted = "(1000$)",
+        isClickable = false,
+        onClick = {},
+    )
+
+    val stateClickable = state.copy(isClickable = true)
+}
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/FeeItem.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/FeeItem.kt
index e4c3b974ca..b3cb10ce22 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/FeeItem.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/FeeItem.kt
@@ -1,20 +1,21 @@
 package com.tangem.feature.swap.ui
 
+import android.content.res.Configuration
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.tooling.preview.Preview
-import com.tangem.core.ui.components.SpacerH24
-import com.tangem.core.ui.components.rows.SimpleActionRow
-import com.tangem.core.ui.extensions.resolveReference
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import com.tangem.core.ui.components.inputrow.InputRowDefault
 import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
-import com.tangem.feature.swap.domain.models.ui.FeeType
 import com.tangem.feature.swap.models.states.FeeItemState
+import com.tangem.feature.swap.presentation.R
+import com.tangem.feature.swap.preview.FeeItemStatePreview
 
 @Composable
 fun FeeItemBlock(state: FeeItemState) {
@@ -25,53 +26,37 @@ fun FeeItemBlock(state: FeeItemState) {
 
 @Composable
 fun FeeItem(state: FeeItemState.Content) {
-    Box(
+    val description = "${state.amountCrypto} ${state.symbolCrypto} (${state.amountFiatFormatted})"
+    val icon = R.drawable.ic_chevron_right_24.takeIf { state.isClickable }
+    InputRowDefault(
+        title = state.title,
+        text = stringReference(description),
+        iconRes = icon,
         modifier = Modifier
-            .background(
-                color = TangemTheme.colors.background.action,
-                shape = TangemTheme.shapes.roundedCornersXMedium,
-            )
             .clip(shape = TangemTheme.shapes.roundedCornersXMedium)
+            .background(color = TangemTheme.colors.background.action)
             .clickable(
+                enabled = state.isClickable,
                 onClick = state.onClick,
-            )
-            .fillMaxWidth()
-            .defaultMinSize(minHeight = TangemTheme.dimens.size68),
-    ) {
-        val description = "${state.amountCrypto} ${state.symbolCrypto} (${state.amountFiatFormatted})"
-        SimpleActionRow(
-            modifier = Modifier.padding(
-                start = TangemTheme.dimens.spacing12,
-                top = TangemTheme.dimens.spacing12,
             ),
-            title = state.title.resolveReference(),
-            description = description,
-            isClickable = state.isClickable,
-        )
+    )
+}
+
+// region Preview
+@Preview(showBackground = true, widthDp = 360)
+@Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Composable
+private fun FeeItem_Preview(@PreviewParameter(FeeItemPreviewProvider::class) data: FeeItemState.Content) {
+    TangemThemePreview {
+        FeeItem(data)
     }
 }
 
-@Preview
-@Composable
-private fun FeeItemPreview() {
-    val state = FeeItemState.Content(
-        feeType = FeeType.NORMAL,
-        title = stringReference("Fee"),
-        amountCrypto = "1000",
-        symbolCrypto = "MATIC",
-        amountFiatFormatted = "(1000$)",
-        isClickable = false,
-        onClick = {},
-    )
-    Column {
-        TangemThemePreview(isDark = false) {
-            FeeItem(state = state)
-        }
-
-        SpacerH24()
-
-        TangemThemePreview(isDark = true) {
-            FeeItem(state = state)
-        }
-    }
-}
\ No newline at end of file
+private class FeeItemPreviewProvider : PreviewParameterProvider<FeeItemState.Content> {
+    override val values: Sequence<FeeItemState.Content>
+        get() = sequenceOf(
+            FeeItemStatePreview.state,
+            FeeItemStatePreview.state.copy(isClickable = true),
+        )
+}
+// endregion
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ProviderItem.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ProviderItem.kt
index 315c7a064a..9bf6689b1c 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ProviderItem.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ProviderItem.kt
@@ -263,7 +263,7 @@ private fun ProviderLoadingState(modifier: Modifier = Modifier) {
         Column {
             Text(
                 text = stringResource(R.string.express_provider),
-                style = TangemTheme.typography.caption2,
+                style = TangemTheme.typography.subtitle2,
                 color = TangemTheme.colors.text.secondary,
                 modifier = Modifier.padding(start = TangemTheme.dimens.spacing12),
             )