diff --git a/OsmAnd/res/layout/wikivoyage_contents_child_list_item.xml b/OsmAnd/res/layout/wikivoyage_contents_child_list_item.xml
deleted file mode 100644
index 052251ff8a..0000000000
--- a/OsmAnd/res/layout/wikivoyage_contents_child_list_item.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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/expandable_list_item_background"
-	android:orientation="vertical">
-
-	<TextView
-		android:id="@+id/item_label"
-		android:layout_width="wrap_content"
-		android:layout_height="@dimen/bottom_sheet_list_item_height"
-		android:layout_gravity="center_vertical"
-		android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
-		android:layout_marginStart="@dimen/bottom_sheet_content_margin"
-		android:drawablePadding="@dimen/bottom_sheet_content_margin"
-		android:gravity="center"
-		android:textSize="@dimen/default_list_text_size"
-		tools:drawableStart="@drawable/ic_action_list_sort"
-		tools:text="@string/shared_string_contents" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/wikivoyage_contents_group_list_item.xml b/OsmAnd/res/layout/wikivoyage_contents_group_list_item.xml
deleted file mode 100644
index a4f17169c2..0000000000
--- a/OsmAnd/res/layout/wikivoyage_contents_group_list_item.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:osmand="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:background="?attr/expandable_list_item_background"
-	android:orientation="vertical">
-
-	<View
-		android:layout_width="wrap_content"
-		android:layout_height="1dp"
-		android:layout_marginBottom="@dimen/bottom_sheet_divider_margin_bottom"
-		android:background="?attr/wikivoyage_card_divider_color" />
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal">
-
-		<net.osmand.plus.widgets.TextViewEx
-			android:id="@+id/item_label"
-			android:layout_width="0dp"
-			android:layout_height="@dimen/bottom_sheet_list_item_height"
-			android:layout_gravity="center_vertical"
-			android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
-			android:layout_marginStart="@dimen/bottom_sheet_content_margin"
-			android:layout_weight="1"
-			android:drawablePadding="@dimen/bottom_sheet_content_margin"
-			android:gravity="start|center_vertical"
-			android:textSize="@dimen/default_list_text_size"
-			osmand:typeface="@string/font_roboto_medium"
-			tools:drawableStart="@drawable/ic_action_list_header"
-			tools:text="@string/shared_string_contents" />
-
-		<ImageView
-			android:id="@+id/explist_indicator"
-			android:layout_width="24dp"
-			android:layout_height="match_parent"
-			android:layout_gravity="end"
-			android:layout_marginRight="@dimen/list_content_padding"
-			android:scaleType="center" />
-
-	</LinearLayout>
-
-	<View
-		android:id="@+id/bottom_row_divider"
-		android:layout_width="wrap_content"
-		android:layout_height="1dp"
-		android:layout_marginTop="@dimen/bottom_sheet_divider_margin_top"
-		android:background="?attr/wikivoyage_card_divider_color" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/wikivoyage_contents_list_item.xml b/OsmAnd/res/layout/wikivoyage_contents_list_item.xml
index 040a075af4..3f8fa47881 100644
--- a/OsmAnd/res/layout/wikivoyage_contents_list_item.xml
+++ b/OsmAnd/res/layout/wikivoyage_contents_list_item.xml
@@ -1,23 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/bottom_sheet_list_item_height"
+    android:layout_height="wrap_content"
     android:background="?attr/expandable_list_item_background"
     android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/item_label"
+    <View
+        android:id="@+id/upper_row_divider"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/bottom_sheet_list_item_height"
-        android:layout_gravity="center_vertical"
-        android:drawablePadding="@dimen/showAllButtonMarginRight"
-        android:gravity="center"
-        android:paddingLeft="@dimen/showAllButtonMarginRight"
-        android:textColor="?android:textColorPrimary"
-        android:textSize="@dimen/default_list_text_size"
-        tools:drawableStart="@drawable/ic_action_list_sort"
-        tools:text="@string/shared_string_contents"
-        tools:textStyle="bold" />
+        android:layout_height="1dp"
+        android:layout_marginBottom="@dimen/bottom_sheet_divider_margin_bottom"
+        android:background="?attr/wikivoyage_card_divider_color" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <net.osmand.plus.widgets.TextViewEx
+            android:id="@+id/item_label"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/bottom_sheet_list_item_height"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
+            android:layout_marginStart="@dimen/bottom_sheet_content_margin"
+            android:layout_weight="1"
+            android:drawablePadding="@dimen/bottom_sheet_content_margin"
+            android:gravity="start|center_vertical"
+            android:textSize="@dimen/default_list_text_size"
+            osmand:typeface="@string/font_roboto_medium"
+            tools:drawableStart="@drawable/ic_action_list_header"
+            tools:text="@string/shared_string_contents" />
+
+        <ImageView
+            android:id="@+id/explist_indicator"
+            android:layout_width="24dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="end"
+            android:layout_marginRight="@dimen/list_content_padding"
+            android:scaleType="center" />
+
+    </LinearLayout>
+
+    <View
+        android:id="@+id/bottom_row_divider"
+        android:layout_width="wrap_content"
+        android:layout_height="1dp"
+        android:layout_marginTop="@dimen/bottom_sheet_divider_margin_top"
+        android:background="?attr/wikivoyage_card_divider_color" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleContentsFragment.java b/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleContentsFragment.java
index 425a75641d..f0d73dd116 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleContentsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleContentsFragment.java
@@ -153,7 +153,7 @@ public class WikivoyageArticleContentsFragment extends MenuBottomSheetDialogFrag
 			String childText = (String) getChild(groupPosition, childPosition);
 			if (convertView == null) {
 				convertView = LayoutInflater.from(context)
-						.inflate(R.layout.wikivoyage_contents_child_list_item, parent, false);
+						.inflate(R.layout.wikivoyage_contents_list_item, parent, false);
 			}
 			TextView txtListChild = (TextView) convertView.findViewById(R.id.item_label);
 			txtListChild.setText(childText);
@@ -161,7 +161,9 @@ public class WikivoyageArticleContentsFragment extends MenuBottomSheetDialogFrag
 					? R.color.wikivoyage_contents_parent_icon_dark
 					: R.color.wikivoyage_contents_parent_icon_light));
 			txtListChild.setCompoundDrawablesWithIntrinsicBounds(itemChildIcon, null, null, null);
-
+			convertView.findViewById(R.id.upper_row_divider).setVisibility(View.GONE);
+			convertView.findViewById(R.id.bottom_row_divider).setVisibility(View.GONE);
+			txtListChild.setTypeface(null);
 			if (childPosition == listDataChild.get(listDataHeader.get(groupPosition)).size() - 1) {
 				convertView.setPadding(0, 0, 0, AndroidUtils.dpToPx(getContext(),7));
 			} else {
@@ -198,7 +200,7 @@ public class WikivoyageArticleContentsFragment extends MenuBottomSheetDialogFrag
 			String headerTitle = (String) getGroup(groupPosition);
 			if (convertView == null) {
 				convertView = LayoutInflater.from(context)
-						.inflate(R.layout.wikivoyage_contents_group_list_item, parent, false);
+						.inflate(R.layout.wikivoyage_contents_list_item, parent, false);
 			}
 			boolean light = getMyApplication().getSettings().isLightContent();
 			TextView lblListHeader = (TextView) convertView.findViewById(R.id.item_label);