diff --git a/OsmAnd/res/layout/download_detailed_map_widget.xml b/OsmAnd/res/layout/download_detailed_map_widget.xml
index 51dbd287a9..9d386ab87d 100644
--- a/OsmAnd/res/layout/download_detailed_map_widget.xml
+++ b/OsmAnd/res/layout/download_detailed_map_widget.xml
@@ -30,6 +30,7 @@
 					android:id="@+id/description"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
+					android:textColor="?android:textColorSecondary"
 					android:layout_marginTop="@dimen/list_content_padding"
 					android:textSize="@dimen/default_list_text_size"
 					osmand:typeface="@string/font_roboto_regular"
diff --git a/OsmAnd/res/layout/list_item_icon_and_switch.xml b/OsmAnd/res/layout/list_item_icon_and_switch.xml
new file mode 100644
index 0000000000..47f588d656
--- /dev/null
+++ b/OsmAnd/res/layout/list_item_icon_and_switch.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/bg_color"
+    android:minHeight="60dp"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <android.support.v7.widget.AppCompatImageView
+            android:id="@+id/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/content_padding"
+            android:layout_marginLeft="@dimen/content_padding"
+            tools:src="@drawable/ic_action_gabout_dark" />
+
+        <android.support.v7.widget.AppCompatTextView
+            android:id="@+id/title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_margin="@dimen/content_padding"
+            android:textAppearance="@style/TextAppearance.ListItemTitle"
+            tools:text="Some title text" />
+
+        <android.support.v7.widget.SwitchCompat
+            android:id="@+id/toggle_item"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="@dimen/content_padding"
+            android:layout_marginRight="@dimen/content_padding"
+            android:focusable="false" />
+
+    </LinearLayout>
+
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        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 f3d4ae7026..0baf4b7990 100644
--- a/OsmAnd/res/layout/list_item_text_button.xml
+++ b/OsmAnd/res/layout/list_item_text_button.xml
@@ -5,26 +5,42 @@
               android:layout_height="wrap_content"
               android:background="?attr/bg_color"
               android:minHeight="54dp"
-              android:orientation="horizontal">
+              android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
+    <LinearLayout
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="16dp"
-        android:layout_weight="1"
-        android:textAppearance="@style/TextAppearance.ListItemTitle"
-        tools:text="Some title text"/>
-
-    <android.support.v7.widget.AppCompatTextView
-        android:id="@+id/description"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="center_vertical"
-        android:layout_margin="16dp"
-        android:gravity="center_vertical"
-        android:textColor="?colorAccent"
-        tools:text="topbar"/>
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            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"/>
+
+        <android.support.v7.widget.AppCompatTextView
+            android:id="@+id/description"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_margin="@dimen/content_padding"
+            android:gravity="center_vertical"
+            android:textColor="?colorAccent"
+            tools:text="topbar"/>
+
+    </LinearLayout>
+
+    <View
+        android:id="@+id/divider"
+        android:layout_width="wrap_content"
+        android:layout_height="1dp"
+        android:layout_marginStart="@dimen/content_padding"
+        android:layout_marginLeft="@dimen/content_padding"
+        android:background="?attr/dashboard_divider" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
index 053773ce42..195dc5afac 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
@@ -344,7 +344,8 @@ public class MapWidgetRegistry {
 		cm.addItem(new ContextMenuItem.ItemBuilder().setTitleId(R.string.coordinates_widget, map)
 				.setIcon(R.drawable.ic_action_coordinates_widget)
 				.setSelected(settings.SHOW_COORDINATES_WIDGET.get())
-				.setListener(new ApearanceItemClickListener(settings.SHOW_COORDINATES_WIDGET, map)).createItem());
+				.setListener(new ApearanceItemClickListener(settings.SHOW_COORDINATES_WIDGET, map))
+				.setLayout(R.layout.list_item_icon_and_switch).createItem());
 		cm.addItem(new ContextMenuItem.ItemBuilder().setTitleId(R.string.map_markers, map)
 				.setDescription(settings.MAP_MARKERS_MODE.get().toHumanString(map))
 				.setListener(new ContextMenuAdapter.ItemClickListener() {