diff --git a/android/res/layout/edit_bookmark_common.xml b/android/res/layout/edit_bookmark_common.xml
index 0dee781cd1..eecb7e6710 100644
--- a/android/res/layout/edit_bookmark_common.xml
+++ b/android/res/layout/edit_bookmark_common.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/rl__bookmark_details"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
@@ -11,7 +11,7 @@
   <LinearLayout
     android:id="@+id/ll__bookmark_name"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/height_item_edit_bookmark"
+    android:layout_height="wrap_content"
     android:layout_marginStart="@dimen/margin_half"
     android:layout_marginEnd="@dimen/margin_half"
     android:orientation="vertical">
@@ -33,10 +33,9 @@
   <RelativeLayout
     android:id="@+id/rl__bookmark_set"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/height_item_edit_bookmark"
+    android:layout_height="wrap_content"
     android:layout_below="@id/ll__bookmark_name"
-    android:layout_marginStart="@dimen/margin_half_plus"
-    android:layout_marginTop="@dimen/margin_half">
+    android:layout_marginStart="@dimen/margin_half_plus">
     <TextView
       android:id="@+id/tv__bookmark_set_title"
       android:layout_width="match_parent"
@@ -55,22 +54,23 @@
       android:background="?attr/selectableItemBackground"
       android:clickable="true"
       android:paddingTop="@dimen/margin_quarter_plus"
-      android:paddingBottom="@dimen/margin_half"
+      android:paddingBottom="@dimen/margin_half_plus"
       android:textAppearance="@style/MwmTextAppearance.Body1"
       app:drawableEndCompat="@drawable/ic_arrow_down" />
     <View
+      android:id="@+id/divideerrr"
       android:layout_width="match_parent"
       android:layout_height="1dp"
-      android:layout_alignParentBottom="true"
+      android:layout_alignBottom="@id/tv__bookmark_set"
       android:layout_marginEnd="@dimen/margin_quadruple"
-      android:layout_marginBottom="@dimen/margin_half"
       android:background="@color/divider" />
     <ImageView
       android:id="@+id/iv__bookmark_color"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_alignParentEnd="true"
-      android:layout_alignParentBottom="true"
+      android:layout_marginTop="20dp"
+      android:layout_alignParentRight="true"
+      android:layout_alignEnd="@id/divideerrr"
       android:background="?clickableBackground"
       android:padding="@dimen/margin_half"
       tools:src="@drawable/ic_bookmark_none" />
@@ -81,7 +81,6 @@
     android:layout_height="wrap_content"
     android:layout_below="@id/rl__bookmark_set"
     android:layout_margin="@dimen/margin_half"
-    android:paddingTop="@dimen/margin_half"
     android:textColorHint="?android:textColorSecondary">
     <EditText
       android:id="@+id/et__description"