diff --git a/app/src/main/java/com/gh/common/util/ImageUtils.kt b/app/src/main/java/com/gh/common/util/ImageUtils.kt
index 9d7e100731..60448eefc4 100644
--- a/app/src/main/java/com/gh/common/util/ImageUtils.kt
+++ b/app/src/main/java/com/gh/common/util/ImageUtils.kt
@@ -279,13 +279,19 @@ object ImageUtils {
                 })
     }
 
+    @JvmStatic
+    fun display(view: SimpleDraweeView?, url: String?) {
+        display(view, url, true)
+    }
+
     /**
      *  规则 width>0 Wifi/4G:x2 traffic:x1
      *  第一种方案:通过LayoutParams获取 可以快速(无延迟)获取宽高,但是无法获取wrap_content和match_parent的View
      *  第二种方案(备用方案):有延迟,View的宽高需要在Measure过程后才能确定,能够在这里获取到正确的宽高
+     *  @param isAutoPlayGif 是否禁止播放动图
      */
     @JvmStatic
-    fun display(view: SimpleDraweeView?, url: String?) {
+    fun display(view: SimpleDraweeView?, url: String?, isAutoPlayGif: Boolean = true) {
         if (url.isNullOrEmpty()) return
 
         val width = view?.layoutParams?.width
@@ -319,7 +325,7 @@ object ImageUtils {
             view?.setTag(R.string.highResImageTag, highResUrl)
         }
 
-        val shouldLoadAsGif = url.endsWith(".gif") && view?.getTag(R.id.tag_show_gif) != false
+        val shouldLoadAsGif = url.endsWith(".gif") && isAutoPlayGif && view?.getTag(R.id.tag_show_gif) != false
 
         if (shouldLoadAsGif && view?.tag == url) return
 
diff --git a/app/src/main/java/com/gh/common/view/GameIconView.kt b/app/src/main/java/com/gh/common/view/GameIconView.kt
index 3f1c207b0d..7600e2f767 100644
--- a/app/src/main/java/com/gh/common/view/GameIconView.kt
+++ b/app/src/main/java/com/gh/common/view/GameIconView.kt
@@ -5,6 +5,7 @@ import android.text.TextUtils
 import android.util.AttributeSet
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat
 import com.facebook.drawee.generic.RoundingParams
 import com.facebook.drawee.view.SimpleDraweeView
 import com.gh.common.util.DisplayUtils
@@ -18,6 +19,7 @@ class GameIconView : ConstraintLayout {
 
     private var mCornerRadius = 10
     private var mBorderColor = 0
+    private var mGameIconOverlayColor = 0
     private var mBorderWidth = 1
     private var mFadeDuration = -1
 
@@ -36,11 +38,15 @@ class GameIconView : ConstraintLayout {
         val ta = context.obtainStyledAttributes(attrs, R.styleable.GameIconView)
         mCornerRadius = ta.getDimensionPixelSize(R.styleable.GameIconView_gameIconCornerRadius, DisplayUtils.dip2px(10F))
         mBorderColor = ta.getColor(R.styleable.GameIconView_gameIconBorderColor, 0)
+        mGameIconOverlayColor = ta.getColor(R.styleable.GameIconView_gameIconOverlayColor, 0)
         mBorderWidth = ta.getDimensionPixelSize(R.styleable.GameIconView_gameIconBorderWidth, 1)
         mFadeDuration = ta.getInt(R.styleable.GameIconView_gameIconFadeDuration, -1)
         ta.recycle()
 
         val roundingParams = RoundingParams.fromCornersRadius(mCornerRadius.toFloat())
+        if (mGameIconOverlayColor != 0) {
+            roundingParams.overlayColor = mGameIconOverlayColor
+        }
 
         if (mBorderColor != 0) {
             roundingParams.setBorder(mBorderColor, mBorderWidth.toFloat())
diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumFollowAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumFollowAdapter.kt
index d3b18c5e55..b7e827ed4c 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumFollowAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumFollowAdapter.kt
@@ -43,7 +43,7 @@ class ForumFollowAdapter(context: Context) : BaseRecyclerAdapter<RecyclerView.Vi
         } else {
             val view = View(mContext).apply {
                 val params = RecyclerView.LayoutParams(1f.dip2px(), 22f.dip2px())
-                params.topMargin = 13f.dip2px()
+                params.topMargin = 17f.dip2px()
                 layoutParams = params
                 setBackgroundColor(ContextCompat.getColor(mContext, R.color.text_eeeeee))
             }
diff --git a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt
index 1e5c8108f7..32bfd4b28e 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt
@@ -7,14 +7,13 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import androidx.core.content.ContextCompat
-import androidx.core.text.getSpans
 import androidx.recyclerview.widget.RecyclerView
 import com.gh.base.BaseActivity
 import com.gh.base.BaseRecyclerViewHolder
 import com.gh.common.constant.ItemViewType
 import com.gh.common.syncpage.ISyncAdapterHandler
+import com.gh.common.util.ImageUtils
 import com.gh.common.util.MtaHelper
-import com.gh.common.util.SpanBuilder
 import com.gh.common.util.dip2px
 import com.gh.common.util.fromHtml
 import com.gh.common.view.CenterImageSpan
@@ -69,7 +68,17 @@ class ForumContentSearchListAdapter(context: Context, val mEntrance: String) : L
                 if (mEntrance == "论坛首页+(搜索)") {
                     val answerViewHolder = holder as ForumArticleAskItemViewHolder
                     answerViewHolder.bindForumAnswerItem(answer, mEntrance, "")
-                    answerViewHolder.binding.title.text = answer.questions.title?.fromHtml()
+                    if (answer.type == "question") {
+                        answerViewHolder.binding.content.visibility = View.GONE
+                        val title = answer.questions.title ?: ""
+                        val spannableStringBuilder = SpannableStringBuilder("  ")
+                        spannableStringBuilder.setSpan(CenterImageSpan(mContext, R.drawable.ic_ask_label), 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+                        spannableStringBuilder.append(title.fromHtml())
+                        answerViewHolder.binding.title.text = spannableStringBuilder
+                    } else {
+                        answerViewHolder.binding.content.visibility = View.VISIBLE
+                        answerViewHolder.binding.title.text = answer.questions.title?.fromHtml()
+                    }
                     answerViewHolder.binding.content.text = answer.brief?.fromHtml()
                     answerViewHolder.itemView.setOnClickListener {
                         val entrance = BaseActivity.mergeEntranceAndPath(mEntrance, "")
@@ -81,6 +90,14 @@ class ForumContentSearchListAdapter(context: Context, val mEntrance: String) : L
                             mContext.startActivity(QuestionsDetailActivity.getIntent(mContext, answer.id, mEntrance, ""))
                         }
                     }
+                    if (answer.type != "community_article") {
+                        answerViewHolder.commentCount.text = "回答"
+                        answerViewHolder.voteCountContainer.visibility = View.GONE
+                        val params = answerViewHolder.binding.includeVoteAndComment.root.layoutParams as LinearLayout.LayoutParams
+                        params.width = 80f.dip2px()
+                        answerViewHolder.binding.includeVoteAndComment.root.layoutParams = params
+                    }
+
                 } else {
                     val forumSearchHolder = holder as ForumSearchContentListViewHolder
                     forumSearchHolder.binding.entity = answer
@@ -95,6 +112,21 @@ class ForumContentSearchListAdapter(context: Context, val mEntrance: String) : L
                         forumSearchHolder.binding.content.visibility = View.VISIBLE
                         forumSearchHolder.binding.title.text = answer.questions.title?.fromHtml()
                     }
+                    when {
+                        answer.getPassVideos().isNotEmpty() -> {
+                            val poster = answer.getPassVideos()[0].poster
+                            ImageUtils.display(forumSearchHolder.binding.image, poster,false)
+                            forumSearchHolder.binding.image.visibility = View.VISIBLE
+                        }
+                        answer.images.isNotEmpty() -> {
+                            forumSearchHolder.binding.image.visibility = View.VISIBLE
+                            ImageUtils.display(forumSearchHolder.binding.image, answer.images[0],false)
+                        }
+                        else -> {
+                            forumSearchHolder.binding.image.visibility = View.GONE
+                        }
+                    }
+
                     forumSearchHolder.binding.content.text = answer.brief?.fromHtml()
                     forumSearchHolder.itemView.setOnClickListener {
                         if ("community_article" == answer.type) {
diff --git a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListFragment.kt
index ab5f347c6b..92b148cfbf 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListFragment.kt
@@ -6,8 +6,11 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
+import com.gh.common.util.DisplayUtils
 import com.gh.common.util.EntranceUtils
 import com.gh.common.util.viewModelProvider
+import com.gh.common.view.divider.HorizontalDividerItemDecoration
+import com.gh.common.view.divider.VerticalDividerItemDecoration
 import com.gh.gamecenter.R
 import com.gh.gamecenter.baselist.ListAdapter
 import com.gh.gamecenter.baselist.ListFragment
@@ -53,7 +56,12 @@ class ForumContentSearchListFragment : ListFragment<AnswerEntity, ForumContentSe
         mListViewModel?.updateSearchKey(mSearchKey)
     }
 
-    override fun getItemDecoration(): RecyclerView.ItemDecoration? = null
+    override fun getItemDecoration(): RecyclerView.ItemDecoration? {
+        return HorizontalDividerItemDecoration.Builder(requireContext())
+                .size(DisplayUtils.dip2px(0.5f))
+                .margin(DisplayUtils.dip2px(20f))
+                .color(ContextCompat.getColor(requireContext(), R.color.text_f5f5f5)).build()
+    }
 
     override fun addSyncPageObserver(): Boolean = true
 
diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt
index 05c3ea2066..7f87076344 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt
@@ -5,7 +5,6 @@ import android.app.Activity
 import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.view.animation.LinearInterpolator
 import android.webkit.JavascriptInterface
 import android.widget.TextView
@@ -267,26 +266,28 @@ class ArticleDetailContentViewHolder(var binding: ItemArticleDetailContentBindin
 
     private fun addTag(tag: String, isCommunityName: Boolean = false) {
         binding.run {
-            val view = LayoutInflater.from(root.context).inflate(R.layout.questionsdedit_tag_item, null)
-            val tagTv = view as TextView
-            val params = FlexboxLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-            params.setMargins(0, 5F.dip2px(), 8F.dip2px(), 5F.dip2px())
-
-            tagTv.text = tag
-            tagTv.setTextColor(if (!isCommunityName) R.color.theme_font.toColor() else R.color.text_666666.toColor())
             if (isCommunityName) {
-                tagTv.setPadding(8F.dip2px(), 8F.dip2px(), 8F.dip2px(), 8F.dip2px())
-                tagTv.setRoundedColorBackground(R.color.text_F5F5F5, 5F)
-                tagTv.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(root.context, R.drawable.ic_article_detail_forum_tag), null,
-                        ContextCompat.getDrawable(root.context,R.drawable.ic_article_tag_arrow_right), null)
-                tagTv.compoundDrawablePadding = 5F.dip2px()
-                tagTv.setOnClickListener {
+                val view = LayoutInflater.from(root.context).inflate(R.layout.article_detail_fourm_tag_item, null)
+                val tagTv = view.findViewById<TextView>(R.id.tagTv)
+                tagTv.text = tag
+
+                view.setOnClickListener {
                     MtaHelper.onEvent("帖子详情", "内容区域", tag)
                     DirectUtils.directForumDetail(tagTv.context, viewModel.detailEntity?.communityId, "帖子详情")
                     LogUtils.uploadAccessToBbs(viewModel.detailEntity?.communityId, "文章内所属论坛")
                 }
+                tagsFlexbox.addView(view)
+
+                val params = view.layoutParams as FlexboxLayout.LayoutParams
+                params.setMargins(0, 5F.dip2px(), 8F.dip2px(), 5F.dip2px())
+                view.layoutParams = params
             } else {
-                tagTv.setPadding(14F.dip2px(), 8F.dip2px(), 14F.dip2px(), 8F.dip2px())
+                val view = LayoutInflater.from(root.context).inflate(R.layout.questionsdedit_tag_item, null)
+                val tagTv = view as TextView
+
+                tagTv.text = tag
+                tagTv.setTextColor(R.color.theme_font.toColor())
+                tagTv.setPadding(14F.dip2px(), 0, 14F.dip2px(), 0)
                 tagTv.setRoundedColorBackground(R.color.text_EEF5FB, 5F)
                 tagTv.setOnClickListener {
                     MtaHelper.onEvent("帖子详情", "内容区域", tag)
@@ -294,9 +295,13 @@ class ArticleDetailContentViewHolder(var binding: ItemArticleDetailContentBindin
                     root.context.startActivity(AskColumnDetailActivity.getIntentByTag(root.context, tag,
                             CommunityEntity(viewModel.detailEntity!!.communityId), mEntrance, "帖子详情"))
                 }
+                tagsFlexbox.addView(view)
+
+                val params = view.layoutParams as FlexboxLayout.LayoutParams
+                params.setMargins(0, 5F.dip2px(), 8F.dip2px(), 5F.dip2px())
+                tagTv.layoutParams = params
             }
-            tagTv.layoutParams = params
-            tagsFlexbox.addView(view)
+
         }
     }
 
diff --git a/app/src/main/res/drawable-xxhdpi/forum_more_guide_rectangle.webp b/app/src/main/res/drawable-xxhdpi/forum_more_guide_rectangle.webp
index 96afb48888..adb49da000 100644
Binary files a/app/src/main/res/drawable-xxhdpi/forum_more_guide_rectangle.webp and b/app/src/main/res/drawable-xxhdpi/forum_more_guide_rectangle.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_forum_detail_search_light.png b/app/src/main/res/drawable-xxhdpi/ic_forum_detail_search_light.png
index 543d35feee..2357f25c9b 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_forum_detail_search_light.png and b/app/src/main/res/drawable-xxhdpi/ic_forum_detail_search_light.png differ
diff --git a/app/src/main/res/drawable/bg_shape_f5_radius_5.xml b/app/src/main/res/drawable/bg_shape_f5_radius_5.xml
new file mode 100644
index 0000000000..d7d69eef8e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_shape_f5_radius_5.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="5dp" />
+    <solid android:color="@color/text_F5F5F5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/article_detail_fourm_tag_item.xml b/app/src/main/res/layout/article_detail_fourm_tag_item.xml
new file mode 100644
index 0000000000..9fc89a179e
--- /dev/null
+++ b/app/src/main/res/layout/article_detail_fourm_tag_item.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="28dp"
+    android:background="@drawable/bg_shape_f5_radius_5"
+    android:orientation="horizontal"
+    android:gravity="center"
+    android:padding="8dp">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_article_detail_forum_tag" />
+
+    <TextView
+        android:id="@+id/tagTv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dp"
+        android:gravity="center"
+        android:textColor="@color/content"
+        android:textSize="13sp" />
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:src="@drawable/ic_article_tag_arrow_right" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/community_answer_item.xml b/app/src/main/res/layout/community_answer_item.xml
index f4a25f0b2a..fe2e3e3302 100644
--- a/app/src/main/res/layout/community_answer_item.xml
+++ b/app/src/main/res/layout/community_answer_item.xml
@@ -21,7 +21,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/white"
-            android:paddingLeft="14dp"
+            android:paddingLeft="12dp"
             android:paddingRight="20dp"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
@@ -50,7 +50,7 @@
                 android:id="@+id/user_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="14dp"
+                android:layout_marginTop="12dp"
                 app:avatar_width="32dp"
                 app:badge_width="12dp"
                 app:border_color="@color/transparent"
@@ -71,20 +71,21 @@
                 android:textColor="@color/text_333333"
                 android:textSize="14sp"
                 app:layout_constrainedWidth="true"
-                app:layout_constraintBottom_toTopOf="@id/time"
+                app:layout_constraintBottom_toTopOf="@id/timeContainer"
                 app:layout_constraintHorizontal_bias="0"
                 app:layout_constraintHorizontal_chainStyle="packed"
                 app:layout_constraintLeft_toRightOf="@id/user_icon"
                 app:layout_constraintRight_toLeftOf="@+id/user_badge_icon"
                 app:layout_constraintTop_toTopOf="@id/user_icon"
+                app:layout_constraintVertical_chainStyle="packed"
                 tools:text="我的名字很长我的名字很长我的名字很长" />
 
             <com.facebook.drawee.view.SimpleDraweeView
                 android:id="@+id/user_badge_icon"
                 imageIcon="@{entity.user.badge.icon}"
                 visibleGone="@{entity.user.badge != null}"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
+                android:layout_width="14dp"
+                android:layout_height="14dp"
                 android:layout_marginLeft="8dp"
                 app:layout_constrainedWidth="true"
                 app:layout_constraintBottom_toBottomOf="@id/user_name"
@@ -113,35 +114,40 @@
                 tools:text="答题先锋答题先锋答题先锋答题先锋答题先锋答题先锋"
                 tools:visibility="visible" />
 
-            <TextView
-                android:id="@+id/followedUserTv"
-                goneIf="@{!entity.me.isFollower}"
+            <LinearLayout
+                android:id="@+id/timeContainer"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:text="关注的人"
-                android:textColor="@color/theme_font"
-                android:textSize="11sp"
-                android:visibility="gone"
+                android:orientation="horizontal"
                 app:layout_constraintBottom_toBottomOf="@id/user_icon"
                 app:layout_constraintLeft_toRightOf="@id/user_icon"
-                app:layout_constraintTop_toBottomOf="@id/user_name"
-                tools:visibility="visible" />
+                app:layout_constraintTop_toBottomOf="@id/user_name">
 
-            <TextView
-                android:id="@+id/time"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:gravity="center"
-                android:text="@{(entity.me.isFollower?`·` :``)+NewsUtils.getFormattedTime(entity.time)}"
-                android:textColor="@color/text_999999"
-                android:textSize="12sp"
-                app:layout_constraintBottom_toBottomOf="@id/user_icon"
-                app:layout_constraintLeft_toRightOf="@id/followedUserTv"
-                app:layout_constraintTop_toBottomOf="@id/user_name"
-                tools:text="1分钟前"
-                tools:visibility="visible" />
+                <TextView
+                    android:id="@+id/followedUserTv"
+                    goneIf="@{!entity.me.isFollower}"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:alpha="0.6"
+                    android:text="关注的人"
+                    android:textColor="@color/theme_font"
+                    android:textSize="11sp"
+                    android:visibility="gone"
+                    tools:visibility="visible" />
+
+                <TextView
+                    android:id="@+id/time"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:gravity="center"
+                    android:text="@{(entity.me.isFollower?`·` :``)+NewsUtils.getFormattedTime(entity.time)}"
+                    android:textColor="@color/text_999999"
+                    android:textSize="11sp"
+                    tools:text="1分钟前"
+                    tools:visibility="visible" />
+            </LinearLayout>
 
             <TextView
                 android:id="@+id/title"
diff --git a/app/src/main/res/layout/forum_search_content_list.xml b/app/src/main/res/layout/forum_search_content_list.xml
index 124e80389f..eec4c08023 100644
--- a/app/src/main/res/layout/forum_search_content_list.xml
+++ b/app/src/main/res/layout/forum_search_content_list.xml
@@ -31,6 +31,7 @@
                 android:layout_marginRight="16dp"
                 android:ellipsize="end"
                 android:maxLines="2"
+                android:lineSpacingExtra="6dp"
                 android:textColor="@color/text_333333"
                 android:textSize="16sp"
                 app:layout_constraintEnd_toStartOf="@+id/image"
@@ -56,14 +57,13 @@
             <com.facebook.drawee.view.SimpleDraweeView
                 android:id="@+id/image"
                 style="@style/frescoStyle"
-                setCommunityImage="@{entity.images}"
-                setCommunityVideoImage="@{entity.passVideos}"
                 android:layout_width="106dp"
                 android:layout_height="80dp"
                 android:visibility="gone"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:roundedCornerRadius="4dp"
+                app:roundWithOverlayColor="@color/white"
                 tools:visibility="visible" />
 
             <ImageView
@@ -99,7 +99,8 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp">
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="16dp">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -117,14 +118,14 @@
                 android:textSize="11sp" />
         </RelativeLayout>
 
-        <View
+        <!--<View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="0.5dp"
             android:layout_marginTop="16dp"
-            android:background="@color/text_eeeeee"
+            android:background="@color/text_f5f5f5"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/timeTv" />
+            app:layout_constraintTop_toBottomOf="@+id/timeTv" />-->
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_article_detail_comment.xml b/app/src/main/res/layout/item_article_detail_comment.xml
index a98419bcd9..1a24c64aef 100644
--- a/app/src/main/res/layout/item_article_detail_comment.xml
+++ b/app/src/main/res/layout/item_article_detail_comment.xml
@@ -64,17 +64,14 @@
             <TextView
                 android:id="@+id/authorHintTv"
                 goneIf="@{!comment.me.contentOwner}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="26dp"
+                android:layout_height="14dp"
                 android:layout_marginLeft="4dp"
                 android:layout_marginRight="8dp"
-                android:background="@drawable/button_round_2496ff"
+                android:background="@drawable/bg_notification_open_btn_style_2"
                 android:includeFontPadding="false"
-                android:paddingLeft="4dp"
-                android:paddingTop="2dp"
-                android:paddingRight="4dp"
-                android:paddingBottom="2dp"
                 android:text="作者"
+                android:gravity="center"
                 android:textColor="@color/white"
                 android:textSize="9sp"
                 android:visibility="gone"
diff --git a/app/src/main/res/layout/item_forum_follow.xml b/app/src/main/res/layout/item_forum_follow.xml
index bfe0411154..fc051be0d1 100644
--- a/app/src/main/res/layout/item_forum_follow.xml
+++ b/app/src/main/res/layout/item_forum_follow.xml
@@ -17,6 +17,7 @@
             android:layout_height="48dp"
             android:layout_marginTop="4dp"
             android:layout_marginRight="4dp"
+            app:gameIconOverlayColor="@color/white"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/questionsdedit_tag_item.xml b/app/src/main/res/layout/questionsdedit_tag_item.xml
index 83d88b17b4..3a4dc90c97 100644
--- a/app/src/main/res/layout/questionsdedit_tag_item.xml
+++ b/app/src/main/res/layout/questionsdedit_tag_item.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android = "http://schemas.android.com/apk/res/android"
     android:layout_width = "wrap_content"
-    android:layout_height = "wrap_content"
+    android:layout_height = "28dp"
     android:background = "@drawable/border_suggest_bg"
     android:gravity = "center"
-    android:paddingBottom = "5dp"
     android:paddingLeft = "10dp"
     android:paddingRight = "10dp"
-    android:paddingTop = "4dp"
     android:textColor = "@color/content"
     android:textSize = "13sp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/user_search_list_item.xml b/app/src/main/res/layout/user_search_list_item.xml
index aa2df41e9b..9636b5c4de 100644
--- a/app/src/main/res/layout/user_search_list_item.xml
+++ b/app/src/main/res/layout/user_search_list_item.xml
@@ -31,7 +31,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:roundingBorderColor="@color/black_alpha_10"
-            app:roundingBorderWidth="1dp" />
+            app:roundingBorderWidth="0.5dp" />
 
         <com.facebook.drawee.view.SimpleDraweeView
             android:id="@+id/user_badge"
@@ -139,7 +139,7 @@
         <View
             android:layout_width="0dp"
             android:layout_height="0.5dp"
-            android:background="@color/text_eeeeee"
+            android:background="@color/text_f5f5f5"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/attentionTv"
             app:layout_constraintStart_toStartOf="@+id/userFansCountTv" />
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index c299214efb..349bede2a4 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -109,6 +109,7 @@
         <attr name="gameIconBorderColor" format="color|reference" />
         <attr name="gameIconBorderWidth" format="dimension" />
         <attr name="gameIconFadeDuration" format="integer" />
+        <attr name="gameIconOverlayColor" format="color|reference" />
     </declare-styleable>
 
     <declare-styleable name="ExpandTextView">