diff --git a/app/src/main/java/com/gh/common/util/CommentUtils.java b/app/src/main/java/com/gh/common/util/CommentUtils.java
index 6a4619ddac..c7a7a840a3 100644
--- a/app/src/main/java/com/gh/common/util/CommentUtils.java
+++ b/app/src/main/java/com/gh/common/util/CommentUtils.java
@@ -450,7 +450,7 @@ public class CommentUtils {
             }
             commentEntity.setVote(commentEntity.getVote() + 1);
             commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme));
-            commentLikeIv.setImageResource(R.drawable.ic_like_select);
+            commentLikeIv.setImageResource(R.drawable.vote_icon_select);
             commentLikeCountTv.setText(String.valueOf(commentEntity.getVote()));
             commentLikeCountTv.setVisibility(View.VISIBLE);
 
@@ -468,7 +468,7 @@ public class CommentUtils {
 
                             commentEntity.setVote(commentEntity.getVote() - 1);
                             commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
-                            commentLikeIv.setImageResource(R.drawable.ic_like_unselect);
+                            commentLikeIv.setImageResource(R.drawable.vote_icon_unselect);
                             commentLikeCountTv.setText(String.valueOf(commentEntity.getVote()));
                             if (commentEntity.getVote() == 0) {
                                 commentLikeCountTv.setVisibility(View.GONE);
@@ -506,7 +506,7 @@ public class CommentUtils {
             }
             commentEntity.setVote(commentEntity.getVote() + 1);
             commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme));
-            commentLikeIv.setImageResource(R.drawable.ic_like_select);
+            commentLikeIv.setImageResource(R.drawable.vote_icon_select);
             commentLikeCountTv.setText(String.valueOf(commentEntity.getVote()));
             commentLikeCountTv.setVisibility(View.VISIBLE);
 
@@ -524,7 +524,7 @@ public class CommentUtils {
 
                             commentEntity.setVote(commentEntity.getVote() - 1);
                             commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
-                            commentLikeIv.setImageResource(R.drawable.ic_like_unselect);
+                            commentLikeIv.setImageResource(R.drawable.vote_icon_unselect);
                             commentLikeCountTv.setText(String.valueOf(commentEntity.getVote()));
                             if (commentEntity.getVote() == 0) {
                                 commentLikeCountTv.setVisibility(View.GONE);
@@ -557,14 +557,14 @@ public class CommentUtils {
     public static void setCommentUserView(Context mContext, CommentViewHolder holder, CommentEntity entity) {
         MeEntity userDataEntity = entity.getMe();
         holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, R.color.hint));
-        holder.commentLikeIv.setImageResource(R.drawable.ic_like_unselect);
+        holder.commentLikeIv.setImageResource(R.drawable.vote_icon_unselect);
 
         if (entity.getVote() == 0) {
             holder.commentLikeCountTv.setVisibility(View.GONE);
         } else { // 检查是否已点赞
             if (userDataEntity != null && (userDataEntity.isCommentVoted() || userDataEntity.isAnswerCommentVoted())) {
                 holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, R.color.theme));
-                holder.commentLikeIv.setImageResource(R.drawable.ic_like_select);
+                holder.commentLikeIv.setImageResource(R.drawable.vote_icon_select);
             }
             holder.commentLikeCountTv.setVisibility(View.VISIBLE);
             holder.commentLikeCountTv.setText(NumberUtils.transSimpleCount(entity.getVote()));
diff --git a/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java b/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java
index 1992e438bc..113c47b872 100644
--- a/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java
@@ -2,7 +2,9 @@ package com.gh.gamecenter;
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.Bundle;
 
+import com.gh.common.util.EntranceUtils;
 import com.gh.gamecenter.message.KeFuFragment;
 
 /**
@@ -16,7 +18,9 @@ public class MessageKeFuActivity extends NormalActivity {
         return getTargetIntent(this, MessageKeFuActivity.class, KeFuFragment.class);
     }
 
-    public static Intent getIntent(Context context) {
-        return getTargetIntent(context, MessageKeFuActivity.class, KeFuFragment.class);
+    public static Intent getIntent(Context context, String entrance) {
+        Bundle bundle = new Bundle();
+        bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance);
+        return getTargetIntent(context, MessageKeFuActivity.class, KeFuFragment.class, bundle);
     }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java
index 45e594fb9f..bdc1ec1101 100644
--- a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java
@@ -121,9 +121,9 @@ public class KeFuFragmentAdapter extends ListAdapter<MessageKeFuEntity> {
         }
 
         if (keFuEntity.isRead()) {
-            viewHolder.itemView.setBackgroundResource(R.drawable.reuse_listview_item_style);
+            viewHolder.unread.setVisibility(View.GONE);
         } else {
-            viewHolder.itemView.setBackgroundResource(R.drawable.list_unread_item_style);
+            viewHolder.unread.setVisibility(View.VISIBLE);
         }
 
         viewHolder.kefuIcon.setOnClickListener(v -> {
diff --git a/app/src/main/java/com/gh/gamecenter/message/KeFuViewHolder.java b/app/src/main/java/com/gh/gamecenter/message/KeFuViewHolder.java
index f68db7efa8..aa49cfd81b 100644
--- a/app/src/main/java/com/gh/gamecenter/message/KeFuViewHolder.java
+++ b/app/src/main/java/com/gh/gamecenter/message/KeFuViewHolder.java
@@ -32,6 +32,8 @@ public class KeFuViewHolder extends BaseRecyclerViewHolder<MessageKeFuEntity> {
     public SimpleDraweeView badgeIcon;
     @BindView(R.id.message_kefu_name)
     TextView kefuName;
+    @BindView(R.id.message_kefu_unread)
+    View unread;
 
     public KeFuViewHolder(View itemView, OnListClickListener listClickListener) {
         super(itemView, listClickListener);
diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java
index 79cd544664..761f2ee885 100644
--- a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java
@@ -77,7 +77,7 @@ public class MessageFragment extends ListFragment<MessageEntity, MessageViewMode
                 return;
             case R.id.message_service:
                 MtaHelper.onEvent("消息中心", "二级入口", "系统");
-                startActivity(MessageKeFuActivity.getIntent(getContext()));
+                startActivity(MessageKeFuActivity.getIntent(getContext(), mEntrance));
                 return;
         }
 
diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java
index be6ab2ab97..d1c114cf26 100644
--- a/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java
+++ b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java
@@ -243,12 +243,6 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
             MtaHelper.onEvent("消息中心", mOuterInfo, "点击名字");
             PersonalHomeActivity.startTargetActivity(itemView.getContext(), messageEntity.getUserEntity().getId(), entrance, "消息中心-邀同及赞请");
         });
-
-        if (messageEntity.getRead()) {
-            itemView.setBackgroundResource(R.drawable.reuse_listview_item_style);
-        } else {
-            itemView.setBackgroundResource(R.drawable.list_unread_item_style);
-        }
     }
 
     public static void messageItemClickSkip(View view, MessageEntity entity, String entrance, String outerInfo, String path) {
diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageNormalAdapter.java b/app/src/main/java/com/gh/gamecenter/message/MessageNormalAdapter.java
index 16c5e4a1cc..963dfcb5da 100644
--- a/app/src/main/java/com/gh/gamecenter/message/MessageNormalAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/message/MessageNormalAdapter.java
@@ -55,7 +55,9 @@ public class MessageNormalAdapter extends ListAdapter<MessageEntity> {
         switch (getItemViewType(position)) {
             case ItemViewType.ITEM_BODY:
                 MessageItemViewHolder viewHolder = (MessageItemViewHolder) holder;
-                viewHolder.setMessageItem(mEntityList.get(position), mEntrance);
+                MessageEntity entity = mEntityList.get(position);
+                entity.setRead(true);
+                viewHolder.setMessageItem(entity, mEntrance);
                 break;
             case ItemViewType.ITEM_FOOTER:
                 ((FooterViewHolder) holder).initFooterViewHolder(mIsLoading, mIsNetworkError, mIsOver, R.string.ask_loadover_hint);
diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageNormalFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageNormalFragment.java
index 5ae17937b5..c051eee345 100644
--- a/app/src/main/java/com/gh/gamecenter/message/MessageNormalFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/message/MessageNormalFragment.java
@@ -15,6 +15,7 @@ import com.halo.assistant.HaloApp;
 
 /**
  * Created by khy on 24/03/18.
+ * 不需要未读机制
  */
 
 public class MessageNormalFragment extends ListFragment<MessageEntity, MessageNormalViewModel> {
@@ -84,9 +85,9 @@ public class MessageNormalFragment extends ListFragment<MessageEntity, MessageNo
         MessageEntity entity = (MessageEntity) data;
         String path = "我的光环-消息中心-" + mTitle;
         MessageItemViewHolder.messageItemClickSkip(view, entity, mEntrance, mOuterInfo, path);
-        if (!entity.getRead()) {
-            mListViewModel.postMessageRead(entity.getId(), entity.getType());
-            mAdapter.notifyItemChanged(position);
-        }
+//        if (!entity.getRead()) {
+//            mListViewModel.postMessageRead(entity.getId(), entity.getType());
+//            mAdapter.notifyItemChanged(position);
+//        }
     }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageNormalViewModel.kt b/app/src/main/java/com/gh/gamecenter/message/MessageNormalViewModel.kt
index 0ef4948226..b213e8173a 100644
--- a/app/src/main/java/com/gh/gamecenter/message/MessageNormalViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/message/MessageNormalViewModel.kt
@@ -6,16 +6,9 @@ import android.arch.lifecycle.ViewModelProvider
 import com.gh.gamecenter.baselist.ListViewModel
 import com.gh.gamecenter.entity.MessageEntity
 import com.gh.gamecenter.manager.UserManager
-import com.gh.gamecenter.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.lightgame.utils.Utils
 import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
-import okhttp3.MediaType
-import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import org.json.JSONObject
 
 class MessageNormalViewModel(application: Application,
                              private val mMessageType: String) : ListViewModel<MessageEntity, MessageEntity>(application) {
@@ -29,30 +22,30 @@ class MessageNormalViewModel(application: Application,
     }
 
 
-    fun postMessageRead(messageId: String, type: String) {
-
-        // 更新本地数据以及页面
-        val listData = mListLiveData.value
-        if (listData != null) {
-            for (entity in listData) {
-                if (messageId == entity.id) {
-                    entity.read = true
-                    mListLiveData.value = listData
-                    break
-                }
-            }
-        }
-
-        // 后端同步
-        val jsonObject = JSONObject()
-        jsonObject.put("type", type)
-        val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString())
-        RetrofitManager.getInstance(getApplication()).api.postMessageRead(UserManager.getInstance().userId, messageId, body)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(object : Response<ResponseBody>() {
-                })
-    }
+//    fun postMessageRead(messageId: String, type: String) {
+//
+//        // 更新本地数据以及页面
+//        val listData = mListLiveData.value
+//        if (listData != null) {
+//            for (entity in listData) {
+//                if (messageId == entity.id) {
+//                    entity.read = true
+//                    mListLiveData.value = listData
+//                    break
+//                }
+//            }
+//        }
+//
+//        // 后端同步
+//        val jsonObject = JSONObject()
+//        jsonObject.put("type", type)
+//        val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString())
+//        RetrofitManager.getInstance(getApplication()).api.postMessageRead(UserManager.getInstance().userId, messageId, body)
+//                .subscribeOn(Schedulers.io())
+//                .observeOn(AndroidSchedulers.mainThread())
+//                .subscribe(object : Response<ResponseBody>() {
+//                })
+//    }
 
     class Factory(private val mApplication: Application,
                   private val mMessageType: String) : ViewModelProvider.NewInstanceFactory() {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt
index bf735e994f..d523962f56 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt
@@ -56,12 +56,11 @@ class MyArticleFragment : ListFragment<ArticleEntity, NormalListViewModel<Articl
 
         if (activity is MyArticleActivity) {
             initMenu(R.menu.menu_article_publich)
-        }
-
-        if (mTargetUserId == UserManager.getInstance().userId) {
-            setNavigationTitle("我的文章")
-        } else {
-            setNavigationTitle("Ta的文章")
+            if (mTargetUserId == UserManager.getInstance().userId) {
+                setNavigationTitle("我的文章")
+            } else {
+                setNavigationTitle("Ta的文章")
+            }
         }
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt
index 2fe71e9627..8b32eaac99 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt
@@ -31,7 +31,6 @@ import com.gh.gamecenter.manager.UserManager
 import com.gh.gamecenter.mvvm.Status
 import com.gh.gamecenter.qa.article.edit.ArticleEditActivity
 import com.gh.gamecenter.qa.comment.CommentActivity
-import com.gh.gamecenter.qa.entity.ArticleDetailEntity
 import com.gh.gamecenter.suggest.SuggestType
 import com.google.android.flexbox.FlexboxLayout
 import kotterknife.bindView
diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftFragment.kt
index e695522e6c..305c00680c 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftFragment.kt
@@ -61,7 +61,9 @@ class ArticleDraftFragment : ListFragment<ArticleDraftEntity, NormalListViewMode
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setNavigationTitle("文章草稿")
+        if (activity is ArticleDraftActivity) {
+            setNavigationTitle("文章草稿")
+        }
     }
 
 
diff --git a/app/src/main/res/drawable-nodpi/splash_01.webp b/app/src/main/res/drawable-nodpi/splash_01.webp
index 63d3b733fa..3f35140f06 100644
Binary files a/app/src/main/res/drawable-nodpi/splash_01.webp and b/app/src/main/res/drawable-nodpi/splash_01.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/game_detail_concern_unselect.png b/app/src/main/res/drawable-xhdpi/game_detail_concern_unselect.png
index ecd4b075e2..841853eca1 100644
Binary files a/app/src/main/res/drawable-xhdpi/game_detail_concern_unselect.png and b/app/src/main/res/drawable-xhdpi/game_detail_concern_unselect.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_answer_detail_edit_empty.png b/app/src/main/res/drawable-xhdpi/ic_answer_detail_edit_empty.png
index 263eabd5e9..8eb73253e2 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_answer_detail_edit_empty.png and b/app/src/main/res/drawable-xhdpi/ic_answer_detail_edit_empty.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_answer_detail_edit_full.png b/app/src/main/res/drawable-xhdpi/ic_answer_detail_edit_full.png
index 56f90e1b99..e4f50a5f75 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_answer_detail_edit_full.png and b/app/src/main/res/drawable-xhdpi/ic_answer_detail_edit_full.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_comment.png b/app/src/main/res/drawable-xhdpi/ic_comment.png
index b957e23c71..b53f55a60c 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_comment.png and b/app/src/main/res/drawable-xhdpi/ic_comment.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_edit.png b/app/src/main/res/drawable-xhdpi/ic_edit.png
index f7d805bacf..b2e8bdbda9 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_edit.png and b/app/src/main/res/drawable-xhdpi/ic_edit.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_like_select.png b/app/src/main/res/drawable-xhdpi/ic_like_select.png
deleted file mode 100644
index fcdd323d74..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_like_select.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_like_unselect.png b/app/src/main/res/drawable-xhdpi/ic_like_unselect.png
deleted file mode 100644
index e43bb5c914..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_like_unselect.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_read.png b/app/src/main/res/drawable-xhdpi/ic_read.png
index 280ca2c531..be398c058e 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_read.png and b/app/src/main/res/drawable-xhdpi/ic_read.png differ
diff --git a/app/src/main/res/drawable-xhdpi/menu_more.png b/app/src/main/res/drawable-xhdpi/menu_more.png
index 9f51a5056f..2013fb2c79 100644
Binary files a/app/src/main/res/drawable-xhdpi/menu_more.png and b/app/src/main/res/drawable-xhdpi/menu_more.png differ
diff --git a/app/src/main/res/drawable-xhdpi/menu_more_edit.png b/app/src/main/res/drawable-xhdpi/menu_more_edit.png
index 73af069c67..793420f650 100644
Binary files a/app/src/main/res/drawable-xhdpi/menu_more_edit.png and b/app/src/main/res/drawable-xhdpi/menu_more_edit.png differ
diff --git a/app/src/main/res/drawable-xhdpi/menu_more_report.png b/app/src/main/res/drawable-xhdpi/menu_more_report.png
index ea2bf2e63c..8a113fe8a5 100644
Binary files a/app/src/main/res/drawable-xhdpi/menu_more_report.png and b/app/src/main/res/drawable-xhdpi/menu_more_report.png differ
diff --git a/app/src/main/res/drawable-xhdpi/rating_comment_vote_select.png b/app/src/main/res/drawable-xhdpi/rating_comment_vote_select.png
deleted file mode 100644
index 8ea70341a2..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/rating_comment_vote_select.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/rating_comment_vote_unselect.png b/app/src/main/res/drawable-xhdpi/rating_comment_vote_unselect.png
deleted file mode 100644
index 9a9b36bf45..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/rating_comment_vote_unselect.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/share_icon_gray.png b/app/src/main/res/drawable-xhdpi/share_icon_gray.png
index 698b15a2c3..7480632dec 100644
Binary files a/app/src/main/res/drawable-xhdpi/share_icon_gray.png and b/app/src/main/res/drawable-xhdpi/share_icon_gray.png differ
diff --git a/app/src/main/res/drawable-xhdpi/vote_icon_select.png b/app/src/main/res/drawable-xhdpi/vote_icon_select.png
new file mode 100644
index 0000000000..22774bc86e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vote_icon_select.png differ
diff --git a/app/src/main/res/drawable-xhdpi/vote_icon_unselect.png b/app/src/main/res/drawable-xhdpi/vote_icon_unselect.png
new file mode 100644
index 0000000000..91abaf00e6
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vote_icon_unselect.png differ
diff --git a/app/src/main/res/drawable/rating_comment_vote_style.xml b/app/src/main/res/drawable/rating_comment_vote_style.xml
index 55ad206569..001b96adaa 100644
--- a/app/src/main/res/drawable/rating_comment_vote_style.xml
+++ b/app/src/main/res/drawable/rating_comment_vote_style.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android = "http://schemas.android.com/apk/res/android" >
 
-    <item android:drawable = "@drawable/rating_comment_vote_select" android:state_checked = "true" />
-    <item android:drawable = "@drawable/rating_comment_vote_unselect" android:state_checked = "false" />
-    <item android:drawable = "@drawable/rating_comment_vote_unselect" />
+    <item android:drawable = "@drawable/vote_icon_select" android:state_checked = "true" />
+    <item android:drawable = "@drawable/vote_icon_unselect" android:state_checked = "false" />
+    <item android:drawable = "@drawable/vote_icon_unselect" />
 
 </selector >
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_news_detail.xml b/app/src/main/res/layout/activity_news_detail.xml
index 9eafa1fcc9..971ed67918 100644
--- a/app/src/main/res/layout/activity_news_detail.xml
+++ b/app/src/main/res/layout/activity_news_detail.xml
@@ -63,6 +63,7 @@
                             android:layout_height = "wrap_content"
                             android:layout_centerVertical = "true"
                             android:layout_marginLeft = "10dp"
+                            android:paddingBottom="1dp"
                             android:layout_toRightOf = "@+id/comment_icon"
                             android:text = "@string/news_detail_send_comment"
                             android:textColor = "@color/button_gray"
diff --git a/app/src/main/res/layout/activity_rating_edit.xml b/app/src/main/res/layout/activity_rating_edit.xml
index 059587dc53..a3e0f0d588 100644
--- a/app/src/main/res/layout/activity_rating_edit.xml
+++ b/app/src/main/res/layout/activity_rating_edit.xml
@@ -19,7 +19,7 @@
             android:layout_width = "match_parent"
             android:layout_height = "wrap_content"
             android:paddingBottom = "15dp"
-            android:paddingTop = "15dp" >
+            android:paddingTop = "12dp" >
 
             <TextView
                 android:id = "@+id/rating_edit_name"
@@ -34,11 +34,11 @@
             <com.gh.common.view.materialratingbar.MaterialRatingBar
                 android:id = "@+id/rating_score"
                 style = "@style/Widget.MaterialRatingBar.RatingBar"
-                android:layout_width = "150dp"
+                android:layout_width = "140dp"
                 android:layout_height = "18dp"
                 android:layout_below = "@+id/rating_edit_name"
                 android:layout_marginLeft = "15dp"
-                android:layout_marginTop = "18dp"
+                android:layout_marginTop = "15dp"
                 android:rating = "5"
                 android:stepSize = "1"
                 app:mrb_progressBackgroundTint = "@color/theme"
@@ -93,7 +93,7 @@
             android:hint = "说说你的想法..."
             android:maxLength = "5000"
             android:minLines = "3"
-            android:paddingTop = "15dp"
+            android:paddingTop = "12dp"
             android:textColorHint = "@color/hint"
             android:textCursorDrawable = "@drawable/cursor_color"
             android:textSize = "13sp" />
diff --git a/app/src/main/res/layout/comment_item.xml b/app/src/main/res/layout/comment_item.xml
index 132ac6fd9b..641db1c199 100644
--- a/app/src/main/res/layout/comment_item.xml
+++ b/app/src/main/res/layout/comment_item.xml
@@ -115,7 +115,7 @@
                         android:paddingLeft="7dp"
                         android:paddingRight="10dp"
                         android:paddingTop="6dp"
-                        android:src="@drawable/ic_like_unselect" />
+                        android:src="@drawable/vote_icon_unselect" />
                 </LinearLayout>
 
             </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_answer_detail.xml b/app/src/main/res/layout/fragment_answer_detail.xml
index 4e84fb59a1..8806f3b6a9 100644
--- a/app/src/main/res/layout/fragment_answer_detail.xml
+++ b/app/src/main/res/layout/fragment_answer_detail.xml
@@ -129,7 +129,7 @@
                     android:layout_marginLeft = "20dp"
                     android:layout_marginTop = "15dp"
                     app:layout_constraintLeft_toLeftOf = "parent"
-                    app:layout_constraintTop_toBottomOf = "@id/answer_detail_line2">
+                    app:layout_constraintTop_toBottomOf = "@id/answer_detail_line2" >
 
                     <com.facebook.drawee.view.SimpleDraweeView
                         android:id = "@+id/answer_detail_usericon"
@@ -145,7 +145,7 @@
                         android:layout_alignParentBottom = "true"
                         android:layout_alignParentRight = "true" />
 
-                </RelativeLayout>
+                </RelativeLayout >
 
                 <TextView
                     android:id = "@+id/answer_detail_username"
@@ -168,12 +168,12 @@
                     android:gravity = "center"
                     android:textColor = "@android:color/white"
                     android:textSize = "11sp"
+                    android:visibility = "gone"
                     app:layout_constraintBottom_toTopOf = "@+id/answer_detail_Rd"
                     app:layout_constraintRight_toLeftOf = "parent"
                     app:layout_constraintTop_toBottomOf = "@id/answer_detail_line2"
-                    android:visibility = "gone"
                     tools:text = "关注"
-                    tools:visibility = "visible"/>
+                    tools:visibility = "visible" />
 
                 <com.gh.common.view.RichEditor
                     android:id = "@+id/answer_detail_Rd"
diff --git a/app/src/main/res/layout/fragment_personal.xml b/app/src/main/res/layout/fragment_personal.xml
index 2aa28d2d6a..3ea2ffc88a 100644
--- a/app/src/main/res/layout/fragment_personal.xml
+++ b/app/src/main/res/layout/fragment_personal.xml
@@ -40,7 +40,7 @@
                         android:layout_width = "23dp"
                         android:layout_height = "23dp"
                         android:layout_alignParentBottom = "true"
-                        android:layout_alignParentRight = "true"/>
+                        android:layout_alignParentRight = "true" />
                 </RelativeLayout >
 
                 <ImageView
@@ -188,7 +188,7 @@
             </LinearLayout >
 
             <RelativeLayout
-                android:id = "@+id/personal_home"
+                android:id = "@+id/personal_game"
                 android:layout_width = "match_parent"
                 android:layout_height = "48dp"
                 android:layout_marginTop = "8dp"
@@ -196,6 +196,42 @@
                 android:paddingLeft = "18dp"
                 android:paddingRight = "18dp" >
 
+                <ImageView
+                    android:id = "@+id/personal_game_icon"
+                    android:layout_width = "18dp"
+                    android:layout_height = "18dp"
+                    android:layout_centerVertical = "true"
+                    android:layout_marginRight = "18dp"
+                    android:src = "@drawable/personal_game_icon" />
+
+                <TextView
+                    android:layout_width = "wrap_content"
+                    android:layout_height = "wrap_content"
+                    android:layout_centerVertical = "true"
+                    android:layout_toRightOf = "@+id/personal_game_icon"
+                    android:text = "@string/personale_mygame"
+                    android:textColor = "@color/title"
+                    android:textSize = "15sp" />
+
+                <TextView
+                    android:layout_width = "wrap_content"
+                    android:layout_height = "wrap_content"
+                    android:layout_alignParentRight = "true"
+                    android:layout_centerVertical = "true"
+                    android:text = "@string/title_share_via_wifi"
+                    android:textColor = "@color/hint"
+                    android:textSize = "12sp" />
+            </RelativeLayout >
+
+            <RelativeLayout
+                android:id = "@+id/personal_home"
+                android:layout_width = "match_parent"
+                android:layout_height = "48dp"
+                android:layout_marginTop = "1dp"
+                android:background = "@drawable/reuse_listview_item_style"
+                android:paddingLeft = "18dp"
+                android:paddingRight = "18dp" >
+
                 <ImageView
                     android:id = "@+id/personal_home_icon"
                     android:layout_width = "18dp"
@@ -231,53 +267,11 @@
             </RelativeLayout >
 
 
-            <RelativeLayout
-                android:id = "@+id/personal_game"
-                android:layout_width = "match_parent"
-                android:layout_height = "48dp"
-                android:layout_marginTop = "8dp"
-                android:background = "@drawable/reuse_listview_item_style"
-                android:paddingLeft = "18dp"
-                android:paddingRight = "18dp" >
-
-                <ImageView
-                    android:id = "@+id/personal_game_icon"
-                    android:layout_width = "18dp"
-                    android:layout_height = "18dp"
-                    android:layout_centerVertical = "true"
-                    android:layout_marginRight = "18dp"
-                    android:src = "@drawable/personal_game_icon" />
-
-                <TextView
-                    android:layout_width = "wrap_content"
-                    android:layout_height = "wrap_content"
-                    android:layout_centerVertical = "true"
-                    android:layout_toRightOf = "@+id/personal_game_icon"
-                    android:text = "@string/personale_mygame"
-                    android:textColor = "@color/title"
-                    android:textSize = "15sp" />
-
-                <TextView
-                    android:layout_width = "wrap_content"
-                    android:layout_height = "wrap_content"
-                    android:layout_alignParentRight = "true"
-                    android:layout_centerVertical = "true"
-                    android:text = "@string/title_share_via_wifi"
-                    android:textColor = "@color/hint"
-                    android:textSize = "12sp" />
-            </RelativeLayout >
-
-            <!--<android.support.v7.widget.RecyclerView-->
-            <!--android:id = "@+id/personal_game_rv"-->
-            <!--android:layout_width = "match_parent"-->
-            <!--android:layout_height = "wrap_content"-->
-            <!--android:background = "@android:color/white" />-->
-
             <RelativeLayout
                 android:id = "@+id/personal_ask"
                 android:layout_width = "match_parent"
                 android:layout_height = "48dp"
-                android:layout_marginTop = "1dp"
+                android:layout_marginTop = "8dp"
                 android:background = "@drawable/reuse_listview_item_style"
                 android:paddingLeft = "18dp"
                 android:paddingRight = "18dp" >
diff --git a/app/src/main/res/layout/gamedetail_body.xml b/app/src/main/res/layout/gamedetail_body.xml
index 464b4405bf..fac4353004 100644
--- a/app/src/main/res/layout/gamedetail_body.xml
+++ b/app/src/main/res/layout/gamedetail_body.xml
@@ -13,7 +13,7 @@
         android:layout_height = "wrap_content"
         android:background = "@android:color/white"
         android:gravity = "center"
-        android:visibility = "gone" >
+        android:visibility = "visible" >
 
         <LinearLayout
             android:layout_width = "match_parent"
@@ -22,7 +22,7 @@
             android:orientation = "horizontal"
             android:paddingBottom = "10dp"
             android:paddingLeft = "10dp"
-            android:paddingRight = "18dp"
+            android:paddingRight = "20dp"
             android:paddingTop = "15dp"
             app:layout_scrollFlags = "scroll|enterAlwaysCollapsed" >
 
@@ -91,7 +91,7 @@
                     android:id = "@+id/gamedetail_tv_info"
                     android:layout_width = "wrap_content"
                     android:layout_height = "wrap_content"
-                    android:layout_marginTop = "10dp"
+                    android:layout_marginTop = "7dp"
                     android:textColor = "@color/hint"
                     android:textSize = "11sp" />
 
@@ -123,8 +123,8 @@
             android:id = "@+id/gamedetail_tabbar"
             android:layout_width = "wrap_content"
             android:layout_height = "25dp"
-            android:layout_marginBottom = "15dp"
-            android:layout_marginTop = "10dp"
+            android:layout_marginBottom = "20dp"
+            android:layout_marginTop = "5dp"
             android:background = "@drawable/border_black_bg" >
 
             <CheckedTextView
diff --git a/app/src/main/res/layout/message_item.xml b/app/src/main/res/layout/message_item.xml
index dca64afc12..822aecb6be 100644
--- a/app/src/main/res/layout/message_item.xml
+++ b/app/src/main/res/layout/message_item.xml
@@ -17,12 +17,15 @@
         android:paddingBottom = "9dp"
         android:paddingLeft = "20dp"
         android:paddingRight = "20dp"
-        android:paddingTop = "15dp" >
+        android:paddingTop = "13dp" >
 
         <RelativeLayout
             android:id = "@+id/message_icon_container"
             android:layout_width = "40dp"
-            android:layout_height = "40dp">
+            android:layout_height = "40dp"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginTop="2dp">
+
 
             <com.facebook.drawee.view.SimpleDraweeView
                 android:id = "@+id/message_user_icon"
@@ -38,14 +41,24 @@
                 android:layout_height = "13dp"
                 android:layout_alignParentBottom = "true"
                 android:layout_alignParentRight = "true" />
-        </RelativeLayout>
+        </RelativeLayout >
+
+        <View
+            android:id = "@+id/message_unread"
+            android:layout_width = "6dp"
+            android:layout_height = "6dp"
+            android:background = "@drawable/message_unread_hint"
+            app:layout_constraintTop_toTopOf="parent"
+            visibleGone="@{!messageEntity.read}"
+            android:layout_marginLeft="38dp"
+            app:layout_constraintLeft_toLeftOf="parent" />
 
         <TextView
             android:id = "@+id/message_user_name"
             android:layout_width = "wrap_content"
             android:layout_height = "wrap_content"
             android:layout_marginLeft = "14dp"
-            android:layout_marginTop = "4dp"
+            android:layout_marginTop = "6dp"
             android:text = "@{messageEntity.userEntity.name}"
             android:textColor = "@color/black"
             android:textSize = "13sp"
@@ -57,7 +70,7 @@
             android:layout_width = "wrap_content"
             android:layout_height = "wrap_content"
             android:layout_marginLeft = "10dp"
-            android:layout_marginTop = "4dp"
+            android:layout_marginTop = "6dp"
             android:textColor = "@color/title"
             android:textSize = "13sp"
             app:layout_constraintLeft_toRightOf = "@id/message_user_name"
diff --git a/app/src/main/res/layout/message_kefu_item.xml b/app/src/main/res/layout/message_kefu_item.xml
index 36341f4554..dd984797be 100644
--- a/app/src/main/res/layout/message_kefu_item.xml
+++ b/app/src/main/res/layout/message_kefu_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android = "http://schemas.android.com/apk/res/android"
-    android:id="@+id/message_kaifu_item"
     xmlns:fresco = "http://schemas.android.com/apk/res-auto"
+    android:id = "@+id/message_kaifu_item"
     android:layout_width = "match_parent"
     android:layout_height = "wrap_content"
     android:background = "@drawable/reuse_listview_item_style"
@@ -9,58 +9,72 @@
     android:paddingBottom = "12dp"
     android:paddingLeft = "20dp"
     android:paddingRight = "20dp"
-    android:paddingTop = "20dp" >
+    android:paddingTop = "18dp" >
 
     <RelativeLayout
         android:layout_width = "match_parent"
         android:layout_height = "wrap_content" >
 
         <RelativeLayout
-            android:id = "@+id/message_icon_container"
-            android:layout_width = "40dp"
-            android:layout_height = "40dp"
-            android:layout_marginRight = "15dp">
+            android:layout_width = "match_parent"
+            android:layout_height = "wrap_content"
+            android:layout_marginTop = "2dp" >
 
-            <com.facebook.drawee.view.SimpleDraweeView
-                android:id = "@+id/message_kefu_icon"
+            <RelativeLayout
+                android:id = "@+id/message_icon_container"
                 android:layout_width = "40dp"
                 android:layout_height = "40dp"
-                fresco:placeholderImageScaleType = "fitXY"
-                fresco:roundAsCircle = "true" />
+                android:layout_marginRight = "15dp" >
 
-            <com.facebook.drawee.view.SimpleDraweeView
-                android:id = "@+id/message_user_badge"
-                android:layout_width = "13dp"
-                android:layout_height = "13dp"
-                android:layout_alignParentBottom = "true"
-                android:layout_alignParentRight = "true" />
-        </RelativeLayout>
+                <com.facebook.drawee.view.SimpleDraweeView
+                    android:id = "@+id/message_kefu_icon"
+                    android:layout_width = "40dp"
+                    android:layout_height = "40dp"
+                    fresco:placeholderImageScaleType = "fitXY"
+                    fresco:roundAsCircle = "true" />
 
-        <TextView
-            android:id = "@+id/message_kefu_name"
-            android:layout_width = "wrap_content"
-            android:layout_height = "wrap_content"
-            android:layout_toRightOf = "@id/message_icon_container"
-            android:textColor = "@android:color/black"
-            android:textSize = "15sp" />
+                <com.facebook.drawee.view.SimpleDraweeView
+                    android:id = "@+id/message_user_badge"
+                    android:layout_width = "13dp"
+                    android:layout_height = "13dp"
+                    android:layout_alignParentBottom = "true"
+                    android:layout_alignParentRight = "true" />
+            </RelativeLayout >
+
+            <TextView
+                android:id = "@+id/message_kefu_name"
+                android:layout_width = "wrap_content"
+                android:layout_height = "wrap_content"
+                android:layout_toRightOf = "@id/message_icon_container"
+                android:textColor = "@android:color/black"
+                android:textSize = "15sp" />
+
+            <TextView
+                android:id = "@+id/message_kefu_time"
+                android:layout_width = "wrap_content"
+                android:layout_height = "wrap_content"
+                android:layout_below = "@id/message_kefu_name"
+                android:layout_marginTop = "5dp"
+                android:layout_toRightOf = "@id/message_icon_container"
+                android:textColor = "@color/hint"
+                android:textSize = "12sp" />
+
+            <View
+                android:id = "@+id/message_kefu_hint"
+                android:layout_width = "10dp"
+                android:layout_height = "10dp"
+                android:layout_alignParentRight = "true"
+                android:background = "@drawable/oval_message_hint_bg"
+                android:visibility = "gone" />
+        </RelativeLayout >
 
-        <TextView
-            android:id = "@+id/message_kefu_time"
-            android:layout_width = "wrap_content"
-            android:layout_height = "wrap_content"
-            android:layout_below = "@id/message_kefu_name"
-            android:layout_marginTop = "5dp"
-            android:layout_toRightOf = "@id/message_icon_container"
-            android:textColor = "@color/hint"
-            android:textSize = "12sp" />
 
         <View
-            android:id = "@+id/message_kefu_hint"
-            android:layout_width = "10dp"
-            android:layout_height = "10dp"
-            android:layout_alignParentRight = "true"
-            android:background = "@drawable/oval_message_hint_bg"
-            android:visibility = "gone" />
+            android:id = "@+id/message_kefu_unread"
+            android:layout_width = "6dp"
+            android:layout_height = "6dp"
+            android:layout_marginLeft = "38dp"
+            android:background = "@drawable/message_unread_hint" />
     </RelativeLayout >
 
     <TextView
diff --git a/app/src/main/res/layout/news_digest_item.xml b/app/src/main/res/layout/news_digest_item.xml
index aa1af02d21..819ff06181 100644
--- a/app/src/main/res/layout/news_digest_item.xml
+++ b/app/src/main/res/layout/news_digest_item.xml
@@ -64,7 +64,7 @@
         android:lineSpacingMultiplier = "1.2"
         android:paddingLeft = "20dp"
         android:paddingRight = "20dp"
-        android:textColor = "@color/title"
+        android:textColor = "@color/text_3a3a3a"
         android:textSize = "14sp" />
 
     <LinearLayout
diff --git a/app/src/main/res/layout/rating_item.xml b/app/src/main/res/layout/rating_item.xml
index 4173b56eb1..3f4dcc42c4 100644
--- a/app/src/main/res/layout/rating_item.xml
+++ b/app/src/main/res/layout/rating_item.xml
@@ -25,11 +25,10 @@
 
         <TextView
             android:layout_width = "match_parent"
-            android:layout_height = "wrap_content"
-            android:paddingBottom = "10dp"
+            android:layout_height = "45dp"
+            android:gravity = "center_vertical"
             android:paddingLeft = "18dp"
             android:paddingRight = "18dp"
-            android:paddingTop = "10dp"
             android:text = "游戏评分"
             android:textColor = "@color/black"
             android:textSize = "14sp"
@@ -124,7 +123,7 @@
                 <LinearLayout
                     android:layout_width = "match_parent"
                     android:layout_height = "wrap_content"
-                    android:layout_marginTop = "8dp"
+                    android:layout_marginTop = "5dp"
                     android:gravity = "center_vertical|right"
                     android:orientation = "horizontal" >
 
@@ -152,7 +151,7 @@
                 <LinearLayout
                     android:layout_width = "match_parent"
                     android:layout_height = "wrap_content"
-                    android:layout_marginTop = "8dp"
+                    android:layout_marginTop = "5dp"
                     android:gravity = "center_vertical|right"
                     android:orientation = "horizontal" >
 
@@ -180,7 +179,7 @@
                 <LinearLayout
                     android:layout_width = "match_parent"
                     android:layout_height = "wrap_content"
-                    android:layout_marginTop = "8dp"
+                    android:layout_marginTop = "5dp"
                     android:gravity = "center_vertical|right"
                     android:orientation = "horizontal" >
 
@@ -209,7 +208,7 @@
                     android:layout_width = "match_parent"
                     android:layout_height = "wrap_content"
                     android:layout_marginBottom = "16dp"
-                    android:layout_marginTop = "8dp"
+                    android:layout_marginTop = "5dp"
                     android:gravity = "center_vertical|right"
                     android:orientation = "horizontal" >
 
@@ -243,11 +242,10 @@
 
         <TextView
             android:layout_width = "match_parent"
-            android:layout_height = "wrap_content"
-            android:paddingBottom = "10dp"
+            android:layout_height = "45dp"
+            android:gravity = "center_vertical"
             android:paddingLeft = "18dp"
             android:paddingRight = "18dp"
-            android:paddingTop = "10dp"
             android:text = "你的评论"
             android:textColor = "@color/black"
             android:textSize = "14sp"
@@ -266,8 +264,8 @@
             android:id = "@+id/rating_selector"
             style = "@style/Widget.MaterialRatingBar.RatingBar"
             visibleGone = "@{data.comment == null}"
-            android:layout_width = "240dp"
-            android:layout_height = "wrap_content"
+            android:layout_width = "200dp"
+            android:layout_height = "30dp"
             android:layout_marginTop = "25dp"
             android:rating = "0"
             android:stepSize = "1"
@@ -280,8 +278,8 @@
             visibleGone = "@{data.comment == null}"
             android:layout_width = "90dp"
             android:layout_height = "33dp"
-            android:layout_marginBottom = "25dp"
-            android:layout_marginTop = "22dp"
+            android:layout_marginBottom = "20dp"
+            android:layout_marginTop = "25dp"
             android:background = "@color/theme"
             android:gravity = "center"
             android:text = "我来评论"
@@ -302,11 +300,10 @@
         <TextView
             visibleGone = "@{data.existComment}"
             android:layout_width = "match_parent"
-            android:layout_height = "wrap_content"
-            android:paddingBottom = "10dp"
+            android:layout_height = "45dp"
+            android:gravity = "center_vertical"
             android:paddingLeft = "18dp"
             android:paddingRight = "18dp"
-            android:paddingTop = "10dp"
             android:text = "全部评论"
             android:textColor = "@color/black"
             android:textSize = "14sp"