diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 53c02b242a..5ad1da01cf 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -236,11 +236,9 @@
         android:configChanges="orientation|screenLayout|screenSize"
         android:label="@string/app_name"/>
 
-<!--
     <activity
       android:name="com.mapswithme.maps.bookmarks.BookmarksCatalogActivity"
       android:label="@string/routes_and_bookmarks"/>
--->
 
     <activity-alias
       android:name="com.mapswithme.maps.DownloadResourcesActivity"
diff --git a/android/src/com/mapswithme/maps/background/AbstractLogBroadcastReceiver.java b/android/src/com/mapswithme/maps/background/AbstractLogBroadcastReceiver.java
index fac5bffb48..3627ff1137 100644
--- a/android/src/com/mapswithme/maps/background/AbstractLogBroadcastReceiver.java
+++ b/android/src/com/mapswithme/maps/background/AbstractLogBroadcastReceiver.java
@@ -32,6 +32,8 @@ public abstract class AbstractLogBroadcastReceiver extends BroadcastReceiver
                  + !backgroundTracker().isForeground();
     LOGGER.i(getTag(), msg);
     CrashlyticsUtils.log(Log.INFO, getTag(), msg);
+    assert intent != null;
+    onReceiveInternal(context, intent);
   }
 
   @NonNull
diff --git a/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoryAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoryAdapter.java
index 02373ae1ec..d53714b3dd 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoryAdapter.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoryAdapter.java
@@ -29,7 +29,7 @@ public abstract class BaseBookmarkCategoryAdapter<V extends RecyclerView.ViewHol
   @NonNull
   public List<BookmarkCategory> getBookmarkCategories()
   {
-    return BookmarkManager.INSTANCE.getOwnedCategoriesSnapshot().items();
+    return BookmarkManager.INSTANCE.getOwnedCategoriesSnapshot().getItems();
   }
 
   @Override
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java
index b11a4ee078..f072d3e159 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java
@@ -141,7 +141,8 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Recyc
   private void bindSize(@NonNull CategoryViewHolder categoryHolder,
                         @NonNull BookmarkCategory category)
   {
-    categoryHolder.setSize(category.getPluralsCountTemplate(), category.getPluralsCount());
+    BookmarkCategory.CountAndPlurals template = category.getPluralsCountTemplate();
+    categoryHolder.setSize(template.getPlurals(), template.getCount());
   }
 
   private void bindAuthor(@NonNull CategoryViewHolder categoryHolder,
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java
index 95035fa736..a85fdc081a 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java
@@ -13,7 +13,7 @@ import com.mapswithme.maps.widget.BookmarkBackupView;
 import com.mapswithme.util.UiUtils;
 
 public class BookmarkCategoriesFragment extends BaseBookmarkCategoriesFragment
-    implements Authorizer.SocialAuthCallback, TargetFragmentCallback
+    implements TargetFragmentCallback
 {
   @Nullable
   private BookmarkBackupController mBackupController;
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java
index 0a642b6757..e567e29b3d 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java
@@ -36,7 +36,7 @@ public class BookmarksCatalogFragment extends BaseWebViewMwmFragment
   public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
                            @Nullable Bundle savedInstanceState)
   {
-    View root = inflater.inflate(R.layout.bookmarks_catalog_frag, container, false);
+    View root = inflater.inflate(R.layout.fragment_bookmarks_catalog, container, false);
     WebView webView = root.findViewById(getWebViewResId());
     initWebView(webView);
     webView.loadUrl(mCatalogUrl);
@@ -84,8 +84,8 @@ public class BookmarksCatalogFragment extends BaseWebViewMwmFragment
 
     private boolean requestArchive(@NonNull WebView view, @NonNull String url) throws IOException
     {
-/*      BookmarksDownloadManager dm = BookmarksDownloadManager.from(view.getContext());
-      dm.enqueueRequest(url);*/
+      BookmarksDownloadManager dm = BookmarksDownloadManager.from(view.getContext());
+      dm.enqueueRequest(url);
       return true;
     }
   }
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksPageFactory.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksPageFactory.java
index 022858d893..95b5e24931 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarksPageFactory.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksPageFactory.java
@@ -14,7 +14,7 @@ public enum BookmarksPageFactory
         @Override
         public Fragment instantiateFragment()
         {
-          return new CachedBookmarksFragment();
+          return new CachedBookmarkCategoriesFragment();
         }
 
         @Override
diff --git a/android/src/com/mapswithme/maps/bookmarks/CatalogBookmarkCategoriesAdapter.java b/android/src/com/mapswithme/maps/bookmarks/CatalogBookmarkCategoriesAdapter.java
index 0a8bf97570..8bafac5824 100644
--- a/android/src/com/mapswithme/maps/bookmarks/CatalogBookmarkCategoriesAdapter.java
+++ b/android/src/com/mapswithme/maps/bookmarks/CatalogBookmarkCategoriesAdapter.java
@@ -19,6 +19,6 @@ public class CatalogBookmarkCategoriesAdapter extends BookmarkCategoriesAdapter
   @NonNull
   public List<BookmarkCategory> getBookmarkCategories()
   {
-    return BookmarkManager.INSTANCE.getCatalogCategoriesSnapshot().items();
+    return BookmarkManager.INSTANCE.getCatalogCategoriesSnapshot().getItems();
   }
 }
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java
index 65a7e7930d..16ca8e2aa6 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java
@@ -23,8 +23,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.mapswithme.maps.widget.placepage.PlacePageButtons.PARTNERS_ITEMS;
-
 public final class PlacePageButtons
 {
   private static final Map<Integer, PartnerItem> PARTNERS_ITEMS = new HashMap<Integer, PartnerItem>()
diff --git a/android/src/com/mapswithme/util/Utils.java b/android/src/com/mapswithme/util/Utils.java
index f788db6bdd..640f1a7806 100644
--- a/android/src/com/mapswithme/util/Utils.java
+++ b/android/src/com/mapswithme/util/Utils.java
@@ -52,11 +52,6 @@ public class Utils
   private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
   private static final String TAG = "Utils";
 
-  public static <T> T castTo(Object object)
-  {
-    return (T) object;
-  }
-
   public interface Proc<T>
   {
     void invoke(@NonNull T param);
diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp
index 25404cfe15..0f2f362e3c 100644
--- a/map/bookmark_manager.cpp
+++ b/map/bookmark_manager.cpp
@@ -89,7 +89,7 @@ bool IsBadCharForPath(strings::UniChar const & c)
 }
 
 bool IsValidFilterType(BookmarkManager::CategoryFilterType const filter,
-                       bool const fromCatalog) const
+                       bool const fromCatalog)
 {
   switch (filter)
   {