diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java
index 5af7ed7006..4fe2a7c7e6 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java
@@ -54,7 +54,7 @@ public class TaxiPassengerServiceManager {
      * @return
      */
     private String getDriverAppSn(){
-        return "X20202206092431156";
+        return "X20202207012UQN8GO";
     }
 
     /**
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt
index 53ba767892..8964d0907b 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt
@@ -166,10 +166,10 @@ object OverlayLeftViewUtils {
                 }
             }
 
-            integers.add(LeftMenuModel(R.drawable.taxi_p_mogo_live_select,R.drawable.taxi_p_mogo_live_selected,false,liveSelected))
-            integers.add(LeftMenuModel(R.drawable.taxi_p_mogo_overview_select,R.drawable.taxi_p_mogo_overview_selected,false,overViewSelected))
-            integers.add(LeftMenuModel(R.drawable.taxi_p_mogo_consult_select,R.drawable.taxi_p_mogo_consult_selected,false,consultSelect))
-            integers.add(LeftMenuModel(R.drawable.taxi_p_mogo_entertainment_select,R.drawable.taxi_p_mogo_entertainment_selected,false,entertainmentSelect))
+            integers.add(LeftMenuModel(R.drawable.shape_size_live_select,           R.drawable.shape_size_live_selected,false,liveSelected))
+            integers.add(LeftMenuModel(R.drawable.shape_size_overview_select,       R.drawable.shape_size_overview_selected,false,overViewSelected))
+            integers.add(LeftMenuModel(R.drawable.shape_size_consult_select,        R.drawable.shape_size_consult_selected,false,consultSelect))
+            integers.add(LeftMenuModel(R.drawable.shape_size_entertainment_select,  R.drawable.shape_size_entertainment_selected,false,entertainmentSelect))
             integers.forEachIndexed { index, leftMenuModel ->
                 leftMenuModel.isChecked = index == checkIndex
             }
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java
index 4e01541cd3..49fac8a530 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java
@@ -18,6 +18,8 @@ import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack;
 
 import java.util.List;
 
+import me.jessyan.autosize.AutoSizeCompat;
+
 public class RecyclerVideoAdapter extends RecyclerView.Adapter<RecyclerItemVideoHolder> {
     private final static String TAG = "RecyclerBaseAdapter";
 
@@ -61,7 +63,7 @@ public class RecyclerVideoAdapter extends RecyclerView.Adapter<RecyclerItemVideo
     @Override
     public void onBindViewHolder(@NonNull final RecyclerItemVideoHolder holder, int position) {
         final TaxiPassengerVideoPlay taxiPassengerVideoPlay = itemDataList.get(position);
-
+        AutoSizeCompat.autoConvertDensityOfGlobal(holder.itemView.getResources());
         holder.gsyVideoOptionBuilder
                 .setEnlargeImageRes(R.drawable.taxi_p_change_full)
                 .setUrl(taxiPassengerVideoPlay.getUrl())
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt
index fdef63f02d..bd7467c6bd 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt
@@ -2,25 +2,25 @@ package com.mogo.och.taxi.passenger.ui.video
 
 import android.content.Context
 import android.content.Intent
+import android.content.res.Resources
 import android.graphics.Color
 import android.net.Uri
 import android.os.Bundle
+import android.os.Looper
 import android.view.View
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
+import com.mogo.commons.screen.ScreenHelper
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.BarUtils
-import com.mogo.och.common.module.utils.DateTimeUtil
-import com.mogo.och.common.module.utils.NumberFormatUtil
 import com.mogo.och.taxi.passenger.R
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerVideoPlay
 import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst
 import com.mogo.och.taxi.passenger.event.FinishActivity
-import com.mogo.och.taxi.passenger.mulprocess.ICallback
 import com.mogo.och.taxi.passenger.ui.leftmenu.LeftMenuOpen
 import com.mogo.och.taxi.passenger.ui.leftmenu.OverlayLeftViewUtils
 import com.mogo.och.taxi.passenger.ui.video.layoutmanage.CarouselLayoutManager
@@ -33,6 +33,8 @@ import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorOrientation
 import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorSlideMode
 import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorStyle
 import com.shuyu.gsyvideoplayer.video.base.GSYVideoView
+import me.jessyan.autosize.AutoSize
+import me.jessyan.autosize.AutoSizeCompat
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -41,9 +43,7 @@ import rx.Observer
 import rx.Subscription
 import rx.android.schedulers.AndroidSchedulers
 import rx.schedulers.Schedulers
-import java.util.Calendar
 import java.util.concurrent.TimeUnit
-import kotlin.collections.ArrayList
 import kotlin.math.floor
 
 
@@ -401,4 +401,10 @@ class VideoActivity : AppCompatActivity() {
 
     override fun onBackPressed() {}
 
+    override fun getResources(): Resources? {
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+            AutoSizeCompat.autoConvertDensityOfGlobal(super.getResources())
+        }
+        return super.getResources()
+    }
 }
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/bg_progress_bar.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/bg_progress_bar.png
deleted file mode 100644
index cd14bf2760..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/bg_progress_bar.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/bg_taxi_p_arrived_info_floating.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/bg_taxi_p_arrived_info_floating.png
deleted file mode 100644
index ebe94ecd52..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/bg_taxi_p_arrived_info_floating.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/bg_taxi_p_checked_input_background.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/bg_taxi_p_checked_input_background.png
deleted file mode 100644
index ec58d028f2..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/bg_taxi_p_checked_input_background.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/bg_taxi_p_video_index.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/bg_taxi_p_video_index.png
deleted file mode 100644
index 61f22d3bf0..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/bg_taxi_p_video_index.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_autopilot_status_bg.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_autopilot_status_bg.xml
deleted file mode 100644
index e323eca4c3..0000000000
--- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_autopilot_status_bg.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true">
-        <shape android:shape="rectangle">
-            <corners android:bottomLeftRadius="20dp" android:bottomRightRadius="50dp" android:topLeftRadius="50dp" android:topRightRadius="20dp" />
-            <gradient android:angle="315" android:endColor="#2B6EFF" android:startColor="#2B6EFF" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <corners android:bottomLeftRadius="20dp" android:bottomRightRadius="50dp" android:topLeftRadius="50dp" android:topRightRadius="20dp" />
-            <gradient android:angle="315" android:endColor="#3B4577" android:startColor="#3B4577" />
-        </shape>
-    </item>
-</selector>
-
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_base_icon_not_in_autopilot.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_base_icon_not_in_autopilot.png
deleted file mode 100644
index 927296d690..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_base_icon_not_in_autopilot.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot.png
deleted file mode 100644
index 539e106058..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_disable.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_disable.png
deleted file mode 100644
index 695515a366..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_disable.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_arrive_end_panel_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_arrive_end_panel_bg.png
deleted file mode 100644
index 8c7c04a122..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_arrive_end_panel_bg.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_arrived_end_light.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_arrived_end_light.png
deleted file mode 100644
index 046f001a37..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_arrived_end_light.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_arrow_nor.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_arrow_nor.png
deleted file mode 100644
index b9d70e5fbb..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_arrow_nor.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_auto_nor.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_auto_nor.png
deleted file mode 100644
index c15a11f4e4..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_auto_nor.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_change_full.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_change_full.png
deleted file mode 100644
index a70be0cdd8..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_change_full.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_change_normal.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_change_normal.png
deleted file mode 100644
index b3ceb81fb6..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_change_normal.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_dot_line.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_dot_line.png
deleted file mode 100644
index 46900bd157..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_dot_line.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_ic_autopilot_loading.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_ic_autopilot_loading.png
deleted file mode 100644
index a71cf9a4f9..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_ic_autopilot_loading.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_left_flow_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_left_flow_bg.png
deleted file mode 100755
index 232b525cc9..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_left_flow_bg.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_light_green_nor.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_light_green_nor.png
deleted file mode 100644
index bc9fed952d..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_light_green_nor.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_light_red_nor.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_light_red_nor.png
deleted file mode 100644
index 8732508ded..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_light_red_nor.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_lightyellow_nor.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_lightyellow_nor.png
deleted file mode 100644
index bae01408fd..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_lightyellow_nor.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_arrow_arrived.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_arrow_arrived.png
deleted file mode 100644
index 36ef2e88d3..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_arrow_arrived.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_arrow_un_arrive.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_arrow_un_arrive.png
deleted file mode 100644
index baa35592cb..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_arrow_un_arrive.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_car.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_car.png
deleted file mode 100644
index dedaf093e9..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_car.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_view_dir_end.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_view_dir_end.png
deleted file mode 100644
index a81336d4c2..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_view_dir_end.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_view_dir_start.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_view_dir_start.png
deleted file mode 100644
index 3cee184981..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_view_dir_start.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_consult_select.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_consult_select.png
deleted file mode 100644
index efa5c92cff..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_consult_select.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_consult_selected.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_consult_selected.png
deleted file mode 100644
index a920f867bf..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_consult_selected.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_consult_title_icon.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_consult_title_icon.png
deleted file mode 100644
index 56452fe256..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_consult_title_icon.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_entertainment_select.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_entertainment_select.png
deleted file mode 100644
index f1fcd94d06..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_entertainment_select.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_entertainment_selected.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_entertainment_selected.png
deleted file mode 100644
index 8777558ee2..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_entertainment_selected.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_live_select.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_live_select.png
deleted file mode 100644
index 7571b33968..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_live_select.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_live_selected.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_live_selected.png
deleted file mode 100644
index 7b309b5815..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_live_selected.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_movies_title_icon.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_movies_title_icon.png
deleted file mode 100644
index 72dc087fd4..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_movies_title_icon.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_overview_select.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_overview_select.png
deleted file mode 100644
index 42d3500f40..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_overview_select.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_overview_selected.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_overview_selected.png
deleted file mode 100644
index 9d8c093a92..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_overview_selected.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_video_play.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_video_play.png
deleted file mode 100644
index ff5fb41cab..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogo_video_play.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogologo_nor.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogologo_nor.png
deleted file mode 100644
index ec1692cdcd..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_mogologo_nor.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_panel_bottom_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_panel_bottom_bg.png
deleted file mode 100644
index 83392d5cc4..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_panel_bottom_bg.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_arrived_close.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_arrived_close.png
deleted file mode 100644
index 2d9221c90e..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_arrived_close.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_check_end_boll.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_check_end_boll.png
deleted file mode 100644
index 97644d1c3d..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_check_end_boll.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_check_logo.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_check_logo.png
deleted file mode 100644
index 328da8bc90..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_check_logo.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_check_panel_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_check_panel_bg.png
deleted file mode 100755
index 49567f10c2..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_check_panel_bg.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_check_robot.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_check_robot.png
deleted file mode 100644
index 156a3d1526..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_check_robot.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_check_start_boll.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_check_start_boll.png
deleted file mode 100644
index c6a019187a..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_check_start_boll.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_check_start_end_line.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_check_start_end_line.png
deleted file mode 100644
index 14c0e5fa19..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_check_start_end_line.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_star.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_star.png
deleted file mode 100644
index e172c9e9cf..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_star.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_star_check.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_star_check.png
deleted file mode 100644
index 4f7770b502..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_star_check.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_start_panel_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_start_panel_bg.png
deleted file mode 100644
index 7121f26751..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_start_panel_bg.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_seekbar_point_icon.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_seekbar_point_icon.png
deleted file mode 100644
index ab00b6fde3..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_seekbar_point_icon.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_speed_light_green_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_speed_light_green_bg.png
deleted file mode 100644
index fda0da73e4..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_speed_light_green_bg.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_speed_light_red_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_speed_light_red_bg.png
deleted file mode 100644
index 4fa0e570fa..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_speed_light_red_bg.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_switch_map_long.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_switch_map_long.png
deleted file mode 100755
index 4bcb596e68..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_switch_map_long.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_switch_map_medium.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_switch_map_medium.png
deleted file mode 100755
index a0b6559ee0..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_switch_map_medium.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_un_auto_nor.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_un_auto_nor.png
deleted file mode 100644
index 08a8e7366a..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_un_auto_nor.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_bg.png
deleted file mode 100755
index dbfb370906..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_bg.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_bg_bottom.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_bg_bottom.png
deleted file mode 100644
index 4192d9cbd7..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_bg_bottom.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_bg_top.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_bg_top.png
deleted file mode 100644
index f9b70e6888..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_bg_top.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_holder.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_holder.png
deleted file mode 100644
index 99bfcefc6f..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_holder.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_shadow.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_shadow.png
deleted file mode 100644
index b348323df0..0000000000
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_video_shadow.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_base_icon_not_in_autopilot.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_base_icon_not_in_autopilot.png
index 21dc719ec9..927296d690 100644
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_base_icon_not_in_autopilot.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_base_icon_not_in_autopilot.png differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot.png
index be978145dc..539e106058 100644
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot.png differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg.png
similarity index 100%
rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_bg.png
rename to OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg.png
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_bg_pressed.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg_pressed.png
similarity index 100%
rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_bg_pressed.png
rename to OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg_pressed.png
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_failed.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_failed.png
similarity index 100%
rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_failed.png
rename to OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_failed.png
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_loading.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_loading.png
similarity index 100%
rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_loading.png
rename to OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_loading.png
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_success.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_success.png
similarity index 100%
rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_success.png
rename to OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_success.png
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_speed_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_speed_bg.png
similarity index 100%
rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_speed_bg.png
rename to OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_speed_bg.png
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_switch_map_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_switch_map_bg.png
similarity index 100%
rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_switch_map_bg.png
rename to OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_switch_map_bg.png
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_consult_select.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_consult_select.xml
new file mode 100644
index 0000000000..6995d42e96
--- /dev/null
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_consult_select.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/taxi_p_mogo_consult_select"
+        android:width="@dimen/dp_610"
+        android:height="@dimen/dp_310"/>
+</layer-list >
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_consult_selected.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_consult_selected.xml
new file mode 100644
index 0000000000..7ec7d6aeab
--- /dev/null
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_consult_selected.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/taxi_p_mogo_consult_selected"
+        android:width="@dimen/dp_610"
+        android:height="@dimen/dp_310"/>
+</layer-list >
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_entertainment_select.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_entertainment_select.xml
new file mode 100644
index 0000000000..1aea2aa656
--- /dev/null
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_entertainment_select.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/taxi_p_mogo_entertainment_select"
+        android:width="@dimen/dp_610"
+        android:height="@dimen/dp_310"/>
+</layer-list >
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_entertainment_selected.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_entertainment_selected.xml
new file mode 100644
index 0000000000..d4e519b304
--- /dev/null
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_entertainment_selected.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/taxi_p_mogo_entertainment_selected"
+        android:width="@dimen/dp_610"
+        android:height="@dimen/dp_310"/>
+</layer-list >
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_live_select.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_live_select.xml
new file mode 100644
index 0000000000..1c2ff76819
--- /dev/null
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_live_select.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/taxi_p_mogo_live_select"
+        android:width="@dimen/dp_610"
+        android:height="@dimen/dp_310"/>
+</layer-list >
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_live_selected.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_live_selected.xml
new file mode 100644
index 0000000000..8ce0bb1be3
--- /dev/null
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_live_selected.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/taxi_p_mogo_live_selected"
+        android:width="@dimen/dp_610"
+        android:height="@dimen/dp_310"/>
+</layer-list >
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_overview_select.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_overview_select.xml
new file mode 100644
index 0000000000..8555fe032d
--- /dev/null
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_overview_select.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/taxi_p_mogo_overview_select"
+        android:width="@dimen/dp_610"
+        android:height="@dimen/dp_310"/>
+</layer-list >
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_overview_selected.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_overview_selected.xml
new file mode 100644
index 0000000000..0f7ecd3028
--- /dev/null
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/shape_size_overview_selected.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/taxi_p_mogo_overview_selected"
+        android:width="@dimen/dp_610"
+        android:height="@dimen/dp_310"/>
+</layer-list >
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_autopilot_bg_selector.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_bg_selector.xml
similarity index 100%
rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_autopilot_bg_selector.xml
rename to OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_bg_selector.xml
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_status_bg.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_status_bg.xml
index 041d4e61c2..e323eca4c3 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_status_bg.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_status_bg.xml
@@ -2,13 +2,13 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true">
         <shape android:shape="rectangle">
-            <corners android:bottomLeftRadius="30dp" android:bottomRightRadius="70dp" android:topLeftRadius="70dp" android:topRightRadius="30dp" />
+            <corners android:bottomLeftRadius="20dp" android:bottomRightRadius="50dp" android:topLeftRadius="50dp" android:topRightRadius="20dp" />
             <gradient android:angle="315" android:endColor="#2B6EFF" android:startColor="#2B6EFF" />
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle">
-            <corners android:bottomLeftRadius="30dp" android:bottomRightRadius="70dp" android:topLeftRadius="70dp" android:topRightRadius="30dp" />
+            <corners android:bottomLeftRadius="20dp" android:bottomRightRadius="50dp" android:topLeftRadius="50dp" android:topRightRadius="20dp" />
             <gradient android:angle="315" android:endColor="#3B4577" android:startColor="#3B4577" />
         </shape>
     </item>
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_speed_selector.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_speed_selector.xml
similarity index 100%
rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_speed_selector.xml
rename to OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_speed_selector.xml
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_normal.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_normal.xml
index bfee44609b..a51634a7c2 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_normal.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_normal.xml
@@ -7,14 +7,16 @@
     <ImageView
         android:layout_gravity="top"
         android:src="@drawable/taxi_p_video_bg_top"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:scaleType="fitXY"
+        android:layout_width="1620dp"
+        android:layout_height="63dp"/>
 
     <ImageView
         android:layout_gravity="bottom"
         android:src="@drawable/taxi_p_video_bg_bottom"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:scaleType="fitXY"
+        android:layout_width="1620dp"
+        android:layout_height="63dp"/>
 
     <com.mogo.och.taxi.passenger.widget.ConsultVideoPlayer
         android:id="@+id/video_item_player"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml
index f75dec7ff4..c4d6a41994 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml
@@ -307,8 +307,8 @@
 
             <ImageView
                 android:id="@+id/taxi_p_arrow_nor"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/dp_100"
+                android:layout_height="@dimen/dp_100"
                 android:layout_marginRight="@dimen/dp_20"
                 android:layout_marginBottom="@dimen/dp_25"
                 android:src="@drawable/taxi_p_arrow_nor"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml
index 75ac0ab3d5..7fb2bc5d21 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml
@@ -21,8 +21,8 @@
         android:src="@drawable/taxi_p_passenger_arrived_close"
         android:layout_marginEnd="@dimen/dp_70"
         android:layout_marginTop="@dimen/dp_140"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_width="@dimen/dp_120"
+        android:layout_height="@dimen/dp_120"/>
 
     <com.mogo.och.common.module.wigets.OCHBorderShadowLayout
         android:id="@+id/och_shadow_layout"
@@ -136,51 +136,56 @@
                 android:layout_marginTop="@dimen/dp_44"
                 android:layout_marginStart="@dimen/dp_34"
                 android:layout_marginEnd="3dp"
+                android:scaleType="fitStart"
                 app:layout_constraintTop_toBottomOf="@+id/tv_please_score"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/iv_star_second"
                 android:src="@drawable/taxi_p_passenger_star"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
+                android:layout_width="@dimen/dp_119"
+                android:layout_height="@dimen/dp_148"/>
 
             <ImageView
                 android:id="@+id/iv_star_second"
                 android:layout_marginEnd="3dp"
+                android:scaleType="fitStart"
                 app:layout_constraintTop_toTopOf="@+id/iv_star_first"
                 app:layout_constraintStart_toEndOf="@+id/iv_star_first"
                 app:layout_constraintEnd_toStartOf="@+id/iv_star_third"
                 android:src="@drawable/taxi_p_passenger_star"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
+                android:layout_width="@dimen/dp_119"
+                android:layout_height="@dimen/dp_148"/>
 
             <ImageView
                 android:id="@+id/iv_star_third"
                 android:layout_marginEnd="3dp"
+                android:scaleType="fitStart"
                 app:layout_constraintTop_toTopOf="@+id/iv_star_second"
                 app:layout_constraintStart_toEndOf="@+id/iv_star_second"
                 app:layout_constraintEnd_toStartOf="@+id/iv_star_fourth"
                 android:src="@drawable/taxi_p_passenger_star"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
+                android:layout_width="@dimen/dp_119"
+                android:layout_height="@dimen/dp_148"/>
 
             <ImageView
                 android:id="@+id/iv_star_fourth"
                 android:layout_marginEnd="3dp"
+                android:scaleType="fitStart"
                 app:layout_constraintTop_toTopOf="@+id/iv_star_third"
                 app:layout_constraintStart_toEndOf="@+id/iv_star_third"
                 app:layout_constraintEnd_toStartOf="@+id/iv_star_fifth"
                 android:src="@drawable/taxi_p_passenger_star"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
+                android:layout_width="@dimen/dp_119"
+                android:layout_height="@dimen/dp_148"/>
 
             <ImageView
                 android:id="@+id/iv_star_fifth"
                 android:layout_marginEnd="3dp"
+                android:scaleType="fitStart"
                 app:layout_constraintTop_toTopOf="@+id/iv_star_fourth"
                 app:layout_constraintStart_toEndOf="@+id/iv_star_fourth"
                 android:src="@drawable/taxi_p_passenger_star"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
+                android:layout_width="@dimen/dp_119"
+                android:layout_height="@dimen/dp_148"/>
 
             <ImageView
                 android:id="@+id/iv_star_hide"
@@ -189,8 +194,8 @@
                 app:layout_constraintStart_toEndOf="@+id/iv_star_fourth"
                 android:src="@drawable/taxi_p_passenger_star"
                 android:visibility="invisible"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
+                android:layout_width="@dimen/dp_119"
+                android:layout_height="@dimen/dp_96"/>
 
             <TextView
                 android:id="@+id/tv_feel"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml
index 4c083c6f7a..30c569cd84 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml
@@ -15,8 +15,8 @@
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginTop="157dp"
         android:layout_marginStart="120dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_width="@dimen/dp_120"
+        android:layout_height="@dimen/dp_120"/>
 
     <TextView
         android:id="@+id/tv_mogo_consult"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_movies.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_movies.xml
index 0729bd5eb6..1eeb201cb5 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_movies.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_movies.xml
@@ -21,8 +21,8 @@
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginTop="@dimen/dp_130"
         android:layout_marginStart="@dimen/dp_100"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_width="@dimen/dp_120"
+        android:layout_height="@dimen/dp_120"/>
 
     <TextView
         android:id="@+id/tv_mogo_consult"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml
index dbac626998..2a755bc665 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml
@@ -88,8 +88,8 @@
 
     <ImageView
         android:id="@+id/iv_passenger_start_boll"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_14"
+        android:layout_height="@dimen/dp_14"
         android:layout_marginStart="@dimen/dp_40"
         android:src="@drawable/taxi_p_passenger_check_start_boll"
         app:layout_constraintBottom_toBottomOf="@+id/tv_passenger_start"
@@ -98,8 +98,8 @@
 
     <ImageView
         android:id="@+id/iv_passenger_start_end_line"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_1"
+        android:layout_height="@dimen/dp_78"
         android:src="@drawable/taxi_p_passenger_check_start_end_line"
         app:layout_constraintEnd_toEndOf="@+id/iv_passenger_start_boll"
         app:layout_constraintStart_toStartOf="@+id/iv_passenger_start_boll"
@@ -107,8 +107,8 @@
 
     <ImageView
         android:id="@+id/iv_passenger_end_boll"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_14"
+        android:layout_height="@dimen/dp_14"
         android:src="@drawable/taxi_p_passenger_check_end_boll"
         app:layout_constraintEnd_toEndOf="@+id/iv_passenger_start_end_line"
         app:layout_constraintStart_toStartOf="@+id/iv_passenger_start_end_line"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml
index 4ccfbd6a7c..9e1c539950 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml
@@ -22,8 +22,8 @@
         android:src="@drawable/taxi_p_passenger_arrived_close"
         android:layout_marginEnd="@dimen/dp_70"
         android:layout_marginTop="@dimen/dp_140"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_width="@dimen/dp_120"
+        android:layout_height="@dimen/dp_120"/>
 
     <ImageView
         android:id="@+id/taxi_p_autopilot_btn_bg"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_video_show.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_video_show.xml
index 4e777889ed..c112692d65 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_video_show.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_video_show.xml
@@ -31,8 +31,8 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:src="@drawable/taxi_p_mogo_video_play"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_width="@dimen/dp_180"
+        android:layout_height="@dimen/dp_180"/>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/layout_top"
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
index e848e6fc80..4bd3d6aa61 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
@@ -18,6 +18,7 @@ import com.mogo.eagle.core.utilcode.util.AppStateManager;
 import com.mogo.eagle.core.utilcode.util.Utils;
 
 import io.reactivex.plugins.RxJavaPlugins;
+import me.jessyan.autosize.AutoSize;
 
 /**
  * @author congtaowang
@@ -41,6 +42,9 @@ public abstract class AbsMogoApplication extends Application {
         AppStateManager.INSTANCE.init(this);
         initRxJavaErrorHandler();
         FinalizeCrashFixer.fix();
+        if (!shouldInit()) {
+            AutoSize.checkAndInit(this);
+        }
         ScreenHelper.setScreenConfig(this);
         Utils.init(this);
     }
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/screen/ScreenHelper.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/screen/ScreenHelper.java
index 591f7795de..306fefc1f2 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/screen/ScreenHelper.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/screen/ScreenHelper.java
@@ -1,8 +1,10 @@
 package com.mogo.commons.screen;
+import android.app.Application;
 import android.content.Context;
 
 
 import me.jessyan.autosize.AutoSizeConfig;
+import me.jessyan.autosize.utils.AutoSizeUtils;
 
 public class ScreenHelper {