diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/TransactionDoneTitle.kt b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/TransactionDoneTitle.kt
index 2adcbdc369..6f23701fea 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/TransactionDoneTitle.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/TransactionDoneTitle.kt
@@ -16,7 +16,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import com.tangem.core.ui.R
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.core.ui.utils.toDateFormat
+import com.tangem.core.ui.utils.DateTimeFormatters
 import com.tangem.core.ui.utils.toTimeFormat
 
 /**
@@ -47,7 +47,11 @@ fun TransactionDoneTitle(@StringRes titleRes: Int, date: Long, modifier: Modifie
                 .padding(top = TangemTheme.dimens.spacing16),
         )
         Text(
-            text = stringResource(id = R.string.send_date_format, date.toDateFormat(), date.toTimeFormat()),
+            text = stringResource(
+                id = R.string.send_date_format,
+                date.toTimeFormat(DateTimeFormatters.dateFormatter),
+                date.toTimeFormat(),
+            ),
             style = TangemTheme.typography.body2,
             color = TangemTheme.colors.text.tertiary,
             modifier = Modifier
diff --git a/core/ui/src/main/java/com/tangem/core/ui/utils/DateUtils.kt b/core/ui/src/main/java/com/tangem/core/ui/utils/DateUtils.kt
index 8d596fc41f..bc2560f6e9 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/utils/DateUtils.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/utils/DateUtils.kt
@@ -11,7 +11,7 @@ import org.joda.time.format.DateTimeFormatter
  * If [this] timestamp is today or yesterday, returns relative date,
  * otherwise returns formatting date.
  */
-fun Long.toDateFormat(formatter: DateTimeFormatter = DateTimeFormatters.dateFormatter): String {
+fun Long.toDateFormatWithTodayYesterday(formatter: DateTimeFormatter = DateTimeFormatters.dateFormatter): String {
     val localDate = DateTime(this, DateTimeZone.getDefault())
     return if (localDate.isToday() || localDate.isYesterday()) {
         DateUtils.getRelativeTimeSpanString(
diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/recipient/SendRecipientHistoryListConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/recipient/SendRecipientHistoryListConverter.kt
index f6ccb6ba98..3b555a7e21 100644
--- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/recipient/SendRecipientHistoryListConverter.kt
+++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/recipient/SendRecipientHistoryListConverter.kt
@@ -4,7 +4,7 @@ import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.extensions.wrappedList
 import com.tangem.core.ui.utils.DateTimeFormatters
-import com.tangem.core.ui.utils.toDateFormat
+import com.tangem.core.ui.utils.toDateFormatWithTodayYesterday
 import com.tangem.core.ui.utils.toTimeFormat
 import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
@@ -81,7 +81,7 @@ internal class SendRecipientHistoryListConverter(
     }
 
     private fun TxHistoryItem.extractTimestamp(): TextReference {
-        val date = timestampInMillis.toDateFormat(
+        val date = timestampInMillis.toDateFormatWithTodayYesterday(
             formatter = DateTimeFormatters.dateDDMMYYYY,
         )
         val time = timestampInMillis.toTimeFormat()
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSwapTransactionsStateConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSwapTransactionsStateConverter.kt
index d5445e3d1a..55e6cba9b0 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSwapTransactionsStateConverter.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSwapTransactionsStateConverter.kt
@@ -4,7 +4,7 @@ import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.core.ui.components.currency.tokenicon.converter.CryptoCurrencyToIconStateConverter
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.utils.BigDecimalFormatter
-import com.tangem.core.ui.utils.toDateFormat
+import com.tangem.core.ui.utils.toDateFormatWithTodayYesterday
 import com.tangem.core.ui.utils.toTimeFormat
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.tokens.model.CryptoCurrency
@@ -71,7 +71,7 @@ internal class TokenDetailsSwapTransactionsStateConverter(
                             txUrl = transaction.status?.txExternalUrl,
                             txExternalId = transaction.status?.txExternalId,
                             timestamp = TextReference.Str(
-                                "${timestamp.toDateFormat()}, ${timestamp.toTimeFormat()}",
+                                "${timestamp.toDateFormatWithTodayYesterday()}, ${timestamp.toTimeFormat()}",
                             ),
                             fiatSymbol = appCurrency.symbol,
                             statuses = getStatuses(transaction.status?.status),
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/txhistory/TokenDetailsTxHistoryItemFlowConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/txhistory/TokenDetailsTxHistoryItemFlowConverter.kt
index 9fb6df70b1..6a8bc163c7 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/txhistory/TokenDetailsTxHistoryItemFlowConverter.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/txhistory/TokenDetailsTxHistoryItemFlowConverter.kt
@@ -4,7 +4,7 @@ import androidx.paging.*
 import com.tangem.core.ui.components.transactions.state.TransactionState
 import com.tangem.core.ui.components.transactions.state.TxHistoryState
 import com.tangem.core.ui.components.transactions.state.TxHistoryState.TxHistoryItemState
-import com.tangem.core.ui.utils.toDateFormat
+import com.tangem.core.ui.utils.toDateFormatWithTodayYesterday
 import com.tangem.domain.txhistory.models.TxHistoryItem
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsState
 import com.tangem.feature.tokendetails.presentation.tokendetails.viewmodels.TokenDetailsClickIntents
@@ -68,7 +68,7 @@ internal class TokenDetailsTxHistoryItemFlowConverter(
             // Use raw timestamp to get date
 
             // If [afterDate] is the first transaction in the flow, add the group title
-            val afterDate = after.getTimestamp()?.toDateFormat() ?: return@insertSeparators null
+            val afterDate = after.getTimestamp()?.toDateFormatWithTodayYesterday() ?: return@insertSeparators null
             if (before is TxHistoryItemState.Title) {
                 return@insertSeparators TxHistoryItemState.GroupTitle(
                     title = afterDate,
@@ -80,7 +80,7 @@ internal class TokenDetailsTxHistoryItemFlowConverter(
              * If [beforeDate] is not equals to [afterDate], then [afterDate] is first transaction in
              * the new group
              */
-            val beforeDate = before.getTimestamp()?.toDateFormat() ?: return@insertSeparators null
+            val beforeDate = before.getTimestamp()?.toDateFormatWithTodayYesterday() ?: return@insertSeparators null
             return@insertSeparators if (beforeDate != afterDate) {
                 TxHistoryItemState.GroupTitle(
                     title = afterDate,
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TxHistoryItemFlowConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TxHistoryItemFlowConverter.kt
index 62c49d5586..b24e902bfa 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TxHistoryItemFlowConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TxHistoryItemFlowConverter.kt
@@ -4,7 +4,7 @@ import androidx.paging.*
 import com.tangem.core.ui.components.transactions.state.TransactionState
 import com.tangem.core.ui.components.transactions.state.TxHistoryState
 import com.tangem.core.ui.components.transactions.state.TxHistoryState.TxHistoryItemState
-import com.tangem.core.ui.utils.toDateFormat
+import com.tangem.core.ui.utils.toDateFormatWithTodayYesterday
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntents
 import com.tangem.utils.converter.Converter
 import kotlinx.coroutines.CoroutineScope
@@ -50,7 +50,7 @@ internal class TxHistoryItemFlowConverter(
             // Use raw timestamp to get date
 
             // If [afterDate] is the first transaction in the flow, add the group title
-            val afterDate = after.getTimestamp()?.toDateFormat() ?: return@insertSeparators null
+            val afterDate = after.getTimestamp()?.toDateFormatWithTodayYesterday() ?: return@insertSeparators null
             if (before is TxHistoryItemState.Title) {
                 return@insertSeparators TxHistoryItemState.GroupTitle(afterDate, itemKey = UUID.randomUUID().toString())
             }
@@ -59,7 +59,7 @@ internal class TxHistoryItemFlowConverter(
              * If [beforeDate] is not equals to [afterDate], then [afterDate] is first transaction in
              * the new group
              */
-            val beforeDate = before.getTimestamp()?.toDateFormat() ?: return@insertSeparators null
+            val beforeDate = before.getTimestamp()?.toDateFormatWithTodayYesterday() ?: return@insertSeparators null
             return@insertSeparators if (beforeDate != afterDate) {
                 TxHistoryItemState.GroupTitle(afterDate, itemKey = UUID.randomUUID().toString())
             } else {