diff --git a/android/res/drawable/divider_base.xml b/android/res/drawable/divider_base.xml
index 04db1f9db2..ad3d70513f 100644
--- a/android/res/drawable/divider_base.xml
+++ b/android/res/drawable/divider_base.xml
@@ -2,4 +2,4 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
   <item
     android:drawable="@drawable/divider_shape" />
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/android/res/drawable/divider_shape.xml b/android/res/drawable/divider_shape.xml
index dd12091eef..5cd2334d9c 100644
--- a/android/res/drawable/divider_shape.xml
+++ b/android/res/drawable/divider_shape.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
   <solid android:color="?attr/dividerHorizontal" />
-  <size android:height="1dp" />
-</shape>
\ No newline at end of file
+  <size android:height="@dimen/divider_height" />
+</shape>
diff --git a/android/src/com/mapswithme/maps/widget/recycler/DividerItemDecorationWithPadding.java b/android/src/com/mapswithme/maps/widget/recycler/DividerItemDecorationWithPadding.java
index 1211e8d140..d34ab86a4b 100644
--- a/android/src/com/mapswithme/maps/widget/recycler/DividerItemDecorationWithPadding.java
+++ b/android/src/com/mapswithme/maps/widget/recycler/DividerItemDecorationWithPadding.java
@@ -23,15 +23,16 @@ public class DividerItemDecorationWithPadding extends RecyclerView.ItemDecoratio
   }
 
   @Override
-  public void onDrawOver(Canvas c, RecyclerView parent, RecyclerView.State state)
+  public void onDrawOver(@NonNull Canvas c, @NonNull RecyclerView parent,
+                         @NonNull RecyclerView.State state)
   {
     if (state.isMeasuring())
       return;
 
-    int right = parent.getWidth();
-    int dividerHeight = mDivider.getIntrinsicHeight();
+    final int right = parent.getWidth();
+    final int dividerHeight = mDivider.getIntrinsicHeight();
 
-    int childCount = parent.getChildCount();
+    final int childCount = parent.getChildCount();
     for (int i = 0; i < childCount; i++)
     {
       View child = parent.getChildAt(i);