diff --git a/.classpath b/.classpath
index 1945bc0..0b5729a 100644
--- a/.classpath
+++ b/.classpath
@@ -18,6 +18,12 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/.project b/.project
index 19dcfb5..47e4344 100644
--- a/.project
+++ b/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -15,9 +20,17 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index f9fe345..839d647 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
 encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index e52a276..443e085 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,8 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.source=1.7
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000..2e34289
--- /dev/null
+++ b/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="storagehub-icons-library">
+        <wb-resource deploy-path="/" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+    </wb-module>
+</project-modules>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..1b22d70
--- /dev/null
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="java" version="1.7"/>
+  <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
diff --git a/src/main/java/org/gcube/portal/stohubicons/IconsManager.java b/src/main/java/org/gcube/portal/stohubicons/IconsManager.java
index 2793c45..8aa6dd8 100644
--- a/src/main/java/org/gcube/portal/stohubicons/IconsManager.java
+++ b/src/main/java/org/gcube/portal/stohubicons/IconsManager.java
@@ -76,6 +76,12 @@ public class IconsManager {
 			return new MDIcon("movie_creation", "#90caf9"); 
 		if (extension.equals( "html") ||extension.equals( "htm") || extension.equals( "jsp") || extension.equals( "asp") || extension.equals( "php"))
 			return new MDIcon("web", "#0277bd"); 
+		if (extension.equals( "java") 
+				|| extension.equals( "r"))
+			return new MDIcon("code", "#000");  // black
+		if (extension.equals( "java") 
+				|| extension.endsWith("xml"))
+			return new MDIcon("assignment", "#f44336"); //red
 		if (extension.equals( "rar") 
 				|| extension.equals( "zip") 
 				|| extension.equals( "tar") 
diff --git a/src/main/java/org/gcube/portal/stohubicons/shared/resources/CODE.png b/src/main/java/org/gcube/portal/stohubicons/shared/resources/CODE.png
new file mode 100644
index 0000000..3433da5
Binary files /dev/null and b/src/main/java/org/gcube/portal/stohubicons/shared/resources/CODE.png differ
diff --git a/src/main/java/org/gcube/portal/stohubicons/shared/resources/GWTIconsManager.java b/src/main/java/org/gcube/portal/stohubicons/shared/resources/GWTIconsManager.java
index 8fcd35f..06ef1f7 100644
--- a/src/main/java/org/gcube/portal/stohubicons/shared/resources/GWTIconsManager.java
+++ b/src/main/java/org/gcube/portal/stohubicons/shared/resources/GWTIconsManager.java
@@ -25,6 +25,20 @@ public class GWTIconsManager {
 	public static ImageResource getIconVREFolder() {
 		return StorageHubIconResources.INSTANCE.VRE_FOLDER();
 	}
+	/**
+	 * 
+	 * @return the ImageResource instance related to the VRE Folders
+	 */
+	public static ImageResource getIconTypeLink() {
+		return StorageHubIconResources.INSTANCE.LINK();
+	}
+	/**
+	 * 
+	 * @return the ImageResource instance related to the VRE Folders
+	 */
+	public static ImageResource getXMLTypeLink() {
+		return StorageHubIconResources.INSTANCE.XML();
+	}
 	/**
 	 * 
 	 * @param filenameWithExtension
@@ -70,6 +84,9 @@ public class GWTIconsManager {
 			return StorageHubIconResources.INSTANCE.MOVIE();
 		else if (extension.equals( "html") ||extension.equals( "htm") || extension.equals( "jsp") || extension.equals( "asp") || extension.equals( "php"))
 			return StorageHubIconResources.INSTANCE.HTML();
+		else if (extension.equals( "java") 
+				|| extension.equals( "r"))
+			return StorageHubIconResources.INSTANCE.CODE();
 		else if (extension.equals( "rar") 
 				|| extension.equals( "zip") 
 				|| extension.equals( "tar") 
diff --git a/src/main/java/org/gcube/portal/stohubicons/shared/resources/LINK.png b/src/main/java/org/gcube/portal/stohubicons/shared/resources/LINK.png
new file mode 100644
index 0000000..581c1a8
Binary files /dev/null and b/src/main/java/org/gcube/portal/stohubicons/shared/resources/LINK.png differ
diff --git a/src/main/java/org/gcube/portal/stohubicons/shared/resources/StorageHubIconResources.java b/src/main/java/org/gcube/portal/stohubicons/shared/resources/StorageHubIconResources.java
index 869d1fb..eabf651 100644
--- a/src/main/java/org/gcube/portal/stohubicons/shared/resources/StorageHubIconResources.java
+++ b/src/main/java/org/gcube/portal/stohubicons/shared/resources/StorageHubIconResources.java
@@ -29,6 +29,9 @@ public interface StorageHubIconResources extends ClientBundle {
 	@Source("XLS.png")
 	ImageResource XLS();
 	
+	@Source("XML.png")
+	ImageResource XML();
+	
 	@Source("CSV.png")
 	ImageResource CSV();
 	
@@ -37,6 +40,9 @@ public interface StorageHubIconResources extends ClientBundle {
 
 	@Source("PDF.png")
 	ImageResource PDF();
+	
+	@Source("CODE.png")
+	ImageResource CODE();
 
 	@Source("IMAGE.png")
 	ImageResource IMAGE();
@@ -52,12 +58,9 @@ public interface StorageHubIconResources extends ClientBundle {
 	
 	@Source("ARCHIVE.png")
 	ImageResource ARCHIVE();	
-	
-	@Source("external_resource_link.png")
-	ImageResource external_resource_link();
-	
-	@Source("external_url.png")
-	ImageResource external_url();
+
+	@Source("LINK.png")
+	ImageResource LINK();
 	
 	@Source("metadata.png")
 	ImageResource metadata();
diff --git a/src/main/java/org/gcube/portal/stohubicons/shared/resources/XML.png b/src/main/java/org/gcube/portal/stohubicons/shared/resources/XML.png
new file mode 100644
index 0000000..385be72
Binary files /dev/null and b/src/main/java/org/gcube/portal/stohubicons/shared/resources/XML.png differ