diff --git a/app/src/main/res/drawable-xhdpi/amp1.png b/app/src/main/res/drawable-xhdpi/amp1.png
index 3a94df9b..b15507f4 100644
Binary files a/app/src/main/res/drawable-xhdpi/amp1.png and b/app/src/main/res/drawable-xhdpi/amp1.png differ
diff --git a/app/src/main/res/drawable-xhdpi/amp2.png b/app/src/main/res/drawable-xhdpi/amp2.png
index f1b1adf7..9b6b062c 100644
Binary files a/app/src/main/res/drawable-xhdpi/amp2.png and b/app/src/main/res/drawable-xhdpi/amp2.png differ
diff --git a/app/src/main/res/drawable-xhdpi/amp3.png b/app/src/main/res/drawable-xhdpi/amp3.png
index beb72b00..97c392d4 100644
Binary files a/app/src/main/res/drawable-xhdpi/amp3.png and b/app/src/main/res/drawable-xhdpi/amp3.png differ
diff --git a/app/src/main/res/drawable-xhdpi/amp4.png b/app/src/main/res/drawable-xhdpi/amp4.png
index 8d41ae8c..037c35ca 100644
Binary files a/app/src/main/res/drawable-xhdpi/amp4.png and b/app/src/main/res/drawable-xhdpi/amp4.png differ
diff --git a/app/src/main/res/drawable-xhdpi/amp5.png b/app/src/main/res/drawable-xhdpi/amp5.png
index 6791bd7b..b55aac31 100644
Binary files a/app/src/main/res/drawable-xhdpi/amp5.png and b/app/src/main/res/drawable-xhdpi/amp5.png differ
diff --git a/app/src/main/res/drawable-xhdpi/amp6.png b/app/src/main/res/drawable-xhdpi/amp6.png
index 5afef7e2..b1df2b90 100644
Binary files a/app/src/main/res/drawable-xhdpi/amp6.png and b/app/src/main/res/drawable-xhdpi/amp6.png differ
diff --git a/app/src/main/res/drawable-xhdpi/amp7.png b/app/src/main/res/drawable-xhdpi/amp7.png
index d2ad7fd3..cbf81442 100644
Binary files a/app/src/main/res/drawable-xhdpi/amp7.png and b/app/src/main/res/drawable-xhdpi/amp7.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/amp1.png b/app/src/main/res/drawable-xxhdpi/amp1.png
index 3a94df9b..b15507f4 100644
Binary files a/app/src/main/res/drawable-xxhdpi/amp1.png and b/app/src/main/res/drawable-xxhdpi/amp1.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/amp2.png b/app/src/main/res/drawable-xxhdpi/amp2.png
index f1b1adf7..9b6b062c 100644
Binary files a/app/src/main/res/drawable-xxhdpi/amp2.png and b/app/src/main/res/drawable-xxhdpi/amp2.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/amp3.png b/app/src/main/res/drawable-xxhdpi/amp3.png
index beb72b00..97c392d4 100644
Binary files a/app/src/main/res/drawable-xxhdpi/amp3.png and b/app/src/main/res/drawable-xxhdpi/amp3.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/amp4.png b/app/src/main/res/drawable-xxhdpi/amp4.png
index 8d41ae8c..037c35ca 100644
Binary files a/app/src/main/res/drawable-xxhdpi/amp4.png and b/app/src/main/res/drawable-xxhdpi/amp4.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/amp5.png b/app/src/main/res/drawable-xxhdpi/amp5.png
index 6791bd7b..b55aac31 100644
Binary files a/app/src/main/res/drawable-xxhdpi/amp5.png and b/app/src/main/res/drawable-xxhdpi/amp5.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/amp6.png b/app/src/main/res/drawable-xxhdpi/amp6.png
index 5afef7e2..b1df2b90 100644
Binary files a/app/src/main/res/drawable-xxhdpi/amp6.png and b/app/src/main/res/drawable-xxhdpi/amp6.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/amp7.png b/app/src/main/res/drawable-xxhdpi/amp7.png
index d2ad7fd3..cbf81442 100644
Binary files a/app/src/main/res/drawable-xxhdpi/amp7.png and b/app/src/main/res/drawable-xxhdpi/amp7.png differ
diff --git a/app/src/main/res/drawable/drawable_bg_blue_frame_black_bg_4_radius.xml b/app/src/main/res/drawable/drawable_bg_blue_frame_white_bg_4_radius.xml
similarity index 83%
rename from app/src/main/res/drawable/drawable_bg_blue_frame_black_bg_4_radius.xml
rename to app/src/main/res/drawable/drawable_bg_blue_frame_white_bg_4_radius.xml
index b722d9fb..b3143d0b 100644
--- a/app/src/main/res/drawable/drawable_bg_blue_frame_black_bg_4_radius.xml
+++ b/app/src/main/res/drawable/drawable_bg_blue_frame_white_bg_4_radius.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" >
-    <solid android:color="@color/black" />
+    <solid android:color="@color/white" />
     <stroke
         android:width="1dp"
-        android:color="@color/deepskyblue" />
+        android:color="@color/highFontColor" />
     <corners
         android:bottomLeftRadius="5dp"
         android:bottomRightRadius="5dp"
diff --git a/app/src/main/res/layout/adapter_offline_map_city.xml b/app/src/main/res/layout/adapter_offline_map_city.xml
index d82faf4d..68d56864 100644
--- a/app/src/main/res/layout/adapter_offline_map_city.xml
+++ b/app/src/main/res/layout/adapter_offline_map_city.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/ivory"
+    android:background="@color/white"
     android:paddingLeft="10dp"
     android:paddingTop="5dp"
     android:paddingRight="10dp"
diff --git a/app/src/main/res/layout/adapter_qs_record_list.xml b/app/src/main/res/layout/adapter_qs_record_list.xml
index 7d3a48dc..7c94347b 100644
--- a/app/src/main/res/layout/adapter_qs_record_list.xml
+++ b/app/src/main/res/layout/adapter_qs_record_list.xml
@@ -13,7 +13,7 @@
         android:id="@+id/qs_record_index"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawableLeft="@mipmap/marker"
+        android:drawableLeft="@mipmap/marker2"
         android:maxLength="3"
         android:text=""
         android:layout_marginRight="@dimen/default_widget_padding"
diff --git a/app/src/main/res/layout/adapter_task_list.xml b/app/src/main/res/layout/adapter_task_list.xml
index 59f52210..42ba089a 100644
--- a/app/src/main/res/layout/adapter_task_list.xml
+++ b/app/src/main/res/layout/adapter_task_list.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/ivory"
+    android:background="@color/white"
     android:paddingLeft="10dp"
     android:paddingTop="5dp"
     android:paddingRight="10dp"
diff --git a/app/src/main/res/layout/cv_card_voice_rcd_hint_window.xml b/app/src/main/res/layout/cv_card_voice_rcd_hint_window.xml
index 013f836d..ff52d891 100644
--- a/app/src/main/res/layout/cv_card_voice_rcd_hint_window.xml
+++ b/app/src/main/res/layout/cv_card_voice_rcd_hint_window.xml
@@ -16,7 +16,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:background="@drawable/drawable_bg_blue_frame_black_bg_4_radius"
+            android:background="@drawable/drawable_bg_blue_frame_white_bg_4_radius"
             android:orientation="horizontal"
             >
             <ImageView
diff --git a/collect-library/src/main/res/mipmap-hdpi/marker.png b/collect-library/src/main/res/mipmap-hdpi/marker.png
index 1a3f7b6c..0f17894d 100644
Binary files a/collect-library/src/main/res/mipmap-hdpi/marker.png and b/collect-library/src/main/res/mipmap-hdpi/marker.png differ
diff --git a/collect-library/src/main/res/mipmap-hdpi/marker2.png b/collect-library/src/main/res/mipmap-hdpi/marker2.png
new file mode 100644
index 00000000..514d3fe5
Binary files /dev/null and b/collect-library/src/main/res/mipmap-hdpi/marker2.png differ
diff --git a/collect-library/src/main/res/mipmap-xxhdpi/map_icon_report.png b/collect-library/src/main/res/mipmap-xxhdpi/map_icon_report.png
index 556d7622..5cfc33a3 100644
Binary files a/collect-library/src/main/res/mipmap-xxhdpi/map_icon_report.png and b/collect-library/src/main/res/mipmap-xxhdpi/map_icon_report.png differ