diff --git a/OsmAnd/res/drawable/dialog_active_card_bg.xml b/OsmAnd/res/drawable/dialog_active_card_bg_dark.xml
similarity index 72%
rename from OsmAnd/res/drawable/dialog_active_card_bg.xml
rename to OsmAnd/res/drawable/dialog_active_card_bg_dark.xml
index ccf3936585..1806a6d0ce 100644
--- a/OsmAnd/res/drawable/dialog_active_card_bg.xml
+++ b/OsmAnd/res/drawable/dialog_active_card_bg_dark.xml
@@ -5,8 +5,8 @@
     </item>
     <item>
         <shape>
-            <stroke android:color="?attr/wikivoyage_active_color" android:width="1dp"/>
-            <solid android:color="?attr/wikivoyage_card_bg_color"/>
+            <stroke android:color="@color/wikivoyage_active_dark" android:width="1dp"/>
+            <solid android:color="@color/wikivoyage_card_bg_dark"/>
             <corners android:radius="3dp"/>
         </shape>
     </item>
diff --git a/OsmAnd/res/drawable/dialog_active_card_bg_light.xml b/OsmAnd/res/drawable/dialog_active_card_bg_light.xml
new file mode 100644
index 0000000000..ebae968061
--- /dev/null
+++ b/OsmAnd/res/drawable/dialog_active_card_bg_light.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<nine-patch android:src="@drawable/bg_card_shadow_cr3dp"/>
+	</item>
+	<item>
+		<shape>
+			<stroke android:color="@color/wikivoyage_active_light" android:width="1dp"/>
+			<solid android:color="@color/wikivoyage_card_bg_light"/>
+			<corners android:radius="3dp"/>
+		</shape>
+	</item>
+</layer-list>
diff --git a/OsmAnd/res/drawable/dialog_card_bg.xml b/OsmAnd/res/drawable/dialog_card_bg.xml
deleted file mode 100644
index 3a8352bc4f..0000000000
--- a/OsmAnd/res/drawable/dialog_card_bg.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <nine-patch android:src="@drawable/bg_card_shadow_cr3dp"/>
-    </item>
-    <item>
-        <shape>
-            <solid android:color="?attr/wikivoyage_card_bg_color"/>
-            <corners android:radius="3dp"/>
-        </shape>
-    </item>
-</layer-list>
diff --git a/OsmAnd/res/drawable/travel_card_bg.xml b/OsmAnd/res/drawable/travel_card_bg_dark.xml
similarity index 82%
rename from OsmAnd/res/drawable/travel_card_bg.xml
rename to OsmAnd/res/drawable/travel_card_bg_dark.xml
index de280be397..2fbb593bc9 100644
--- a/OsmAnd/res/drawable/travel_card_bg.xml
+++ b/OsmAnd/res/drawable/travel_card_bg_dark.xml
@@ -5,7 +5,7 @@
 	</item>
 	<item>
 		<shape>
-			<solid android:color="?attr/wikivoyage_card_bg_color"/>
+			<solid android:color="@color/wikivoyage_card_bg_dark"/>
 			<corners android:radius="3dp"/>
 		</shape>
 	</item>
diff --git a/OsmAnd/res/drawable/wikivoyage_search_card_bg.xml b/OsmAnd/res/drawable/travel_card_bg_light.xml
similarity index 82%
rename from OsmAnd/res/drawable/wikivoyage_search_card_bg.xml
rename to OsmAnd/res/drawable/travel_card_bg_light.xml
index de280be397..b8c94363a4 100644
--- a/OsmAnd/res/drawable/wikivoyage_search_card_bg.xml
+++ b/OsmAnd/res/drawable/travel_card_bg_light.xml
@@ -5,7 +5,7 @@
 	</item>
 	<item>
 		<shape>
-			<solid android:color="?attr/wikivoyage_card_bg_color"/>
+			<solid android:color="@color/wikivoyage_card_bg_light"/>
 			<corners android:radius="3dp"/>
 		</shape>
 	</item>
diff --git a/OsmAnd/res/drawable/travel_card_stroke_bg.xml b/OsmAnd/res/drawable/travel_card_stroke_bg_dark.xml
similarity index 78%
rename from OsmAnd/res/drawable/travel_card_stroke_bg.xml
rename to OsmAnd/res/drawable/travel_card_stroke_bg_dark.xml
index e629d12875..511f882de9 100644
--- a/OsmAnd/res/drawable/travel_card_stroke_bg.xml
+++ b/OsmAnd/res/drawable/travel_card_stroke_bg_dark.xml
@@ -5,7 +5,7 @@
 
 	<stroke
 		android:width="1dp"
-		android:color="?attr/wikivoyage_card_divider_color"/>
+		android:color="@color/wikivoyage_card_divider_dark"/>
 
 	<corners android:radius="3dp"/>
 
diff --git a/OsmAnd/res/drawable/travel_card_stroke_bg_light.xml b/OsmAnd/res/drawable/travel_card_stroke_bg_light.xml
new file mode 100644
index 0000000000..f7e37d2cec
--- /dev/null
+++ b/OsmAnd/res/drawable/travel_card_stroke_bg_light.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+
+	<stroke
+		android:width="1dp"
+		android:color="@color/wikivoyage_card_divider_light"/>
+
+	<corners android:radius="3dp"/>
+
+</shape>
diff --git a/OsmAnd/res/drawable/wikivoyage_primary_btn_bg.xml b/OsmAnd/res/drawable/wikivoyage_primary_btn_bg_dark.xml
similarity index 76%
rename from OsmAnd/res/drawable/wikivoyage_primary_btn_bg.xml
rename to OsmAnd/res/drawable/wikivoyage_primary_btn_bg_dark.xml
index e709c76cc1..a1d6ff94c7 100644
--- a/OsmAnd/res/drawable/wikivoyage_primary_btn_bg.xml
+++ b/OsmAnd/res/drawable/wikivoyage_primary_btn_bg_dark.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
 	   android:shape="rectangle">
 
-	<solid android:color="?attr/wikivoyage_active_color"/>
+	<solid android:color="@color/wikivoyage_active_dark"/>
 
 	<corners android:radius="3dp"/>
 
diff --git a/OsmAnd/res/drawable/wikivoyage_primary_btn_bg_light.xml b/OsmAnd/res/drawable/wikivoyage_primary_btn_bg_light.xml
new file mode 100644
index 0000000000..581c0d9f2e
--- /dev/null
+++ b/OsmAnd/res/drawable/wikivoyage_primary_btn_bg_light.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+
+	<solid android:color="@color/wikivoyage_active_light"/>
+
+	<corners android:radius="3dp"/>
+
+</shape>
diff --git a/OsmAnd/res/drawable/wikivoyage_secondary_btn_bg.xml b/OsmAnd/res/drawable/wikivoyage_secondary_btn_bg_dark.xml
similarity index 61%
rename from OsmAnd/res/drawable/wikivoyage_secondary_btn_bg.xml
rename to OsmAnd/res/drawable/wikivoyage_secondary_btn_bg_dark.xml
index 7b42cd135b..738d47c6cc 100644
--- a/OsmAnd/res/drawable/wikivoyage_secondary_btn_bg.xml
+++ b/OsmAnd/res/drawable/wikivoyage_secondary_btn_bg_dark.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-	   android:shape="rectangle">
+	android:shape="rectangle">
 
-	<solid android:color="?attr/wikivoyage_secondary_btn_bg_color"/>
+	<solid android:color="@color/wikivoyage_secondary_btn_bg_dark"/>
 
 	<corners android:radius="3dp"/>
 
diff --git a/OsmAnd/res/drawable/wikivoyage_secondary_btn_bg_light.xml b/OsmAnd/res/drawable/wikivoyage_secondary_btn_bg_light.xml
new file mode 100644
index 0000000000..5ae606dd50
--- /dev/null
+++ b/OsmAnd/res/drawable/wikivoyage_secondary_btn_bg_light.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+
+	<solid android:color="@color/wikivoyage_secondary_btn_bg_light"/>
+
+	<corners android:radius="3dp"/>
+
+</shape>
diff --git a/OsmAnd/res/layout/fragment_wikivoyage_explore_dialog.xml b/OsmAnd/res/layout/fragment_wikivoyage_explore_dialog.xml
index 4c834efca3..76c66b9e89 100644
--- a/OsmAnd/res/layout/fragment_wikivoyage_explore_dialog.xml
+++ b/OsmAnd/res/layout/fragment_wikivoyage_explore_dialog.xml
@@ -75,7 +75,7 @@
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="@dimen/text_margin_small"
 			android:layout_marginRight="@dimen/text_margin_small"
-			android:background="@drawable/wikivoyage_search_card_bg">
+			android:background="?attr/wikivoyage_travel_card_bg">
 
 			<LinearLayout
 				android:id="@+id/search_button"
diff --git a/OsmAnd/res/layout/fragment_wikivoyage_show_images_first_time.xml b/OsmAnd/res/layout/fragment_wikivoyage_show_images_first_time.xml
index 6754e45410..88a886d390 100644
--- a/OsmAnd/res/layout/fragment_wikivoyage_show_images_first_time.xml
+++ b/OsmAnd/res/layout/fragment_wikivoyage_show_images_first_time.xml
@@ -62,7 +62,7 @@
 				android:layout_marginEnd="@dimen/bottom_sheet_content_margin_small"
 				android:layout_marginRight="@dimen/bottom_sheet_content_margin_small"
 				android:layout_weight="1"
-				android:background="@drawable/wikivoyage_secondary_btn_bg">
+				android:background="?attr/wikivoyage_secondary_btn_bg">
 
 				<net.osmand.plus.widgets.TextViewEx
 					android:id="@+id/button_no"
@@ -88,7 +88,7 @@
 				android:layout_marginEnd="@dimen/bottom_sheet_content_margin_small"
 				android:layout_marginRight="@dimen/bottom_sheet_content_margin_small"
 				android:layout_weight="1"
-				android:background="@drawable/wikivoyage_secondary_btn_bg">
+				android:background="?attr/wikivoyage_secondary_btn_bg">
 
 				<net.osmand.plus.widgets.TextViewEx
 					android:id="@+id/button_wifi"
@@ -112,7 +112,7 @@
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
 				android:layout_weight="1"
-				android:background="@drawable/wikivoyage_primary_btn_bg">
+				android:background="?attr/wikivoyage_primary_btn_bg">
 
 				<net.osmand.plus.widgets.TextViewEx
 					android:id="@+id/button_yes"
diff --git a/OsmAnd/res/layout/purchase_dialog_active_card.xml b/OsmAnd/res/layout/purchase_dialog_active_card.xml
index aacbcfe57b..ef4ebd43cb 100644
--- a/OsmAnd/res/layout/purchase_dialog_active_card.xml
+++ b/OsmAnd/res/layout/purchase_dialog_active_card.xml
@@ -8,7 +8,7 @@
     android:layout_marginBottom="@dimen/list_header_padding"
     android:layout_marginLeft="@dimen/card_padding"
     android:layout_marginRight="@dimen/card_padding"
-    android:background="@drawable/dialog_active_card_bg"
+    android:background="?attr/purchase_dialog_active_card_bg"
     android:orientation="vertical">
 
     <include layout="@layout/purchase_dialog_card_header"/>
diff --git a/OsmAnd/res/layout/purchase_dialog_card.xml b/OsmAnd/res/layout/purchase_dialog_card.xml
index dfbc449d67..d511f68ece 100644
--- a/OsmAnd/res/layout/purchase_dialog_card.xml
+++ b/OsmAnd/res/layout/purchase_dialog_card.xml
@@ -7,7 +7,7 @@
     android:layout_marginBottom="@dimen/list_header_padding"
     android:layout_marginLeft="@dimen/card_padding"
     android:layout_marginRight="@dimen/card_padding"
-    android:background="@drawable/dialog_card_bg"
+    android:background="?attr/wikivoyage_travel_card_bg"
     android:orientation="vertical">
 
     <include layout="@layout/purchase_dialog_card_header"/>
diff --git a/OsmAnd/res/layout/purchase_dialog_card_button.xml b/OsmAnd/res/layout/purchase_dialog_card_button.xml
index 7e70c781ac..bbe40ddedc 100644
--- a/OsmAnd/res/layout/purchase_dialog_card_button.xml
+++ b/OsmAnd/res/layout/purchase_dialog_card_button.xml
@@ -4,7 +4,7 @@
              xmlns:tools="http://schemas.android.com/tools"
              android:layout_width="match_parent"
              android:layout_height="wrap_content"
-             android:background="@drawable/wikivoyage_active_card_bg">
+             android:background="?attr/wikivoyage_primary_btn_bg">
 
     <LinearLayout
         android:id="@+id/card_button"
diff --git a/OsmAnd/res/layout/purchase_dialog_fragment.xml b/OsmAnd/res/layout/purchase_dialog_fragment.xml
index 28ab868e73..2443989954 100644
--- a/OsmAnd/res/layout/purchase_dialog_fragment.xml
+++ b/OsmAnd/res/layout/purchase_dialog_fragment.xml
@@ -87,7 +87,7 @@
                 android:layout_marginLeft="@dimen/card_padding"
                 android:layout_marginRight="@dimen/card_padding"
                 android:layout_marginTop="4dp"
-                android:background="@drawable/wikivoyage_search_card_bg">
+                android:background="?attr/wikivoyage_travel_card_bg">
 
                 <net.osmand.plus.widgets.TextViewEx
                     android:id="@+id/button_later"
diff --git a/OsmAnd/res/layout/travel_download_update_card.xml b/OsmAnd/res/layout/travel_download_update_card.xml
index 7e0bfdf0ff..d7398aed93 100644
--- a/OsmAnd/res/layout/travel_download_update_card.xml
+++ b/OsmAnd/res/layout/travel_download_update_card.xml
@@ -7,7 +7,7 @@
 	android:layout_height="wrap_content"
 	android:layout_marginLeft="@dimen/text_margin_small"
 	android:layout_marginRight="@dimen/text_margin_small"
-	android:background="@drawable/travel_card_bg"
+	android:background="?attr/wikivoyage_travel_card_bg"
 	android:orientation="vertical">
 
 	<LinearLayout
@@ -64,7 +64,7 @@
 		android:layout_marginBottom="@dimen/content_padding"
 		android:layout_marginLeft="@dimen/bottom_sheet_content_margin_small"
 		android:layout_marginRight="@dimen/bottom_sheet_content_margin_small"
-		android:background="@drawable/travel_card_stroke_bg"
+		android:background="?attr/wikivoyage_travel_card_stroke_bg"
 		android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
 		android:paddingLeft="@dimen/content_padding"
 		android:paddingRight="@dimen/content_padding">
@@ -135,7 +135,7 @@
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:background="@drawable/wikivoyage_secondary_btn_bg">
+			android:background="?attr/wikivoyage_secondary_btn_bg">
 
 			<net.osmand.plus.widgets.TextViewEx
 				android:id="@+id/secondary_button"
@@ -165,7 +165,7 @@
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:background="@drawable/wikivoyage_primary_btn_bg">
+			android:background="?attr/wikivoyage_primary_btn_bg">
 
 			<net.osmand.plus.widgets.TextViewEx
 				android:id="@+id/primary_button"
diff --git a/OsmAnd/res/layout/wikivoyage_open_beta_card.xml b/OsmAnd/res/layout/wikivoyage_open_beta_card.xml
index 945f3cbc14..2dd8334ba0 100644
--- a/OsmAnd/res/layout/wikivoyage_open_beta_card.xml
+++ b/OsmAnd/res/layout/wikivoyage_open_beta_card.xml
@@ -8,7 +8,7 @@
 	android:layout_marginTop="@dimen/content_padding_small"
 	android:layout_marginLeft="@dimen/text_margin_small"
 	android:layout_marginRight="@dimen/text_margin_small"
-	android:background="@drawable/travel_card_bg"
+	android:background="?attr/wikivoyage_travel_card_bg"
 	android:orientation="vertical">
 
 	<LinearLayout
diff --git a/OsmAnd/res/layout/wikivoyage_start_editing_card.xml b/OsmAnd/res/layout/wikivoyage_start_editing_card.xml
index 549225fe6a..b7f48bbbc8 100644
--- a/OsmAnd/res/layout/wikivoyage_start_editing_card.xml
+++ b/OsmAnd/res/layout/wikivoyage_start_editing_card.xml
@@ -8,7 +8,7 @@
 	android:layout_marginTop="@dimen/content_padding_small"
 	android:layout_marginLeft="@dimen/text_margin_small"
 	android:layout_marginRight="@dimen/text_margin_small"
-	android:background="@drawable/travel_card_bg">
+	android:background="?attr/wikivoyage_travel_card_bg">
 
 	<LinearLayout
 		android:layout_width="match_parent"
diff --git a/OsmAnd/res/values/attrs.xml b/OsmAnd/res/values/attrs.xml
index 87f081516a..2b461eb30e 100644
--- a/OsmAnd/res/values/attrs.xml
+++ b/OsmAnd/res/values/attrs.xml
@@ -81,6 +81,13 @@
 		<attr name="wikivoyage_primary_btn_text_color" format="reference"/>
 		<attr name="wikivoyage_welcome_bg_color" format="reference"/>
 		<attr name="wikivoyage_primary_text_color" format="reference"/>
+
+		<attr name="wikivoyage_travel_card_bg" format="reference"/>
+		<attr name="wikivoyage_travel_card_stroke_bg" format="reference"/>
+		<attr name="wikivoyage_secondary_btn_bg" format="reference"/>
+		<attr name="wikivoyage_primary_btn_bg" format="reference"/>
+
+		<attr name="purchase_dialog_active_card_bg" format="reference"/>
     </declare-styleable>
 
     <declare-styleable name="PagerSlidingTabStrip">
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index bcbd3ed781..85d654d46d 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -213,6 +213,13 @@
         <item name="wikivoyage_primary_btn_text_color">@color/wikivoyage_primary_btn_text_light</item>
         <item name="wikivoyage_welcome_bg_color">@color/wikivoyage_welcome_bg_light</item>
         <item name="wikivoyage_primary_text_color">@color/wikivoyage_primary_text_light</item>
+
+        <item name="wikivoyage_travel_card_bg">@drawable/travel_card_bg_light</item>
+        <item name="wikivoyage_travel_card_stroke_bg">@drawable/travel_card_stroke_bg_light</item>
+        <item name="wikivoyage_secondary_btn_bg">@drawable/wikivoyage_secondary_btn_bg_light</item>
+        <item name="wikivoyage_primary_btn_bg">@drawable/wikivoyage_primary_btn_bg_light</item>
+        <item name="purchase_dialog_active_card_bg">@drawable/dialog_active_card_bg_light</item>
+
     </style>
 
     <style name="OverflowMenuButton" parent="@style/Widget.AppCompat.ActionButton.Overflow">
@@ -414,6 +421,13 @@
         <item name="wikivoyage_primary_btn_text_color">@color/wikivoyage_primary_btn_text_dark</item>
         <item name="wikivoyage_welcome_bg_color">@color/wikivoyage_welcome_bg_dark</item>
         <item name="wikivoyage_primary_text_color">@color/wikivoyage_primary_text_dark</item>
+
+        <item name="wikivoyage_travel_card_bg">@drawable/travel_card_bg_dark</item>
+        <item name="wikivoyage_travel_card_stroke_bg">@drawable/travel_card_stroke_bg_dark</item>
+        <item name="wikivoyage_secondary_btn_bg">@drawable/wikivoyage_secondary_btn_bg_dark</item>
+        <item name="wikivoyage_primary_btn_bg">@drawable/wikivoyage_primary_btn_bg_dark</item>
+        <item name="purchase_dialog_active_card_bg">@drawable/dialog_active_card_bg_dark</item>
+
     </style>
 
     <style name="FreeVersionBanner" parent="OsmandDarkTheme">
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelDownloadUpdateCard.java b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelDownloadUpdateCard.java
index 454a608f75..b7c1226887 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelDownloadUpdateCard.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelDownloadUpdateCard.java
@@ -206,9 +206,9 @@ public class TravelDownloadUpdateCard extends BaseTravelCard {
 	@DrawableRes
 	private int getPrimaryBtnBgRes(boolean enabled) {
 		if (enabled) {
-			return R.drawable.wikivoyage_primary_btn_bg;
+			return nightMode ? R.drawable.wikivoyage_primary_btn_bg_dark : R.drawable.wikivoyage_primary_btn_bg_light;
 		}
-		return R.drawable.wikivoyage_secondary_btn_bg;
+		return nightMode ? R.drawable.wikivoyage_secondary_btn_bg_dark : R.drawable.wikivoyage_secondary_btn_bg_light;
 	}
 
 	@ColorRes