diff --git a/android/res/drawable-hdpi/ic_disclosure_down.webp b/android/res/drawable-hdpi/ic_disclosure_down.webp
deleted file mode 100644
index aa8385aad5..0000000000
Binary files a/android/res/drawable-hdpi/ic_disclosure_down.webp and /dev/null differ
diff --git a/android/res/drawable-hdpi/ic_disclosure_up.webp b/android/res/drawable-hdpi/ic_disclosure_up.webp
deleted file mode 100644
index 048af58d68..0000000000
Binary files a/android/res/drawable-hdpi/ic_disclosure_up.webp and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_disclosure_down.webp b/android/res/drawable-mdpi/ic_disclosure_down.webp
deleted file mode 100644
index 74a790adee..0000000000
Binary files a/android/res/drawable-mdpi/ic_disclosure_down.webp and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_disclosure_up.webp b/android/res/drawable-mdpi/ic_disclosure_up.webp
deleted file mode 100644
index 9c065758ce..0000000000
Binary files a/android/res/drawable-mdpi/ic_disclosure_up.webp and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_disclosure_down.webp b/android/res/drawable-xhdpi/ic_disclosure_down.webp
deleted file mode 100644
index 4ba0a6b954..0000000000
Binary files a/android/res/drawable-xhdpi/ic_disclosure_down.webp and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_disclosure_up.webp b/android/res/drawable-xhdpi/ic_disclosure_up.webp
deleted file mode 100644
index f93aac8355..0000000000
Binary files a/android/res/drawable-xhdpi/ic_disclosure_up.webp and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_disclosure_down.webp b/android/res/drawable-xxhdpi/ic_disclosure_down.webp
deleted file mode 100644
index 516a76beb9..0000000000
Binary files a/android/res/drawable-xxhdpi/ic_disclosure_down.webp and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_disclosure_up.webp b/android/res/drawable-xxhdpi/ic_disclosure_up.webp
deleted file mode 100644
index 02743d7b7d..0000000000
Binary files a/android/res/drawable-xxhdpi/ic_disclosure_up.webp and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/ic_disclosure_down.webp b/android/res/drawable-xxxhdpi/ic_disclosure_down.webp
deleted file mode 100644
index 8da74c4b78..0000000000
Binary files a/android/res/drawable-xxxhdpi/ic_disclosure_down.webp and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/ic_disclosure_up.webp b/android/res/drawable-xxxhdpi/ic_disclosure_up.webp
deleted file mode 100644
index 0c15b4fb19..0000000000
Binary files a/android/res/drawable-xxxhdpi/ic_disclosure_up.webp and /dev/null differ
diff --git a/android/res/layout/activity_map.xml b/android/res/layout/activity_map.xml
index 0c0bc56215..5b943ce2a3 100644
--- a/android/res/layout/activity_map.xml
+++ b/android/res/layout/activity_map.xml
@@ -63,6 +63,7 @@
 </RelativeLayout>
   <com.mapswithme.maps.widget.placepage.PlacePageView
     android:id="@+id/placepage"
+    style="?attr/bottomSheetStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:fillViewport="true"
diff --git a/android/res/layout/place_page_preview.xml b/android/res/layout/place_page_preview.xml
index c97dc4c68a..112f1fab36 100644
--- a/android/res/layout/place_page_preview.xml
+++ b/android/res/layout/place_page_preview.xml
@@ -5,23 +5,11 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:gravity="center_vertical"
-  android:background="?cardBackground"
-  android:paddingTop="@dimen/margin_base"
   android:paddingBottom="@dimen/margin_quarter">
-  <LinearLayout
+
+  <include
     android:id="@+id/pull_icon_container"
-    android:layout_width="wrap_content"
-    android:layout_height="@dimen/margin_half"
-    android:layout_marginBottom="@dimen/margin_eighth"
-    android:layout_centerHorizontal="true"
-    android:layout_alignParentTop="true"
-    android:gravity="center"
-    android:orientation="vertical">
-    <ImageView
-      android:id="@+id/pull_icon"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"/>
-  </LinearLayout>
+    layout="@layout/bottom_sheet_handle" />
 
   <include
     android:id="@+id/downloader_status_frame"
@@ -30,7 +18,7 @@
     android:layout_width="@dimen/downloader_status_size"
     android:layout_height="@dimen/downloader_status_size"
     android:layout_marginStart="@dimen/margin_base"
-    android:layout_marginTop="@dimen/margin_half"
+    android:layout_marginTop="@dimen/margin_base_plus"
     android:visibility="gone"
     tools:visibility="visible"/>
 
@@ -41,7 +29,7 @@
     android:orientation="vertical"
     android:layout_alignWithParentIfMissing="true"
     android:layout_below="@id/pull_icon_container"
-    android:layout_marginTop="@dimen/margin_quarter"
+    android:layout_marginTop="@dimen/margin_base"
     android:layout_marginEnd="@dimen/margin_base"
     android:layout_marginStart="@dimen/margin_base"
     android:layout_toEndOf="@id/downloader_status_frame"
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageUtils.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageUtils.java
index 5bb6b1c573..8168ddb734 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageUtils.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageUtils.java
@@ -66,30 +66,6 @@ class PlacePageUtils
     });
   }
 
-  static void setPullDrawable(@NonNull BottomSheetBehavior behavior, @NonNull View bottomSheet,
-                              @IdRes int pullDrawableId)
-  {
-    final ImageView img = bottomSheet.findViewById(pullDrawableId);
-    if (img == null)
-      return;
-
-    @BottomSheetBehavior.State
-    int state = behavior.getState();
-    @DrawableRes
-    int drawableId = UiUtils.NO_ID;
-    if (PlacePageUtils.isCollapsedState(state))
-      drawableId = R.drawable.ic_disclosure_up;
-    else if (PlacePageUtils.isExpandedState(state))
-      drawableId = R.drawable.ic_disclosure_down;
-
-    if (drawableId == UiUtils.NO_ID)
-      return;
-
-    Drawable drawable = Graphics.tint(bottomSheet.getContext(), drawableId,
-            R.attr.chevronTintColor);
-    img.setImageDrawable(drawable);
-  }
-
   static boolean isSettlingState(@BottomSheetBehavior.State int state)
   {
     return state == BottomSheetBehavior.STATE_SETTLING;
diff --git a/android/src/com/mapswithme/maps/widget/placepage/RichPlacePageController.java b/android/src/com/mapswithme/maps/widget/placepage/RichPlacePageController.java
index 9ac036ed53..4418967de8 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/RichPlacePageController.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/RichPlacePageController.java
@@ -60,7 +60,7 @@ public class RichPlacePageController implements PlacePageController, LocationLis
     @Override
     public void onSheetDirectionIconChange()
     {
-      PlacePageUtils.setPullDrawable(mPlacePageBehavior, mPlacePage, R.id.pull_icon);
+      // No op.
     }
 
     @Override
@@ -352,7 +352,6 @@ public class RichPlacePageController implements PlacePageController, LocationLis
       mPlacePageBehavior.setState(state);
       UiUtils.show(mButtonsLayout);
       setPeekHeight();
-      PlacePageUtils.setPullDrawable(mPlacePageBehavior, mPlacePage, R.id.pull_icon);
     });
   }
 
diff --git a/android/src/com/mapswithme/maps/widget/placepage/SimplePlacePageController.java b/android/src/com/mapswithme/maps/widget/placepage/SimplePlacePageController.java
index 6f4946ec7e..da7023bea0 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/SimplePlacePageController.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/SimplePlacePageController.java
@@ -53,10 +53,7 @@ public class SimplePlacePageController implements PlacePageController
         @Override
         public void onSheetDirectionIconChange()
         {
-          if (UiUtils.isLandscape(mApplication))
-            return;
-
-          PlacePageUtils.setPullDrawable(mSheetBehavior, mSheet, R.id.pull_icon);
+          // No op.
         }
 
         @Override
@@ -234,8 +231,6 @@ public class SimplePlacePageController implements PlacePageController
       }
       return;
     }
-
-    PlacePageUtils.setPullDrawable(mSheetBehavior, mSheet, R.id.pull_icon);
   }
 
   private void onHiddenInternal()