diff --git a/src/main/java/org/gcube/portlets/admin/resourcesweeper/Resource_sweeper.gwt.xml b/src/main/java/org/gcube/portlets/admin/resourcesweeper/Resource_sweeper.gwt.xml
index c3f7604..f5fe37d 100644
--- a/src/main/java/org/gcube/portlets/admin/resourcesweeper/Resource_sweeper.gwt.xml
+++ b/src/main/java/org/gcube/portlets/admin/resourcesweeper/Resource_sweeper.gwt.xml
@@ -9,6 +9,7 @@
 	<entry-point
 		class='org.gcube.portlets.admin.resourcesweeper.client.Resource_sweeper' />
 
+	<stylesheet src='Resource_sweeper.css' />
 	<!-- Specify the paths for translatable code -->
 	<source path='client' />
 	<source path='shared' />
diff --git a/src/main/java/org/gcube/portlets/admin/resourcesweeper/client/Resource_sweeper.java b/src/main/java/org/gcube/portlets/admin/resourcesweeper/client/Resource_sweeper.java
index d041df6..670e841 100644
--- a/src/main/java/org/gcube/portlets/admin/resourcesweeper/client/Resource_sweeper.java
+++ b/src/main/java/org/gcube/portlets/admin/resourcesweeper/client/Resource_sweeper.java
@@ -6,11 +6,12 @@ import com.google.gwt.core.client.EntryPoint;
  * Entry point classes define <code>onModuleLoad()</code>.
  */
 public class Resource_sweeper implements EntryPoint {
-	
+
 	/**
 	 * This is the entry point method.
 	 */
 	public void onModuleLoad() {
-		//new SweeperDialog("/gcube/devNext");
+		//### Just for testing leave commented
+		//snew SweeperDialog("/gcube/devNext");
 	}
 }
diff --git a/src/main/java/org/gcube/portlets/admin/resourcesweeper/client/dialog/SweeperDialog.java b/src/main/java/org/gcube/portlets/admin/resourcesweeper/client/dialog/SweeperDialog.java
index b3461c2..d27c3ed 100644
--- a/src/main/java/org/gcube/portlets/admin/resourcesweeper/client/dialog/SweeperDialog.java
+++ b/src/main/java/org/gcube/portlets/admin/resourcesweeper/client/dialog/SweeperDialog.java
@@ -84,13 +84,13 @@ public class SweeperDialog {
 				ResourceTypeDecorator.GHN.getIcon());
 
 		AtomicTreeNode ghn_expired = new AtomicTreeNode(SweeperActions.GET_GHN_MOVE_TO_UNREACHABLE.name(),
-				SweeperActions.GET_GHN_MOVE_TO_UNREACHABLE.getLabel());
+				SweeperActions.GET_GHN_MOVE_TO_UNREACHABLE.getLabel(), ResourceTypeDecorator.Sweeper_GHN_Expired.getIcon());
 		// setting tooltip
 		ghn_expired.set("tooltip", SweeperActions.GET_GHN_MOVE_TO_UNREACHABLE.getTooltip());
 		ghn_expired.set("operation", SweeperActions.GET_GHN_MOVE_TO_UNREACHABLE.getOperationDescription());
 
 		AtomicTreeNode ghn_dead = new AtomicTreeNode(SweeperActions.GET_GHN_DELETE.name(),
-				SweeperActions.GET_GHN_DELETE.getLabel());
+				SweeperActions.GET_GHN_DELETE.getLabel(), ResourceTypeDecorator.Sweeper_GHN_Dead.getIcon());
 		// setting tooltip
 		ghn_dead.set("tooltip", SweeperActions.GET_GHN_DELETE.getTooltip());
 		ghn_dead.set("operation", SweeperActions.GET_GHN_DELETE.getOperationDescription());
@@ -105,7 +105,7 @@ public class SweeperDialog {
 				ResourceTypeDecorator.RunningInstance.getLabel(),
 				ResourceTypeDecorator.RunningInstance.getIcon());
 		AtomicTreeNode ri_orphan = new AtomicTreeNode(SweeperActions.GET_RI_DELETE.name(),
-				SweeperActions.GET_RI_DELETE.getLabel());
+				SweeperActions.GET_RI_DELETE.getLabel(), ResourceTypeDecorator.Sweeper_RI_Orphan.getIcon());
 		// setting tooltip
 		ri_orphan.set("tooltip", SweeperActions.GET_RI_DELETE.getTooltip());
 		ri_orphan.set("operation", SweeperActions.GET_RI_DELETE.getOperationDescription());
@@ -243,7 +243,7 @@ public class SweeperDialog {
 	public final void initDialog(String scope) {
 		this.dialog = new Dialog();
 		this.dialog.setBodyBorder(false);
-		this.dialog.setIconStyle("sweeper-icon");
+		this.dialog.setIconStyle("sweeper-dialog-icon");
 		this.dialog.setHeading("Resource Sweeper " + "(" + scope + ")");
 		this.dialog.setWidth(900);
 		this.dialog.setHeight(450);
diff --git a/src/main/java/org/gcube/portlets/admin/resourcesweeper/client/model/ResourceTypeDecorator.java b/src/main/java/org/gcube/portlets/admin/resourcesweeper/client/model/ResourceTypeDecorator.java
index d33c0ec..b0992c0 100644
--- a/src/main/java/org/gcube/portlets/admin/resourcesweeper/client/model/ResourceTypeDecorator.java
+++ b/src/main/java/org/gcube/portlets/admin/resourcesweeper/client/model/ResourceTypeDecorator.java
@@ -56,7 +56,11 @@ public enum ResourceTypeDecorator {
 	 * Models for SWEEPER
 	 ***************************************/
 	Sweeper_GHN("gCube Hosting Node", "ghn-icon"),
-	Sweeper_RI("Running Instance", "runninginstance-icon");
+	Sweeper_RI("Running Instance", "runninginstance-icon"),
+	Sweeper_RI_Orphan("Orphan Running Instance", "orphan-runninginstance-icon"),
+	Sweeper_GHN_Expired("Expired gHN", "expired-ghn-icon"),
+	Sweeper_GHN_Dead("Dead gHN", "dead-ghn-icon");
+
 
 
 	private String label = null;
diff --git a/src/main/java/org/gcube/portlets/admin/resourcesweeper/public/Resource_sweeper.css b/src/main/java/org/gcube/portlets/admin/resourcesweeper/public/Resource_sweeper.css
new file mode 100644
index 0000000..65d8b77
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/admin/resourcesweeper/public/Resource_sweeper.css
@@ -0,0 +1,12 @@
+.sweeper-dialog-icon {
+	background-image: url(sweep-imgs/sweeper2.png) !important;
+}
+.dead-ghn-icon {
+	background-image: url(sweep-imgs/death.png) !important;
+}
+.expired-ghn-icon {
+	background-image: url(sweep-imgs/expired.png) !important;
+}
+.orphan-runninginstance-icon {
+	background-image: url(sweep-imgs/orphan.png) !important;
+}
diff --git a/src/main/java/org/gcube/portlets/admin/resourcesweeper/public/sweep-imgs/death.png b/src/main/java/org/gcube/portlets/admin/resourcesweeper/public/sweep-imgs/death.png
new file mode 100644
index 0000000..602c4b4
Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/resourcesweeper/public/sweep-imgs/death.png differ
diff --git a/src/main/java/org/gcube/portlets/admin/resourcesweeper/public/sweep-imgs/expired.png b/src/main/java/org/gcube/portlets/admin/resourcesweeper/public/sweep-imgs/expired.png
new file mode 100644
index 0000000..f02cdfb
Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/resourcesweeper/public/sweep-imgs/expired.png differ
diff --git a/src/main/java/org/gcube/portlets/admin/resourcesweeper/public/sweep-imgs/orphan.png b/src/main/java/org/gcube/portlets/admin/resourcesweeper/public/sweep-imgs/orphan.png
new file mode 100755
index 0000000..4766743
Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/resourcesweeper/public/sweep-imgs/orphan.png differ
diff --git a/src/main/java/org/gcube/portlets/admin/resourcesweeper/public/sweep-imgs/sweeper2.png b/src/main/java/org/gcube/portlets/admin/resourcesweeper/public/sweep-imgs/sweeper2.png
new file mode 100644
index 0000000..e6c8e8b
Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/resourcesweeper/public/sweep-imgs/sweeper2.png differ
diff --git a/war/Resource_sweeper.css b/war/Resource_sweeper.css
deleted file mode 100644
index e69de29..0000000
diff --git a/war/Resource_sweeper.html b/war/Resource_sweeper.html
index cae5b0b..b869b40 100644
--- a/war/Resource_sweeper.html
+++ b/war/Resource_sweeper.html
@@ -7,8 +7,6 @@
 <html>
   <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-
-    <link type="text/css" rel="stylesheet" href="Resource_sweeper.css">
     <link type="text/css" rel="stylesheet" href="gxt/css/gxt-all.css" />
 
     <script type="text/javascript" language="javascript" src="resource_sweeper/resource_sweeper.nocache.js"></script>