diff --git a/android/res/layout/item_bookmark.xml b/android/res/layout/item_bookmark.xml
index df86b2b14b..3f436f4ed0 100644
--- a/android/res/layout/item_bookmark.xml
+++ b/android/res/layout/item_bookmark.xml
@@ -4,7 +4,11 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:minHeight="@dimen/height_item_oneline"
-  android:background="?clickableBackground">
+  android:background="?clickableBackground"
+  android:paddingRight="@dimen/margin_base"
+  android:paddingEnd="@dimen/margin_base"
+  android:paddingLeft="@dimen/margin_base"
+  android:paddingStart="@dimen/margin_base">
 
   <ImageView
     android:id="@+id/iv__bookmark_color"
@@ -12,9 +16,9 @@
     android:layout_height="wrap_content"
     android:layout_alignParentLeft="true"
     android:layout_centerVertical="true"
-    android:layout_marginLeft="@dimen/margin_base"
+    android:layout_alignParentStart="true"
     android:layout_marginRight="@dimen/margin_base"
-    android:layout_alignParentStart="true"/>
+    android:layout_marginEnd="@dimen/margin_base"/>
 
   <LinearLayout
     android:layout_width="wrap_content"
@@ -22,12 +26,8 @@
     android:weightSum="2"
     android:orientation="vertical"
     android:layout_centerVertical="true"
-    android:paddingRight="@dimen/margin_base"
-    android:paddingEnd="@dimen/margin_base"
     android:layout_toRightOf="@id/iv__bookmark_color"
     android:layout_toEndOf="@id/iv__bookmark_color"
-    android:layout_marginRight="@dimen/margin_base"
-    android:layout_marginEnd="@dimen/margin_base"
     android:layout_toLeftOf="@id/more"
     android:layout_toStartOf="@id/more">
     <TextView
diff --git a/android/src/com/mapswithme/maps/base/BaseMwmRecyclerFragment.java b/android/src/com/mapswithme/maps/base/BaseMwmRecyclerFragment.java
index a07c0c15b4..d90870572e 100644
--- a/android/src/com/mapswithme/maps/base/BaseMwmRecyclerFragment.java
+++ b/android/src/com/mapswithme/maps/base/BaseMwmRecyclerFragment.java
@@ -35,6 +35,7 @@ public abstract class BaseMwmRecyclerFragment<T extends RecyclerView.Adapter> ex
   @NonNull
   private T mAdapter;
 
+  @NonNull
   protected abstract T createAdapter();
 
   @LayoutRes
diff --git a/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java b/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java
index 45fec75dc9..565f91afce 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java
@@ -52,6 +52,7 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag
     return R.layout.fragment_bookmark_categories;
   }
 
+  @NonNull
   @Override
   protected BookmarkCategoriesAdapter createAdapter()
   {
@@ -249,7 +250,7 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag
   }
 
   @Override
-  public void onItemClick(View v, BookmarkCategory category)
+  public void onItemClick(@NonNull View v, @NonNull BookmarkCategory category)
   {
     startActivity(makeBookmarksListIntent(category));
   }
@@ -278,7 +279,7 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag
     return R.id.set_delete;
   }
 
-  private void onSaveText(String text)
+  private void onSaveText(@NonNull String text)
   {
     if (mCategoryEditor != null)
       mCategoryEditor.commit(text);
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesPagerFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesPagerFragment.java
index dbab5c01e5..2652299f5e 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesPagerFragment.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesPagerFragment.java
@@ -31,7 +31,7 @@ public class BookmarkCategoriesPagerFragment extends BaseMwmFragment
   public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
                            @Nullable Bundle savedInstanceState)
   {
-    View root = inflater.inflate(R.layout.fragment_bookmark_categories_pager, null);
+    View root = inflater.inflate(R.layout.fragment_bookmark_categories_pager, container, false);
     ViewPager viewPager = root.findViewById(R.id.viewpager);
     TabLayout tabLayout = root.findViewById(R.id.sliding_tabs_layout);
 
@@ -54,24 +54,12 @@ public class BookmarkCategoriesPagerFragment extends BaseMwmFragment
     return Arrays.asList(BookmarksPageFactory.PRIVATE, BookmarksPageFactory.CATALOG);
   }
 
-  private class PageChangeListener implements ViewPager.OnPageChangeListener
+  private class PageChangeListener extends ViewPager.SimpleOnPageChangeListener
   {
-    @Override
-    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels)
-    {
-
-    }
-
     @Override
     public void onPageSelected(int position)
     {
       SharedPropertiesUtils.setLastVisibleBookmarkCategoriesPage(getActivity(), position);
     }
-
-    @Override
-    public void onPageScrollStateChanged(int state)
-    {
-
-    }
   }
 }
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksDownloadManager.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksDownloadManager.java
index 7a7651e878..4e6047452b 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarksDownloadManager.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksDownloadManager.java
@@ -79,7 +79,7 @@ public class BookmarksDownloadManager
     return new BookmarksDownloadManager(context);
   }
 
-  public static class UnprocessedUrlException extends Exception
+  static class UnprocessedUrlException extends Exception
   {
     UnprocessedUrlException(@NonNull String msg)
     {
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
index 98e22ce18c..c75ff0b573 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
@@ -51,6 +51,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
     mCategory = getArguments().getParcelable(EXTRA_CATEGORY);
   }
 
+  @NonNull
   @Override
   protected BookmarkListAdapter createAdapter()
   {
diff --git a/android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java b/android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java
index 973c26081e..aa1a59aeb6 100644
--- a/android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java
+++ b/android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java
@@ -50,6 +50,7 @@ public class CachedBookmarkCategoriesFragment extends BaseBookmarkCategoriesFrag
     return R.layout.fragment_catalog_bookmark_categories;
   }
 
+  @NonNull
   @Override
   protected CatalogBookmarkCategoriesAdapter createAdapter()
   {
diff --git a/android/src/com/mapswithme/maps/bookmarks/Holders.java b/android/src/com/mapswithme/maps/bookmarks/Holders.java
index f78c630b2d..20d12c43f4 100644
--- a/android/src/com/mapswithme/maps/bookmarks/Holders.java
+++ b/android/src/com/mapswithme/maps/bookmarks/Holders.java
@@ -138,7 +138,7 @@ public class Holders
     View mMore;
     @NonNull
     TextView mAuthorName;
-    @NonNull
+    @Nullable
     private BookmarkCategory mEntity;
 
     CategoryViewHolder(@NonNull View root)
@@ -187,6 +187,8 @@ public class Holders
     @NonNull
     public BookmarkCategory getEntity()
     {
+      if (mEntity == null)
+        throw new AssertionError("BookmarkCategory is null");
       return mEntity;
     }
 
diff --git a/android/src/com/mapswithme/maps/bookmarks/OnItemClickListener.java b/android/src/com/mapswithme/maps/bookmarks/OnItemClickListener.java
index e689be6424..4fe6e3cdea 100644
--- a/android/src/com/mapswithme/maps/bookmarks/OnItemClickListener.java
+++ b/android/src/com/mapswithme/maps/bookmarks/OnItemClickListener.java
@@ -1,8 +1,9 @@
 package com.mapswithme.maps.bookmarks;
 
+import android.support.annotation.NonNull;
 import android.view.View;
 
 public interface OnItemClickListener<T>
 {
-  void onItemClick(View v, T item);
+  void onItemClick(@NonNull View v, @NonNull T item);
 }
diff --git a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java
index e677fbce7a..de638ce526 100644
--- a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java
+++ b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java
@@ -731,4 +731,20 @@ public enum BookmarkManager
      */
     void onImportFinished(@NonNull String serverId, boolean successful);
   }
+
+  public static class DefaultBookmarksCatalogListener implements BookmarksCatalogListener
+  {
+
+    @Override
+    public void onImportStarted(@NonNull String serverId)
+    {
+      /* do noting by default */
+    }
+
+    @Override
+    public void onImportFinished(@NonNull String serverId, boolean successful)
+    {
+      /* do noting by default */
+    }
+  }
 }
diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java b/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java
index 2ea5dd983a..7b78710363 100644
--- a/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java
+++ b/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java
@@ -190,6 +190,7 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapte
     return R.layout.fragment_downloader;
   }
 
+  @NonNull
   @Override
   protected DownloaderAdapter createAdapter()
   {
diff --git a/android/src/com/mapswithme/maps/editor/CuisineFragment.java b/android/src/com/mapswithme/maps/editor/CuisineFragment.java
index db96fac801..c91897e4c1 100644
--- a/android/src/com/mapswithme/maps/editor/CuisineFragment.java
+++ b/android/src/com/mapswithme/maps/editor/CuisineFragment.java
@@ -9,6 +9,7 @@ public class CuisineFragment extends BaseMwmRecyclerFragment<CuisineAdapter>
 {
   private CuisineAdapter mAdapter;
 
+  @NonNull
   @Override
   protected CuisineAdapter createAdapter()
   {
diff --git a/android/src/com/mapswithme/maps/editor/FeatureCategoryFragment.java b/android/src/com/mapswithme/maps/editor/FeatureCategoryFragment.java
index 03355a9816..31319a583e 100644
--- a/android/src/com/mapswithme/maps/editor/FeatureCategoryFragment.java
+++ b/android/src/com/mapswithme/maps/editor/FeatureCategoryFragment.java
@@ -56,6 +56,7 @@ public class FeatureCategoryFragment extends BaseMwmRecyclerFragment<FeatureCate
                                                : Editor.nativeSearchFeatureCategories(query, Language.getKeyboardLocale()));
   }
 
+  @NonNull
   @Override
   protected FeatureCategoryAdapter createAdapter()
   {
diff --git a/android/src/com/mapswithme/maps/editor/LanguagesFragment.java b/android/src/com/mapswithme/maps/editor/LanguagesFragment.java
index 48e57e7e20..1f5f4a5d54 100644
--- a/android/src/com/mapswithme/maps/editor/LanguagesFragment.java
+++ b/android/src/com/mapswithme/maps/editor/LanguagesFragment.java
@@ -1,6 +1,7 @@
 package com.mapswithme.maps.editor;
 
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
 
 import com.mapswithme.maps.base.BaseMwmRecyclerFragment;
@@ -23,6 +24,7 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
     void onLanguageSelected(Language language);
   }
 
+  @NonNull
   @Override
   protected LanguagesAdapter createAdapter()
   {
diff --git a/android/src/com/mapswithme/maps/editor/SimpleTimetableFragment.java b/android/src/com/mapswithme/maps/editor/SimpleTimetableFragment.java
index d5a8cac325..36a4f9fcbd 100644
--- a/android/src/com/mapswithme/maps/editor/SimpleTimetableFragment.java
+++ b/android/src/com/mapswithme/maps/editor/SimpleTimetableFragment.java
@@ -1,6 +1,7 @@
 package com.mapswithme.maps.editor;
 
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -25,6 +26,7 @@ public class SimpleTimetableFragment extends BaseMwmRecyclerFragment<SimpleTimet
     super.onCreate(savedInstanceState);
   }
 
+  @NonNull
   @Override
   protected SimpleTimetableAdapter createAdapter()
   {
diff --git a/android/src/com/mapswithme/maps/editor/StreetFragment.java b/android/src/com/mapswithme/maps/editor/StreetFragment.java
index 707d131d3d..f3a575dc7c 100644
--- a/android/src/com/mapswithme/maps/editor/StreetFragment.java
+++ b/android/src/com/mapswithme/maps/editor/StreetFragment.java
@@ -40,6 +40,7 @@ public class StreetFragment extends BaseMwmRecyclerFragment<StreetAdapter>
     Editor.nativeSetStreet(getStreet());
   }
 
+  @NonNull
   @Override
   protected StreetAdapter createAdapter()
   {
diff --git a/android/src/com/mapswithme/maps/search/SearchCategoriesFragment.java b/android/src/com/mapswithme/maps/search/SearchCategoriesFragment.java
index 7bce0498e9..177441bc8a 100644
--- a/android/src/com/mapswithme/maps/search/SearchCategoriesFragment.java
+++ b/android/src/com/mapswithme/maps/search/SearchCategoriesFragment.java
@@ -1,6 +1,7 @@
 package com.mapswithme.maps.search;
 
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
 
@@ -10,6 +11,7 @@ import com.mapswithme.maps.base.BaseMwmRecyclerFragment;
 public class SearchCategoriesFragment extends BaseMwmRecyclerFragment<CategoriesAdapter>
                                    implements CategoriesAdapter.OnCategorySelectedListener
 {
+  @NonNull
   @Override
   protected CategoriesAdapter createAdapter()
   {
diff --git a/android/src/com/mapswithme/maps/search/SearchHistoryFragment.java b/android/src/com/mapswithme/maps/search/SearchHistoryFragment.java
index b90238a51f..48a1d36353 100644
--- a/android/src/com/mapswithme/maps/search/SearchHistoryFragment.java
+++ b/android/src/com/mapswithme/maps/search/SearchHistoryFragment.java
@@ -23,6 +23,7 @@ public class SearchHistoryFragment extends BaseMwmRecyclerFragment<SearchHistory
     UiUtils.showIf(getAdapter() != null && getAdapter().getItemCount() == 0, mPlaceHolder);
   }
 
+  @NonNull
   @Override
   protected SearchHistoryAdapter createAdapter()
   {
diff --git a/android/src/com/mapswithme/util/SharedPropertiesUtils.java b/android/src/com/mapswithme/util/SharedPropertiesUtils.java
index 81ce909d22..6146b511d8 100644
--- a/android/src/com/mapswithme/util/SharedPropertiesUtils.java
+++ b/android/src/com/mapswithme/util/SharedPropertiesUtils.java
@@ -100,11 +100,11 @@ public final class SharedPropertiesUtils
                          .getInt(PREFS_BOOKMARK_CATEGORIES_LAST_VISIBLE_PAGE, 0);
   }
 
-  public static void setLastVisibleBookmarkCategoriesPage(@NonNull Context context, int lastVisibleScreenIndex)
+  public static void setLastVisibleBookmarkCategoriesPage(@NonNull Context context, int pageIndex)
   {
     MwmApplication.prefs(context)
                   .edit()
-                  .putInt(PREFS_BOOKMARK_CATEGORIES_LAST_VISIBLE_PAGE, lastVisibleScreenIndex)
+                  .putInt(PREFS_BOOKMARK_CATEGORIES_LAST_VISIBLE_PAGE, pageIndex)
                   .apply();
   }
 }