diff --git a/android/res/drawable-hdpi/ic_routing_get.png b/android/res/drawable-hdpi/ic_routing_get.png
index fac2022201..b20a8ecef1 100644
Binary files a/android/res/drawable-hdpi/ic_routing_get.png and b/android/res/drawable-hdpi/ic_routing_get.png differ
diff --git a/android/res/drawable-hdpi/ic_routing_get_night.png b/android/res/drawable-hdpi/ic_routing_get_night.png
new file mode 100644
index 0000000000..aebe4d2e6d
Binary files /dev/null and b/android/res/drawable-hdpi/ic_routing_get_night.png differ
diff --git a/android/res/drawable-hdpi/ic_routing_ok.png b/android/res/drawable-hdpi/ic_routing_ok.png
index d7e8d78d36..3b711ca2ca 100644
Binary files a/android/res/drawable-hdpi/ic_routing_ok.png and b/android/res/drawable-hdpi/ic_routing_ok.png differ
diff --git a/android/res/drawable-hdpi/ic_routing_ok_night.png b/android/res/drawable-hdpi/ic_routing_ok_night.png
new file mode 100644
index 0000000000..85f66ae1f2
Binary files /dev/null and b/android/res/drawable-hdpi/ic_routing_ok_night.png differ
diff --git a/android/res/drawable-mdpi/ic_routing_get.png b/android/res/drawable-mdpi/ic_routing_get.png
index 7e85eefe3b..c4ab157a0d 100644
Binary files a/android/res/drawable-mdpi/ic_routing_get.png and b/android/res/drawable-mdpi/ic_routing_get.png differ
diff --git a/android/res/drawable-mdpi/ic_routing_get_night.png b/android/res/drawable-mdpi/ic_routing_get_night.png
new file mode 100644
index 0000000000..c67b6b4796
Binary files /dev/null and b/android/res/drawable-mdpi/ic_routing_get_night.png differ
diff --git a/android/res/drawable-mdpi/ic_routing_ok.png b/android/res/drawable-mdpi/ic_routing_ok.png
index 1009437c55..e8ae99341c 100644
Binary files a/android/res/drawable-mdpi/ic_routing_ok.png and b/android/res/drawable-mdpi/ic_routing_ok.png differ
diff --git a/android/res/drawable-mdpi/ic_routing_ok_night.png b/android/res/drawable-mdpi/ic_routing_ok_night.png
new file mode 100644
index 0000000000..9bdcfaead8
Binary files /dev/null and b/android/res/drawable-mdpi/ic_routing_ok_night.png differ
diff --git a/android/res/drawable-xhdpi/ic_routing_get.png b/android/res/drawable-xhdpi/ic_routing_get.png
index e8ddb8bfa4..9667c5b6b8 100644
Binary files a/android/res/drawable-xhdpi/ic_routing_get.png and b/android/res/drawable-xhdpi/ic_routing_get.png differ
diff --git a/android/res/drawable-xhdpi/ic_routing_get_night.png b/android/res/drawable-xhdpi/ic_routing_get_night.png
new file mode 100644
index 0000000000..aed9acee16
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_routing_get_night.png differ
diff --git a/android/res/drawable-xhdpi/ic_routing_ok.png b/android/res/drawable-xhdpi/ic_routing_ok.png
index ad892f886d..ea0dc1f0b8 100644
Binary files a/android/res/drawable-xhdpi/ic_routing_ok.png and b/android/res/drawable-xhdpi/ic_routing_ok.png differ
diff --git a/android/res/drawable-xhdpi/ic_routing_ok_night.png b/android/res/drawable-xhdpi/ic_routing_ok_night.png
new file mode 100644
index 0000000000..66c6e44503
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_routing_ok_night.png differ
diff --git a/android/res/drawable-xxhdpi/ic_routing_get.png b/android/res/drawable-xxhdpi/ic_routing_get.png
index 3235e57590..72cda804c5 100644
Binary files a/android/res/drawable-xxhdpi/ic_routing_get.png and b/android/res/drawable-xxhdpi/ic_routing_get.png differ
diff --git a/android/res/drawable-xxhdpi/ic_routing_get_night.png b/android/res/drawable-xxhdpi/ic_routing_get_night.png
new file mode 100644
index 0000000000..1312c5fad1
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_routing_get_night.png differ
diff --git a/android/res/drawable-xxhdpi/ic_routing_ok.png b/android/res/drawable-xxhdpi/ic_routing_ok.png
index 1dbc8989d8..f6a7e770bf 100644
Binary files a/android/res/drawable-xxhdpi/ic_routing_ok.png and b/android/res/drawable-xxhdpi/ic_routing_ok.png differ
diff --git a/android/res/drawable-xxhdpi/ic_routing_ok_night.png b/android/res/drawable-xxhdpi/ic_routing_ok_night.png
new file mode 100644
index 0000000000..e4f954d4bb
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_routing_ok_night.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_routing_get.png b/android/res/drawable-xxxhdpi/ic_routing_get.png
new file mode 100644
index 0000000000..2eff9e3627
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_routing_get.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_routing_get_night.png b/android/res/drawable-xxxhdpi/ic_routing_get_night.png
new file mode 100644
index 0000000000..8290482c59
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_routing_get_night.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_routing_ok.png b/android/res/drawable-xxxhdpi/ic_routing_ok.png
new file mode 100644
index 0000000000..a7f98efc6a
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_routing_ok.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_routing_ok_night.png b/android/res/drawable-xxxhdpi/ic_routing_ok_night.png
new file mode 100644
index 0000000000..53926c6886
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_routing_ok_night.png differ
diff --git a/android/res/layout-land/fragment_suggest_country_download.xml b/android/res/layout-land/fragment_suggest_country_download.xml
index ae688edd54..8fb90341f8 100644
--- a/android/res/layout-land/fragment_suggest_country_download.xml
+++ b/android/res/layout-land/fragment_suggest_country_download.xml
@@ -127,7 +127,7 @@
         android:layout_marginTop="@dimen/margin_half_plus"
         android:background="?clickableBackground"
         wheel:wheelProgressColor="@color/base_green"
-        wheel:wheelSecondaryColor="@color/downloader_progress_secondary"
+        wheel:wheelSecondaryColor="?dividerHorizontal"
         wheel:wheelThickness="@dimen/margin_quarter"/>
   </LinearLayout>
 
diff --git a/android/res/layout/download_item_country.xml b/android/res/layout/download_item_country.xml
index a57aa0b6a2..380b8cc4ff 100644
--- a/android/res/layout/download_item_country.xml
+++ b/android/res/layout/download_item_country.xml
@@ -29,8 +29,8 @@
     android:layout_marginRight="@dimen/progress_wheel_width_neg"
     android:paddingLeft="@dimen/margin_quarter"
     android:paddingRight="@dimen/margin_quarter"
-    wheel:wheelProgressColor="@color/downloader_progress_primary"
-    wheel:wheelSecondaryColor="@color/downloader_progress_secondary"
+    wheel:wheelProgressColor="?colorAccent"
+    wheel:wheelSecondaryColor="?dividerHorizontal"
     wheel:wheelThickness="@dimen/margin_eighth"/>
 
   <ImageView
@@ -50,8 +50,8 @@
     android:layout_centerVertical="true"
     android:paddingLeft="@dimen/margin_quarter"
     android:paddingRight="@dimen/margin_quarter"
-    wheel:wheelProgressColor="@color/downloader_progress_primary"
-    wheel:wheelSecondaryColor="@color/downloader_progress_secondary"
+    wheel:wheelProgressColor="?colorAccent"
+    wheel:wheelSecondaryColor="?dividerHorizontal"
     wheel:wheelThickness="@dimen/margin_eighth"/>
 
   <LinearLayout
diff --git a/android/res/layout/fragment_suggest_country_download.xml b/android/res/layout/fragment_suggest_country_download.xml
index 3e81ed8727..c0c8eef67d 100644
--- a/android/res/layout/fragment_suggest_country_download.xml
+++ b/android/res/layout/fragment_suggest_country_download.xml
@@ -128,7 +128,7 @@
       android:layout_marginTop="@dimen/margin_half_plus"
       android:background="?clickableBackground"
       wheel:wheelProgressColor="@color/base_green"
-      wheel:wheelSecondaryColor="@color/downloader_progress_secondary"
+      wheel:wheelSecondaryColor="?dividerHorizontal"
       wheel:wheelThickness="@dimen/margin_quarter"/>
   </LinearLayout>
 </FrameLayout>
diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml
index 8691d32f2b..baed7826ee 100644
--- a/android/res/values/colors.xml
+++ b/android/res/values/colors.xml
@@ -49,11 +49,7 @@
   <color name="fg_azimut_arrow">#FFFFFFFF</color>
 
   <!-- Downloader -->
-  <color name="downloader_progress_primary">@color/base_accent</color>
-  <color name="downloader_progress_secondary">#FFF0F0F0</color>
   <color name="downloader_gray">#FF999999</color>
-  <color name="downloader_country_downloaded">#FF000000</color>
-  <color name="downloader_country_downloaded_night">#FF000000</color>
   <color name="downloader_spacer">#FFEFEFF4</color>
   <color name="downloader_spacer_night">@color/divider_night</color>
 
diff --git a/android/src/com/mapswithme/country/BaseDownloadAdapter.java b/android/src/com/mapswithme/country/BaseDownloadAdapter.java
index 5783371b96..30aef98f7c 100644
--- a/android/src/com/mapswithme/country/BaseDownloadAdapter.java
+++ b/android/src/com/mapswithme/country/BaseDownloadAdapter.java
@@ -209,7 +209,7 @@ abstract class BaseDownloadAdapter extends BaseAdapter
 
   private void processFailed(ViewHolder holder, int position)
   {
-    holder.mProgressSlided.setProgressColor(mFragment.getResources().getColor(R.color.downloader_progress_primary));
+    holder.mProgressSlided.setProgressColor(ThemeUtils.getColor(mListView.getContext(), R.attr.colorAccent));
     holder.mProgressSlided.setCenterDrawable(null);
     retryDownload(position);
   }
@@ -482,10 +482,12 @@ abstract class BaseDownloadAdapter extends BaseAdapter
 
   private static void bindCarRoutingIcon(ViewHolder holder, CountryItem item)
   {
-    if (item.getOptions() == StorageOptions.MAP_OPTION_MAP_ONLY)
-      holder.mImageRoutingStatus.setImageResource(R.drawable.ic_routing_get);
-    else
-      holder.mImageRoutingStatus.setImageResource(R.drawable.ic_routing_ok);
+    boolean night = ThemeUtils.isNightTheme();
+    int icon = (item.getOptions() == StorageOptions.MAP_OPTION_MAP_ONLY) ? night ? R.drawable.ic_routing_get_night
+                                                                                 : R.drawable.ic_routing_get
+                                                                         : night ? R.drawable.ic_routing_ok_night
+                                                                                 : R.drawable.ic_routing_ok;
+    holder.mImageRoutingStatus.setImageResource(icon);
   }
 
   private void startItemDownloading(final ViewHolder holder, final int position, int newOptions)