diff --git a/OsmAnd/res/layout/quick_action_add_marker.xml b/OsmAnd/res/layout/quick_action_add_marker.xml
deleted file mode 100644
index 78551a7815..0000000000
--- a/OsmAnd/res/layout/quick_action_add_marker.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/bg_color"
-        android:padding="16dp"
-        android:text="@string/quick_action_add_marker_discr"
-        android:textColor="?android:textColorPrimary"
-        android:textSize="@dimen/default_list_text_size" />
-
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top"
-        android:scaleType="fitXY"
-        android:src="@drawable/bg_shadow_list_bottom" />
-</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/quick_action_show_hide_favorites.xml b/OsmAnd/res/layout/quick_action_with_text.xml
similarity index 96%
rename from OsmAnd/res/layout/quick_action_show_hide_favorites.xml
rename to OsmAnd/res/layout/quick_action_with_text.xml
index b2f8b51129..8ad903340f 100644
--- a/OsmAnd/res/layout/quick_action_show_hide_favorites.xml
+++ b/OsmAnd/res/layout/quick_action_with_text.xml
@@ -6,6 +6,7 @@
     android:orientation="vertical">
 
     <TextView
+        android:id="@+id/text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?attr/bg_color"
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index bbb2137877..8f1737900d 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -2488,5 +2488,7 @@ If you need help with OsmAnd application, please contact our support team: suppo
     <string name="quick_action_duplicates">Specified quick action name already in use, was changed to %1$s to avoid duplication.</string>
     <string name="quick_action_duplicate">Quick action name duplicate</string>
     <string name="quick_action_showhides_favorites_discr">Tap on action will Show or Hide favorites points on map.</string>
+    <string name="quick_action_showhides_poi_discr">Tap on action will Show or Hide POI points on map.</string>
     <string name="quic_action_showhide_favorites_title">Show/Hide Favorites</string>
+    <string name="quic_action_showhide_poi_title">Show/Hide POI</string>
 </resources>
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionFactory.java b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionFactory.java
index 49f59e115f..ea7b7e0378 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionFactory.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionFactory.java
@@ -1,19 +1,12 @@
 package net.osmand.plus.quickaction;
 
 
-import android.app.Activity;
 import android.app.Dialog;
 import android.app.ProgressDialog;
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.support.annotation.StringRes;
-import android.support.v4.app.DialogFragment;
 import android.support.v7.widget.SwitchCompat;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -21,31 +14,19 @@ import android.widget.TextView;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
-import net.osmand.AndroidUtils;
-import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
 import net.osmand.plus.FavouritesDbHelper;
 import net.osmand.plus.GeocodingLookupService;
-import net.osmand.plus.IconsCache;
-import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.base.FavoriteImageDrawable;
-import net.osmand.plus.dialogs.ProgressDialogFragment;
 import net.osmand.plus.mapcontextmenu.editors.EditCategoryDialogFragment;
-import net.osmand.plus.mapcontextmenu.editors.FavoritePointEditor;
-import net.osmand.plus.mapcontextmenu.editors.FavoritePointEditorFragment;
 import net.osmand.plus.mapcontextmenu.editors.SelectCategoryDialogFragment;
-import net.osmand.plus.osmedit.OsmEditsUploadListener;
-import net.osmand.plus.osmedit.OsmEditsUploadListenerHelper;
-import net.osmand.plus.osmedit.OsmPoint;
 import net.osmand.plus.widgets.AutoCompleteTextViewEx;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 public class QuickActionFactory {
 
@@ -71,6 +52,7 @@ public class QuickActionFactory {
         quickActions.add(new MarkerAction());
         quickActions.add(new FavoriteAction());
         quickActions.add(new ShowHideFavoritesAction());
+        quickActions.add(new ShowHidePoiAction());
 
         return quickActions;
     }
@@ -91,6 +73,9 @@ public class QuickActionFactory {
             case ShowHideFavoritesAction.TYPE:
                 return new ShowHideFavoritesAction();
 
+            case ShowHidePoiAction.TYPE:
+                return new ShowHidePoiAction();
+
             default:
                 return new QuickAction();
         }
@@ -112,6 +97,9 @@ public class QuickActionFactory {
             case ShowHideFavoritesAction.TYPE:
                 return new ShowHideFavoritesAction(quickAction);
 
+            case ShowHidePoiAction.TYPE:
+                return new ShowHidePoiAction(quickAction);
+
             default:
                 return quickAction;
         }
@@ -185,7 +173,10 @@ public class QuickActionFactory {
         public void drawUI(ViewGroup parent, MapActivity activity) {
 
             View view = LayoutInflater.from(parent.getContext())
-                    .inflate(R.layout.quick_action_add_marker, parent, false);
+                    .inflate(R.layout.quick_action_with_text, parent, false);
+
+            ((TextView) view.findViewById(R.id.text)).setText(
+                    R.string.quick_action_add_marker_discr);
 
             parent.addView(view);
         }
@@ -405,7 +396,45 @@ public class QuickActionFactory {
         public void drawUI(ViewGroup parent, MapActivity activity) {
 
             View view = LayoutInflater.from(parent.getContext())
-                    .inflate(R.layout.quick_action_show_hide_favorites, parent, false);
+                    .inflate(R.layout.quick_action_with_text, parent, false);
+
+            ((TextView) view.findViewById(R.id.text)).setText(
+                    R.string.quick_action_showhides_favorites_discr);
+
+            parent.addView(view);
+        }
+    }
+
+    public static class ShowHidePoiAction extends QuickAction {
+
+        public static final int TYPE = 5;
+
+        protected ShowHidePoiAction() {
+            id = System.currentTimeMillis();
+            type = TYPE;
+            nameRes = R.string.quic_action_showhide_poi_title;
+            iconRes = R.drawable.ic_action_gabout_dark;
+        }
+
+        public ShowHidePoiAction(QuickAction quickAction) {
+            super(quickAction);
+        }
+
+        @Override
+        public void execute(MapActivity activity) {
+
+            activity.getMyApplication().getSettings().SHOW_NEARBY_POI.set(
+                    !activity.getMyApplication().getSettings().SHOW_NEARBY_POI.get());
+        }
+
+        @Override
+        public void drawUI(ViewGroup parent, MapActivity activity) {
+
+            View view = LayoutInflater.from(parent.getContext())
+                    .inflate(R.layout.quick_action_with_text, parent, false);
+
+            ((TextView) view.findViewById(R.id.text)).setText(
+                    R.string.quick_action_showhides_poi_discr);
 
             parent.addView(view);
         }