diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentViewHolder.java
index 16ac3f218f..84f13edb2b 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentViewHolder.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentViewHolder.java
@@ -33,6 +33,8 @@ public class CommentViewHolder extends BaseRecyclerViewHolder {
     public TextView commentUserNameTv;
     @BindView(R.id.comment_line_bottom)
     public View commentLineBottom;
+    @BindView(R.id.comment_badge)
+    public View commentBadge;
 
     public CommentViewHolder(View itemView) {
         super(itemView);
diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/comment/AnswerCommentAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/comment/AnswerCommentAdapter.java
index a94b28833b..9070b6d296 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/comment/AnswerCommentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/comment/AnswerCommentAdapter.java
@@ -88,6 +88,9 @@ public class AnswerCommentAdapter extends ListAdapter<CommentEntity> {
         holder.itemView.setOnClickListener(v -> CommentUtils.showAnswerCommentOptions(commentEntity, mContext, mOnCommentCallBackListener, null, !mIsShowingConversation, mAnswerId));
         holder.commentUserIconDv.setOnClickListener(v -> PersonalHomeActivity.startTargetActivity(mContext, commentEntity.getUser().getId(),"回答详情-评论管理"));
         holder.commentUserNameTv.setOnClickListener(v -> PersonalHomeActivity.startTargetActivity(mContext, commentEntity.getUser().getId(), "回答详情-评论管理"));
+
+        // TODO 根据字段判断是否需要显示指定标记
+        holder.commentBadge.setVisibility(View.VISIBLE);
     }
 
     private void initFooterViewHolder(FooterViewHolder holder) {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/comment/AnswerCommentFragment.java b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/comment/AnswerCommentFragment.java
index 523725ffb2..4d6695697e 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/comment/AnswerCommentFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/comment/AnswerCommentFragment.java
@@ -141,7 +141,7 @@ public class AnswerCommentFragment extends ListFragment<CommentEntity, AnswerCom
             DisplayMetrics displayMetrics = new DisplayMetrics();
             ((Activity) getContext()).getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
 
-            mCommentContainer.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, displayMetrics.heightPixels / 2));
+            mCommentContainer.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, displayMetrics.heightPixels * 2 / 3 ));
         }
     }
 
diff --git a/app/src/main/res/drawable-hdpi/sharecard_share_icon.png b/app/src/main/res/drawable-hdpi/sharecard_share_icon.png
index 6daf61550c..e9f4d31ae8 100644
Binary files a/app/src/main/res/drawable-hdpi/sharecard_share_icon.png and b/app/src/main/res/drawable-hdpi/sharecard_share_icon.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_answer_detail_check_comment.png b/app/src/main/res/drawable-xhdpi/ic_answer_detail_check_comment.png
index c671021235..b905c68222 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_answer_detail_check_comment.png and b/app/src/main/res/drawable-xhdpi/ic_answer_detail_check_comment.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
index 8ea70341a2..fcdd323d74 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_like_select.png and b/app/src/main/res/drawable-xhdpi/ic_like_select.png 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
index 9a9b36bf45..e43bb5c914 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_like_unselect.png and b/app/src/main/res/drawable-xhdpi/ic_like_unselect.png differ
diff --git a/app/src/main/res/drawable-xhdpi/menu_more_share.png b/app/src/main/res/drawable-xhdpi/menu_more_share.png
index fb03309a76..18d214058b 100644
Binary files a/app/src/main/res/drawable-xhdpi/menu_more_share.png and b/app/src/main/res/drawable-xhdpi/menu_more_share.png 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 d44dbc03b2..698b15a2c3 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-xxhdpi/menu_ic_share.png b/app/src/main/res/drawable-xxhdpi/menu_ic_share.png
index de457447b4..4c039d5901 100644
Binary files a/app/src/main/res/drawable-xxhdpi/menu_ic_share.png and b/app/src/main/res/drawable-xxhdpi/menu_ic_share.png differ
diff --git a/app/src/main/res/layout/answer_comment_item.xml b/app/src/main/res/layout/answer_comment_item.xml
index 6f93f4964b..7e727b3824 100644
--- a/app/src/main/res/layout/answer_comment_item.xml
+++ b/app/src/main/res/layout/answer_comment_item.xml
@@ -34,11 +34,12 @@
 
                 <com.facebook.drawee.view.SimpleDraweeView
                     android:id="@+id/comment_user_icon"
-                    android:layout_width="45dp"
-                    android:layout_height="45dp"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
                     fresco:placeholderImage="@drawable/user_default_icon_comment"
                     fresco:placeholderImageScaleType="fitXY"
-                    fresco:roundAsCircle="true" />
+                    fresco:roundAsCircle="true"
+                    tools:src="@drawable/ic_discover_select" />
 
                 <com.facebook.drawee.view.SimpleDraweeView
                     android:id="@+id/comment_user_badge"
@@ -59,12 +60,27 @@
 
                 <TextView
                     android:id="@+id/comment_user_name"
-                    android:layout_width="match_parent"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="@color/black"
                     android:textSize="12sp"
                     tools:text="孙一峰" />
 
+                <TextView
+                    android:id="@+id/comment_badge"
+                    android:layout_width="27dp"
+                    android:layout_height="13dp"
+                    android:layout_marginLeft="6dp"
+                    android:layout_marginTop="2dp"
+                    android:layout_toRightOf="@id/comment_user_name"
+                    android:background="@color/theme"
+                    android:gravity="center"
+                    android:text="置顶"
+                    android:textColor="#fff"
+                    android:textSize="9sp"
+                    android:visibility="gone"
+                    tools:visibility="visible"/>
+
                 <TextView
                     android:id="@+id/comment_time"
                     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_answer_comment.xml b/app/src/main/res/layout/fragment_answer_comment.xml
index aedf60b20e..82796ae3d7 100644
--- a/app/src/main/res/layout/fragment_answer_comment.xml
+++ b/app/src/main/res/layout/fragment_answer_comment.xml
@@ -7,7 +7,7 @@
     <RelativeLayout
         android:id="@+id/answer_comment_container"
         android:layout_width="match_parent"
-        android:layout_height="320dp"
+        android:layout_height="match_parent"
         android:background="@android:color/white"
         android:orientation="vertical">
 
diff --git a/app/src/main/res/layout/piece_comment_typing_container.xml b/app/src/main/res/layout/piece_comment_typing_container.xml
index 1d811617a5..68221f271f 100644
--- a/app/src/main/res/layout/piece_comment_typing_container.xml
+++ b/app/src/main/res/layout/piece_comment_typing_container.xml
@@ -33,13 +33,12 @@
                 android:layout_width = "match_parent"
                 android:layout_height = "wrap_content"
                 android:background = "@android:color/transparent"
-                android:drawableBottom = "@drawable/et_line"
                 android:hint = "请输入评论"
                 android:drawablePadding="4dp"
                 android:textColor = "@color/black"
-                android:textColorHint = "#b3b3b3"
+                android:textColorHint = "@color/theme"
                 android:textCursorDrawable = "@drawable/cursor_color"
-                android:textSize = "13sp" />
+                android:textSize = "14sp" />
         </ScrollView >
 
         <Button
diff --git a/dependencies.gradle b/dependencies.gradle
index c0b4389eaf..c9188ec61b 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -3,7 +3,7 @@ ext {
     buildToolsVersion = "27.0.3"
     compileSdkVersion = 27
     minSdkVersion = 14
-    // TODO fix permission/ target 23 will cause permission issues
+
     targetSdkVersion = 27
 
     // application info