diff --git a/OsmAnd/res/layout/main.xml b/OsmAnd/res/layout/main.xml
index 9908d51e14..8055744234 100644
--- a/OsmAnd/res/layout/main.xml
+++ b/OsmAnd/res/layout/main.xml
@@ -66,6 +66,6 @@
         android:layout_width="280dp"
         android:layout_height="match_parent"
         android:layout_gravity="left"
-        android:background="@color/dashboard_background"/>
+        android:background="?attr/bg_color"/>
 
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/simple_list_menu_item.xml b/OsmAnd/res/layout/simple_list_menu_item.xml
index a827bdda7a..828100a6fd 100644
--- a/OsmAnd/res/layout/simple_list_menu_item.xml
+++ b/OsmAnd/res/layout/simple_list_menu_item.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<TextView
+<net.osmand.plus.widgets.TextViewEx
     android:id="@+id/title"
     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:drawablePadding="24dp"
     android:gravity="center_vertical"
     android:padding="16dp"
-    android:text="@string/layer_poi"
-    android:textSize="@dimen/default_list_text_size_large"
-    tools:drawableLeft="@drawable/ic_action_search_dark"/>
\ No newline at end of file
+    android:textColor="?android:textColorPrimary"
+    android:textSize="@dimen/default_desc_text_size"
+    osmand:typeface="@string/font_roboto_medium"
+    tools:drawableLeft="@drawable/ic_action_search_dark"
+    tools:text="@string/layer_poi"/>
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index a1952b8311..528d2e3613 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -232,7 +232,8 @@ public class MapActivity extends AccessibleActivity {
 		final ListView menuItemsListView = (ListView) findViewById(R.id.menuItems);
 		menuItemsListView.setDivider(null);
 		final ContextMenuAdapter contextMenuAdapter = mapActions.createMainOptionsMenu();
-		final ArrayAdapter<?> simpleListAdapter = contextMenuAdapter.createSimpleListAdapter(this, true);
+		final ArrayAdapter<?> simpleListAdapter = contextMenuAdapter.createSimpleListAdapter(this,
+				settings.OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME);
 		menuItemsListView.setAdapter(simpleListAdapter);
 		menuItemsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
 			@Override