diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_normal.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_normal_och.png
similarity index 100%
rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_normal.png
rename to OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_normal_och.png
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_select.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_select_och.png
similarity index 100%
rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_select.png
rename to OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_select_och.png
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_normal.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_normal_och.png
similarity index 100%
rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_normal.png
rename to OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_normal_och.png
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_select.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_select_och.png
similarity index 100%
rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_select.png
rename to OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_select_och.png
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/ai_collect_selector.xml b/OCH/mogo-och-taxi/src/main/res/drawable/ai_collect_selector.xml
deleted file mode 100755
index 879be14e27..0000000000
--- a/OCH/mogo-och-taxi/src/main/res/drawable/ai_collect_selector.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/icon_ai_select" android:state_focused="true" android:state_pressed="true" />
-    <item android:drawable="@drawable/icon_ai_select" android:state_focused="false" android:state_pressed="true" />
-    <item android:drawable="@drawable/icon_ai_select" android:state_selected="true" />
-    <item android:drawable="@drawable/icon_ai_select" android:state_focused="true" />
-    <item android:drawable="@drawable/icon_ai_normal" />
-</selector>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/ai_collect_selector_och.xml b/OCH/mogo-och-taxi/src/main/res/drawable/ai_collect_selector_och.xml
new file mode 100755
index 0000000000..a130b0115b
--- /dev/null
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/ai_collect_selector_och.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/icon_ai_select_och" android:state_focused="true" android:state_pressed="true" />
+    <item android:drawable="@drawable/icon_ai_select_och" android:state_focused="false" android:state_pressed="true" />
+    <item android:drawable="@drawable/icon_ai_select_och" android:state_selected="true" />
+    <item android:drawable="@drawable/icon_ai_select_och" android:state_focused="true" />
+    <item android:drawable="@drawable/icon_ai_normal_och" />
+</selector>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/bad_case_selector.xml b/OCH/mogo-och-taxi/src/main/res/drawable/bad_case_selector.xml
deleted file mode 100755
index b0e7932bd4..0000000000
--- a/OCH/mogo-och-taxi/src/main/res/drawable/bad_case_selector.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/icon_bad_case_select" android:state_focused="true" android:state_pressed="true" />
-    <item android:drawable="@drawable/icon_bad_case_select" android:state_focused="false" android:state_pressed="true" />
-    <item android:drawable="@drawable/icon_bad_case_select" android:state_selected="true" />
-    <item android:drawable="@drawable/icon_bad_case_select" android:state_focused="true" />
-    <item android:drawable="@drawable/icon_bad_case_normal" />
-</selector>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/bad_case_selector_och.xml b/OCH/mogo-och-taxi/src/main/res/drawable/bad_case_selector_och.xml
new file mode 100755
index 0000000000..fbc6c83a08
--- /dev/null
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/bad_case_selector_och.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/icon_bad_case_select_och" android:state_focused="true" android:state_pressed="true" />
+    <item android:drawable="@drawable/icon_bad_case_select_och" android:state_focused="false" android:state_pressed="true" />
+    <item android:drawable="@drawable/icon_bad_case_select_och" android:state_selected="true" />
+    <item android:drawable="@drawable/icon_bad_case_select_och" android:state_focused="true" />
+    <item android:drawable="@drawable/icon_bad_case_normal_och" />
+</selector>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml
index bdc8f211c2..0b41b947f6 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml
@@ -308,17 +308,17 @@
         android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
         android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
         android:layout_marginLeft="40dp"
+        android:background="@drawable/taxi_operation_status_bg_selector"
         android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
         android:elevation="@dimen/dp_10"
-        android:background="@drawable/taxi_operation_status_bg_selector"
         android:gravity="center"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/module_och_taxi_swich_map_layout">
         <ImageView
-            android:layout_width="@dimen/dp_80"
-            android:layout_height="@dimen/dp_80"
+            android:layout_width="@dimen/dp_70"
+            android:layout_height="@dimen/dp_70"
             android:layout_gravity="center"
-            android:background="@drawable/bad_case_selector"/>
+            android:background="@drawable/bad_case_selector_och"/>
     </LinearLayout>
 
     <LinearLayout
@@ -333,10 +333,10 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/module_och_taxi_badcase_ll">
         <ImageView
-            android:layout_width="@dimen/dp_80"
-            android:layout_height="@dimen/dp_80"
+            android:layout_width="@dimen/dp_70"
+            android:layout_height="@dimen/dp_70"
             android:layout_gravity="center"
-            android:background="@drawable/ai_collect_selector"/>
+            android:background="@drawable/ai_collect_selector_och"/>
     </LinearLayout>
 
     <Button