diff --git a/OsmAnd/res/drawable/btn_round_dark.xml b/OsmAnd/res/drawable/btn_round_dark.xml
new file mode 100644
index 0000000000..88b246a83c
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_round_dark.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item android:state_pressed="true"><shape android:shape="rectangle">
+		<solid android:color="@color/active_buttons_and_links_bg_pressed_dark" />
+		<corners android:radius="@dimen/map_button_rect_rad" />
+	</shape></item>
+	<item android:state_enabled="false"><shape android:shape="rectangle">
+		<solid android:color="@color/inactive_buttons_and_links_bg_dark" />
+		<corners android:radius="@dimen/map_button_rect_rad" />
+	</shape></item>
+	<item><shape android:shape="rectangle">
+		<solid android:color="@color/active_color_primary_dark" />
+		<corners android:radius="@dimen/map_button_rect_rad" />
+	</shape></item>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_round_blue.xml b/OsmAnd/res/drawable/btn_round_light.xml
similarity index 100%
rename from OsmAnd/res/drawable/btn_round_blue.xml
rename to OsmAnd/res/drawable/btn_round_light.xml
diff --git a/OsmAnd/res/layout-land/fragment_measurement_tool.xml b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
index 3c3615d0af..8a99257bb1 100644
--- a/OsmAnd/res/layout-land/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
@@ -203,7 +203,7 @@
                         android:layout_marginEnd="@dimen/measurement_tool_button_margin"
                         android:layout_marginRight="@dimen/measurement_tool_button_margin"
                         android:layout_marginTop="@dimen/measurement_tool_button_margin"
-                        android:background="@drawable/btn_round_blue"
+                        android:background="?attr/btn_round"
                         android:drawableLeft="@drawable/ic_action_plus"
                         android:maxLines="1"
                         android:minHeight="@dimen/measurement_tool_button_height"
@@ -233,7 +233,7 @@
                     android:layout_marginEnd="@dimen/measurement_tool_button_margin"
                     android:layout_marginRight="@dimen/measurement_tool_button_margin"
                     android:layout_marginTop="@dimen/measurement_tool_button_margin"
-                    android:background="@drawable/btn_round_blue"
+                    android:background="?attr/btn_round"
                     android:minHeight="@dimen/measurement_tool_button_height"
                     android:paddingLeft="@dimen/measurement_tool_button_padding"
                     android:paddingRight="@dimen/measurement_tool_button_padding"
@@ -308,7 +308,7 @@
                     android:layout_marginEnd="@dimen/measurement_tool_button_margin"
                     android:layout_marginRight="@dimen/measurement_tool_button_margin"
                     android:layout_marginTop="@dimen/measurement_tool_button_margin"
-                    android:background="@drawable/btn_round_blue"
+                    android:background="?attr/btn_round"
                     android:drawableLeft="@drawable/ic_action_plus"
                     android:minHeight="@dimen/measurement_tool_button_height"
                     android:paddingLeft="@dimen/measurement_tool_button_padding"
diff --git a/OsmAnd/res/layout-xlarge/first_usage_welcome_fragment.xml b/OsmAnd/res/layout-xlarge/first_usage_welcome_fragment.xml
index 038807fb44..ceeabfb598 100644
--- a/OsmAnd/res/layout-xlarge/first_usage_welcome_fragment.xml
+++ b/OsmAnd/res/layout-xlarge/first_usage_welcome_fragment.xml
@@ -60,7 +60,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginBottom="@dimen/first_usage_title_margin_bottom"
-            android:background="@drawable/btn_round_blue"
+            android:background="@drawable/btn_round_light"
             android:padding="14dp"
             android:text="@string/get_started"
             android:textColor="@color/color_white"/>
diff --git a/OsmAnd/res/layout/first_usage_welcome_fragment.xml b/OsmAnd/res/layout/first_usage_welcome_fragment.xml
index 167f84d579..1c69626c8f 100644
--- a/OsmAnd/res/layout/first_usage_welcome_fragment.xml
+++ b/OsmAnd/res/layout/first_usage_welcome_fragment.xml
@@ -60,7 +60,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginBottom="@dimen/first_usage_title_margin_bottom"
-            android:background="@drawable/btn_round_blue"
+            android:background="@drawable/btn_round_light"
             android:padding="14dp"
             android:text="@string/get_started"
             android:textColor="@color/color_white"/>
diff --git a/OsmAnd/res/layout/first_usage_wizard_fragment.xml b/OsmAnd/res/layout/first_usage_wizard_fragment.xml
index b887ebb805..c121f9fb13 100644
--- a/OsmAnd/res/layout/first_usage_wizard_fragment.xml
+++ b/OsmAnd/res/layout/first_usage_wizard_fragment.xml
@@ -653,7 +653,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginBottom="@dimen/first_usage_title_margin_bottom"
-                android:background="@drawable/btn_round_blue"
+                android:background="@drawable/btn_round_light"
                 android:padding="14dp"
                 android:text="@string/give_permission"
                 android:textColor="@color/color_white"
diff --git a/OsmAnd/res/layout/fragment_map_markers_groups.xml b/OsmAnd/res/layout/fragment_map_markers_groups.xml
index 1bc03db2b7..79cacd4840 100644
--- a/OsmAnd/res/layout/fragment_map_markers_groups.xml
+++ b/OsmAnd/res/layout/fragment_map_markers_groups.xml
@@ -21,7 +21,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/ic_action_plus"
-        app:backgroundTint="@color/active_color_primary_light"
+        app:backgroundTint="?attr/active_color_basic"
         app:fabSize="normal"
         app:useCompatPadding="true"/>
 
diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index 68c9d27698..ea187473f4 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -222,7 +222,7 @@
                     android:layout_marginEnd="@dimen/measurement_tool_button_margin"
                     android:layout_marginRight="@dimen/measurement_tool_button_margin"
                     android:layout_marginTop="@dimen/measurement_tool_button_margin"
-                    android:background="@drawable/btn_round_blue"
+                    android:background="?attr/btn_round"
                     android:drawableLeft="@drawable/ic_action_plus"
                     android:ellipsize="end"
                     android:maxLines="1"
@@ -252,7 +252,7 @@
                 android:layout_marginEnd="@dimen/measurement_tool_button_margin"
                 android:layout_marginRight="@dimen/measurement_tool_button_margin"
                 android:layout_marginTop="@dimen/measurement_tool_button_margin"
-                android:background="@drawable/btn_round_blue"
+                android:background="?attr/btn_round"
                 android:minHeight="@dimen/measurement_tool_button_height"
                 android:paddingLeft="@dimen/measurement_tool_button_padding"
                 android:paddingRight="@dimen/measurement_tool_button_padding"
@@ -326,7 +326,7 @@
                 android:layout_marginEnd="@dimen/measurement_tool_button_margin"
                 android:layout_marginRight="@dimen/measurement_tool_button_margin"
                 android:layout_marginTop="@dimen/measurement_tool_button_margin"
-                android:background="@drawable/btn_round_blue"
+                android:background="?attr/btn_round"
                 android:drawableLeft="@drawable/ic_action_plus"
                 android:minHeight="@dimen/measurement_tool_button_height"
                 android:paddingLeft="@dimen/measurement_tool_button_padding"
diff --git a/OsmAnd/res/layout/fragment_selected_profile.xml b/OsmAnd/res/layout/fragment_selected_profile.xml
index 2332888992..9100a1636e 100644
--- a/OsmAnd/res/layout/fragment_selected_profile.xml
+++ b/OsmAnd/res/layout/fragment_selected_profile.xml
@@ -142,6 +142,7 @@
 							android:layout_weight="1"
 							android:layout_margin="@dimen/list_content_padding"
 							app:primaryColor="@color/active_color_primary_dark"
+							app:secondaryColor="?android:textColorSecondary"
 							app:labelText="@string/profile_name_hint">
 
 							<studio.carbonylgroup.textfieldboxes.ExtendedEditText
@@ -185,6 +186,7 @@
 						android:layout_width="match_parent"
 						android:layout_height="60dp"
 						app:primaryColor="@color/active_color_primary_dark"
+						app:secondaryColor="?android:textColorSecondary"
 						app:labelText="@string/nav_type_hint">
 
 						<studio.carbonylgroup.textfieldboxes.ExtendedEditText
diff --git a/OsmAnd/res/layout/my_places_fabs.xml b/OsmAnd/res/layout/my_places_fabs.xml
index 7195ff90a1..a0b20b330a 100644
--- a/OsmAnd/res/layout/my_places_fabs.xml
+++ b/OsmAnd/res/layout/my_places_fabs.xml
@@ -15,7 +15,7 @@
         android:layout_alignParentRight="true"
         android:contentDescription="@string/quick_action_new_action"
         android:src="@drawable/ic_action_plus"
-        app:backgroundTint="@color/active_color_primary_light"
+        app:backgroundTint="?attr/active_color_basic"
         app:fabSize="normal"
         app:useCompatPadding="true"/>
 
diff --git a/OsmAnd/res/layout/subscription_fragment.xml b/OsmAnd/res/layout/subscription_fragment.xml
index f4401d074b..915bba3cf5 100644
--- a/OsmAnd/res/layout/subscription_fragment.xml
+++ b/OsmAnd/res/layout/subscription_fragment.xml
@@ -285,7 +285,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="72dp"
                             android:layout_marginRight="16dp"
-                            android:background="@drawable/btn_round_blue"
+                            android:background="?attr/btn_round"
                             android:paddingLeft="16dp"
                             android:paddingRight="16dp"
                             android:text="@string/shared_string_save_changes"
diff --git a/OsmAnd/res/values/attrs.xml b/OsmAnd/res/values/attrs.xml
index a0f9091274..923656c033 100644
--- a/OsmAnd/res/values/attrs.xml
+++ b/OsmAnd/res/values/attrs.xml
@@ -18,6 +18,7 @@
 		<attr name="expandable_list_item_background" format="color"/>
 		<attr name="expandable_list_background" format="color"/>
 		<attr name="bg_color" format="reference" />
+	    <attr name="btn_round" format="reference" />
         <attr name="btn_round_border" format="reference" />
 		<attr name="btn_round_border_2" format="reference" />
 		<attr name="bg_card" format="reference" />
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index ca2c2d6f62..41c9fc9f21 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -59,7 +59,7 @@
         <item name="android:paddingTop">8dp</item>
         <item name="android:paddingBottom">8dp</item>
         <item name="android:textColor">@color/color_white</item>
-        <item name="android:background">@drawable/btn_round_blue</item>
+        <item name="android:background">?attr/btn_round</item>
     </style>
 
     <style name="DialogCancelButton">
@@ -129,6 +129,7 @@
         <item name="actionModeBackground">@color/app_bar_color_light</item>
         <item name="actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
         <item name="bg_color">@color/list_background_color_light</item>
+        <item name="btn_round">@drawable/btn_round_light</item>
         <item name="btn_round_border">@drawable/btn_round_border_light</item>
         <item name="btn_round_border_2">@drawable/btn_round_border_light_2</item>
         <item name="bg_card">@drawable/bg_card_light</item>
@@ -394,6 +395,7 @@
         <item name="actionModeBackground">@color/app_bar_color_dark</item>
         <item name="actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
         <item name="bg_color">@color/list_background_color_dark</item>
+        <item name="btn_round">@drawable/btn_round_dark</item>
         <item name="btn_round_border">@drawable/btn_round_border_dark</item>
         <item name="btn_round_border_2">@drawable/btn_round_border_dark_2</item>
         <item name="bg_card">@drawable/bg_card_dark</item>
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
index 16e6e36e3b..76d872a9f0 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
@@ -7,6 +7,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.TypedArray;
 import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
@@ -517,7 +518,10 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement
 				});
 			}
 			if (contextMenuItem.getIcon() != -1) {
-				item.setIcon(contextMenuItem.getIcon());
+				int activeButtonsAndLinksTextColorResId = getMyApplication().getSettings().isLightContent() ?
+						R.color.active_buttons_and_links_text_light : R.color.active_buttons_and_links_text_dark;
+				Drawable icMenuItem = getMyApplication().getUIUtilities().getIcon(contextMenuItem.getIcon(), activeButtonsAndLinksTextColorResId);
+				item.setIcon(icMenuItem);
 			}
 		}
 	}