diff --git a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java index e1d4c125b7..5bd7965c37 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java @@ -106,9 +106,6 @@ public class MapButtonsController extends Fragment helpButton.setImageResource(R.drawable.ic_christmas_tree); else helpButton.setImageResource(R.drawable.logo); - // Keep this button colorful in normal theme. - if (!ThemeUtils.isNightTheme(requireContext())) - helpButton.getDrawable().setTintList(null); } final View zoomFrame = mFrame.findViewById(R.id.zoom_buttons_container); diff --git a/android/app/src/main/res/layout/map_buttons_help.xml b/android/app/src/main/res/layout/map_buttons_help.xml index 563961dd5d..f7edc00fc7 100644 --- a/android/app/src/main/res/layout/map_buttons_help.xml +++ b/android/app/src/main/res/layout/map_buttons_help.xml @@ -6,4 +6,5 @@ style="@style/MwmWidget.MapButton.Square" android:contentDescription="@string/help" app:shapeAppearanceOverlay="@style/MwmWidget.MapButton.Square" - app:srcCompat="@drawable/ic_question_mark" /> \ No newline at end of file + app:srcCompat="@drawable/logo" + android:tint="?helpIconTint"/> \ No newline at end of file diff --git a/android/app/src/main/res/values-night/themes-base.xml b/android/app/src/main/res/values-night/themes-base.xml index d3158b3fe4..968b7f479e 100644 --- a/android/app/src/main/res/values-night/themes-base.xml +++ b/android/app/src/main/res/values-night/themes-base.xml @@ -38,6 +38,7 @@ @color/white_12 @color/yellow @color/icon_tint_light_night + @color/white_secondary @color/text_light_hint @color/divider_night diff --git a/android/app/src/main/res/values/themes-attrs.xml b/android/app/src/main/res/values/themes-attrs.xml index 75a651c16c..4c13463cda 100644 --- a/android/app/src/main/res/values/themes-attrs.xml +++ b/android/app/src/main/res/values/themes-attrs.xml @@ -15,6 +15,7 @@ + diff --git a/android/app/src/main/res/values/themes-base.xml b/android/app/src/main/res/values/themes-base.xml index a822323ea2..8f0945efca 100644 --- a/android/app/src/main/res/values/themes-base.xml +++ b/android/app/src/main/res/values/themes-base.xml @@ -36,6 +36,7 @@ @color/black_12 @color/yellow @color/icon_tint_light + @android:color/transparent @color/text_dark_hint @color/divider