diff --git a/app/src/main/res/drawable-ar-xhdpi/arrow_right_3.png b/app/src/main/res/drawable-ar-xhdpi/arrow_right_3.png
new file mode 100644
index 000000000..3af39740e
Binary files /dev/null and b/app/src/main/res/drawable-ar-xhdpi/arrow_right_3.png differ
diff --git a/app/src/main/res/drawable-ar-xhdpi/arrow_right_more_room.png b/app/src/main/res/drawable-ar-xhdpi/arrow_right_more_room.png
new file mode 100644
index 000000000..bebcec38a
Binary files /dev/null and b/app/src/main/res/drawable-ar-xhdpi/arrow_right_more_room.png differ
diff --git a/app/src/main/res/drawable-ar-xhdpi/ic_home_list_arrow_right.png b/app/src/main/res/drawable-ar-xhdpi/ic_home_list_arrow_right.png
new file mode 100644
index 000000000..ec067a9bc
Binary files /dev/null and b/app/src/main/res/drawable-ar-xhdpi/ic_home_list_arrow_right.png differ
diff --git a/app/src/main/res/drawable-ar-xhdpi/ic_tag_arrow.png b/app/src/main/res/drawable-ar-xhdpi/ic_tag_arrow.png
new file mode 100644
index 000000000..cbf77f233
Binary files /dev/null and b/app/src/main/res/drawable-ar-xhdpi/ic_tag_arrow.png differ
diff --git a/app/src/main/res/drawable-ar-xhdpi/icon_arrow_left_black.png b/app/src/main/res/drawable-ar-xhdpi/icon_arrow_left_black.png
new file mode 100644
index 000000000..3e09bb1e5
Binary files /dev/null and b/app/src/main/res/drawable-ar-xhdpi/icon_arrow_left_black.png differ
diff --git a/app/src/main/res/drawable-ar-xhdpi/icon_arrow_right_small.png b/app/src/main/res/drawable-ar-xhdpi/icon_arrow_right_small.png
new file mode 100644
index 000000000..5e1d08162
Binary files /dev/null and b/app/src/main/res/drawable-ar-xhdpi/icon_arrow_right_small.png differ
diff --git a/app/src/main/res/drawable-ar-xhdpi/icon_user_back.png b/app/src/main/res/drawable-ar-xhdpi/icon_user_back.png
new file mode 100644
index 000000000..77f037818
Binary files /dev/null and b/app/src/main/res/drawable-ar-xhdpi/icon_user_back.png differ
diff --git a/app/src/main/res/drawable-ar-xhdpi/icon_user_back_black.png b/app/src/main/res/drawable-ar-xhdpi/icon_user_back_black.png
new file mode 100644
index 000000000..6e4bd558d
Binary files /dev/null and b/app/src/main/res/drawable-ar-xhdpi/icon_user_back_black.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_tag_arrow.png b/app/src/main/res/drawable-xhdpi/ic_tag_arrow.png
new file mode 100644
index 000000000..6f29df660
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_tag_arrow.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_tag_arrow.webp b/app/src/main/res/drawable-xhdpi/ic_tag_arrow.webp
deleted file mode 100644
index 37b74b795..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_tag_arrow.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_arrow_left_black.png b/app/src/main/res/drawable-xhdpi/icon_arrow_left_black.png
new file mode 100644
index 000000000..55203fc3c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_arrow_left_black.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_arrow_left_black.webp b/app/src/main/res/drawable-xhdpi/icon_arrow_left_black.webp
deleted file mode 100644
index 4c456a735..000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_arrow_left_black.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_arrow_right_small.png b/app/src/main/res/drawable-xhdpi/icon_arrow_right_small.png
new file mode 100644
index 000000000..5948858b4
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_arrow_right_small.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_arrow_right_small.webp b/app/src/main/res/drawable-xhdpi/icon_arrow_right_small.webp
deleted file mode 100644
index 8f660039a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_arrow_right_small.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_user_back.png b/app/src/main/res/drawable-xhdpi/icon_user_back.png
new file mode 100644
index 000000000..9f0bd72b4
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_user_back.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_user_back.webp b/app/src/main/res/drawable-xhdpi/icon_user_back.webp
deleted file mode 100644
index dfd726df2..000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_user_back.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_user_back_black.png b/app/src/main/res/drawable-xhdpi/icon_user_back_black.png
new file mode 100644
index 000000000..422e86c11
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_user_back_black.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_user_back_black.webp b/app/src/main/res/drawable-xhdpi/icon_user_back_black.webp
deleted file mode 100644
index 0ac0dc4a1..000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_user_back_black.webp and /dev/null differ
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java
index a9838b2b7..413ea5d55 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java
@@ -80,7 +80,7 @@ public class ShareModel extends BaseModel implements IShareModel {
                         sp.setImageUrl(webViewInfo.getImgUrl());
                     }
                     String siteUrl = webViewInfo.getShowUrl();
-                    String params = "shareUid=" + AuthModel.get().getCurrentUid() + "&lang=" + Locale.getDefault().getLanguage();
+                    String params = "shareUid=" + AuthModel.get().getCurrentUid();
                     if (siteUrl.contains("?")) {
                         if (siteUrl.endsWith("?")) {
                             siteUrl += params;
@@ -160,7 +160,7 @@ public class ShareModel extends BaseModel implements IShareModel {
                 if (platform != null) {
                     String name = platform.getName();
                     final String siteUrl = UriProvider.IM_SERVER_URL + XChatConstants.SHARE_ROOM_URL +
-                            AuthModel.get().getCurrentUid() + "&uid=" + roomUid + "&room_name=" +
+                            AuthModel.get().getCurrentUid() + "&lang=" + Locale.getDefault().getLanguage() + "&uid=" + roomUid + "&room_name=" +
                             URLEncoder.encode(title, "utf8") + "&room_id=" + roomId + "&room_avatar=" +
                             URLEncoder.encode(room_avatar, "utf8") + "&share_name=" +
                             URLEncoder.encode(UserModel.get().getCacheLoginUserInfo().getNick(), "utf8");
diff --git a/nim_uikit/res/drawable-ar-xhdpi/nim_arrow_right.png b/nim_uikit/res/drawable-ar-xhdpi/nim_arrow_right.png
new file mode 100644
index 000000000..371232f8c
Binary files /dev/null and b/nim_uikit/res/drawable-ar-xhdpi/nim_arrow_right.png differ
diff --git a/nim_uikit/res/drawable-xhdpi/nim_arrow_right.png b/nim_uikit/res/drawable-xhdpi/nim_arrow_right.png
new file mode 100644
index 000000000..d6c8f467e
Binary files /dev/null and b/nim_uikit/res/drawable-xhdpi/nim_arrow_right.png differ
diff --git a/nim_uikit/res/drawable-xhdpi/nim_arrow_right.webp b/nim_uikit/res/drawable-xhdpi/nim_arrow_right.webp
deleted file mode 100644
index 17ea24c52..000000000
Binary files a/nim_uikit/res/drawable-xhdpi/nim_arrow_right.webp and /dev/null differ
diff --git a/nim_uikit/res/layout/nim_message_activity_text_layout.xml b/nim_uikit/res/layout/nim_message_activity_text_layout.xml
index 0dce98f75..b3521b0ab 100644
--- a/nim_uikit/res/layout/nim_message_activity_text_layout.xml
+++ b/nim_uikit/res/layout/nim_message_activity_text_layout.xml
@@ -71,6 +71,7 @@
         android:maxLines="4"
         android:paddingStart="@dimen/dp_10"
         android:paddingEnd="10dp"
+        android:gravity="center_vertical"
         android:textColor="@color/color_C6C6E9"
         android:textColorHint="@color/color_b3b3b3"
         android:textCursorDrawable="@null"