diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java
index 9c1d54a25f..f46502e624 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java
@@ -59,18 +59,18 @@ public class OchBusStationAdapter extends RecyclerView.Adapter
@@ -125,7 +125,7 @@
android:layout_width="wrap_content"
android:layout_height="0dp"
android:scaleType="fitXY"
- android:src="@drawable/module_och_bus_dot_line"
+ android:src="@drawable/module_och_dot_line"
app:layout_constraintBottom_toTopOf="@+id/blueDot"
app:layout_constraintLeft_toLeftOf="@+id/greenDot"
app:layout_constraintRight_toRightOf="@+id/greenDot"
@@ -135,7 +135,7 @@
android:id="@+id/blueDot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/module_mogo_och_bus_icon_arriving_station"
+ android:src="@drawable/module_mogo_och_icon_arriving_station"
app:layout_constraintBottom_toBottomOf="@+id/module_och_bus_order_end_station"
app:layout_constraintLeft_toLeftOf="@+id/greenDot"
app:layout_constraintTop_toTopOf="@+id/module_och_bus_order_end_station" />
diff --git a/OCH/mogo-och-bus/src/main/res/layout/item_och_bus_station.xml b/OCH/mogo-och-bus/src/main/res/layout/item_och_bus_station.xml
index d777f2d0d6..25ac60ead5 100644
--- a/OCH/mogo-och-bus/src/main/res/layout/item_och_bus_station.xml
+++ b/OCH/mogo-och-bus/src/main/res/layout/item_och_bus_station.xml
@@ -26,7 +26,7 @@
android:layout_width="20px"
android:layout_height="20px"
android:scaleType="center"
- android:src="@drawable/module_mogo_och_bus_icon_arrived_station"
+ android:src="@drawable/module_mogo_och_icon_arrived_station"
app:layout_constraintBottom_toBottomOf="@id/module_mogo_och_bus_station_name"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintVertical_bias="0.4"
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_blue_dot.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_blue_dot.png
deleted file mode 100644
index e1fd463963..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_blue_dot.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_dot_line.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_dot_line.png
deleted file mode 100644
index 186001352c..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_dot_line.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_green_dot.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_green_dot.png
deleted file mode 100644
index a676a789c3..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_green_dot.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml
index 33d370bf3f..888fec075e 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml
@@ -49,7 +49,7 @@
android:id="@+id/greenDot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/module_och_taxi_green_dot"
+ android:src="@drawable/module_mogo_och_icon_arriving_station"
app:layout_constraintBottom_toBottomOf="@+id/module_och_taxi_order_start_station"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="@+id/module_och_taxi_order_start_station" />
@@ -83,7 +83,7 @@
android:layout_width="wrap_content"
android:layout_height="0dp"
android:scaleType="fitXY"
- android:src="@drawable/module_och_taxi_dot_line"
+ android:src="@drawable/module_och_dot_line"
app:layout_constraintBottom_toTopOf="@+id/blueDot"
app:layout_constraintLeft_toLeftOf="@+id/greenDot"
app:layout_constraintRight_toRightOf="@+id/greenDot"
@@ -93,7 +93,7 @@
android:id="@+id/blueDot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/module_och_taxi_blue_dot"
+ android:src="@drawable/module_mogo_och_icon_arrived_station"
app:layout_constraintBottom_toBottomOf="@+id/module_och_taxi_order_end_station"
app:layout_constraintLeft_toLeftOf="@+id/greenDot"
app:layout_constraintTop_toTopOf="@+id/module_och_taxi_order_end_station" />
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_base_icon_not_in_autopilot.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_base_icon_not_in_autopilot.png
new file mode 100644
index 0000000000..927296d690
Binary files /dev/null and b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_base_icon_not_in_autopilot.png differ
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arrived_station.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arrived_station.png
new file mode 100644
index 0000000000..8a065b66dd
Binary files /dev/null and b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arrived_station.png differ
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arriving_station.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arriving_station.png
new file mode 100644
index 0000000000..4ed57a0e30
Binary files /dev/null and b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arriving_station.png differ
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_base_slide_block.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_base_slide_block.png
new file mode 100644
index 0000000000..ed7b293b90
Binary files /dev/null and b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_base_slide_block.png differ
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_dot_line.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_dot_line.png
new file mode 100644
index 0000000000..a720a532ea
Binary files /dev/null and b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_dot_line.png differ
diff --git a/OCH/mogo-och/src/main/res/values-xhdpi-2560x1600/dimens.xml b/OCH/mogo-och/src/main/res/values-xhdpi-2560x1600/dimens.xml
index 27dffebb9e..764069ec8a 100644
--- a/OCH/mogo-och/src/main/res/values-xhdpi-2560x1600/dimens.xml
+++ b/OCH/mogo-och/src/main/res/values-xhdpi-2560x1600/dimens.xml
@@ -9,13 +9,13 @@
530px
492px
- 30px
- 30px
+ 20px
+ 20px
70px
130px
93px
150px
- 48px
+ 70px
24px
460px