diff --git a/app/src/main/java/one/mixin/android/ui/common/GroupsInCommonFragment.kt b/app/src/main/java/one/mixin/android/ui/common/GroupsInCommonFragment.kt
index fc27cfb0bd..bf74bdb30b 100644
--- a/app/src/main/java/one/mixin/android/ui/common/GroupsInCommonFragment.kt
+++ b/app/src/main/java/one/mixin/android/ui/common/GroupsInCommonFragment.kt
@@ -86,7 +86,7 @@ class GroupHolder(val binding: ItemGroupsInCommonBinding) : RecyclerView.ViewHol
     ) {
         binding.apply {
             icon.setGroup(item.groupIconUrl)
-            name.text = item.groupName
+            name.setGroupName(item.groupName)
             memberCount.text = root.context.resources.getQuantityString(R.plurals.title_participants, item.memberCount, item.memberCount)
             root.setOnClickListener { onItemClick(item) }
         }
diff --git a/app/src/main/java/one/mixin/android/ui/conversation/ConversationFragment.kt b/app/src/main/java/one/mixin/android/ui/conversation/ConversationFragment.kt
index 94377f3342..e656be1ac5 100644
--- a/app/src/main/java/one/mixin/android/ui/conversation/ConversationFragment.kt
+++ b/app/src/main/java/one/mixin/android/ui/conversation/ConversationFragment.kt
@@ -2448,6 +2448,7 @@ class ConversationFragment() :
                     info.count,
                 ),
             )
+            binding.actionBar.titleTv.setGroupName(info.name)
             binding.actionBar.avatarIv.setGroup(info.iconUrl)
             inGroup = info.isExist
             if (inGroup) {
diff --git a/app/src/main/java/one/mixin/android/ui/home/market/LineChart.kt b/app/src/main/java/one/mixin/android/ui/home/market/LineChart.kt
index 54992d3ece..c7f07a5fbb 100644
--- a/app/src/main/java/one/mixin/android/ui/home/market/LineChart.kt
+++ b/app/src/main/java/one/mixin/android/ui/home/market/LineChart.kt
@@ -94,7 +94,7 @@ fun LineChart(
             .getBoolean(Constants.Account.PREF_QUOTE_COLOR, false)
         val isRising = dataPointsData.last() >= dataPointsData.first()
         val color = if (isRising != quoteColorPref) MixinAppTheme.colors.marketGreen else MixinAppTheme.colors.marketRed
-        val textColor = if (isRising != quoteColorPref) MixinAppTheme.colors.walletGreen else MixinAppTheme.colors.walletRed
+        val textColor = if (isRising != quoteColorPref) MixinAppTheme.colors.marketGreen else MixinAppTheme.colors.marketRed
         val circleColor = MixinAppTheme.colors.background
         val lineWidth = Dp(1.5f)
 
diff --git a/app/src/main/java/one/mixin/android/ui/home/web3/market/MarketListComponents.kt b/app/src/main/java/one/mixin/android/ui/home/web3/market/MarketListComponents.kt
index bbbc90aff9..c98ef0bd93 100644
--- a/app/src/main/java/one/mixin/android/ui/home/web3/market/MarketListComponents.kt
+++ b/app/src/main/java/one/mixin/android/ui/home/web3/market/MarketListComponents.kt
@@ -421,9 +421,9 @@ internal fun MarketRecommendationCard(
         if (change == null) {
             MixinAppTheme.colors.textAssist
         } else if (change >= BigDecimal.ZERO) {
-            if (quoteColorReversed) MixinAppTheme.colors.walletRed else MixinAppTheme.colors.walletGreen
+            if (quoteColorReversed) MixinAppTheme.colors.marketRed else MixinAppTheme.colors.marketGreen
         } else {
-            if (quoteColorReversed) MixinAppTheme.colors.walletGreen else MixinAppTheme.colors.walletRed
+            if (quoteColorReversed) MixinAppTheme.colors.marketGreen else MixinAppTheme.colors.marketRed
         }
     Row(
         modifier =
@@ -549,15 +549,15 @@ internal fun MarketChangeColumn(
         if (change == null) {
             MixinAppTheme.colors.textAssist
         } else if (isRising) {
-            if (quoteColorReversed) MixinAppTheme.colors.walletRed else MixinAppTheme.colors.walletGreen
+            if (quoteColorReversed) MixinAppTheme.colors.marketRed else MixinAppTheme.colors.marketGreen
         } else {
-            if (quoteColorReversed) MixinAppTheme.colors.walletGreen else MixinAppTheme.colors.walletRed
+            if (quoteColorReversed) MixinAppTheme.colors.marketGreen else MixinAppTheme.colors.marketRed
         }
     val sparklineColor =
         if (isRising) {
-            if (quoteColorReversed) MixinAppTheme.colors.walletRed else MixinAppTheme.colors.walletGreen
+            if (quoteColorReversed) MixinAppTheme.colors.marketRed else MixinAppTheme.colors.marketGreen
         } else {
-            if (quoteColorReversed) MixinAppTheme.colors.walletGreen else MixinAppTheme.colors.walletRed
+            if (quoteColorReversed) MixinAppTheme.colors.marketGreen else MixinAppTheme.colors.marketRed
         }
     if (sparkline.isNullOrBlank()) {
         Box(
diff --git a/app/src/main/java/one/mixin/android/ui/home/web3/market/MarketPage.kt b/app/src/main/java/one/mixin/android/ui/home/web3/market/MarketPage.kt
index a01ca28455..35029854fd 100644
--- a/app/src/main/java/one/mixin/android/ui/home/web3/market/MarketPage.kt
+++ b/app/src/main/java/one/mixin/android/ui/home/web3/market/MarketPage.kt
@@ -742,9 +742,9 @@ private fun IndicatorMetric(
         if (change == null) {
             MixinAppTheme.colors.textAssist
         } else if (change >= BigDecimal.ZERO) {
-            if (quoteColorReversed) MixinAppTheme.colors.walletRed else MixinAppTheme.colors.walletGreen
+            if (quoteColorReversed) MixinAppTheme.colors.marketRed else MixinAppTheme.colors.marketGreen
         } else {
-            if (quoteColorReversed) MixinAppTheme.colors.walletGreen else MixinAppTheme.colors.walletRed
+            if (quoteColorReversed) MixinAppTheme.colors.marketGreen else MixinAppTheme.colors.marketRed
         }
     Column(
         modifier = modifier,
diff --git a/app/src/main/java/one/mixin/android/ui/home/web3/market/MarketSearchPage.kt b/app/src/main/java/one/mixin/android/ui/home/web3/market/MarketSearchPage.kt
index dd39b4db05..520fd01e6d 100644
--- a/app/src/main/java/one/mixin/android/ui/home/web3/market/MarketSearchPage.kt
+++ b/app/src/main/java/one/mixin/android/ui/home/web3/market/MarketSearchPage.kt
@@ -679,9 +679,9 @@ private fun searchChangeColor(
     when {
         change == null -> MixinAppTheme.colors.textAssist
         change >= BigDecimal.ZERO ->
-            if (quoteColorReversed) MixinAppTheme.colors.walletRed else MixinAppTheme.colors.walletGreen
+            if (quoteColorReversed) MixinAppTheme.colors.marketRed else MixinAppTheme.colors.marketGreen
         else ->
-            if (quoteColorReversed) MixinAppTheme.colors.walletGreen else MixinAppTheme.colors.walletRed
+            if (quoteColorReversed) MixinAppTheme.colors.marketGreen else MixinAppTheme.colors.marketRed
     }
 
 private const val SEARCH_RESULT_PREVIEW_COUNT = 3
diff --git a/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpetualContent.kt b/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpetualContent.kt
index 1cc58c3f6e..649405917a 100644
--- a/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpetualContent.kt
+++ b/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpetualContent.kt
@@ -81,8 +81,8 @@ fun PerpetualContent(
     val walletId = Session.getAccountId()!!
     val quoteColorReversed = context.defaultSharedPreferences
         .getBoolean(Constants.Account.PREF_QUOTE_COLOR, false)
-    val risingColor = if (quoteColorReversed) MixinAppTheme.colors.walletRed else MixinAppTheme.colors.walletGreen
-    val fallingColor = if (quoteColorReversed) MixinAppTheme.colors.walletGreen else MixinAppTheme.colors.walletRed
+    val risingColor = if (quoteColorReversed) MixinAppTheme.colors.marketRed else MixinAppTheme.colors.marketGreen
+    val fallingColor = if (quoteColorReversed) MixinAppTheme.colors.marketGreen else MixinAppTheme.colors.marketRed
     val viewModel = hiltViewModel<PerpetualViewModel>()
     val lifecycleOwner = LocalLifecycleOwner.current
 
diff --git a/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsMarketDetailPage.kt b/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsMarketDetailPage.kt
index 58c77b013b..ce246122e8 100644
--- a/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsMarketDetailPage.kt
+++ b/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsMarketDetailPage.kt
@@ -218,8 +218,8 @@ fun PerpsMarketDetailPage(
     }
     val quoteColorReversed = context.defaultSharedPreferences
         .getBoolean(Constants.Account.PREF_QUOTE_COLOR, false)
-    val risingColor = if (quoteColorReversed) MixinAppTheme.colors.walletRed else MixinAppTheme.colors.walletGreen
-    val fallingColor = if (quoteColorReversed) MixinAppTheme.colors.walletGreen else MixinAppTheme.colors.walletRed
+    val risingColor = if (quoteColorReversed) MixinAppTheme.colors.marketRed else MixinAppTheme.colors.marketGreen
+    val fallingColor = if (quoteColorReversed) MixinAppTheme.colors.marketGreen else MixinAppTheme.colors.marketRed
 
     LaunchedEffect(marketId) {
         viewModel.refreshFavoriteMarkets()
@@ -1016,8 +1016,8 @@ private fun MarketDetailCard(
     val context = LocalContext.current
     val quoteColorReversed = context.defaultSharedPreferences
         .getBoolean(Constants.Account.PREF_QUOTE_COLOR, false)
-    val risingColor = if (quoteColorReversed) MixinAppTheme.colors.walletRed else MixinAppTheme.colors.walletGreen
-    val fallingColor = if (quoteColorReversed) MixinAppTheme.colors.walletGreen else MixinAppTheme.colors.walletRed
+    val risingColor = if (quoteColorReversed) MixinAppTheme.colors.marketRed else MixinAppTheme.colors.marketGreen
+    val fallingColor = if (quoteColorReversed) MixinAppTheme.colors.marketGreen else MixinAppTheme.colors.marketRed
 
     val changePercent = market.changePercent()
     val isPositive = changePercent >= BigDecimal.ZERO
@@ -1249,8 +1249,8 @@ private fun OpenPositionCard(
     val context = LocalContext.current
     val quoteColorReversed = context.defaultSharedPreferences
         .getBoolean(Constants.Account.PREF_QUOTE_COLOR, false)
-    val risingColor = if (quoteColorReversed) MixinAppTheme.colors.walletRed else MixinAppTheme.colors.walletGreen
-    val fallingColor = if (quoteColorReversed) MixinAppTheme.colors.walletGreen else MixinAppTheme.colors.walletRed
+    val risingColor = if (quoteColorReversed) MixinAppTheme.colors.marketRed else MixinAppTheme.colors.marketGreen
+    val fallingColor = if (quoteColorReversed) MixinAppTheme.colors.marketGreen else MixinAppTheme.colors.marketRed
     val pnl = position.unrealizedPnl?.toBigDecimalOrNull() ?: BigDecimal.ZERO
     val roe = (position.roe?.toBigDecimalOrNull() ?: BigDecimal.ZERO).multiply(BigDecimal(100))
     val isProfit = pnl >= BigDecimal.ZERO
diff --git a/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsMarketItem.kt b/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsMarketItem.kt
index 8a93ea5b90..b9d5ec6896 100644
--- a/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsMarketItem.kt
+++ b/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsMarketItem.kt
@@ -38,15 +38,15 @@ fun PerpsMarketItem(
     val isPositive = changePercent >= BigDecimal.ZERO
     val changeColor = if (isPositive) {
         if (quoteColorReversed) {
-            MixinAppTheme.colors.walletRed
+            MixinAppTheme.colors.marketRed
         } else {
-            MixinAppTheme.colors.walletGreen
+            MixinAppTheme.colors.marketGreen
         }
     } else {
         if (quoteColorReversed) {
-            MixinAppTheme.colors.walletGreen
+            MixinAppTheme.colors.marketGreen
         } else {
-            MixinAppTheme.colors.walletRed
+            MixinAppTheme.colors.marketRed
         }
     }
     val changeText = formatPerpsSignedPercent(changePercent)
diff --git a/app/src/main/java/one/mixin/android/ui/search/SearchMessageFragment.kt b/app/src/main/java/one/mixin/android/ui/search/SearchMessageFragment.kt
index c3f6af42ee..a775f8565c 100644
--- a/app/src/main/java/one/mixin/android/ui/search/SearchMessageFragment.kt
+++ b/app/src/main/java/one/mixin/android/ui/search/SearchMessageFragment.kt
@@ -108,7 +108,7 @@ class SearchMessageFragment : BaseFragment(R.layout.fragment_search_message) {
                 searchMessageItem.userId,
             )
         } else {
-            binding.titleView.titleTv.setTextOnly(searchMessageItem.conversationName)
+            binding.titleView.titleTv.setGroupName(searchMessageItem.conversationName)
             binding.titleView.avatarIv.setGroup(searchMessageItem.conversationAvatarUrl)
         }
 
diff --git a/app/src/main/java/one/mixin/android/ui/search/holder/ChatHolder.kt b/app/src/main/java/one/mixin/android/ui/search/holder/ChatHolder.kt
index 8f15c7525c..cb0cde319f 100644
--- a/app/src/main/java/one/mixin/android/ui/search/holder/ChatHolder.kt
+++ b/app/src/main/java/one/mixin/android/ui/search/holder/ChatHolder.kt
@@ -18,7 +18,7 @@ class ChatHolder(val binding: ItemSearchChatBinding) : NormalHolder(binding.root
             binding.searchAvatarIv.setInfo(chat.fullName, chat.avatarUrl, chat.userId)
             binding.searchName.setName(chat)
         } else {
-            binding.searchName.setTextOnly(chat.groupName)
+            binding.searchName.setGroupName(chat.groupName)
             binding.searchName.highLight(target)
             binding.searchAvatarIv.setInfo(chat.groupName, chat.groupIconUrl, chat.conversationId)
         }
diff --git a/app/src/main/java/one/mixin/android/ui/wallet/MarketPerpsAction.kt b/app/src/main/java/one/mixin/android/ui/wallet/MarketPerpsAction.kt
index d9235a24c0..47ee0fd05b 100644
--- a/app/src/main/java/one/mixin/android/ui/wallet/MarketPerpsAction.kt
+++ b/app/src/main/java/one/mixin/android/ui/wallet/MarketPerpsAction.kt
@@ -55,8 +55,8 @@ fun MarketPerpsAction(
 ) {
     val quoteColorReversed = LocalContext.current.defaultSharedPreferences
         .getBoolean(Constants.Account.PREF_QUOTE_COLOR, false)
-    val longColor = if (quoteColorReversed) MixinAppTheme.colors.walletRed else MixinAppTheme.colors.walletGreen
-    val shortColor = if (quoteColorReversed) MixinAppTheme.colors.walletGreen else MixinAppTheme.colors.walletRed
+    val longColor = if (quoteColorReversed) MixinAppTheme.colors.marketRed else MixinAppTheme.colors.marketGreen
+    val shortColor = if (quoteColorReversed) MixinAppTheme.colors.marketGreen else MixinAppTheme.colors.marketRed
     val longBackgroundColor = if (quoteColorReversed) MarketPerpsButtonRedBackground else MarketPerpsButtonGreenBackground
     val shortBackgroundColor = if (quoteColorReversed) MarketPerpsButtonGreenBackground else MarketPerpsButtonRedBackground
 
diff --git a/app/src/main/java/one/mixin/android/widget/NameTextView.kt b/app/src/main/java/one/mixin/android/widget/NameTextView.kt
index 564fe9c418..14218d8d78 100644
--- a/app/src/main/java/one/mixin/android/widget/NameTextView.kt
+++ b/app/src/main/java/one/mixin/android/widget/NameTextView.kt
@@ -153,6 +153,14 @@ class NameTextView : LinearLayoutCompat {
         this.textView.setCompoundDrawables(null, null, null, null)
     }
 
+    fun setGroupName(text: String?) {
+        setTextOnly(text)
+        val icon = AppCompatResources.getDrawable(context, R.drawable.ic_group_badge)?.apply {
+            setBounds(0, 0, badgeSize, badgeSize)
+        }
+        textView.setCompoundDrawablesRelative(null, null, icon, null)
+    }
+
     fun setVerifiedName(text: String, isVerified: Boolean) {
         setTextOnly(text)
         if (!isVerified) return
@@ -391,10 +399,7 @@ class NameTextView : LinearLayoutCompat {
 
     fun setName(item: ConversationMinimal) {
         if (item.isGroupConversation()) {
-            this.textView.text = item.groupName
-            iconView.isVisible = false
-            iconView.stopAnimation()
-            this.textView.setCompoundDrawables(null, null, null, null)
+            setGroupName(item.groupName)
         } else {
             this.textView.text = item.name
             if (item.isProsperity()) {
diff --git a/app/src/main/res/drawable/ic_group_badge.xml b/app/src/main/res/drawable/ic_group_badge.xml
index 468048192d..9423668fa6 100644
--- a/app/src/main/res/drawable/ic_group_badge.xml
+++ b/app/src/main/res/drawable/ic_group_badge.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="30"
     android:viewportHeight="30">
     <path
diff --git a/app/src/main/res/layout/item_groups_in_common.xml b/app/src/main/res/layout/item_groups_in_common.xml
index 4605235c16..b684d4ff73 100644
--- a/app/src/main/res/layout/item_groups_in_common.xml
+++ b/app/src/main/res/layout/item_groups_in_common.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="72dp"
     android:background="?attr/bg_white"
@@ -18,7 +19,7 @@
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"/>
 
-    <TextView
+    <one.mixin.android.widget.NameTextView
         android:id="@+id/name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -28,9 +29,9 @@
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="2dp"
         android:layout_marginStart="@dimen/activity_horizontal_margin"
-        android:textSize="16sp"
+        app:textSize="16sp"
         android:ellipsize="end"
-        android:singleLine="true"
+        app:lines="1"
         android:textColor="?attr/text_primary" />
 
     <TextView