diff --git a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
index 0fdb217740..3fb4d99e61 100644
--- a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
@@ -346,7 +346,7 @@ public class ContextMenuAdapter {
 
 			if (layoutId == R.layout.simple_list_menu_item) {
 				int color = activity.getResources()
-						.getColor(holoLight ? R.color.icon_color : R.color.dash_search_icon_dark);
+						.getColor(holoLight ? R.color.icon_color : R.color.dashboard_subheader_text_dark);
 				Drawable imageId = app.getIconsCache().getPaintedContentIcon(
 						iconListLight.get(position), color);
 				float density = activity.getResources().getDisplayMetrics().density;
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashSearchFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashSearchFragment.java
index 740f88a48d..dc60ce461c 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashSearchFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashSearchFragment.java
@@ -60,7 +60,7 @@ public class DashSearchFragment extends DashBaseFragment {
 			}
 		});
 		btn.setCompoundDrawablesWithIntrinsicBounds(null, iconsCache.getIcon(R.drawable.ic_action_info2,
-				light ? R.color.dash_search_icon_light : R.color.dash_search_icon_dark), null, null);
+				light ? R.color.dash_search_icon_light : R.color.dashboard_subheader_text_dark), null, null);
 
 		btn = (Button)view.findViewById(R.id.address);
 		btn.setOnClickListener(new View.OnClickListener() {
@@ -71,7 +71,7 @@ public class DashSearchFragment extends DashBaseFragment {
 			}
 		});
 		btn.setCompoundDrawablesWithIntrinsicBounds(null, iconsCache.getIcon(R.drawable.ic_action_home2,
-				light ? R.color.dash_search_icon_light : R.color.dash_search_icon_dark), null, null);
+				light ? R.color.dash_search_icon_light : R.color.dashboard_subheader_text_dark), null, null);
 
 		btn = (Button) view.findViewById(R.id.coord);
 		btn.setOnClickListener(new View.OnClickListener() {
@@ -82,7 +82,7 @@ public class DashSearchFragment extends DashBaseFragment {
 			}
 		});
 		btn.setCompoundDrawablesWithIntrinsicBounds(null, iconsCache.getIcon(R.drawable.ic_action_marker2,
-				light ? R.color.dash_search_icon_light : R.color.dash_search_icon_dark), null, null);
+				light ? R.color.dash_search_icon_light : R.color.dashboard_subheader_text_dark), null, null);
 
 		(view.findViewById(R.id.recents)).setOnClickListener(new View.OnClickListener() {
 			@Override
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
index 505c5ccafc..0b4a1a8f2b 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
@@ -120,7 +120,7 @@ public class MapContextMenuFragment extends Fragment {
 				menuFullHeight = view.findViewById(R.id.context_menu_main).getHeight();
 
 				menuTitleHeight = menuTopShadowHeight + menuTopShadowAllHeight;
-				menuFullHeightMax = menuTitleHeight + menuBottomViewHeight + dpToPx(2f);
+				menuFullHeightMax = menuTitleHeight + (menuBottomViewHeight > 0 ? menuBottomViewHeight + dpToPx(2f) : -dpToPx(SHADOW_HEIGHT_BOTTOM_DP));
 
 				ViewTreeObserver obs = view.getViewTreeObserver();
 
@@ -223,7 +223,7 @@ public class MapContextMenuFragment extends Fragment {
 						velocity.recycle();
 
 						if (menuController != null) {
-							if (slidingUp) {
+							if (menuBottomViewHeight > 0 && slidingUp) {
 								menuController.slideUp();
 							} else if (slidingDown) {
 								menuController.slideDown();