diff --git a/OsmAnd/res/layout/list_item_icon_and_switch.xml b/OsmAnd/res/layout/list_item_icon_and_switch.xml
index 9dcbf75759..47f588d656 100644
--- a/OsmAnd/res/layout/list_item_icon_and_switch.xml
+++ b/OsmAnd/res/layout/list_item_icon_and_switch.xml
@@ -5,7 +5,6 @@
     android:layout_height="wrap_content"
     android:background="?attr/bg_color"
     android:minHeight="60dp"
-    tools:layout_height="60dp"
     android:orientation="vertical">
 
     <LinearLayout
@@ -18,8 +17,8 @@
             android:id="@+id/icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/bottom_sheet_content_margin"
-            android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
+            android:layout_marginStart="@dimen/content_padding"
+            android:layout_marginLeft="@dimen/content_padding"
             tools:src="@drawable/ic_action_gabout_dark" />
 
         <android.support.v7.widget.AppCompatTextView
@@ -27,7 +26,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:layout_margin="@dimen/bottom_sheet_content_margin"
+            android:layout_margin="@dimen/content_padding"
             android:textAppearance="@style/TextAppearance.ListItemTitle"
             tools:text="Some title text" />
 
@@ -36,8 +35,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="center_vertical"
-            android:layout_marginEnd="@dimen/bottom_sheet_content_margin"
-            android:layout_marginRight="@dimen/bottom_sheet_content_margin"
+            android:layout_marginEnd="@dimen/content_padding"
+            android:layout_marginRight="@dimen/content_padding"
             android:focusable="false" />
 
     </LinearLayout>
@@ -46,8 +45,8 @@
         android:id="@+id/divider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_marginStart="@dimen/bottom_sheet_content_margin"
-        android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
+        android:layout_marginStart="@dimen/content_padding"
+        android:layout_marginLeft="@dimen/content_padding"
         android:background="?attr/dashboard_divider" />
 
 </LinearLayout>
diff --git a/OsmAnd/res/layout/list_item_text_button.xml b/OsmAnd/res/layout/list_item_text_button.xml
index 9f952dbc13..0baf4b7990 100644
--- a/OsmAnd/res/layout/list_item_text_button.xml
+++ b/OsmAnd/res/layout/list_item_text_button.xml
@@ -5,8 +5,7 @@
               android:layout_height="wrap_content"
               android:background="?attr/bg_color"
               android:minHeight="54dp"
-              android:orientation="vertical"
-              tools:layout_height="54dp">
+              android:orientation="vertical">
 
     <LinearLayout
         android:layout_gravity="center_vertical"
@@ -19,8 +18,8 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
-            android:layout_marginStart="@dimen/bottom_sheet_content_margin"
+            android:layout_marginLeft="@dimen/content_padding"
+            android:layout_marginStart="@dimen/content_padding"
             android:gravity="center_vertical"
             android:textAppearance="@style/TextAppearance.ListItemTitle"
             tools:text="Some title text"/>
@@ -29,7 +28,7 @@
             android:id="@+id/description"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_margin="@dimen/bottom_sheet_content_margin"
+            android:layout_margin="@dimen/content_padding"
             android:gravity="center_vertical"
             android:textColor="?colorAccent"
             tools:text="topbar"/>
@@ -40,8 +39,8 @@
         android:id="@+id/divider"
         android:layout_width="wrap_content"
         android:layout_height="1dp"
-        android:layout_marginStart="@dimen/bottom_sheet_content_margin"
-        android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
+        android:layout_marginStart="@dimen/content_padding"
+        android:layout_marginLeft="@dimen/content_padding"
         android:background="?attr/dashboard_divider" />
 
 </LinearLayout>
\ No newline at end of file