diff --git a/android/build.gradle b/android/build.gradle
index 4a467e14bf..75f8d06e1a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -31,11 +31,11 @@ apply plugin: 'io.fabric'
 
 dependencies {
   // android support libs
-  compile 'com.android.support:support-v4:23.0.0'
-  compile 'com.android.support:appcompat-v7:23.0.0'
-  compile 'com.android.support:recyclerview-v7:22.2.1'
-  compile 'com.android.support:design:22.2.1'
-  compile 'com.android.support:cardview-v7:22.2.1'
+  compile 'com.android.support:support-v4:23.2.1'
+  compile 'com.android.support:appcompat-v7:23.2.1'
+  compile 'com.android.support:recyclerview-v7:23.2.1'
+  compile 'com.android.support:design:23.2.1'
+  compile 'com.android.support:cardview-v7:23.2.1'
   // google play services
   compile 'com.google.android.gms:play-services-location:8.4.0'
   compile 'com.google.android.gms:play-services-analytics:8.4.0'
diff --git a/android/res/layout/fragment_osm_login.xml b/android/res/layout/fragment_osm_login.xml
index 77a92ecc0a..ffb7c66c0f 100644
--- a/android/res/layout/fragment_osm_login.xml
+++ b/android/res/layout/fragment_osm_login.xml
@@ -77,7 +77,7 @@
           android:layout_width="@dimen/editor_auth_btn_height"
           android:layout_height="@dimen/editor_auth_btn_height"
           android:layout_gravity="center"
-          android:elevation="@dimen/fab_elevation"
+          android:elevation="@dimen/design_fab_elevation"
           tools:targetApi="lollipop"/>
 
       </FrameLayout>
diff --git a/android/res/layout/place_page_hotel_rating.xml b/android/res/layout/place_page_hotel_rating.xml
index 864e64538d..37c3920de5 100644
--- a/android/res/layout/place_page_hotel_rating.xml
+++ b/android/res/layout/place_page_hotel_rating.xml
@@ -35,11 +35,10 @@
       tools:text="Based on 848 hotel reviews"/>
   </LinearLayout>
 
-  <com.mapswithme.maps.widget.StaticGridView
-    android:id="@+id/gv__place_hotel_review"
+  <android.support.v7.widget.RecyclerView
+    android:id="@+id/rv__place_hotel_review"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:numColumns="1"
     tools:listitem="@layout/item_comment"/>
 
   <View
diff --git a/android/src/com/mapswithme/maps/routing/SearchWheel.java b/android/src/com/mapswithme/maps/routing/SearchWheel.java
index 35cb9f9e2f..d326dd1eea 100644
--- a/android/src/com/mapswithme/maps/routing/SearchWheel.java
+++ b/android/src/com/mapswithme/maps/routing/SearchWheel.java
@@ -254,8 +254,8 @@ class SearchWheel implements View.OnClickListener
     final MwmActivity parent;
     if (context instanceof ContextThemeWrapper)
       parent = (MwmActivity)((ContextThemeWrapper)context).getBaseContext();
-    else if (context instanceof android.support.v7.internal.view.ContextThemeWrapper)
-      parent = (MwmActivity)((android.support.v7.internal.view.ContextThemeWrapper)context).getBaseContext();
+    else if (context instanceof android.support.v7.view.ContextThemeWrapper)
+      parent = (MwmActivity)((android.support.v7.view.ContextThemeWrapper)context).getBaseContext();
     else
       parent = (MwmActivity) context;
     parent.showSearch();
diff --git a/android/src/com/mapswithme/maps/widget/ObservableScrollView.java b/android/src/com/mapswithme/maps/widget/ObservableScrollView.java
index 8907aedb5e..997196bfaf 100644
--- a/android/src/com/mapswithme/maps/widget/ObservableScrollView.java
+++ b/android/src/com/mapswithme/maps/widget/ObservableScrollView.java
@@ -4,11 +4,11 @@ import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.view.GestureDetectorCompat;
+import android.support.v4.widget.NestedScrollView;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
-import android.widget.ScrollView;
 
-public class ObservableScrollView extends ScrollView
+public class ObservableScrollView extends NestedScrollView
 {
   public interface ScrollListener
   {
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
index 5cb9d3f6e1..a7de4f941a 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
@@ -14,6 +14,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.content.ContextCompat;
+import android.support.v4.widget.NestedScrollView;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
@@ -35,7 +36,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupMenu;
 import android.widget.RelativeLayout;
-import android.widget.ScrollView;
 import android.widget.TextView;
 
 import com.mapswithme.maps.Framework;
@@ -121,7 +121,7 @@ public class PlacePageView extends RelativeLayout
   private TextView mTvSponsoredRating;
   private TextView mTvSponsoredPrice;
   // Details.
-  private ScrollView mDetails;
+  private NestedScrollView mDetails;
   private View mPhone;
   private TextView mTvPhone;
   private View mWebsite;
@@ -288,7 +288,7 @@ public class PlacePageView extends RelativeLayout
     mTvSponsoredRating = (TextView) mSponsoredInfo.findViewById(R.id.tv__hotel_rating);
     mTvSponsoredPrice = (TextView) mSponsoredInfo.findViewById(R.id.tv__hotel_price);
 
-    mDetails = (ScrollView) findViewById(R.id.pp__details);
+    mDetails = (NestedScrollView) findViewById(R.id.pp__details);
     RelativeLayout address = (RelativeLayout) mDetails.findViewById(R.id.ll__place_name);
     mPhone = mDetails.findViewById(R.id.ll__place_phone);
     mPhone.setOnClickListener(this);
@@ -510,8 +510,12 @@ public class PlacePageView extends RelativeLayout
   private void initHotelRatingView()
   {
     mHotelReview = findViewById(R.id.ll__place_hotel_rating);
-    GridView gvHotelReview = (GridView) findViewById(R.id.gv__place_hotel_review);
-    gvHotelReview.setAdapter(mReviewAdapter);
+    RecyclerView rvHotelReview = (RecyclerView) findViewById(R.id.rv__place_hotel_review);
+    rvHotelReview.setLayoutManager(new LinearLayoutManager(getContext()));
+    rvHotelReview.getLayoutManager().setAutoMeasureEnabled(true);
+    rvHotelReview.setNestedScrollingEnabled(false);
+    rvHotelReview.setHasFixedSize(false);
+    rvHotelReview.setAdapter(mReviewAdapter);
     mHotelRating = (TextView) findViewById(R.id.tv__place_hotel_rating);
     mHotelRatingBase = (TextView) findViewById(R.id.tv__place_hotel_rating_base);
     View hotelMoreReviews = findViewById(R.id.tv__place_hotel_reviews_more);
diff --git a/android/src/com/mapswithme/maps/widget/placepage/ReviewAdapter.java b/android/src/com/mapswithme/maps/widget/placepage/ReviewAdapter.java
index 70043648d7..9b20745348 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/ReviewAdapter.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/ReviewAdapter.java
@@ -1,12 +1,12 @@
 package com.mapswithme.maps.widget.placepage;
 
 import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.BaseAdapter;
 import android.widget.TextView;
 
 import com.mapswithme.maps.R;
@@ -17,7 +17,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.Locale;
 
-class ReviewAdapter extends BaseAdapter
+class ReviewAdapter extends RecyclerView.Adapter<ReviewAdapter.ViewHolder>
 {
   private static final int MAX_COUNT = 3;
 
@@ -25,44 +25,24 @@ class ReviewAdapter extends BaseAdapter
   private ArrayList<Review> mItems = new ArrayList<>();
 
   @Override
-  public int getCount()
+  public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType)
+  {
+    return  new ViewHolder(LayoutInflater.from(parent.getContext())
+                                         .inflate(R.layout.item_comment, parent, false));
+  }
+
+  @Override
+  public void onBindViewHolder(ViewHolder holder, int position)
+  {
+    holder.bind(mItems.get(position), position > 0);
+  }
+
+  @Override
+  public int getItemCount()
   {
     return Math.min(mItems.size(), MAX_COUNT);
   }
 
-  @Override
-  public Object getItem(int position)
-  {
-    return mItems.get(position);
-  }
-
-  @Override
-  public long getItemId(int position)
-  {
-    return position;
-  }
-
-  @Override
-  public View getView(int position, View convertView, ViewGroup parent)
-  {
-    ViewHolder holder;
-    if (convertView == null)
-    {
-      convertView = LayoutInflater.from(parent.getContext())
-                                  .inflate(R.layout.item_comment, parent, false);
-      holder = new ViewHolder(convertView);
-      convertView.setTag(holder);
-    }
-    else
-    {
-      holder = (ViewHolder) convertView.getTag();
-    }
-
-    holder.bind(mItems.get(position), position > 0);
-
-    return convertView;
-  }
-
   public void setItems(@NonNull ArrayList<Review> items)
   {
     this.mItems = items;
@@ -75,7 +55,7 @@ class ReviewAdapter extends BaseAdapter
     return mItems;
   }
 
-  private static class ViewHolder
+  static class ViewHolder extends RecyclerView.ViewHolder
   {
     @NonNull
     final View mDivider;
@@ -96,6 +76,7 @@ class ReviewAdapter extends BaseAdapter
 
     public ViewHolder(View view)
     {
+      super(view);
       mDivider = view.findViewById(R.id.v__divider);
       mUserName = (TextView) view.findViewById(R.id.tv__user_name);
       mCommentDate = (TextView) view.findViewById(R.id.tv__comment_date);
diff --git a/android/src/com/mapswithme/util/ThemeUtils.java b/android/src/com/mapswithme/util/ThemeUtils.java
index 135aa57822..9ec9a4f9d1 100644
--- a/android/src/com/mapswithme/util/ThemeUtils.java
+++ b/android/src/com/mapswithme/util/ThemeUtils.java
@@ -6,7 +6,7 @@ import android.support.annotation.AttrRes;
 import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
 import android.support.annotation.StyleRes;
-import android.support.v7.internal.view.ContextThemeWrapper;
+import android.support.v7.view.ContextThemeWrapper;
 import android.util.TypedValue;
 import android.view.LayoutInflater;