diff --git a/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml b/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml
index 0e89455b55..02a1b7e671 100644
--- a/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml
+++ b/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml
@@ -20,6 +20,6 @@
         android:layout_marginTop="@dimen/module_apps_app_name_marginTop"
         android:gravity="center"
         android:maxLines="2"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/module_apps_id_app_name_textColor"
         android:textSize="@dimen/module_apps_app_name_textSize" />
 </LinearLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-apps/src/main/res/values/colors.xml b/modules/mogo-module-apps/src/main/res/values/colors.xml
index 7d6ca3277b..155daf49f1 100644
--- a/modules/mogo-module-apps/src/main/res/values/colors.xml
+++ b/modules/mogo-module-apps/src/main/res/values/colors.xml
@@ -16,6 +16,7 @@
 
     <color name="bg_common">#080625</color>
     <color name="txt_blue">#3E7FFC</color>
-    <color name="module_app_page_bkg_color">#0C0C0C</color>
+    <color name="module_app_page_bkg_color">#E6000000</color>
+    <color name="module_apps_id_app_name_textColor">#FFFFFF</color>
 
 </resources>
diff --git a/modules/mogo-module-apps/src/main/res/values/dimens.xml b/modules/mogo-module-apps/src/main/res/values/dimens.xml
index 679816b821..d335541a42 100644
--- a/modules/mogo-module-apps/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-apps/src/main/res/values/dimens.xml
@@ -24,6 +24,6 @@
     <dimen name="module_apps_navigator_icon_width">78px</dimen>
     <dimen name="module_apps_navigator_icon_height">78px</dimen>
     <dimen name="module_apps_navigator_icon_divider">17px</dimen>
-    <dimen name="module_apps_voice_icon_width">60px</dimen>
-    <dimen name="module_apps_voice_icon_height">60px</dimen>
+    <dimen name="module_apps_voice_icon_width">55px</dimen>
+    <dimen name="module_apps_voice_icon_height">55px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryFragment.java b/modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryFragment.java
index 94b2c4d7d6..21a37325bf 100644
--- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryFragment.java
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryFragment.java
@@ -108,8 +108,8 @@ class MessageHistoryFragment extends MvpFragment< MessageHistoryView, MessageHis
                     if ( size > 0 && size < mHistoryList.getChildCount() ) {
                         return;
                     }
-                    mClear.setVisibility( show ? View.VISIBLE : View.GONE );
                 }
+                mClear.setVisibility( show ? View.VISIBLE : View.GONE );
             }
         };
         mViewModel = new MessageViewModel( list -> {
@@ -126,6 +126,8 @@ class MessageHistoryFragment extends MvpFragment< MessageHistoryView, MessageHis
         mHistoryList.setItemAnimator( new PushItemAnimator() );
         mHistoryList.addOnItemTouchListener( new SwipeItemLayout.OnSwipeItemTouchListener( getContext() ) );
 
+        mRootView.setOnClickListener( view -> {
+        } );
         GlobalToolsKt.getApis( getContext() ).getMsgCenterApi().registerMsgCenterListener( this );
     }
 
diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_message_activity_background.xml b/modules/mogo-module-push/src/main/res/drawable/module_push_message_activity_background.xml
index 80b95aaa85..5adad50e3d 100644
--- a/modules/mogo-module-push/src/main/res/drawable/module_push_message_activity_background.xml
+++ b/modules/mogo-module-push/src/main/res/drawable/module_push_message_activity_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#FA36374A"/>
+    <solid android:color="#F710121E"/>
     <corners android:radius="@dimen/module_push_panel_corner"/>
 </shape>
diff --git a/modules/mogo-module-push/src/main/res/layout/module_push_message_hisotry_fragment.xml b/modules/mogo-module-push/src/main/res/layout/module_push_message_hisotry_fragment.xml
index e66b892add..06a0aff54d 100644
--- a/modules/mogo-module-push/src/main/res/layout/module_push_message_hisotry_fragment.xml
+++ b/modules/mogo-module-push/src/main/res/layout/module_push_message_hisotry_fragment.xml
@@ -9,7 +9,6 @@
     android:layout_marginLeft="@dimen/module_push_panel_marginRight"
     android:paddingLeft="@dimen/module_push_panel_paddingLeft"
     android:paddingRight="@dimen/module_push_panel_paddingLeft"
-    android:paddingBottom="@dimen/module_push_panel_paddingBottom"
     android:background="@drawable/module_push_message_activity_background"
     android:layout_gravity="center_vertical">
 
@@ -44,7 +43,7 @@
         android:layout_gravity="center"
         android:gravity="center"
         android:text="暂无消息"
-        android:textColor="@android:color/white"
+        android:textColor="@color/module_push_panel_title_textColor"
         android:textSize="@dimen/module_push_activity_not_data_text_size" />
 
     <TextView
@@ -56,7 +55,7 @@
         android:background="@drawable/module_push_activity_clear_bg"
         android:gravity="center"
         android:text="清空历史消息"
-        android:textColor="@android:color/white"
+        android:textColor="@color/module_push_panel_title_textColor"
         android:textSize="@dimen/module_push_title_text_size"
         android:visibility="gone"
         tools:visibility="visible" />
diff --git a/modules/mogo-module-push/src/main/res/layout/module_push_message_item.xml b/modules/mogo-module-push/src/main/res/layout/module_push_message_item.xml
index 29803b5e64..a01bc6197c 100644
--- a/modules/mogo-module-push/src/main/res/layout/module_push_message_item.xml
+++ b/modules/mogo-module-push/src/main/res/layout/module_push_message_item.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.mogo.module.push.view.SwipeItemLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:paddingBottom="@dimen/module_push_content_only_line_space">
+    android:paddingBottom="@dimen/module_push_panel_paddingBottom">
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -32,15 +33,15 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/module_push_image_margin_top"
                 android:layout_marginTop="@dimen/module_push_item_title_margin_top"
-                android:layout_marginBottom="@dimen/module_push_item_title_margin_bottom"
                 android:ellipsize="end"
                 android:gravity="left"
                 android:maxLines="1"
                 android:text="push title"
                 android:textColor="@color/module_push_item_title_textColor"
                 android:textSize="@dimen/module_push_title_text_size"
-                app:layout_constraintBottom_toTopOf="@+id/module_push_item_content"
+                android:textStyle="bold"
                 app:layout_constraintLeft_toRightOf="@+id/module_push_item_app_icon"
+                app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintWidth_max="@dimen/module_push_item_content_width"
                 app:layout_goneMarginBottom="@dimen/module_push_item_title_gone_margin_bottom" />
 
@@ -49,20 +50,19 @@
                 android:layout_width="@dimen/module_push_item_content_width"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/module_push_item_content_margin_end"
-                android:layout_marginBottom="@dimen/module_push_item_content_margin_bottom"
                 android:ellipsize="end"
                 android:gravity="left"
                 android:maxLines="1"
-                android:text="发现系统新版本，共140.3M。部分功能优化，建议下载升级。"
                 android:textColor="@color/module_push_item_content_textColor"
                 android:textSize="@dimen/module_push_item_content_text_size"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="@+id/module_push_item_title" />
+                app:layout_constraintStart_toStartOf="@+id/module_push_item_title"
+                app:layout_constraintTop_toBottomOf="@+id/module_push_item_title"
+                tools:text="发现系统新版本，共140.3M。部分功能优化，建议下载升级。" />
 
             <com.mogo.service.imageloader.MogoImageView
                 android:id="@+id/module_push_item_image"
-                android:layout_width="@dimen/module_push_message_item_image_size"
-                android:layout_height="@dimen/module_push_message_item_image_size"
+                android:layout_width="@dimen/module_push_item_image_width"
+                android:layout_height="@dimen/module_push_item_image_height"
                 android:layout_marginEnd="@dimen/module_push_message_item_image_margin_end"
                 android:scaleType="centerCrop"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -75,14 +75,14 @@
                 android:id="@+id/module_push_item_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/module_push_item_time_textSize"
                 android:layout_marginEnd="@dimen/module_push_image_margin_top"
                 android:maxLines="1"
-                android:text="3:20"
-                android:layout_marginTop="@dimen/module_push_item_time_textSize"
                 android:textColor="@color/module_push_item_time_textColor"
                 android:textSize="@dimen/module_push_massage_time_text_size"
                 app:layout_constraintLeft_toLeftOf="@+id/module_push_item_content"
-                app:layout_constraintTop_toBottomOf="@+id/module_push_item_content" />
+                app:layout_constraintTop_toBottomOf="@+id/module_push_item_content"
+                tools:text="3:20" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </FrameLayout>
 
@@ -98,7 +98,7 @@
             android:layout_marginStart="@dimen/module_push_button_margin_top"
             android:background="@drawable/module_push_recycler_item_background"
             android:gravity="center"
-            android:text="清除"
+            android:text="@string/module_push_str_delete"
             android:textColor="@color/module_push_item_title_textColor"
             android:textSize="@dimen/module_push_title_text_size" />
     </FrameLayout>
diff --git a/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml
index 9188363b09..e7f1b333e7 100644
--- a/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml
@@ -14,7 +14,7 @@
     <dimen name="module_push_timer_margin_top">18px</dimen>
     <dimen name="module_push_image_width">320px</dimen>
     <dimen name="module_push_image_height">180px</dimen>
-    <dimen name="module_push_image_margin_top">21px</dimen>
+    <dimen name="module_push_image_margin_top">16px</dimen>
     <dimen name="module_push_content_only_width">320px</dimen>
     <dimen name="module_push_content_only_height">160px</dimen>
     <dimen name="module_push_content_only_line_space">9px</dimen>
@@ -34,15 +34,15 @@
     <dimen name="module_push_message_item_height">100px</dimen>
     <dimen name="module_push_message_app_icon_size">64px</dimen>
     <dimen name="module_push_message_margin_start">24px</dimen>
-    <dimen name="module_push_item_title_margin_top">12px</dimen>
+    <dimen name="module_push_item_title_margin_top">16px</dimen>
     <dimen name="module_push_item_title_gone_margin_bottom">44px</dimen>
     <dimen name="module_push_item_title_margin_bottom">2px</dimen>
     <dimen name="module_push_item_content_margin_end">20px</dimen>
     <dimen name="module_push_item_content_margin_bottom">27px</dimen>
     <dimen name="module_push_item_content_text_size">16px</dimen>
     <dimen name="module_push_message_item_image_size">64px</dimen>
-    <dimen name="module_push_message_item_image_margin_end">100px</dimen>
-    <dimen name="module_push_massage_time_text_size">12px</dimen>
+    <dimen name="module_push_message_item_image_margin_end">8px</dimen>
+    <dimen name="module_push_massage_time_text_size">16px</dimen>
 
     <dimen name="module_push_image_margin_bottom">22px</dimen>
     <dimen name="module_push_button_radius">27px</dimen>
@@ -50,7 +50,7 @@
     <dimen name="module_push_timer_thickness">1.5px</dimen>
     <dimen name="module_push_clear_bg_radius">24px</dimen>
     <dimen name="module_push_image_radius">10px</dimen>
-    <dimen name="module_push_item_image_radius">4px</dimen>
+    <dimen name="module_push_item_image_radius">8px</dimen>
     <dimen name="module_push_item_content_width">560px</dimen>
     <dimen name="module_push_ui_height">194px</dimen>
     <dimen name="module_push_ui_image_width">266px</dimen>
@@ -95,4 +95,6 @@
     <dimen name="module_push_panel_corner">16px</dimen>
     <dimen name="module_push_panel_item_corner">12px</dimen>
     <dimen name="module_push_item_time_textSize">5px</dimen>
+    <dimen name="module_push_item_image_width">118px</dimen>
+    <dimen name="module_push_item_image_height">86px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml
index 9188363b09..e7f1b333e7 100644
--- a/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml
@@ -14,7 +14,7 @@
     <dimen name="module_push_timer_margin_top">18px</dimen>
     <dimen name="module_push_image_width">320px</dimen>
     <dimen name="module_push_image_height">180px</dimen>
-    <dimen name="module_push_image_margin_top">21px</dimen>
+    <dimen name="module_push_image_margin_top">16px</dimen>
     <dimen name="module_push_content_only_width">320px</dimen>
     <dimen name="module_push_content_only_height">160px</dimen>
     <dimen name="module_push_content_only_line_space">9px</dimen>
@@ -34,15 +34,15 @@
     <dimen name="module_push_message_item_height">100px</dimen>
     <dimen name="module_push_message_app_icon_size">64px</dimen>
     <dimen name="module_push_message_margin_start">24px</dimen>
-    <dimen name="module_push_item_title_margin_top">12px</dimen>
+    <dimen name="module_push_item_title_margin_top">16px</dimen>
     <dimen name="module_push_item_title_gone_margin_bottom">44px</dimen>
     <dimen name="module_push_item_title_margin_bottom">2px</dimen>
     <dimen name="module_push_item_content_margin_end">20px</dimen>
     <dimen name="module_push_item_content_margin_bottom">27px</dimen>
     <dimen name="module_push_item_content_text_size">16px</dimen>
     <dimen name="module_push_message_item_image_size">64px</dimen>
-    <dimen name="module_push_message_item_image_margin_end">100px</dimen>
-    <dimen name="module_push_massage_time_text_size">12px</dimen>
+    <dimen name="module_push_message_item_image_margin_end">8px</dimen>
+    <dimen name="module_push_massage_time_text_size">16px</dimen>
 
     <dimen name="module_push_image_margin_bottom">22px</dimen>
     <dimen name="module_push_button_radius">27px</dimen>
@@ -50,7 +50,7 @@
     <dimen name="module_push_timer_thickness">1.5px</dimen>
     <dimen name="module_push_clear_bg_radius">24px</dimen>
     <dimen name="module_push_image_radius">10px</dimen>
-    <dimen name="module_push_item_image_radius">4px</dimen>
+    <dimen name="module_push_item_image_radius">8px</dimen>
     <dimen name="module_push_item_content_width">560px</dimen>
     <dimen name="module_push_ui_height">194px</dimen>
     <dimen name="module_push_ui_image_width">266px</dimen>
@@ -95,4 +95,6 @@
     <dimen name="module_push_panel_corner">16px</dimen>
     <dimen name="module_push_panel_item_corner">12px</dimen>
     <dimen name="module_push_item_time_textSize">5px</dimen>
+    <dimen name="module_push_item_image_width">118px</dimen>
+    <dimen name="module_push_item_image_height">86px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml
index d4fd8152a1..31bb7874fd 100644
--- a/modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml
@@ -14,7 +14,7 @@
     <dimen name="module_push_timer_margin_top">34px</dimen>
     <dimen name="module_push_image_width">600px</dimen>
     <dimen name="module_push_image_height">338px</dimen>
-    <dimen name="module_push_image_margin_top">40px</dimen>
+    <dimen name="module_push_image_margin_top">30px</dimen>
     <dimen name="module_push_content_only_width">605px</dimen>
     <dimen name="module_push_content_only_height">300px</dimen>
     <dimen name="module_push_content_only_line_space">16px</dimen>
@@ -34,7 +34,7 @@
     <dimen name="module_push_message_item_height">180px</dimen>
     <dimen name="module_push_message_app_icon_size">120px</dimen>
     <dimen name="module_push_message_margin_start">50px</dimen>
-    <dimen name="module_push_item_title_margin_top">21px</dimen>
+    <dimen name="module_push_item_title_margin_top">22px</dimen>
     <dimen name="module_push_item_title_margin_bottom">6px</dimen>
     <dimen name="module_push_item_title_gone_margin_bottom">84px</dimen>
 
@@ -42,7 +42,7 @@
     <dimen name="module_push_item_content_margin_bottom">52px</dimen>
     <dimen name="module_push_item_content_text_size">28px</dimen>
     <dimen name="module_push_message_item_image_size">120px</dimen>
-    <dimen name="module_push_message_item_image_margin_end">180px</dimen>
+    <dimen name="module_push_message_item_image_margin_end">11px</dimen>
     <dimen name="module_push_massage_time_text_size">26px</dimen>
     <dimen name="module_push_image_margin_bottom">42px</dimen>
     <dimen name="module_push_button_radius">51px</dimen>
@@ -50,7 +50,7 @@
     <dimen name="module_push_timer_thickness">3px</dimen>
     <dimen name="module_push_clear_bg_radius">45px</dimen>
     <dimen name="module_push_image_radius">20px</dimen>
-    <dimen name="module_push_item_image_radius">8px</dimen>
+    <dimen name="module_push_item_image_radius">16px</dimen>
     <dimen name="module_push_item_content_width">1000px</dimen>
     <dimen name="module_push_ui_height">350px</dimen>
     <dimen name="module_push_ui_image_width">480px</dimen>
@@ -95,4 +95,6 @@
     <dimen name="module_push_panel_corner">29px</dimen>
     <dimen name="module_push_panel_item_corner">22px</dimen>
     <dimen name="module_push_item_time_textSize">11px</dimen>
+    <dimen name="module_push_item_image_width">212px</dimen>
+    <dimen name="module_push_item_image_height">154px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/res/values/colors.xml b/modules/mogo-module-push/src/main/res/values/colors.xml
index 8281819316..cd5df39f48 100644
--- a/modules/mogo-module-push/src/main/res/values/colors.xml
+++ b/modules/mogo-module-push/src/main/res/values/colors.xml
@@ -3,5 +3,5 @@
     <color name="module_push_panel_title_textColor">#FFFFFFFF</color>
     <color name="module_push_item_title_textColor">#FFFFFF</color>
     <color name="module_push_item_content_textColor">#B2FFFFFF</color>
-    <color name="module_push_item_time_textColor">#B2FFFFFF</color>
+    <color name="module_push_item_time_textColor">#999999</color>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/res/values/dimens.xml b/modules/mogo-module-push/src/main/res/values/dimens.xml
index c0dd3e9561..6f442bde0d 100644
--- a/modules/mogo-module-push/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-push/src/main/res/values/dimens.xml
@@ -14,7 +14,7 @@
     <dimen name="module_push_timer_margin_top">18px</dimen>
     <dimen name="module_push_image_width">320px</dimen>
     <dimen name="module_push_image_height">180px</dimen>
-    <dimen name="module_push_image_margin_top">21px</dimen>
+    <dimen name="module_push_image_margin_top">16px</dimen>
     <dimen name="module_push_content_only_width">320px</dimen>
     <dimen name="module_push_content_only_height">160px</dimen>
     <dimen name="module_push_content_only_line_space">9px</dimen>
@@ -34,15 +34,15 @@
     <dimen name="module_push_message_item_height">100px</dimen>
     <dimen name="module_push_message_app_icon_size">64px</dimen>
     <dimen name="module_push_message_margin_start">24px</dimen>
-    <dimen name="module_push_item_title_margin_top">12px</dimen>
+    <dimen name="module_push_item_title_margin_top">16px</dimen>
     <dimen name="module_push_item_title_gone_margin_bottom">44px</dimen>
     <dimen name="module_push_item_title_margin_bottom">2px</dimen>
     <dimen name="module_push_item_content_margin_end">20px</dimen>
     <dimen name="module_push_item_content_margin_bottom">27px</dimen>
     <dimen name="module_push_item_content_text_size">16px</dimen>
     <dimen name="module_push_message_item_image_size">64px</dimen>
-    <dimen name="module_push_message_item_image_margin_end">100px</dimen>
-    <dimen name="module_push_massage_time_text_size">12px</dimen>
+    <dimen name="module_push_message_item_image_margin_end">8px</dimen>
+    <dimen name="module_push_massage_time_text_size">16px</dimen>
 
     <dimen name="module_push_image_margin_bottom">22px</dimen>
     <dimen name="module_push_button_radius">27px</dimen>
@@ -50,7 +50,7 @@
     <dimen name="module_push_timer_thickness">1.5px</dimen>
     <dimen name="module_push_clear_bg_radius">24px</dimen>
     <dimen name="module_push_image_radius">10px</dimen>
-    <dimen name="module_push_item_image_radius">4px</dimen>
+    <dimen name="module_push_item_image_radius">8px</dimen>
     <dimen name="module_push_item_content_width">560px</dimen>
     <dimen name="module_push_ui_height">194px</dimen>
     <dimen name="module_push_ui_image_width">266px</dimen>
@@ -95,4 +95,6 @@
     <dimen name="module_push_panel_corner">16px</dimen>
     <dimen name="module_push_panel_item_corner">12px</dimen>
     <dimen name="module_push_item_time_textSize">5px</dimen>
+    <dimen name="module_push_item_image_width">118px</dimen>
+    <dimen name="module_push_item_image_height">86px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/res/values/strings.xml b/modules/mogo-module-push/src/main/res/values/strings.xml
index a740d57bd3..e8ee4efdc3 100644
--- a/modules/mogo-module-push/src/main/res/values/strings.xml
+++ b/modules/mogo-module-push/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">mogo-module-push</string>
+    <string name="module_push_str_delete">清除</string>
 </resources>
diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt
index 1c2ccc322d..fe57ab63b7 100644
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt
@@ -149,13 +149,13 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener {
             SettingManager.mapType = checkedId
             when (checkedId) {
                 R.id.rb_navi_day -> {
-                    SearchApisHolder.getUiControllerApis().changeMapMode(EnumMapUI.Type_Light)
+                    SearchApisHolder.getApis().adasControllerApi.changeAdasControlMode(EnumMapUI.Type_Light)
                 }
                 R.id.rb_navi_night -> {
-                    SearchApisHolder.getUiControllerApis().changeMapMode(EnumMapUI.Type_Night)
+                    SearchApisHolder.getApis().adasControllerApi.changeAdasControlMode(EnumMapUI.Type_Night)
                 }
                 R.id.rb_navi_auto -> {
-                    SearchApisHolder.getUiControllerApis().changeMapMode(EnumMapUI.Type_AUTO_LIGHT_Night)
+                    SearchApisHolder.getApis().adasControllerApi.changeAdasControlMode(EnumMapUI.Type_AUTO_LIGHT_Night)
                 }
             }
         }
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
index 761a83dc2e..3621019256 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
@@ -36,6 +36,7 @@ import com.mogo.module.service.utils.ViewUtils;
 import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
 import com.mogo.service.connection.IMogoOnMessageListener;
 import com.mogo.service.module.IMogoBizActionDoneListener;
+import com.mogo.utils.AppUtils;
 import com.mogo.utils.ResourcesHelper;
 import com.mogo.utils.ThreadPoolService;
 import com.mogo.utils.UiThreadHandler;
@@ -959,7 +960,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
         switch ( mapUI ) {
             case Type_Light:
             case Type_Night:
-                if ( !MarkerServiceHandler.getApis().getStatusManagerApi().isMainPageOnResume() ) {
+                if ( !AppUtils.isAppForeground( mContext ) ) {
                     return;
                 }
                 if ( mLastDataResult != null ) {
diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_marker_bkg.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_marker_bkg.png
old mode 100644
new mode 100755
index f12819ecfc..2dff68497d
Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_marker_bkg.png and b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_marker_bkg.png differ
diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_ai_assist_bkg_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_ai_assist_bkg_light.png
new file mode 100755
index 0000000000..402c1def01
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_ai_assist_bkg_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_applist_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_applist_light.png
new file mode 100755
index 0000000000..0438b180a1
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_applist_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_im_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_im_light.png
new file mode 100755
index 0000000000..e1d31d23fc
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_im_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_media_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_media_light.png
new file mode 100755
index 0000000000..9c4ddd35f3
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_media_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_navi_disable_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_navi_disable_light.png
new file mode 100644
index 0000000000..6138ca850c
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_navi_disable_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_navi_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_navi_light.png
new file mode 100755
index 0000000000..6abad98484
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_navi_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable/module_apps_pager_indicator_light.xml b/skin/mogo-skin-light/src/main/module-apps-res/drawable/module_apps_pager_indicator_light.xml
new file mode 100644
index 0000000000..bff99886f4
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-apps-res/drawable/module_apps_pager_indicator_light.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="false">
+        <shape android:shape="rectangle">
+
+            <!-- 填充的颜色 -->
+            <solid android:color="#4D333333" />
+            <!-- 设置矩形的四个角为弧形 -->
+            <!-- android:radius 弧形的半径 -->
+            <corners android:radius="90px" />
+
+        </shape>
+    </item>
+    <item android:state_selected="true">
+        <shape android:shape="rectangle">
+
+            <!-- 填充的颜色 -->
+            <solid android:color="#333333" />
+            <!-- 设置矩形的四个角为弧形 -->
+            <!-- android:radius 弧形的半径 -->
+            <corners android:radius="90px" />
+
+        </shape>
+    </item>
+</selector>
diff --git a/skin/mogo-skin-light/src/main/module-apps-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-apps-res/values/colors.xml
index ff5c5d096b..0f4ba56af4 100644
--- a/skin/mogo-skin-light/src/main/module-apps-res/values/colors.xml
+++ b/skin/mogo-skin-light/src/main/module-apps-res/values/colors.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="module_app_page_bkg_color_light">#B2F5F5F5</color>
+    <color name="module_app_page_bkg_color_light">#F5F5F5</color>
+    <color name="module_apps_id_app_name_textColor_light">#333333</color>
 </resources>
diff --git a/skin/mogo-skin-light/src/main/module-push-res/drawable-mdpi/module_push_close_light.png b/skin/mogo-skin-light/src/main/module-push-res/drawable-mdpi/module_push_close_light.png
new file mode 100755
index 0000000000..d25aa13032
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-push-res/drawable-mdpi/module_push_close_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_activity_clear_bg_light.xml b/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_activity_clear_bg_light.xml
new file mode 100644
index 0000000000..d518d9b0ab
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_activity_clear_bg_light.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="@dimen/module_push_clear_bg_radius" />
+    <solid android:color="#FEFEFF"/>
+</shape>
diff --git a/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_activity_background_light.xml b/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_activity_background_light.xml
index 54e15b4ecc..d55da005a7 100644
--- a/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_activity_background_light.xml
+++ b/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_activity_background_light.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#FFFFFF"/>
+    <solid android:color="#E6F5F5F5"/>
     <corners android:radius="@dimen/module_push_panel_corner"/>
 </shape>
diff --git a/skin/mogo-skin-light/src/main/module-push-res/values-ldpi/dimens.xml b/skin/mogo-skin-light/src/main/module-push-res/values-ldpi/dimens.xml
index 1ebc40fcc0..f3c9b8e297 100644
--- a/skin/mogo-skin-light/src/main/module-push-res/values-ldpi/dimens.xml
+++ b/skin/mogo-skin-light/src/main/module-push-res/values-ldpi/dimens.xml
@@ -2,4 +2,5 @@
 <resources>
     <dimen name="module_push_panel_corner">16px</dimen>
     <dimen name="module_push_panel_item_corner">12px</dimen>
+    <dimen name="module_push_clear_bg_radius">24px</dimen>
 </resources>
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-push-res/values-mdpi/dimens.xml b/skin/mogo-skin-light/src/main/module-push-res/values-mdpi/dimens.xml
index 1ebc40fcc0..f3c9b8e297 100644
--- a/skin/mogo-skin-light/src/main/module-push-res/values-mdpi/dimens.xml
+++ b/skin/mogo-skin-light/src/main/module-push-res/values-mdpi/dimens.xml
@@ -2,4 +2,5 @@
 <resources>
     <dimen name="module_push_panel_corner">16px</dimen>
     <dimen name="module_push_panel_item_corner">12px</dimen>
+    <dimen name="module_push_clear_bg_radius">24px</dimen>
 </resources>
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-push-res/values-xhdpi/dimens.xml b/skin/mogo-skin-light/src/main/module-push-res/values-xhdpi/dimens.xml
index d28982bd82..7aabd7e78b 100644
--- a/skin/mogo-skin-light/src/main/module-push-res/values-xhdpi/dimens.xml
+++ b/skin/mogo-skin-light/src/main/module-push-res/values-xhdpi/dimens.xml
@@ -2,4 +2,5 @@
 <resources>
     <dimen name="module_push_panel_corner">29px</dimen>
     <dimen name="module_push_panel_item_corner">22px</dimen>
+    <dimen name="module_push_clear_bg_radius">45px</dimen>
 </resources>
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-push-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-push-res/values/colors.xml
index 86bf425d17..7a6ecee38d 100644
--- a/skin/mogo-skin-light/src/main/module-push-res/values/colors.xml
+++ b/skin/mogo-skin-light/src/main/module-push-res/values/colors.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="module_push_panel_title_textColor_light">#333333</color>
+    <color name="module_push_item_title_textColor_light">#333333</color>
     <color name="module_push_item_content_textColor_light">#666666</color>
-    <color name="module_push_item_time_textColor_light">#666666</color>
+    <color name="module_push_item_time_textColor_light">#999999</color>
 </resources>
diff --git a/skin/mogo-skin-light/src/main/module-push-res/values/dimens.xml b/skin/mogo-skin-light/src/main/module-push-res/values/dimens.xml
index 1ebc40fcc0..f3c9b8e297 100644
--- a/skin/mogo-skin-light/src/main/module-push-res/values/dimens.xml
+++ b/skin/mogo-skin-light/src/main/module-push-res/values/dimens.xml
@@ -2,4 +2,5 @@
 <resources>
     <dimen name="module_push_panel_corner">16px</dimen>
     <dimen name="module_push_panel_item_corner">12px</dimen>
+    <dimen name="module_push_clear_bg_radius">24px</dimen>
 </resources>
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-mdpi/module_services_marker_bkg_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-mdpi/module_services_marker_bkg_light.png
new file mode 100755
index 0000000000..8044b0458f
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-services-res/drawable-mdpi/module_services_marker_bkg_light.png differ