diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIChatFeatureView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIChatFeatureView.kt
index 34e4ae8f7b..9d9198f9de 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIChatFeatureView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIChatFeatureView.kt
@@ -13,6 +13,8 @@ import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
 import chat.simplex.common.model.ChatModel.getChatItemIndexOrNull
 import chat.simplex.common.platform.onRightClick
+import chat.simplex.common.ui.theme.CurrentColors
+import chat.simplex.common.ui.theme.DefaultTheme
 import chat.simplex.common.ui.theme.simplexSecondaryTint
 
 @Composable
@@ -103,7 +105,7 @@ private fun featureInfo(ci: ChatItem, chatInfo: ChatInfo): FeatureInfo? =
 
 @Composable
 private fun FeatureIconView(f: FeatureInfo) {
-  val icon = @Composable { Icon(f.icon.icon, null, Modifier.size(20.dp), tint = f.color) }
+  val icon = @Composable { Icon(f.icon.icon, null, Modifier.size(20.dp), tint = if (CurrentColors.value.base == DefaultTheme.SIMPLEX && f.color == CurrentColors.value.colors.secondary) simplexSecondaryTint() else f.color) }
   if (f.param != null) {
     Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(4.dp)) {
       icon()
@@ -126,7 +128,7 @@ private fun FullFeatureView(
     verticalAlignment = Alignment.CenterVertically,
     horizontalArrangement = Arrangement.spacedBy(4.dp)
   ) {
-    Icon(icon ?: feature.iconFilled(), feature.text, Modifier.size(20.dp), tint = iconColor)
+    Icon(icon ?: feature.iconFilled(), feature.text, Modifier.size(20.dp), tint = if (CurrentColors.value.base == DefaultTheme.SIMPLEX && iconColor == CurrentColors.value.colors.secondary) simplexSecondaryTint() else iconColor)
     Text(
       chatEventText(chatItem),
       Modifier,