diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 9d8d20d50d..5974cf305a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -84,7 +84,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/module_services_marker_bkg.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/module_services_marker_bkg.png
old mode 100755
new mode 100644
index 2dff68497d..79d163824d
Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/module_services_marker_bkg.png and b/modules/mogo-module-common/src/main/res/drawable-ldpi/module_services_marker_bkg.png differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-mdpi/module_services_marker_bkg.png b/modules/mogo-module-common/src/main/res/drawable-mdpi/module_services_marker_bkg.png
old mode 100755
new mode 100644
index 2dff68497d..79d163824d
Binary files a/modules/mogo-module-common/src/main/res/drawable-mdpi/module_services_marker_bkg.png and b/modules/mogo-module-common/src/main/res/drawable-mdpi/module_services_marker_bkg.png differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_ext_shadow_bkg_pressed.9.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_ext_shadow_bkg_pressed.9.png
index 59004c573b..8a39d6393d 100644
Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_ext_shadow_bkg_pressed.9.png and b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_ext_shadow_bkg_pressed.9.png differ
diff --git a/modules/mogo-module-common/src/main/res/drawable/module_ext_shadow_bkg.9.png b/modules/mogo-module-common/src/main/res/drawable/module_ext_shadow_bkg.9.png
index afb16dbbaa..791e27e8b1 100644
Binary files a/modules/mogo-module-common/src/main/res/drawable/module_ext_shadow_bkg.9.png and b/modules/mogo-module-common/src/main/res/drawable/module_ext_shadow_bkg.9.png differ
diff --git a/modules/mogo-module-common/src/main/res/drawable/module_ext_shadow_bkg_pressed.9.png b/modules/mogo-module-common/src/main/res/drawable/module_ext_shadow_bkg_pressed.9.png
index 84714660ab..421939e6e9 100644
Binary files a/modules/mogo-module-common/src/main/res/drawable/module_ext_shadow_bkg_pressed.9.png and b/modules/mogo-module-common/src/main/res/drawable/module_ext_shadow_bkg_pressed.9.png differ
diff --git a/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml
index a3ca5a2f67..5a70add03a 100644
--- a/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml
@@ -10,8 +10,8 @@
 
     <dimen name="module_service_marker_anchor_size">16dp</dimen>
     <dimen name="module_service_marker_dot_marginTop">2dp</dimen>
-    <dimen name="module_service_marker_bubble_width">56px</dimen>
-    <dimen name="module_service_marker_bubble_height">65px</dimen>
+    <dimen name="module_service_marker_bubble_width">70px</dimen>
+    <dimen name="module_service_marker_bubble_height">76px</dimen>
     <dimen name="module_service_marker_bubble_icon_width">35px</dimen>
     <dimen name="module_service_marker_bubble_icon_height">35px</dimen>
     <dimen name="module_service_marker_bubble_icon_marginBottom">4px</dimen>
diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
index d6ea8d2cf5..eae48600b3 100644
--- a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
@@ -1064,7 +1064,7 @@
 
     <dimen name="module_service_marker_anchor_size">20dp</dimen>
     <dimen name="module_service_marker_dot_marginTop">4dp</dimen>
-    <dimen name="module_service_marker_bubble_width">100px</dimen>
+    <dimen name="module_service_marker_bubble_width">120px</dimen>
     <dimen name="module_service_marker_bubble_vr_width">55px</dimen>
     <dimen name="module_service_marker_bubble_height">130px</dimen>
     <dimen name="module_service_marker_bubble_vr_height">69px</dimen>
diff --git a/modules/mogo-module-common/src/main/res/values/dimens.xml b/modules/mogo-module-common/src/main/res/values/dimens.xml
index d64511c300..3a3061909a 100644
--- a/modules/mogo-module-common/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values/dimens.xml
@@ -1056,8 +1056,8 @@
 
 	<dimen name="module_service_marker_anchor_size">16dp</dimen>
 	<dimen name="module_service_marker_dot_marginTop">2dp</dimen>
-	<dimen name="module_service_marker_bubble_width">56px</dimen>
-	<dimen name="module_service_marker_bubble_height">65px</dimen>
+	<dimen name="module_service_marker_bubble_width">70px</dimen>
+	<dimen name="module_service_marker_bubble_height">76px</dimen>
 	<dimen name="module_service_marker_bubble_icon_width">35px</dimen>
 	<dimen name="module_service_marker_bubble_icon_height">35px</dimen>
 	<dimen name="module_service_marker_bubble_icon_marginBottom">4px</dimen>
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_message2.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_message2.png
old mode 100755
new mode 100644
index b697913af8..2c4fe2dcb8
Binary files a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_message2.png and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_message2.png differ
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_map_ic_move2_current_location.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_map_ic_move2_current_location.png
index 401802a43f..3f520955ef 100644
Binary files a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_map_ic_move2_current_location.png and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_map_ic_move2_current_location.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_marker_bkg.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_marker_bkg.png
deleted file mode 100644
index 8679746dc7..0000000000
Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_marker_bkg.png and /dev/null differ
diff --git a/modules/mogo-module-service/src/main/res/layout/modudle_services_marker_layout.xml b/modules/mogo-module-service/src/main/res/layout/modudle_services_marker_layout.xml
deleted file mode 100644
index d056cf267e..0000000000
--- a/modules/mogo-module-service/src/main/res/layout/modudle_services_marker_layout.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 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="wrap_content"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:orientation="vertical"
-    android:padding="1px"
-    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
-
-    <FrameLayout
-        android:id="@+id/clMarkerTopView"
-        android:layout_width="@dimen/module_service_marker_bubble_width"
-        android:background="@drawable/module_services_marker_bkg"
-        android:layout_height="@dimen/module_service_marker_bubble_height">
-
-        <com.mogo.service.imageloader.MogoImageView
-            android:id="@+id/ivIcon"
-            android:layout_width="@dimen/module_service_marker_bubble_icon_width"
-            android:layout_height="@dimen/module_service_marker_bubble_icon_height"
-            android:layout_gravity="center"
-            android:layout_marginBottom="@dimen/module_service_marker_bubble_icon_marginBottom"
-            tools:src="@drawable/icon_map_marker_road_block_up2" />
-
-    </FrameLayout>
-
-    <ImageView
-        android:id="@+id/ivCar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/module_service_marker_dot_marginTop"
-        android:src="@drawable/icon_map_marker_location_yellow" />
-</LinearLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml
index 67cbb204d3..a15301a919 100644
--- a/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml
@@ -2,8 +2,6 @@
 <resources>
     <dimen name="module_service_marker_anchor_size">16dp</dimen>
     <dimen name="module_service_marker_dot_marginTop">2px</dimen>
-    <dimen name="module_service_marker_bubble_width">70px</dimen>
-    <dimen name="module_service_marker_bubble_height">76px</dimen>
     <dimen name="module_service_marker_bubble_icon_width">35px</dimen>
     <dimen name="module_service_marker_bubble_icon_height">35px</dimen>
     <dimen name="module_service_marker_bubble_icon_marginBottom">4px</dimen>
diff --git a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml
index 4a29170957..9a8a2ee168 100644
--- a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml
@@ -2,8 +2,6 @@
 <resources>
     <dimen name="module_service_marker_anchor_size">16dp</dimen>
     <dimen name="module_service_marker_dot_marginTop">2px</dimen>
-    <dimen name="module_service_marker_bubble_width">70px</dimen>
-    <dimen name="module_service_marker_bubble_height">76px</dimen>
     <dimen name="module_service_marker_bubble_icon_width">35px</dimen>
     <dimen name="module_service_marker_bubble_icon_height">35px</dimen>
     <dimen name="module_service_marker_bubble_icon_marginBottom">4px</dimen>
diff --git a/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml
index f210b727f5..190a08a8cf 100644
--- a/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -2,8 +2,6 @@
 <resources>
     <dimen name="module_service_marker_anchor_size">20dp</dimen>
     <dimen name="module_service_marker_dot_marginTop">4px</dimen>
-    <dimen name="module_service_marker_bubble_width">120px</dimen>
-    <dimen name="module_service_marker_bubble_height">130px</dimen>
     <dimen name="module_service_marker_bubble_icon_width">60px</dimen>
     <dimen name="module_service_marker_bubble_icon_height">60px</dimen>
     <dimen name="module_service_marker_bubble_icon_marginBottom">8px</dimen>
diff --git a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml
index f0d8afe799..9bf4714aaf 100644
--- a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml
@@ -2,8 +2,6 @@
 <resources>
     <dimen name="module_service_marker_anchor_size">20dp</dimen>
     <dimen name="module_service_marker_dot_marginTop">4px</dimen>
-    <dimen name="module_service_marker_bubble_width">120px</dimen>
-    <dimen name="module_service_marker_bubble_height">130px</dimen>
     <dimen name="module_service_marker_bubble_icon_width">60px</dimen>
     <dimen name="module_service_marker_bubble_icon_height">60px</dimen>
     <dimen name="module_service_marker_bubble_icon_marginBottom">8px</dimen>
diff --git a/modules/mogo-module-service/src/main/res/values/dimens.xml b/modules/mogo-module-service/src/main/res/values/dimens.xml
index 39993d0f54..1831322eed 100644
--- a/modules/mogo-module-service/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values/dimens.xml
@@ -2,8 +2,6 @@
 <resources>
     <dimen name="module_service_marker_anchor_size">20dp</dimen>
     <dimen name="module_service_marker_dot_marginTop">4px</dimen>
-    <dimen name="module_service_marker_bubble_width">120px</dimen>
-    <dimen name="module_service_marker_bubble_height">130px</dimen>
     <dimen name="module_service_marker_bubble_icon_width">60px</dimen>
     <dimen name="module_service_marker_bubble_icon_height">60px</dimen>
     <dimen name="module_service_marker_bubble_icon_marginBottom">8px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/destination/基于目的地违章高发情况的停车推荐 b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/destination/基于目的地违章高发情况的停车推荐
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/destination/基于目的地预判的道路事件提醒、路线推荐 b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/destination/基于目的地预判的道路事件提醒、路线推荐
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_event_panel_more.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_event_panel_more.png
index 2cf79cfff6..5d6656f2d0 100644
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_event_panel_more.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_event_panel_more.png differ
diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_ext_shadow_bkg_light.9.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_ext_shadow_bkg_light.9.png
index c0eb68efbb..57693fe6a0 100644
Binary files a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_ext_shadow_bkg_light.9.png and b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_ext_shadow_bkg_light.9.png differ
diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_message2_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_message2_light.png
index 970f745d27..496358dfba 100644
Binary files a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_message2_light.png and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_message2_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_map_ic_move2_current_location_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_map_ic_move2_current_location_light.png
index bc4de1e54d..b0cca09385 100644
Binary files a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_map_ic_move2_current_location_light.png and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_map_ic_move2_current_location_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_shadow_bkg_pressed_light.9.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_shadow_bkg_pressed_light.9.png
index 3fcd24fdcd..133a6cc00b 100644
Binary files a/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_shadow_bkg_pressed_light.9.png and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_shadow_bkg_pressed_light.9.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_event_panel_more_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_event_panel_more_light.png
index 4218e8615b..ea1f645de1 100644
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_event_panel_more_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_event_panel_more_light.png differ