diff --git a/android/src/org/gale/GaleSurfaceViewGL.java b/android/src/org/gale/GaleSurfaceViewGL.java
index db10b0d..1045e9e 100644
--- a/android/src/org/gale/GaleSurfaceViewGL.java
+++ b/android/src/org/gale/GaleSurfaceViewGL.java
@@ -35,6 +35,12 @@ public class GaleSurfaceViewGL extends GLSurfaceView implements GaleConstants {
 		m_galeNative = _galeInstance;
 		/*
 		  List of the Android API :
+		  Android 9.0                 28  Pie
+		  Android 8.0 - 8.1           26  Oreo
+		  Android 7.0 - 7.1.2         24  Nougat
+		  Android 6.0 - 6.0.1         23  Marshmallow
+		  Android 5.0 - 5.1.1         21  LOLIPOP
+		  Android 4.4 - 4.4.4         19  KIT-KAT
 		  Android 4.1, 4.1.1          16  JELLY_BEAN               Platform Highlights
 		  Android 4.0.3, 4.0.4        15  ICE_CREAM_SANDWICH_MR1   Platform Highlights
 		  Android 4.0, 4.0.1, 4.0.2   14  ICE_CREAM_SANDWICH
diff --git a/gale/Application.cpp b/gale/Application.cpp
index 238c900..1b6855f 100644
--- a/gale/Application.cpp
+++ b/gale/Application.cpp
@@ -131,13 +131,13 @@ etk::String gale::Application::getTitle() {
 	return m_title;
 }
 
-void gale::Application::setIcon(const etk::String& _iconFile) {
+void gale::Application::setIcon(const etk::Uri& _iconFile) {
 	m_iconName = _iconFile;
 	gale::Context& context = gale::getContext();
 	context.setIcon(m_iconName);
 }
 
-etk::String gale::Application::getIcon() {
+const etk::Uri& gale::Application::getIcon() {
 	return m_iconName;
 }
 
diff --git a/gale/Application.hpp b/gale/Application.hpp
index d8aab39..02d5fcb 100644
--- a/gale/Application.hpp
+++ b/gale/Application.hpp
@@ -7,6 +7,7 @@
 
 #include <ememory/memory.hpp>
 #include <etk/types.hpp>
+#include <etk/uri/uri.hpp>
 #include <etk/math/Vector2D.hpp>
 #include <gale/orientation.hpp>
 #include <gale/key/status.hpp>
@@ -158,18 +159,18 @@ namespace gale {
 			 */
 			virtual etk::String getTitle();
 		private:
-			etk::String m_iconName;
+			etk::Uri m_iconName;
 		public:
 			/**
 			 * @brief set the Icon of the application.
 			 * @param[in] _iconFile File name icon (.bmp/.png).
 			 */
-			virtual void setIcon(const etk::String& _iconFile);
+			virtual void setIcon(const etk::Uri& _iconFile);
 			/**
 			 * @brief Get the current filename of the application.
 			 * @return Filename of the icon.
 			 */
-			virtual etk::String getIcon();
+			virtual const etk::Uri& getIcon();
 		private:
 			enum gale::context::cursor m_cursor;
 		public:
diff --git a/gale/context/Context.hpp b/gale/context/Context.hpp
index 73b33e2..5a63252 100644
--- a/gale/context/Context.hpp
+++ b/gale/context/Context.hpp
@@ -263,7 +263,7 @@ namespace gale {
 			 * @brief set the Icon of the program
 			 * @param[in] _inputFile new filename icon of the curent program.
 			 */
-			virtual void setIcon(const etk::String& _inputFile) { };
+			virtual void setIcon(const etk::Uri& _inputFile) { };
 			/**
 			 * @brief Enable or Disable the decoration on the Windows (availlable only on Desktop)
 			 * @param[in] _status "true" to enable decoration / false otherwise
diff --git a/gale/context/X11/Context.cpp b/gale/context/X11/Context.cpp
index fd4b559..181a5b7 100644
--- a/gale/context/X11/Context.cpp
+++ b/gale/context/X11/Context.cpp
@@ -1269,7 +1269,7 @@ class X11Interface : public gale::Context {
 			return true;
 		}
 		/****************************************************************************************/
-		void setIcon(const etk::String& _inputFile) {
+		void setIcon(const etk::Uri& _inputFile) {
 			X11_FUNC();
 			#if    defined(GALE_BUILD_EGAMI) \
 			    && !defined(__TARGET_OS__Web)
diff --git a/gale/resource/Program.hpp b/gale/resource/Program.hpp
index eaeaae3..483fbea 100644
--- a/gale/resource/Program.hpp
+++ b/gale/resource/Program.hpp
@@ -63,7 +63,7 @@ namespace gale {
 				Program();
 				void init(const etk::Uri& _uri);
 			public:
-				DECLARE_RESOURCE_NAMED_FACTORY(Program);
+				DECLARE_RESOURCE_URI_FACTORY(Program);
 				/**
 				 * @brief Destructor, remove the current Program.
 				 */
diff --git a/gale/resource/Shader.hpp b/gale/resource/Shader.hpp
index ce7ab18..f9e74f2 100644
--- a/gale/resource/Shader.hpp
+++ b/gale/resource/Shader.hpp
@@ -30,7 +30,7 @@ namespace gale {
 				Shader();
 			public:
 				void init(const etk::Uri& _uri);
-				DECLARE_RESOURCE_NAMED_FACTORY(Shader);
+				DECLARE_RESOURCE_URI_FACTORY(Shader);
 				/**
 				 * @brief Destructor, remove the current Shader
 				 */