diff --git a/android/res/drawable-v21/bg_active_icon.xml b/android/res/drawable-v21/bg_active_icon.xml
index ff27258423..f9d51f4a6d 100644
--- a/android/res/drawable-v21/bg_active_icon.xml
+++ b/android/res/drawable-v21/bg_active_icon.xml
@@ -6,7 +6,7 @@
     <shape
       xmlns:android="http://schemas.android.com/apk/res/android"
       android:shape="oval">
-      <solid android:color="?activeIconBackground"/>
+      <solid android:color="@color/base_accent"/>
       <size
         android:height="40dp"
         android:width="40dp"/>
diff --git a/android/res/drawable-v21/bg_active_icon_night.xml b/android/res/drawable-v21/bg_active_icon_night.xml
new file mode 100644
index 0000000000..4213c398ca
--- /dev/null
+++ b/android/res/drawable-v21/bg_active_icon_night.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:color="?attr/colorControlHighlight">
+  <item>
+    <shape
+      xmlns:android="http://schemas.android.com/apk/res/android"
+      android:shape="oval">
+      <solid android:color="@color/base_accent_night"/>
+      <size
+        android:height="40dp"
+        android:width="40dp"/>
+    </shape>
+  </item>
+</ripple>
diff --git a/android/res/drawable-v21/bg_steady_icon.xml b/android/res/drawable-v21/bg_steady_icon.xml
index 41ae40fa0f..a47cc39d35 100644
--- a/android/res/drawable-v21/bg_steady_icon.xml
+++ b/android/res/drawable-v21/bg_steady_icon.xml
@@ -6,7 +6,7 @@
     <shape
       xmlns:android="http://schemas.android.com/apk/res/android"
       android:shape="oval">
-      <solid android:color="?steadyIconBackground"/>
+      <solid android:color="@color/black_8"/>
       <size
         android:height="40dp"
         android:width="40dp"/>
diff --git a/android/res/drawable-v21/bg_steady_icon_night.xml b/android/res/drawable-v21/bg_steady_icon_night.xml
new file mode 100644
index 0000000000..0dc5b43b03
--- /dev/null
+++ b/android/res/drawable-v21/bg_steady_icon_night.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:color="?attr/colorControlHighlight">
+  <item>
+    <shape
+      xmlns:android="http://schemas.android.com/apk/res/android"
+      android:shape="oval">
+      <solid android:color="@color/white_8"/>
+      <size
+        android:height="40dp"
+        android:width="40dp"/>
+    </shape>
+  </item>
+</ripple>
diff --git a/android/res/drawable/bg_active_icon.xml b/android/res/drawable/bg_active_icon.xml
index e828fa93ed..bfdeed2693 100644
--- a/android/res/drawable/bg_active_icon.xml
+++ b/android/res/drawable/bg_active_icon.xml
@@ -1,6 +1,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="oval">
-  <solid android:color="?activeIconBackground"/>
+  <solid android:color="@color/base_accent"/>
   <size
     android:height="40dp"
     android:width="40dp"/>
diff --git a/android/res/drawable/bg_active_icon_night.xml b/android/res/drawable/bg_active_icon_night.xml
new file mode 100644
index 0000000000..fa73f0e6c4
--- /dev/null
+++ b/android/res/drawable/bg_active_icon_night.xml
@@ -0,0 +1,7 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
+  <solid android:color="@color/base_accent_night"/>
+  <size
+    android:height="40dp"
+    android:width="40dp"/>
+</shape>
\ No newline at end of file
diff --git a/android/res/drawable/bg_steady_icon.xml b/android/res/drawable/bg_steady_icon.xml
index f12692cde9..907426b69b 100644
--- a/android/res/drawable/bg_steady_icon.xml
+++ b/android/res/drawable/bg_steady_icon.xml
@@ -1,6 +1,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="oval">
-  <solid android:color="?steadyIconBackground"/>
+  <solid android:color="@color/black_8"/>
   <size
     android:height="40dp"
     android:width="40dp"/>
diff --git a/android/res/drawable/bg_steady_icon_night.xml b/android/res/drawable/bg_steady_icon_night.xml
new file mode 100644
index 0000000000..ec05ef536f
--- /dev/null
+++ b/android/res/drawable/bg_steady_icon_night.xml
@@ -0,0 +1,7 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
+  <solid android:color="@color/white_8"/>
+  <size
+    android:height="40dp"
+    android:width="40dp"/>
+</shape>
\ No newline at end of file
diff --git a/android/res/values/themes-attrs.xml b/android/res/values/themes-attrs.xml
index d2583421b2..877a9998ba 100644
--- a/android/res/values/themes-attrs.xml
+++ b/android/res/values/themes-attrs.xml
@@ -71,9 +71,9 @@
     <attr name="bannerBackground" format="color"/>
 
     <attr name="steadyIconTint" format="color"/>
-    <attr name="steadyIconBackground" format="color"/>
+    <attr name="steadyIconBackground" format="reference"/>
     <attr name="activeIconTint" format="color"/>
-    <attr name="activeIconBackground" format="color"/>
+    <attr name="activeIconBackground" format="reference"/>
   </declare-styleable>
 
   <declare-styleable name="ThemeAttrs.NavButtons">
diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml
index f1d192ac25..3884ea94dc 100644
--- a/android/res/values/themes-base.xml
+++ b/android/res/values/themes-base.xml
@@ -87,9 +87,9 @@
     <item name="bannerBackground">@color/bg_banner_color</item>
 
     <item name="steadyIconTint">@color/black_secondary</item>
-    <item name="steadyIconBackground">@color/black_8</item>
+    <item name="steadyIconBackground">@drawable/bg_steady_icon</item>
     <item name="activeIconTint">@color/bg_cards</item>
-    <item name="activeIconBackground">?colorAccent</item>
+    <item name="activeIconBackground">@drawable/bg_active_icon</item>
   </style>
 
   <!-- Night theme -->
@@ -180,7 +180,8 @@
     <item name="bannerBackground">@color/bg_banner_color_night</item>
 
     <item name="steadyIconTint">@color/white_secondary</item>
-    <item name="steadyIconBackground">@color/white_8</item>
+    <item name="steadyIconBackground">@drawable/bg_steady_icon_night</item>
     <item name="activeIconTint">@color/bg_cards_night</item>
+    <item name="activeIconBackground">@drawable/bg_active_icon_night</item>
   </style>
 </resources>
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java
index f4c413a0ad..6a516719e7 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java
@@ -15,6 +15,7 @@ import com.mapswithme.maps.bookmarks.data.BookmarkManager;
 import com.mapswithme.maps.widget.recycler.RecyclerClickListener;
 import com.mapswithme.maps.widget.recycler.RecyclerLongClickListener;
 import com.mapswithme.util.Graphics;
+import com.mapswithme.util.UiUtils;
 
 public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<BookmarkCategoriesAdapter.ViewHolder>
 {
@@ -134,12 +135,14 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Bookm
       Drawable drawable;
       if (visible)
       {
-        visibilityMarker.setBackgroundResource(R.drawable.bg_active_icon);
+        visibilityMarker.setBackgroundResource(UiUtils.getStyledResourceId(
+            visibilityMarker.getContext(), R.attr.activeIconBackground));
         drawable = Graphics.tint(visibilityMarker.getContext(), R.drawable.ic_bookmark_show, R.attr.activeIconTint);
       }
       else
       {
-        visibilityMarker.setBackgroundResource(R.drawable.bg_steady_icon);
+        visibilityMarker.setBackgroundResource(UiUtils.getStyledResourceId(
+            visibilityMarker.getContext(), R.attr.steadyIconBackground));
         drawable = Graphics.tint(visibilityMarker.getContext(), R.drawable.ic_bookmark_hide,
                                  R.attr.steadyIconTint);
       }