diff --git a/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp b/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp
index 3f2014f907..fc6d69818d 100644
--- a/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp
+++ b/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp
@@ -155,11 +155,13 @@ void PrepareClassRefs(JNIEnv * env)
 //                          int bookmarksCount,
 //                          boolean fromCatalog,
 //                          boolean isMyCategory,
-//                          boolean isVisible)
+//                          boolean isVisible,
+//                          String mImageUrl)
   g_bookmarkCategoryConstructor =
       jni::GetConstructorID(env, g_bookmarkCategoryClass,
                             "(JLjava/lang/String;Ljava/lang/String;"
-                            "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIZZZILjava/lang/String;Ljava/lang/String;)V");
+                            "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;"
+                            "IIZZZILjava/lang/String;Ljava/lang/String;)V");
 
   g_catalogTagClass =
     jni::GetGlobalClassRef(env, "com/mapswithme/maps/bookmarks/data/CatalogTag");
diff --git a/android/res/layout/item_bookmark_collection.xml b/android/res/layout/item_bookmark_collection.xml
index 9b4ba10d2d..1e07212959 100644
--- a/android/res/layout/item_bookmark_collection.xml
+++ b/android/res/layout/item_bookmark_collection.xml
@@ -36,7 +36,8 @@
       android:layout_marginBottom="@dimen/margin_half_plus"
       android:ellipsize="end"
       android:singleLine="true"
-      android:textAppearance="@style/MwmTextAppearance.Body3"
+      android:textColor="?android:textColorSecondary"
+      android:textAppearance="?fontBody2"
       tools:text="42000000" />
   </LinearLayout>
 </LinearLayout>
diff --git a/android/res/layout/item_bookmark_group_list_header.xml b/android/res/layout/item_bookmark_group_list_header.xml
index 626973e47b..b0982f4e1f 100644
--- a/android/res/layout/item_bookmark_group_list_header.xml
+++ b/android/res/layout/item_bookmark_group_list_header.xml
@@ -30,6 +30,6 @@
     android:fontFamily="@string/robotoMedium"
     android:text="@string/bookmarks_groups_hide_all"
     android:textAllCaps="true"
-    android:textAppearance="?textAppearanceSubtitle2"
+    android:textAppearance="?fontSubtitle2"
     android:textColor="?colorAccent" />
 </RelativeLayout>
diff --git a/android/res/layout/item_track.xml b/android/res/layout/item_track.xml
index 6a74701721..8a6c23b18f 100644
--- a/android/res/layout/item_track.xml
+++ b/android/res/layout/item_track.xml
@@ -25,7 +25,7 @@
       android:layout_marginTop="@dimen/margin_base"
       android:layout_marginEnd="@dimen/bookmark_collection_item_end_margin"
       android:singleLine="true"
-      android:textAppearance="?textAppearanceBody1"
+      android:textAppearance="?fontBody1"
       tools:text="@string/tracks_title" />
     <TextView
       android:id="@+id/tv__bookmark_distance"
@@ -34,7 +34,8 @@
       android:layout_marginEnd="@dimen/bookmark_collection_item_end_margin"
       android:layout_marginBottom="@dimen/margin_half_plus"
       android:singleLine="true"
-      android:textAppearance="@style/MwmTextAppearance.Body3"
+      android:textColor="?android:textColorSecondary"
+      android:textAppearance="?fontBody2"
       tools:text="@string/by_distance" />
   </LinearLayout>
 </RelativeLayout>
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCollectionAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCollectionAdapter.java
index 8c098e740d..3738a93ee5 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCollectionAdapter.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCollectionAdapter.java
@@ -27,15 +27,14 @@ public class BookmarkCollectionAdapter extends RecyclerView.Adapter<RecyclerView
   private final static int TYPE_CATEGORY_ITEM = 2;
 
   @NonNull
-  private List<BookmarkCategory> mItemsCollection;
-  @NonNull
-  private List<BookmarkCategory> mItemsCategory;
+  private final List<BookmarkCategory> mItemsCollection;
   @NonNull
+  private final List<BookmarkCategory> mItemsCategory;
+
   private int mSectionCount;
-  @NonNull
   private int mCollectionSectionIndex = SectionPosition.INVALID_POSITION;
-  @NonNull
   private int mCategorySectionIndex = SectionPosition.INVALID_POSITION;
+
   @Nullable
   private OnItemClickListener<BookmarkCategory> mClickListener;