diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/TangemPayTxHistoryDetailsConverterV2.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/TangemPayTxHistoryDetailsConverterV2.kt
index a46ad42459..49ff1574e7 100644
--- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/TangemPayTxHistoryDetailsConverterV2.kt
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/TangemPayTxHistoryDetailsConverterV2.kt
@@ -233,25 +233,8 @@ internal object TangemPayTxHistoryDetailsConverterV2 :
         return when (this) {
             is TangemPayTxHistoryItem.Payment,
             is TangemPayTxHistoryItem.Collateral,
-            -> {
-                TransactionLabelUM(
-                    transactionStateType = TransactionStateType.Completed,
-                    icon = TangemIconUM.Icon(
-                        imageVector = Icons.ic_success_24,
-                        tintReference = { TangemTheme.colors3.icon.status.success },
-                    ),
-                    title = resourceReference(R.string.tangem_pay_status_completed),
-                )
-            }
-            is TangemPayTxHistoryItem.Fee -> TransactionLabelUM(
-                transactionStateType = TransactionStateType.Completed,
-                icon = TangemIconUM.Icon(
-                    imageVector = Icons.ic_success_24,
-                    tintReference = { TangemTheme.colors3.icon.status.success },
-                ),
-                title = resourceReference(R.string.tangem_pay_status_completed),
-                subtitle = resourceReference(R.string.tangem_pay_transaction_fee_notification_text),
-            )
+            is TangemPayTxHistoryItem.Fee,
+            -> null
             is TangemPayTxHistoryItem.Spend -> when (this.status) {
                 TangemPayTxHistoryItem.Status.COMPLETED -> TransactionLabelUM(
                     transactionStateType = TransactionStateType.Completed,
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayCardPageSettingsButtonsBlock.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayCardPageSettingsButtonsBlock.kt
index ca0e75ed12..36b2fbe6ee 100644
--- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayCardPageSettingsButtonsBlock.kt
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayCardPageSettingsButtonsBlock.kt
@@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.tooling.preview.Preview
@@ -26,7 +25,6 @@ internal fun TangemPayCardPageSettingsButtonsBlock(
     if (settings.isEmpty()) return
     Row(
         modifier = modifier.padding(vertical = TangemTheme.dimens2.x6),
-        verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.Center,
     ) {
         settings.fastForEach { setting ->
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/components/TangemPayActionButton.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/components/TangemPayActionButton.kt
index 924d154d90..4d6b516500 100644
--- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/components/TangemPayActionButton.kt
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/components/TangemPayActionButton.kt
@@ -5,6 +5,7 @@ import androidx.annotation.DrawableRes
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.TextAutoSize
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -49,6 +50,11 @@ internal fun TangemPayActionButton(
             text = title.resolveAnnotatedReference(),
             style = TangemTheme.typography3.subheading.medium,
             color = TangemTheme.colors3.text.primary,
+            autoSize = TextAutoSize.StepBased(
+                minFontSize = TangemTheme.typography3.caption.medium.fontSize,
+                maxFontSize = TangemTheme.typography3.subheading.medium.fontSize,
+            ),
+            maxLines = 1,
         )
     }
 }