diff --git a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountBlock.kt b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountBlock.kt
index bcac8bb21b..3fd2bd8ad8 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountBlock.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountBlock.kt
@@ -21,10 +21,10 @@ import com.tangem.core.ui.components.ResizableText
 import com.tangem.core.ui.components.currency.icon.CurrencyIcon
 import com.tangem.core.ui.format.bigdecimal.anyDecimals
 import com.tangem.core.ui.format.bigdecimal.crypto
+import com.tangem.core.ui.format.bigdecimal.fiat
 import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
-import com.tangem.core.ui.utils.BigDecimalFormatter
 import java.math.BigDecimal
 
 @Composable
@@ -33,15 +33,11 @@ fun AmountBlock(amountState: AmountState, isClickDisabled: Boolean, isEditingDis
     val amount = amountState.amountTextField
 
     val cryptoAmount = formatWithSymbol(amount.value, amount.cryptoAmount.currencySymbol)
-    val fiatAmount = BigDecimalFormatter.formatFiatAmount(
-        fiatAmount = amount.fiatAmount.value,
-        fiatCurrencySymbol = amount.fiatAmount.currencySymbol,
-        fiatCurrencyCode = amountState.appCurrencyCode,
-    )
-    val backgroundColor = if (isEditingDisabled) {
-        TangemTheme.colors.button.disabled
-    } else {
-        TangemTheme.colors.background.action
+    val fiatAmount = amount.fiatAmount.value.format {
+        fiat(
+            fiatCurrencySymbol = amount.fiatAmount.currencySymbol,
+            fiatCurrencyCode = amountState.appCurrencyCode,
+        )
     }
 
     val (firstAmount, secondAmount) = if (amount.isFiatValue) {
@@ -54,7 +50,7 @@ fun AmountBlock(amountState: AmountState, isClickDisabled: Boolean, isEditingDis
         horizontalAlignment = Alignment.CenterHorizontally,
         modifier = Modifier
             .clip(TangemTheme.shapes.roundedCornersXMedium)
-            .background(backgroundColor)
+            .background(TangemTheme.colors.background.action)
             .clickable(enabled = !isClickDisabled && !isEditingDisabled, onClick = onClick)
             .padding(TangemTheme.dimens.spacing16),
     ) {
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/ui/DestinationBlock.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/ui/DestinationBlock.kt
index 649422d27c..9fe2722f12 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/ui/DestinationBlock.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/ui/DestinationBlock.kt
@@ -23,19 +23,13 @@ internal fun DestinationBlock(
     isEditingDisabled: Boolean,
     onClick: () -> Unit,
 ) {
-    val destinationUM = destinationUM as? DestinationUM.Content ?: return
-
-    val backgroundColor = if (isEditingDisabled) {
-        TangemTheme.colors.button.disabled
-    } else {
-        TangemTheme.colors.background.action
-    }
+    if (destinationUM !is DestinationUM.Content) return
 
     Column(
         modifier = Modifier
             .fillMaxWidth()
             .clip(TangemTheme.shapes.roundedCornersXMedium)
-            .background(backgroundColor)
+            .background(TangemTheme.colors.background.action)
             .clickable(enabled = !isClickDisabled && !isEditingDisabled, onClick = onClick)
             .padding(TangemTheme.dimens.spacing12),
     ) {
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/FeeBlock.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/FeeBlock.kt
index b1c82b14af..10284bde92 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/FeeBlock.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/FeeBlock.kt
@@ -32,17 +32,11 @@ internal fun FeeBlock(feeUM: FeeUM, isClickEnabled: Boolean, onClick: () -> Unit
     val feeSelectorUM = feeUM.feeSelectorUM as? FeeSelectorUM.Content
     val isEditingDisabled = feeSelectorUM?.fees is TransactionFee.Single
 
-    val backgroundColor = if (isEditingDisabled) {
-        TangemTheme.colors.button.disabled
-    } else {
-        TangemTheme.colors.background.action
-    }
-
     Column(
         modifier = Modifier
             .fillMaxWidth()
             .clip(TangemTheme.shapes.roundedCornersXMedium)
-            .background(backgroundColor)
+            .background(TangemTheme.colors.background.action)
             .clickable(enabled = isClickEnabled && !isEditingDisabled, onClick = onClick)
             .padding(12.dp),
     ) {
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 313451a067..9451e29e99 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
@@ -29,17 +29,11 @@ internal fun RecipientBlock(
     isEditingDisabled: Boolean,
     onClick: () -> Unit,
 ) {
-    val backgroundColor = if (isEditingDisabled) {
-        TangemTheme.colors.button.disabled
-    } else {
-        TangemTheme.colors.background.action
-    }
-
     Column(
         modifier = Modifier
             .fillMaxWidth()
             .clip(TangemTheme.shapes.roundedCornersXMedium)
-            .background(backgroundColor)
+            .background(TangemTheme.colors.background.action)
             .clickable(enabled = !isClickDisabled && !isEditingDisabled, onClick = onClick)
             .padding(TangemTheme.dimens.spacing12),
     ) {
diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/StakingConfirmationContent.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/StakingConfirmationContent.kt
index 49d1aa49dd..42f7777f9f 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/StakingConfirmationContent.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/StakingConfirmationContent.kt
@@ -71,7 +71,7 @@ internal fun StakingConfirmationContent(
             isClickable = !isTransactionInProgress,
             onClick = clickIntents::openValidators,
         )
-        StakingFeeBlock(feeState = state.feeState, isTransactionSent = isTransactionSent)
+        StakingFeeBlock(feeState = state.feeState)
         NotificationsBlock(notifications = state.notifications)
         Spacer(Modifier)
     }
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 cfd283c0d1..0b4973970b 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
@@ -32,17 +32,12 @@ import com.tangem.features.staking.impl.presentation.state.FeeState
 import java.math.BigDecimal
 
 @Composable
-internal fun StakingFeeBlock(feeState: FeeState, isTransactionSent: Boolean) {
-    val backgroundColor = if (isTransactionSent) {
-        TangemTheme.colors.background.action
-    } else {
-        TangemTheme.colors.button.disabled
-    }
+internal fun StakingFeeBlock(feeState: FeeState) {
     Column(
         modifier = Modifier
             .fillMaxWidth()
             .clip(TangemTheme.shapes.roundedCornersXMedium)
-            .background(backgroundColor)
+            .background(TangemTheme.colors.background.action)
             .padding(TangemTheme.dimens.spacing12),
     ) {
         Text(
@@ -144,10 +139,7 @@ private fun BoxScope.FeeError(feeState: FeeState) {
 @Composable
 private fun FeeBlockPreview(@PreviewParameter(FeeBlockPreviewProvider::class) value: FeeState) {
     TangemThemePreview {
-        StakingFeeBlock(
-            feeState = value,
-            isTransactionSent = false,
-        )
+        StakingFeeBlock(feeState = value)
     }
 }