diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/layers.png b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/layers.png
index 41fc600..4a90fb3 100644
Binary files a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/layers.png and b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/layers.png differ
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/layers2.png b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/layers2.png
new file mode 100644
index 0000000..41fc600
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/layers2.png differ
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/map.png b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/map.png
index da4854a..d2c357f 100644
Binary files a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/map.png and b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/map.png differ
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/map2.png b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/map2.png
new file mode 100644
index 0000000..da4854a
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/map2.png differ
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/map4.png b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/map4.png
new file mode 100644
index 0000000..133e343
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/map4.png differ
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/preset_location.png b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/preset_location.png
index 18f7663..bbc0ddc 100644
Binary files a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/preset_location.png and b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/preset_location.png differ
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.java
index 57735b4..37803a9 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/GeonaDataViewMainPanel.java
@@ -11,6 +11,7 @@ import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerCon
 import org.gcube.portlets.user.geoportaldataviewer.client.events.ChangeMapLayerEvent;
 import org.gcube.portlets.user.geoportaldataviewer.client.events.MapExtentToEvent;
 import org.gcube.portlets.user.geoportaldataviewer.client.gis.OpenLayerMap;
+import org.gcube.portlets.user.geoportaldataviewer.client.resources.GNAIcons;
 import org.gcube.portlets.user.geoportaldataviewer.client.resources.GNAImages;
 import org.gcube.portlets.user.geoportaldataviewer.client.ui.map.ExtentMapUtil;
 import org.gcube.portlets.user.geoportaldataviewer.client.ui.map.ExtentMapUtil.Location;
@@ -150,9 +151,9 @@ public class GeonaDataViewMainPanel extends Composite {
 		extentToEarth.getElement().appendChild(worldImg.getElement());
 		extentToEarth.setWidth("140px");
 		
-		//linkMap.setCustomIconStyle(GNAIcons.CustomIconType.MAP.get());
-		//linkPresetLocation.setCustomIconStyle(GNAIcons.CustomIconType.PRESET_LOCATION.get());
-		//linkLayers.setCustomIconStyle(GNAIcons.CustomIconType.LAYERS.get());
+		linkMap.setCustomIconStyle(GNAIcons.CustomIconType.MAP.get());
+		linkPresetLocation.setCustomIconStyle(GNAIcons.CustomIconType.PRESET_LOCATION.get());
+		linkLayers.setCustomIconStyle(GNAIcons.CustomIconType.LAYERS.get());
 		
 		searchFacility = new SearchFacilityUI(applicationBus, sortByFields, searchForFields, initialSortFilter);
 		searchFacility.setSearchButton(searchFacilityButton);
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/SearchFacilityUI.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/SearchFacilityUI.java
index 1900b13..9646e21 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/SearchFacilityUI.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/SearchFacilityUI.java
@@ -10,7 +10,9 @@ import org.gcube.application.geoportalcommon.shared.GeoNaItemRef;
 import org.gcube.application.geoportalcommon.shared.ItemField;
 import org.gcube.application.geoportalcommon.shared.ResultSetPaginatedData;
 import org.gcube.application.geoportalcommon.shared.SearchingFilter;
+import org.gcube.application.geoportalcommon.shared.SearchingFilter.LOGICAL_OP;
 import org.gcube.application.geoportalcommon.shared.SearchingFilter.ORDER;
+import org.gcube.application.geoportalcommon.shared.WhereClause;
 import org.gcube.application.geoportalcommon.shared.products.ConcessioneDV;
 import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerConstants;
 import org.gcube.portlets.user.geoportaldataviewer.client.GeoportalDataViewerServiceAsync;
@@ -463,7 +465,16 @@ public class SearchFacilityUI extends Composite {
 				searchInto.put(fieldname, searchText);
 			}
 			
-			searchingFilter.setSearchInto(searchInto);
+			WhereClause where = new WhereClause();
+			where.setSearchInto(searchInto);
+			where.setOperator(LOGICAL_OP.OR);
+			
+			//THIS CLAUSE IS ADDED IN ORDER TO SEARCH ONLY PUBLISHED PRODUCT (WITH SUCCESS)
+			Map<String, Object> searchInto2 = new HashMap<String, Object>();
+			searchInto2.put("report.status", "PASSED");
+			WhereClause where2 = new WhereClause(LOGICAL_OP.AND, searchInto2);
+			
+			searchingFilter.setConditions(Arrays.asList(where, where2));
 		}
 		return searchingFilter;
 	}
diff --git a/src/test/java/org/gcube/portlets/user/geoportaldataviewer/IAMClient.java b/src/test/java/org/gcube/portlets/user/geoportaldataviewer/IAMClient.java
index 0aa3b91..b45ae06 100644
--- a/src/test/java/org/gcube/portlets/user/geoportaldataviewer/IAMClient.java
+++ b/src/test/java/org/gcube/portlets/user/geoportaldataviewer/IAMClient.java
@@ -1,7 +1,5 @@
 package org.gcube.portlets.user.geoportaldataviewer;
 
-import java.util.List;
-
 import org.gcube.application.geoportal.common.model.legacy.Concessione;
 import org.gcube.common.scope.api.ScopeProvider;
 import org.gcube.portlets.user.geoportaldataviewer.server.mongoservice.IAMClientCredentialsReader;