diff --git a/app/src/main/java/com/gh/base/BaseDetailActivity.java b/app/src/main/java/com/gh/base/BaseDetailActivity.java
index 3576059001..761a6821a9 100644
--- a/app/src/main/java/com/gh/base/BaseDetailActivity.java
+++ b/app/src/main/java/com/gh/base/BaseDetailActivity.java
@@ -92,7 +92,7 @@ public abstract class BaseDetailActivity extends BaseActivity implements View.On
 
         // 添加分享图标
         iv_share = new ImageView(this);
-        iv_share.setImageResource(R.drawable.share_icon);
+        iv_share.setImageResource(R.drawable.ic_share);
         iv_share.setOnClickListener(this);
         iv_share.setVisibility(View.GONE);
         iv_share.setPadding(DisplayUtils.dip2px(this, 13),DisplayUtils.dip2px(this, 11)
diff --git a/app/src/main/java/com/gh/base/GHPushMessageReceiver.java b/app/src/main/java/com/gh/base/GHPushMessageReceiver.java
index ce0c71c643..7719932907 100644
--- a/app/src/main/java/com/gh/base/GHPushMessageReceiver.java
+++ b/app/src/main/java/com/gh/base/GHPushMessageReceiver.java
@@ -249,9 +249,8 @@ public class GHPushMessageReceiver extends PushMessageReceiver {
 	public void onNotificationMessageClicked(Context context, MiPushMessage message) {
 		Log.v(AppController.TAG, "onNotificationMessageClicked is called. " + message.toString());
 
-		String content = message.getContent();
-
 		try {
+			String content = message.getContent();
 			JSONObject response = new JSONObject(content);
 			Bundle bundle = new Bundle();
 			bundle.putString("entrance", "(小米推送)");
@@ -293,7 +292,6 @@ public class GHPushMessageReceiver extends PushMessageReceiver {
 		} catch (JSONException e) {
 			e.printStackTrace();
 		}
-
 	}
 
 	@Override
diff --git a/app/src/main/java/com/gh/base/GHUmengNotificationClickHandler.java b/app/src/main/java/com/gh/base/GHUmengNotificationClickHandler.java
index 72834c8be9..f339f9a10f 100644
--- a/app/src/main/java/com/gh/base/GHUmengNotificationClickHandler.java
+++ b/app/src/main/java/com/gh/base/GHUmengNotificationClickHandler.java
@@ -7,6 +7,8 @@ import android.text.TextUtils;
 
 import com.gh.common.util.ClassUtils;
 import com.gh.common.util.RunningUtils;
+import com.gh.common.util.Utils;
+import com.gh.gamecenter.MainActivity;
 import com.gh.gamecenter.SplashScreenActivity;
 import com.umeng.message.UmengNotificationClickHandler;
 import com.umeng.message.entity.UMessage;
@@ -19,11 +21,10 @@ public class GHUmengNotificationClickHandler extends UmengNotificationClickHandl
 
 	@Override
 	public void launchApp(Context context, UMessage uMessage) {
-		super.launchApp(context, uMessage);
-
-		String content = uMessage.extra.get("data");
+//		super.launchApp(context, uMessage);
 
 		try {
+			String content = uMessage.extra.get("data");
 			JSONObject response = new JSONObject(content);
 			Bundle bundle = new Bundle();
 			bundle.putString("entrance", "(友盟推送)");
@@ -65,7 +66,6 @@ public class GHUmengNotificationClickHandler extends UmengNotificationClickHandl
 		} catch (JSONException e) {
 			e.printStackTrace();
 		}
-
 	}
 
 }
diff --git a/app/src/main/java/com/gh/common/util/LibaoUtils.java b/app/src/main/java/com/gh/common/util/LibaoUtils.java
index 09cbeebf1c..e4dcfa0b82 100644
--- a/app/src/main/java/com/gh/common/util/LibaoUtils.java
+++ b/app/src/main/java/com/gh/common/util/LibaoUtils.java
@@ -156,13 +156,13 @@ public class LibaoUtils {
                 });
     }
 
-    public static void deleteGift(final Context context, final String code, final boolean isCheck,
+    public static void deleteLibaoCode(final Context context, final String code, final boolean isCheck,
                                   final PostLibaoListener listener) {
         TokenUtils.getToken(context, isCheck)
                 .flatMap(new Func1<String, Observable<ResponseBody>>() {
                     @Override
                     public Observable<ResponseBody> call(String token) {
-                        return RetrofitManager.getLibao().deleteGift(token, code);
+                        return RetrofitManager.getLibao().deleteLibaoCode(token, code);
                     }
                 }).subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
diff --git a/app/src/main/java/com/gh/common/util/RunningUtils.java b/app/src/main/java/com/gh/common/util/RunningUtils.java
index 917b70ad3a..53efa19e20 100644
--- a/app/src/main/java/com/gh/common/util/RunningUtils.java
+++ b/app/src/main/java/com/gh/common/util/RunningUtils.java
@@ -92,9 +92,24 @@ public class RunningUtils {
 		}
 		return false;
 	}
-	
+
 	/**
-	 * 获取当前topactivity
+	 * 获取当前baseActivity
+	 */
+	public static String getBaseActivity(Context context) {
+		ActivityManager activityManager = (ActivityManager) context
+				.getSystemService(Context.ACTIVITY_SERVICE);
+		List<RunningTaskInfo> infos = activityManager.getRunningTasks(100);
+		for (RunningTaskInfo info : infos) {
+			if (info.baseActivity.getPackageName().equals(context.getPackageName())) {
+				return info.baseActivity.getClassName();
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * 获取当前topActivity
 	 */
 	public static String getTopActivity(Context context) {
 		ActivityManager activityManager = (ActivityManager) context
diff --git a/app/src/main/java/com/gh/common/util/TokenUtils.java b/app/src/main/java/com/gh/common/util/TokenUtils.java
index 68362a1004..5ec905beba 100644
--- a/app/src/main/java/com/gh/common/util/TokenUtils.java
+++ b/app/src/main/java/com/gh/common/util/TokenUtils.java
@@ -34,6 +34,7 @@ import okhttp3.ResponseBody;
 import rx.Observable;
 import rx.Subscriber;
 import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
 import rx.functions.Func1;
 import rx.schedulers.Schedulers;
 
@@ -90,62 +91,56 @@ public class TokenUtils {
 	}
 
 	// 获取用户token
-	public static synchronized Observable<String> getToken(final Context context, final boolean isCheck) {
-		return Observable.create(new Observable.OnSubscribe<String>() {
-			@Override
-			public void call(Subscriber<? super String> subscriber) {
-				String token = null;
-				if (isCheck) {
-					SharedPreferences sp = context.getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE);
-					token = sp.getString("token", null);
-					if (token != null) {
-						long expire = sp.getLong("token_expire", 0) * 1000 - 10 * 1000;
-						long time = Utils.getTime(context);
-						// 判断token是否过期
-						if (time >= expire) {
-							// token已过期
-							token = null;
+	public static synchronized Observable<String> getToken(final Context context, boolean isCheck) {
+		String token = null;
+		if (isCheck) {
+			SharedPreferences sp = context.getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE);
+			token = sp.getString("token", null);
+			if (token != null) {
+				long expire = sp.getLong("token_expire", 0) * 1000 - 10 * 1000;
+				long time = Utils.getTime(context);
+				// 判断token是否过期
+				if (time >= expire) {
+					// token已过期
+					token = null;
+				}
+			}
+		}
+		if (token == null) {
+			Map<String, String> params = new HashMap<>();
+			params.put("device_id", getDeviceId(context));
+			return RetrofitManager.getUser()
+					.postLogin(RequestBody.create(MediaType.parse("application/json"), new JSONObject(params).toString()))
+					.flatMap(new Func1<ResponseBody, Observable<String>>() {
+						@Override
+						public Observable<String> call(ResponseBody responseBody) {
+							String value = null;
+							try {
+								SharedPreferences sp = context.getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE);
+								Editor editor = sp.edit();
+								JSONObject response = new JSONObject(responseBody.string());
+								editor.putString("user_name", response.getString("name"));
+								editor.putString("user_icon", response.getString("icon"));
+								response = response.getJSONObject("token");
+								editor.putString("token", response.getString("value"));
+								editor.putLong("token_expire", response.getLong("expire"));
+								editor.apply();
+								// 服务器返回的token和本地已存的token相同，更新本地时间
+								getTime(context);
+								value = response.getString("value");
+							} catch (IOException | JSONException e) {
+								e.printStackTrace();
+							}
+							return Observable.just(value);
 						}
-					}
-				}
-				subscriber.onNext(token);
-				subscriber.onCompleted();
-			}
-		}).flatMap(new Func1<String, Observable<String>>() {
-			@Override
-			public Observable<String> call(String token) {
-				if (token == null) {
-					Map<String, String> params = new HashMap<>();
-					params.put("device_id", getDeviceId(context));
-					return RetrofitManager.getUser()
-							.postLogin(RequestBody.create(MediaType.parse("application/json"), params.toString()))
-							.flatMap(new Func1<ResponseBody, Observable<String>>() {
-								@Override
-								public Observable<String> call(ResponseBody responseBody) {
-									String value = null;
-									try {
-										SharedPreferences sp = context.getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE);
-										Editor editor = sp.edit();
-										JSONObject response = new JSONObject(responseBody.string());
-										editor.putString("user_name", response.getString("name"));
-										editor.putString("user_icon", response.getString("icon"));
-										response = response.getJSONObject("token");
-										editor.putString("token", response.getString("value"));
-										editor.putLong("token_expire", response.getLong("expire"));
-										editor.apply();
-										// 服务器返回的token和本地已存的token相同，更新本地时间
-										getTime(context);
-										value = response.getString("value");
-									} catch (IOException | JSONException e) {
-										e.printStackTrace();
-									}
-									return Observable.just(value);
-								}
-							});
-				}
-				return Observable.just(token);
-			}
-		});
+					}).onErrorResumeNext(new Func1<Throwable, Observable<? extends String>>() {
+						@Override
+						public Observable<? extends String> call(Throwable throwable) {
+							return Observable.empty();
+						}
+					});
+		}
+		return Observable.just(token);
 	}
 
 	// 检查设备信息是否已经上传完整
diff --git a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java
index a5a64f12c3..4a09377b8b 100644
--- a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java
@@ -51,7 +51,7 @@ public class GameNewsActivity extends BaseActivity implements View.OnClickListen
 		View contentView = View.inflate(this, R.layout.activity_game_news, null);
 
 		ivSearch = new ImageView(this);
-		ivSearch.setImageResource(R.drawable.search_icon);
+		ivSearch.setImageResource(R.drawable.ic_search_white);
 
 		RelativeLayout.LayoutParams ivSearchParams = new RelativeLayout.LayoutParams(
 				DisplayUtils.dip2px(this, 20), DisplayUtils.dip2px(this, 20));
diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java
index aa789ef164..3680862e65 100644
--- a/app/src/main/java/com/gh/gamecenter/MainActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java
@@ -351,8 +351,6 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
 		if (savedInstanceState != null) {
 			currentTab = savedInstanceState.getInt("currentTab");
 			isSkipped = savedInstanceState.getBoolean("isSkipped");
-		} else if (isNewFirstLaunch) {
-			currentTab = 1;
 		} else {
 			currentTab = 0;
 		}
@@ -368,7 +366,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
 		}
 		if (isNewFirstLaunch) {
 			getPluginUpdate();
-//			sp.edit().putBoolean("isNewFirstLaunchV" + PackageUtils.getVersionName(getApplicationContext()), false).apply();
+			sp.edit().putBoolean("isNewFirstLaunchV" + PackageUtils.getVersionName(getApplicationContext()), false).apply();
 		}
 
 		// 获取免责声明
@@ -404,7 +402,6 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
 		handler.postDelayed(skipRun, 500);
 
 		Log.e("TD_CHANNEL_ID", (String) PackageUtils.getMetaData(this, getPackageName(), "TD_CHANNEL_ID"));
-		Log.e("device", TokenUtils.getDeviceId(this));
 	}
 
 	private void updateUserGhzs() {
@@ -880,14 +877,14 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
 		public void run() {
 			if (getIntent() != null && getIntent().getExtras() != null && !isSkipped) {
 				isSkipped = true;
-				String to = getIntent().getStringExtra("to");
-				if(!TextUtils.isEmpty(to)){
-					Class<?> clazz = ClassUtils.forName(to);
-					if (clazz != null) {
-						Intent skipIntent = new Intent(MainActivity.this, clazz);
+				Bundle bundle = getIntent().getBundleExtra("data");
+				if (bundle != null) {
+					String to = bundle.getString("to");
+					if(!TextUtils.isEmpty(to)){
+						Class<?> clazz = ClassUtils.forName(to);
+						if (clazz != null) {
+							Intent skipIntent = new Intent(MainActivity.this, clazz);
 
-						Bundle bundle = getIntent().getBundleExtra("data");
-						if (bundle != null) {
 							String entrance = bundle.getString("entrance");
 							if (TextUtils.isEmpty(entrance) || !entrance.startsWith("(") || !entrance.endsWith(")")) {
 								bundle.putString("entrance", "(插件跳转)");
@@ -896,10 +893,10 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
 							if (packageName != null) {
 								bundle.putInt("currentItem", 1);
 							}
-						}
 
-						skipIntent.putExtra("data", bundle);
-						startActivity(skipIntent);
+							skipIntent.putExtra("data", bundle);
+							startActivity(skipIntent);
+						}
 					}
 				}
 			}
@@ -984,7 +981,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
 		hideFragments(transaction);
 		switch (index) {
 			case 0:
-				ivGame.setImageResource(R.drawable.home1_selected);
+				ivGame.setImageResource(R.drawable.ic_game_select);
 				tvGame.setTextColor(getResources().getColor(R.color.theme));
 				if (gameFragment == null) {
 					List<Fragment> list = getSupportFragmentManager().getFragments();
@@ -1010,7 +1007,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
 				currentTab = 0;
 				break;
 			case 1:
-				ivNews.setImageResource(R.drawable.home2_selected);
+				ivNews.setImageResource(R.drawable.ic_news_select);
 				tvNews.setTextColor(getResources().getColor(R.color.theme));
 				if (newsFragment == null) {
 					List<Fragment> list = getSupportFragmentManager().getFragments();
@@ -1036,7 +1033,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
 				currentTab = 1;
 				break;
 			case 2:
-				ivPersonal.setImageResource(R.drawable.home3_selected);
+				ivPersonal.setImageResource(R.drawable.ic_user_select);
 				tvPersonal.setTextColor(getResources().getColor(R.color.theme));
 				if (personalFragment == null) {
 					List<Fragment> list = getSupportFragmentManager().getFragments();
@@ -1066,9 +1063,9 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
 
 	// 清除掉所有的选中状态。
 	private void clearSelection() {
-		ivGame.setImageResource(R.drawable.home1_unselected);
-		ivNews.setImageResource(R.drawable.home2_unselected);
-		ivPersonal.setImageResource(R.drawable.home3_unselected);
+		ivGame.setImageResource(R.drawable.ic_game_unselect);
+		ivNews.setImageResource(R.drawable.ic_news_unselect);
+		ivPersonal.setImageResource(R.drawable.ic_user_unselect);
 		tvGame.setTextColor(getResources().getColor(R.color.title));
 		tvNews.setTextColor(getResources().getColor(R.color.title));
 		tvPersonal.setTextColor(getResources().getColor(R.color.title));
diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java
index d32ef41e26..1524b42040 100644
--- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java
@@ -135,7 +135,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener
 
         // 添加分享图标
         iv_share = new ImageView(this);
-        iv_share.setImageResource(R.drawable.share_icon);
+        iv_share.setImageResource(R.drawable.ic_share);
         iv_share.setOnClickListener(this);
         iv_share.setVisibility(View.GONE);
         iv_share.setPadding(DisplayUtils.dip2px(this, 13),DisplayUtils.dip2px(this, 11)
diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
index a2ab422031..84b1a833ac 100644
--- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
@@ -323,14 +323,13 @@ public class SplashScreenActivity extends BaseActivity {
 
 	// 跳转到主界面
 	private void launch() {
-		Intent intent = new Intent(SplashScreenActivity.this, MainActivity.class);
-
-		Bundle bundle = intent.getExtras();
-		if (intent.getBundleExtra("data") != null) {
-			bundle = intent.getBundleExtra("data");
+		Bundle bundle = getIntent().getExtras();
+		if (getIntent().getBundleExtra("data") != null) {
+			bundle = getIntent().getBundleExtra("data");
 		}
-		intent.putExtra("data", bundle);
 
+		Intent intent = new Intent(SplashScreenActivity.this, MainActivity.class);
+		intent.putExtra("data", bundle);
 		startActivity(intent);
 		finish();
 	}
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java
index d73a53ddf5..4fd724a647 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java
@@ -343,7 +343,7 @@ public class MessageDetailAdapter extends RecyclerView.Adapter<RecyclerView.View
         }
 
         if (mConcernEntity.getLink() != null) {
-            viewHolder.link.setImageResource(R.drawable.link_iv);
+            viewHolder.link.setImageResource(R.drawable.ic_link);
         } else {
             viewHolder.link.setImageResource(R.drawable.concern_message_icon);
         }
@@ -500,14 +500,14 @@ public class MessageDetailAdapter extends RecyclerView.Adapter<RecyclerView.View
         holder.commentContentTv.setText(commentEntity.getContent());
 
         holder.commentLikeCountTv.setTextColor(mContext.getResources().getColor(R.color.hint));
-        holder.commentLikeIv.setImageResource(R.drawable.comment_like_unselect);
+        holder.commentLikeIv.setImageResource(R.drawable.ic_like_unselect);
 
         if (commentEntity.getVote() == 0) {
             holder.commentLikeCountTv.setVisibility(View.GONE);
         } else { // 检查是否已点赞
             if (mVoteDao.isVote(commentEntity.getId()) && commentEntity.getVote() >= 1) {
                 holder.commentLikeCountTv.setTextColor(mContext.getResources().getColor(R.color.theme));
-                holder.commentLikeIv.setImageResource(R.drawable.comment_like_select);
+                holder.commentLikeIv.setImageResource(R.drawable.ic_like_select);
             }
             holder.commentLikeCountTv.setVisibility(View.VISIBLE);
             holder.commentLikeCountTv.setText(String.valueOf(commentEntity.getVote()));
@@ -568,7 +568,7 @@ public class MessageDetailAdapter extends RecyclerView.Adapter<RecyclerView.View
                 }
                 finalCommentEntity.setVote(finalCommentEntity.getVote() + 1);
                 holder.commentLikeCountTv.setTextColor(mContext.getResources().getColor(R.color.theme));
-                holder.commentLikeIv.setImageResource(R.drawable.comment_like_select);
+                holder.commentLikeIv.setImageResource(R.drawable.ic_like_select);
                 holder.commentLikeCountTv.setText(String.valueOf(finalCommentEntity.getVote()));
                 holder.commentLikeCountTv.setVisibility(View.VISIBLE);
 
@@ -598,7 +598,7 @@ public class MessageDetailAdapter extends RecyclerView.Adapter<RecyclerView.View
 
                         finalCommentEntity.setVote(finalCommentEntity.getVote() - 1);
                         holder.commentLikeCountTv.setTextColor(mContext.getResources().getColor(R.color.hint));
-                        holder.commentLikeIv.setImageResource(R.drawable.comment_like_unselect);
+                        holder.commentLikeIv.setImageResource(R.drawable.ic_like_unselect);
                         holder.commentLikeCountTv.setText(String.valueOf(finalCommentEntity.getVote()));
                         if (finalCommentEntity.getVote() == 0) {
                             holder.commentLikeCountTv.setVisibility(View.GONE);
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java
index 9e1e108a09..0e211e92b6 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java
@@ -298,9 +298,9 @@ public class SubjectAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 		final GameEntity gameEntity = subjectList.get(position);
 
 		if (gameEntity.isLibaoExists()) {
-			holder.giftIcon.setVisibility(View.VISIBLE);
+			holder.libaoIcon.setVisibility(View.VISIBLE);
 		} else {
-			holder.giftIcon.setVisibility(View.GONE);
+			holder.libaoIcon.setVisibility(View.GONE);
 		}
 
 		holder.gameThumb.setImageURI(gameEntity.getIcon());
@@ -379,9 +379,9 @@ public class SubjectAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 		final GameEntity gameEntity = subjectList.get(position);
 
 		if (gameEntity.isLibaoExists()) {
-			holder.giftIcon.setVisibility(View.VISIBLE);
+			holder.libaoIcon.setVisibility(View.VISIBLE);
 		} else {
-			holder.giftIcon.setVisibility(View.GONE);
+			holder.libaoIcon.setVisibility(View.GONE);
 		}
 
 		holder.gameThumb.setImageURI(gameEntity.getIcon());
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNormalViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNormalViewHolder.java
index a8dd82b11a..f05e3eadde 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNormalViewHolder.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNormalViewHolder.java
@@ -25,7 +25,7 @@ public class GameNormalViewHolder extends RecyclerView.ViewHolder {
     public LinearLayout game_ll_info;
     public TextView download_speed;
     public TextView download_percentage;
-    public ImageView giftIcon;
+    public ImageView libaoIcon;
 
     public GameNormalViewHolder(View itemView) {
         super(itemView);
@@ -40,7 +40,7 @@ public class GameNormalViewHolder extends RecyclerView.ViewHolder {
         game_progressbar = (ProgressBar) itemView.findViewById(R.id.home1_game_progressbar);
         download_speed = (TextView) itemView.findViewById(R.id.home1_download_speed);
         download_percentage = (TextView) itemView.findViewById(R.id.home1_download_percentage);
-        giftIcon = (ImageView) itemView.findViewById(R.id.home1_game_gift);
+        libaoIcon = (ImageView) itemView.findViewById(R.id.home1_game_libao);
 
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java
index 72b6140b04..99d835baa0 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java
@@ -27,7 +27,7 @@ public class GameTestViewHolder extends RecyclerView.ViewHolder {
     public LinearLayout game_ll_info;
     public TextView download_speed;
     public TextView download_percentage;
-    public ImageView giftIcon;
+    public ImageView libaoIcon;
 
     public GameTestViewHolder(View itemView) {
         super(itemView);
@@ -43,7 +43,7 @@ public class GameTestViewHolder extends RecyclerView.ViewHolder {
         game_progressbar = (ProgressBar) itemView.findViewById(R.id.home2_game_progressbar);
         download_speed = (TextView) itemView.findViewById(R.id.home2_download_speed);
         download_percentage = (TextView) itemView.findViewById(R.id.home2_download_percentage);
-        giftIcon = (ImageView) itemView.findViewById(R.id.home2_game_gift);
+        libaoIcon = (ImageView) itemView.findViewById(R.id.home2_game_libao);
 
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownLoadFragment.java b/app/src/main/java/com/gh/gamecenter/download/GameDownLoadFragment.java
index fe9e7ef272..4cb9956fb8 100644
--- a/app/src/main/java/com/gh/gamecenter/download/GameDownLoadFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/download/GameDownLoadFragment.java
@@ -213,8 +213,6 @@ public class GameDownLoadFragment extends Fragment implements View.OnClickListen
 		downloadmanager_rv_show.setOnScrollListener(new RecyclerView.OnScrollListener() {
 			@Override
 			public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
-				super.onScrolled(recyclerView, dx, dy);
-
 				int position = layoutManager.findFirstVisibleItemPosition();
 				if (adapter.getDoneList().isEmpty()) {
 					if (position >= 0) {
diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragment.java b/app/src/main/java/com/gh/gamecenter/game/GameFragment.java
index e22bbba4cc..b564fa118c 100644
--- a/app/src/main/java/com/gh/gamecenter/game/GameFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/game/GameFragment.java
@@ -33,8 +33,7 @@ import java.util.List;
  * Created by khy on 2016/12/6.
  * 新主界面
  */
-public class GameFragment extends HomeFragment implements SwipeRefreshLayout.OnRefreshListener
-        , OnCallBackListener {
+public class GameFragment extends HomeFragment implements SwipeRefreshLayout.OnRefreshListener, OnCallBackListener {
 
     private SwipeRefreshLayout fm_game_swipe_refresh;
     private RecyclerView fm_game_rv_list;
@@ -96,7 +95,6 @@ public class GameFragment extends HomeFragment implements SwipeRefreshLayout.OnR
         fm_game_rv_list.setOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
             public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
-                super.onScrollStateChanged(recyclerView, newState);
                 if (newState == RecyclerView.SCROLL_STATE_IDLE){
                     Fresco.getImagePipeline().resume();
                 }else {
diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java
index 5915e620cb..9bafdc16f9 100644
--- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java
@@ -714,9 +714,9 @@ public class GameFragmentAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         }
 
         if (gameEntity.isLibaoExists()) {
-            holder.giftIcon.setVisibility(View.VISIBLE);
+            holder.libaoIcon.setVisibility(View.VISIBLE);
         } else {
-            holder.giftIcon.setVisibility(View.GONE);
+            holder.libaoIcon.setVisibility(View.GONE);
         }
 
         if (subjectEntity.isOrder()) {
@@ -831,9 +831,9 @@ public class GameFragmentAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         }
 
         if (gameEntity.isLibaoExists()) {
-            holder.giftIcon.setVisibility(View.VISIBLE);
+            holder.libaoIcon.setVisibility(View.VISIBLE);
         } else {
-            holder.giftIcon.setVisibility(View.GONE);
+            holder.libaoIcon.setVisibility(View.GONE);
         }
 
         if (subjectEntity.isOrder()) {
diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java
index b5609a86fd..3349e441fd 100644
--- a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java
@@ -142,7 +142,7 @@ public class Libao3FragmentAdapter extends RecyclerView.Adapter<RecyclerView.Vie
                         , new DialogUtils.ConfiremListener() {
                             @Override
                             public void onConfirem() {
-                                LibaoUtils.deleteGift(mContext, libaoEntity.getCode(), true, new LibaoUtils.PostLibaoListener() {
+                                LibaoUtils.deleteLibaoCode(mContext, libaoEntity.getCode(), true, new LibaoUtils.PostLibaoListener() {
                                     @Override
                                     public void postSucced(Object response) {
                                         Utils.toast(mContext, "删除成功");
diff --git a/app/src/main/java/com/gh/gamecenter/news/News1Fragment.java b/app/src/main/java/com/gh/gamecenter/news/News1Fragment.java
index f954a447ce..5b9a6d31f8 100644
--- a/app/src/main/java/com/gh/gamecenter/news/News1Fragment.java
+++ b/app/src/main/java/com/gh/gamecenter/news/News1Fragment.java
@@ -1,8 +1,6 @@
 package com.gh.gamecenter.news;
 
-import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.util.ArrayMap;
@@ -18,7 +16,6 @@ import android.widget.TextView;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.gc.materialdesign.views.ProgressBarCircularIndeterminate;
 import com.gh.base.BaseFragment;
-import com.gh.common.constant.Config;
 import com.gh.common.util.PackageUtils;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.db.info.ConcernInfo;
@@ -72,7 +69,6 @@ public class News1Fragment extends BaseFragment implements SwipeRefreshLayout.On
 
     private ConcernManager concernManager;
 
-    private boolean isNewFirstLaunch;
     private boolean isInitConcernOcer;
     private boolean isInitInstallOver;
 
@@ -96,14 +92,6 @@ public class News1Fragment extends BaseFragment implements SwipeRefreshLayout.On
         concernManager = new ConcernManager(getActivity());
         concernMap = new ArrayMap<>();
 
-        SharedPreferences sp = getActivity().getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE);
-
-        isNewFirstLaunch = sp.getBoolean("isNewFirstLaunchV" + PackageUtils.getVersionName(getActivity()), true);
-
-        if (isNewFirstLaunch) {
-            sp.edit().putBoolean("isNewFirstLaunchV" + PackageUtils.getVersionName(getActivity()), false).apply();
-        }
-
         refreshLayout.setColorSchemeResources(R.color.theme);
         refreshLayout.setOnRefreshListener(this);
 
@@ -209,7 +197,7 @@ public class News1Fragment extends BaseFragment implements SwipeRefreshLayout.On
     public void onEventMainThread(EBUISwitch swith) {
         if ("NewsFragment".equals(swith.getFrom())) {
             if (swith.getPosition() == 0) {
-                if (loadingLayout.getVisibility() == View.VISIBLE && !isNewFirstLaunch) {
+                if (loadingLayout.getVisibility() == View.VISIBLE) {
                     adapter.addList(0);
                 }
             } else if (swith.getPosition() == -2 || swith.getPosition() == -1) {
@@ -241,10 +229,6 @@ public class News1Fragment extends BaseFragment implements SwipeRefreshLayout.On
         adapter = new News1FragmentAdapter(News1Fragment.this);
         recyclerView.setAdapter(adapter);
         adapter.addList(0);
-
-        if (isNewFirstLaunch) {
-            isNewFirstLaunch = false;
-        }
     }
 
     @Override
diff --git a/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java
index e3a6a4499b..7638546aa8 100644
--- a/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java
@@ -556,7 +556,7 @@ public class News1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
             }
             viewHolder.comment.setVisibility(View.GONE);
             viewHolder.share.setVisibility(View.GONE);
-            viewHolder.link.setImageResource(R.drawable.libao_icon);
+            viewHolder.link.setImageResource(R.drawable.ic_libao);
 
             for (LibaoStatusEntity libaoStatusEntity : libaoStatusList) {
                 if (libaoStatusEntity.getId().equals(concernEntity.getId())) {
@@ -639,7 +639,7 @@ public class News1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
         }
 
         if (concernEntity.getLink() != null) {
-            viewHolder.link.setImageResource(R.drawable.link_iv);
+            viewHolder.link.setImageResource(R.drawable.ic_link);
         } else {
             viewHolder.link.setImageResource(R.drawable.concern_message_icon);
         }
diff --git a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java
index 2fa835593b..0501db3b0a 100644
--- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java
@@ -303,7 +303,7 @@ public class NewsDetailAdapter extends RecyclerView.Adapter {
 			} else { // 检查是否已点赞
 				if (mVoteDao.isVote(commentEntity.getId()) && commentEntity.getVote() >= 1) {
 					likeCount.setTextColor(context.getResources().getColor(R.color.theme));
-					like.setImageResource(R.drawable.comment_like_select);
+					like.setImageResource(R.drawable.ic_like_select);
 				}
 				likeCount.setVisibility(View.VISIBLE);
 				likeCount.setText(String.valueOf(commentEntity.getVote()));
@@ -319,11 +319,12 @@ public class NewsDetailAdapter extends RecyclerView.Adapter {
 					}
 					commentEntity.setVote(commentEntity.getVote() + 1);
 					likeCount.setTextColor(context.getResources().getColor(R.color.theme));
-					like.setImageResource(R.drawable.comment_like_select);
+					like.setImageResource(R.drawable.ic_like_select);
 					likeCount.setText(String.valueOf(commentEntity.getVote()));
 					likeCount.setVisibility(View.VISIBLE);
 
-					PostCommentUtils.addCommentVoto(context, commentEntity.getId(), new PostCommentUtils.PostCommentListener() {
+					PostCommentUtils.addCommentVoto(context, commentEntity.getId(), true,
+							new PostCommentUtils.PostCommentListener() {
 						@Override
 						public void postSucced(JSONObject response) {
 							mVoteDao.add(new VoteInfo(commentEntity.getId()));
@@ -333,7 +334,7 @@ public class NewsDetailAdapter extends RecyclerView.Adapter {
 						public void postFailed(Throwable error) {
 							commentEntity.setVote(commentEntity.getVote() - 1);
 							likeCount.setTextColor(context.getResources().getColor(R.color.hint));
-							like.setImageResource(R.drawable.comment_like_unselect);
+							like.setImageResource(R.drawable.ic_like_unselect);
 							likeCount.setText(String.valueOf(commentEntity.getVote()));
 							if (commentEntity.getVote() == 0) {
 								likeCount.setVisibility(View.GONE);
diff --git a/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java
index 8c6bd709f5..4c244b1317 100644
--- a/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java
@@ -359,9 +359,9 @@ public class InstallFragmentAdapter extends RecyclerView.Adapter<RecyclerView.Vi
         holder.gameThumb.setImageURI(gameEntity.getIcon());
 
         if (gameEntity.isLibaoExists()) {
-            holder.giftIcon.setVisibility(View.VISIBLE);
+            holder.libaoIcon.setVisibility(View.VISIBLE);
         } else {
-            holder.giftIcon.setVisibility(View.GONE);
+            holder.libaoIcon.setVisibility(View.GONE);
         }
 
         if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty()
diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/LibaoService.java b/app/src/main/java/com/gh/gamecenter/retrofit/LibaoService.java
index da80ad635c..27ef4716aa 100644
--- a/app/src/main/java/com/gh/gamecenter/retrofit/LibaoService.java
+++ b/app/src/main/java/com/gh/gamecenter/retrofit/LibaoService.java
@@ -48,7 +48,7 @@ public interface LibaoService {
 	@POST("libao/{libao_id}/tao")
 	Observable<ResponseBody> postLibaoTao(@Header("TOKEN") String token, @Path("libao_id") String libaoId); // 礼包 淘号
 
-	@DELETE("libao/code/{gift_code}")
-	Observable<ResponseBody> deleteGift(@Header("TOKEN") String token, @Path("gift_code") String giftId); //删除存号箱的礼包
+	@DELETE("libao/code/{code}")
+	Observable<ResponseBody> deleteLibaoCode(@Header("TOKEN") String token, @Path("code") String code); //删除存号箱的礼包
 
 }
diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java
index c0a616087b..492e85231f 100644
--- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java
@@ -103,9 +103,9 @@ public class SearchGameDetailFragmentAdapter extends RecyclerView.Adapter<GameNo
 		final GameEntity gameEntity = gameList.get(position);
 
 		if (gameEntity.isLibaoExists()) {
-			viewHolder.giftIcon.setVisibility(View.VISIBLE);
+			viewHolder.libaoIcon.setVisibility(View.VISIBLE);
 		} else {
-			viewHolder.giftIcon.setVisibility(View.GONE);
+			viewHolder.libaoIcon.setVisibility(View.GONE);
 		}
 
 		// 第一个
diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java
index 130f054885..b145597919 100644
--- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java
@@ -110,9 +110,9 @@ public class SearchGameListFragmentAdapter extends RecyclerView.Adapter<Recycler
 			((CardLinearLayout) viewHolder.itemView).setmBottom(0);
 
 			if (gameEntity.isLibaoExists()) {
-				viewHolder.giftIcon.setVisibility(View.VISIBLE);
+				viewHolder.libaoIcon.setVisibility(View.VISIBLE);
 			} else {
-				viewHolder.giftIcon.setVisibility(View.GONE);
+				viewHolder.libaoIcon.setVisibility(View.GONE);
 			}
 
 			((GameNormalViewHolder) holder).gameThumb.setImageURI(gameEntity.getIcon());
diff --git a/app/src/main/res/drawable-hdpi/game_gift_icon.png b/app/src/main/res/drawable-hdpi/game_libao_icon.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/game_gift_icon.png
rename to app/src/main/res/drawable-hdpi/game_libao_icon.png
diff --git a/app/src/main/res/drawable-hdpi/comment_icon.png b/app/src/main/res/drawable-hdpi/ic_comment.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/comment_icon.png
rename to app/src/main/res/drawable-hdpi/ic_comment.png
diff --git a/app/src/main/res/drawable-hdpi/ic_actionbar_notification.png b/app/src/main/res/drawable-hdpi/ic_concern.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_actionbar_notification.png
rename to app/src/main/res/drawable-hdpi/ic_concern.png
diff --git a/app/src/main/res/drawable-hdpi/delete_btn.png b/app/src/main/res/drawable-hdpi/ic_delete.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/delete_btn.png
rename to app/src/main/res/drawable-hdpi/ic_delete.png
diff --git a/app/src/main/res/drawable-hdpi/ic_actionbar_download.png b/app/src/main/res/drawable-hdpi/ic_download.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_actionbar_download.png
rename to app/src/main/res/drawable-hdpi/ic_download.png
diff --git a/app/src/main/res/drawable-hdpi/et_icon.png b/app/src/main/res/drawable-hdpi/ic_edit.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/et_icon.png
rename to app/src/main/res/drawable-hdpi/ic_edit.png
diff --git a/app/src/main/res/drawable-hdpi/home1_selected.png b/app/src/main/res/drawable-hdpi/ic_game_select.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/home1_selected.png
rename to app/src/main/res/drawable-hdpi/ic_game_select.png
diff --git a/app/src/main/res/drawable-hdpi/home1_unselected.png b/app/src/main/res/drawable-hdpi/ic_game_unselect.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/home1_unselected.png
rename to app/src/main/res/drawable-hdpi/ic_game_unselect.png
diff --git a/app/src/main/res/drawable-hdpi/gamedetail_hint.png b/app/src/main/res/drawable-hdpi/ic_hint.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/gamedetail_hint.png
rename to app/src/main/res/drawable-hdpi/ic_hint.png
diff --git a/app/src/main/res/drawable-hdpi/libao_icon.png b/app/src/main/res/drawable-hdpi/ic_libao.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/libao_icon.png
rename to app/src/main/res/drawable-hdpi/ic_libao.png
diff --git a/app/src/main/res/drawable-hdpi/comment_like_select.png b/app/src/main/res/drawable-hdpi/ic_like_select.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/comment_like_select.png
rename to app/src/main/res/drawable-hdpi/ic_like_select.png
diff --git a/app/src/main/res/drawable-hdpi/comment_like_unselect.png b/app/src/main/res/drawable-hdpi/ic_like_unselect.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/comment_like_unselect.png
rename to app/src/main/res/drawable-hdpi/ic_like_unselect.png
diff --git a/app/src/main/res/drawable-hdpi/link_iv.png b/app/src/main/res/drawable-hdpi/ic_link.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/link_iv.png
rename to app/src/main/res/drawable-hdpi/ic_link.png
diff --git a/app/src/main/res/drawable-hdpi/home2_selected.png b/app/src/main/res/drawable-hdpi/ic_news_select.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/home2_selected.png
rename to app/src/main/res/drawable-hdpi/ic_news_select.png
diff --git a/app/src/main/res/drawable-hdpi/home2_unselected.png b/app/src/main/res/drawable-hdpi/ic_news_unselect.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/home2_unselected.png
rename to app/src/main/res/drawable-hdpi/ic_news_unselect.png
diff --git a/app/src/main/res/drawable-hdpi/ic_search.png b/app/src/main/res/drawable-hdpi/ic_search_grey.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_search.png
rename to app/src/main/res/drawable-hdpi/ic_search_grey.png
diff --git a/app/src/main/res/drawable-hdpi/search_icon.png b/app/src/main/res/drawable-hdpi/ic_search_white.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/search_icon.png
rename to app/src/main/res/drawable-hdpi/ic_search_white.png
diff --git a/app/src/main/res/drawable-hdpi/share_icon.png b/app/src/main/res/drawable-hdpi/ic_share.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/share_icon.png
rename to app/src/main/res/drawable-hdpi/ic_share.png
diff --git a/app/src/main/res/drawable-hdpi/home3_selected.png b/app/src/main/res/drawable-hdpi/ic_user_select.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/home3_selected.png
rename to app/src/main/res/drawable-hdpi/ic_user_select.png
diff --git a/app/src/main/res/drawable-hdpi/home3_unselected.png b/app/src/main/res/drawable-hdpi/ic_user_unselect.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/home3_unselected.png
rename to app/src/main/res/drawable-hdpi/ic_user_unselect.png
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d0360f5507..5343f767ad 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -42,7 +42,7 @@
                     android:layout_width="32dp"
                     android:layout_height="21dp"
                     android:layout_gravity="center_horizontal"
-                    android:src="@drawable/home1_unselected" />
+                    android:src="@drawable/ic_game_unselect" />
 
                 <TextView
                     android:id="@+id/main_tv_game"
@@ -67,7 +67,7 @@
                     android:layout_width="21dp"
                     android:layout_height="21dp"
                     android:layout_gravity="center_horizontal"
-                    android:src="@drawable/home2_unselected" />
+                    android:src="@drawable/ic_news_unselect" />
 
                 <TextView
                     android:id="@+id/main_tv_news"
@@ -92,7 +92,7 @@
                     android:layout_width="21dp"
                     android:layout_height="21dp"
                     android:layout_gravity="center_horizontal"
-                    android:src="@drawable/home3_unselected" />
+                    android:src="@drawable/ic_user_unselect" />
 
                 <TextView
                     android:id="@+id/main_tv_personal"
diff --git a/app/src/main/res/layout/activity_messagedetail.xml b/app/src/main/res/layout/activity_messagedetail.xml
index f81eadd145..177e283464 100644
--- a/app/src/main/res/layout/activity_messagedetail.xml
+++ b/app/src/main/res/layout/activity_messagedetail.xml
@@ -133,7 +133,7 @@
                 android:layout_marginLeft="5dp"
                 android:paddingTop="13dp"
                 android:paddingBottom="14dp"
-                android:src="@drawable/et_icon"/>
+                android:src="@drawable/ic_edit"/>
 
             <TextView
                 android:id="@+id/message_detail_comment_hint"
diff --git a/app/src/main/res/layout/activity_news_detail.xml b/app/src/main/res/layout/activity_news_detail.xml
index 7980b71495..791538d687 100644
--- a/app/src/main/res/layout/activity_news_detail.xml
+++ b/app/src/main/res/layout/activity_news_detail.xml
@@ -52,7 +52,7 @@
                             android:id="@+id/comment_icon"
                             android:layout_width="18dp"
                             android:layout_height="18dp"
-                            android:src="@drawable/et_icon"/>
+                            android:src="@drawable/ic_edit"/>
 
                         <TextView
                             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/comment_item.xml b/app/src/main/res/layout/comment_item.xml
index 6dd92fdb1a..ccf8867b91 100644
--- a/app/src/main/res/layout/comment_item.xml
+++ b/app/src/main/res/layout/comment_item.xml
@@ -72,7 +72,7 @@
                 android:paddingBottom="12dp"
                 android:paddingLeft="4dp"
                 android:paddingRight="10dp"
-                android:src="@drawable/comment_like_unselect"
+                android:src="@drawable/ic_like_unselect"
                 android:layout_alignParentRight="true"/>
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/fm_downloadmanager_item.xml b/app/src/main/res/layout/fm_downloadmanager_item.xml
index fc9da29485..4619fafa14 100644
--- a/app/src/main/res/layout/fm_downloadmanager_item.xml
+++ b/app/src/main/res/layout/fm_downloadmanager_item.xml
@@ -59,7 +59,7 @@
                 android:layout_width="16dp"
                 android:layout_height="12dp"
                 android:paddingLeft="4dp"
-                android:src="@drawable/delete_btn"/>
+                android:src="@drawable/ic_delete"/>
 
             <TextView
                 android:id="@+id/dm_item_tv_speed"
diff --git a/app/src/main/res/layout/game_normal_item.xml b/app/src/main/res/layout/game_normal_item.xml
index d1139a2b52..e0633338a6 100644
--- a/app/src/main/res/layout/game_normal_item.xml
+++ b/app/src/main/res/layout/game_normal_item.xml
@@ -40,10 +40,10 @@
             style="@style/frescoStyle"/>
 
         <ImageView
-            android:id="@+id/home1_game_gift"
+            android:id="@+id/home1_game_libao"
             android:layout_width="20dp"
             android:layout_height="20dp"
-            android:src="@drawable/game_gift_icon"
+            android:src="@drawable/game_libao_icon"
             android:visibility="gone"/>
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/game_test_item.xml b/app/src/main/res/layout/game_test_item.xml
index 521b206bf7..4130e285ed 100644
--- a/app/src/main/res/layout/game_test_item.xml
+++ b/app/src/main/res/layout/game_test_item.xml
@@ -40,10 +40,10 @@
             style="@style/frescoStyle"/>
 
         <ImageView
-            android:id="@+id/home2_game_gift"
+            android:id="@+id/home2_game_libao"
             android:layout_width="20dp"
             android:layout_height="20dp"
-            android:src="@drawable/game_gift_icon"/>
+            android:src="@drawable/game_libao_icon"/>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/gamedetail_plugin_item.xml b/app/src/main/res/layout/gamedetail_plugin_item.xml
index 7225a62a89..852e9e78ec 100644
--- a/app/src/main/res/layout/gamedetail_plugin_item.xml
+++ b/app/src/main/res/layout/gamedetail_plugin_item.xml
@@ -16,7 +16,7 @@
             android:layout_width="15dp"
             android:layout_height="15dp"
             android:layout_marginRight="5dp"
-            fresco:placeholderImage="@drawable/gamedetail_hint"/>
+            fresco:placeholderImage="@drawable/ic_hint"/>
 
         <TextView
             android:id="@+id/gamedetail_tv_hint"
diff --git a/app/src/main/res/layout/home_actionbar.xml b/app/src/main/res/layout/home_actionbar.xml
index 59db919f78..77378476d0 100644
--- a/app/src/main/res/layout/home_actionbar.xml
+++ b/app/src/main/res/layout/home_actionbar.xml
@@ -20,7 +20,7 @@
             android:layout_width="25dp"
             android:layout_height="25dp"
             android:layout_centerInParent="true"
-            android:src="@drawable/ic_actionbar_download" />
+            android:src="@drawable/ic_download" />
 
         <TextView
             android:id="@+id/action_tip"
@@ -51,7 +51,7 @@
             android:layout_height="18dp"
             android:layout_centerVertical="true"
             android:layout_marginLeft="8dp"
-            android:src="@drawable/ic_search" />
+            android:src="@drawable/ic_search_grey" />
 
         <TextView
             android:id="@+id/actionbar_search_input"
@@ -80,7 +80,7 @@
             android:layout_width="25dp"
             android:layout_height="25dp"
             android:layout_centerInParent="true"
-            android:src="@drawable/ic_actionbar_notification" />
+            android:src="@drawable/ic_concern" />
     </RelativeLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/news_digest_item.xml b/app/src/main/res/layout/news_digest_item.xml
index e12bab2c21..7c966c4aaa 100644
--- a/app/src/main/res/layout/news_digest_item.xml
+++ b/app/src/main/res/layout/news_digest_item.xml
@@ -96,7 +96,7 @@
             <ImageView
                 android:layout_width="19dp"
                 android:layout_height="19dp"
-                android:src="@drawable/comment_icon"
+                android:src="@drawable/ic_comment"
                 android:layout_marginRight="6dp" />
 
             <TextView
@@ -128,7 +128,7 @@
                 android:layout_height="18dp"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-                android:src="@drawable/link_iv"/>
+                android:src="@drawable/ic_link"/>
 
         </RelativeLayout>