diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index cfb8b4696..0e8396061 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,5 +1,6 @@
 jobs:
   - job: ubuntu16
+    timeoutInMinutes: 120
     pool:
       vmImage: 'Ubuntu-16.04'
     steps:
@@ -26,12 +27,13 @@ jobs:
         sudo apt-get install libsquish-dev -y
         sudo apt-get install liblzma-dev -y
         sudo apt-get install libgsf-1-dev -y
+        sudo apt-get install qtbase5-dev qttools5-dev qttools5-dev-tools
       displayName: 'Dependencies'
     - script: |
         mkdir build
         cmake --version
         cd build
-        cmake -DWITH_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=ON -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=ON -DWITH_RYZOM_TOOLS=OFF -DWITH_NEL_TOOLS=ON -DWITH_LIBGSF=ON ../code
+        cmake -DWITH_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=ON -DWITH_LUA51=ON -DWITH_RYZOM=ON -DWITH_RYZOM_SERVER=ON -DWITH_RYZOM_CLIENT=ON -DWITH_RYZOM_TOOLS=ON -DWITH_NEL_TOOLS=ON -DWITH_NELNS=ON -DWITH_NELNS_LOGIN_SYSTEM=ON -DWITH_NELNS_SERVER=ON -DWITH_QT5=ON -DWITH_LIBGSF=ON ../code
         cat CMakeCache.txt
       displayName: 'CMake'
     - script: |
diff --git a/code/CMakeModules/GetRevision.cmake b/code/CMakeModules/GetRevision.cmake
index dba90c765..94b877438 100644
--- a/code/CMakeModules/GetRevision.cmake
+++ b/code/CMakeModules/GetRevision.cmake
@@ -72,6 +72,37 @@ IF(EXISTS "${ROOT_DIR}/.hg/")
   ENDIF()
 ENDIF()
 
+IF(EXISTS "${ROOT_DIR}/.git/")
+  FIND_PACKAGE(Git)
+
+  IF(GIT_FOUND)
+    EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-list HEAD --count
+      WORKING_DIRECTORY ${ROOT_DIR}
+      RESULT_VARIABLE git_exit_code
+      OUTPUT_VARIABLE REVISION)
+    IF(NOT ${git_exit_code} EQUAL 0)
+      message(WARNING "git rev-list failed, unable to include version.")
+    ENDIF()
+    EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse --short=8 HEAD
+      WORKING_DIRECTORY ${ROOT_DIR}
+      RESULT_VARIABLE git_exit_code
+      OUTPUT_VARIABLE CHANGESET)
+    IF(NOT ${git_exit_code} EQUAL 0)
+      message(WARNING "git rev-parse failed, unable to include version.")
+    ENDIF()
+    EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+      WORKING_DIRECTORY ${ROOT_DIR}
+      RESULT_VARIABLE git_exit_code
+      OUTPUT_VARIABLE BRANCH)
+    IF(NOT ${git_exit_code} EQUAL 0)
+      message(WARNING "git rev-parse failed, unable to include git branch.")
+    ENDIF()
+    STRING(STRIP ${REVISION} REVISION)
+    STRING(STRIP ${CHANGESET} CHANGESET)
+    STRING(STRIP ${BRANCH} BRANCH)
+  ENDIF()
+ENDIF()
+
 # if processing exported sources, use "revision" file if exists
 IF(SOURCE_DIR AND NOT DEFINED REVISION)
   SET(REVISION_FILE ${SOURCE_DIR}/revision)
diff --git a/code/nel/include/nel/gui/interface_group.h b/code/nel/include/nel/gui/interface_group.h
index 01f2b9701..fea928cb3 100644
--- a/code/nel/include/nel/gui/interface_group.h
+++ b/code/nel/include/nel/gui/interface_group.h
@@ -211,6 +211,11 @@ namespace NLGUI
 		int luaGetNumGroups(CLuaState &ls);
 		int luaGetGroup(CLuaState &ls);
 
+		// debug functions
+		int luaDumpSize(CLuaState &ls);
+		int luaDumpEltsOrder(CLuaState &ls);
+		int luaDumpGroups(CLuaState &ls);
+
 		void setMaxSizeRef(const std::string &maxSizeRef);
 		std::string getMaxSizeRefAsString() const;
 
@@ -223,6 +228,9 @@ namespace NLGUI
 			REFLECT_LUA_METHOD("delGroup", luaDelGroup);
 			REFLECT_LUA_METHOD("getNumGroups", luaGetNumGroups);
 			REFLECT_LUA_METHOD("getGroup", luaGetGroup);
+			REFLECT_LUA_METHOD("dumpSize", luaDumpSize);
+			REFLECT_LUA_METHOD("dumpEltsOrder", luaDumpEltsOrder);
+			REFLECT_LUA_METHOD("dumpGroups", luaDumpGroups);
 			REFLECT_STRING ("left_click", getLeftClickHandler, setLeftClickHandler);
 			REFLECT_STRING ("right_click", getRightClickHandler, setRightClickHandler);
 			REFLECT_STRING ("left_click_params", getLeftClickHandlerParams, setLeftClickHandlerParams);
@@ -274,8 +282,8 @@ namespace NLGUI
 		sint getInsertionOrder(CViewBase *vb) const;
 
 		// for debug only
-		void dumpGroups();
-		void dumpEltsOrder();
+		void dumpGroups() const;
+		void dumpEltsOrder() const;
 
 		virtual void renderWiredQuads(CInterfaceElement::TRenderWired type, const std::string &uiFilter);
 
diff --git a/code/nel/src/gui/group_html.cpp b/code/nel/src/gui/group_html.cpp
index 2e6616dbb..11368149d 100644
--- a/code/nel/src/gui/group_html.cpp
+++ b/code/nel/src/gui/group_html.cpp
@@ -5793,7 +5793,7 @@ namespace NLGUI
 	// ***************************************************************************
 	void CGroupHTML::htmlHR(const CHtmlElement &elm)
 	{
-		newParagraph(0);
+		endParagraph();
 
 		CInterfaceGroup *sep = CWidgetManager::getInstance()->getParser()->createGroupInstance("html_hr", "", NULL, 0);
 		if (sep)
@@ -5816,7 +5816,7 @@ namespace NLGUI
 			}
 
 			renderPseudoElement(":before", elm);
-			getParagraph()->addChild(sep);
+			addHtmlGroup(sep, 0);
 			renderPseudoElement(":after", elm);
 
 			endParagraph();
@@ -5828,10 +5828,9 @@ namespace NLGUI
 	{
 		if (elm.hasNonEmptyAttribute("style"))
 		{
-			_Style.Root = _Style.Current;
-			_Style.applyRootStyle(elm.getAttribute("style"));
-			_Style.Current = _Style.Root;
+			_Style.applyStyle(elm.getAttribute("style"));
 		}
+		_Style.Root = _Style.Current;
 		applyBackground(elm);
 	}
 
diff --git a/code/nel/src/gui/interface_group.cpp b/code/nel/src/gui/interface_group.cpp
index 789030a4a..3996d827f 100644
--- a/code/nel/src/gui/interface_group.cpp
+++ b/code/nel/src/gui/interface_group.cpp
@@ -829,7 +829,7 @@ namespace NLGUI
 
 		const std::map< uint32, SLinkData > &linkMap =
 			CWidgetManager::getInstance()->getParser()->getLinkMap();
-		
+
 		xmlNodePtr node = NULL;
 
 		std::map< uint32, SLinkData >::const_iterator itr;
@@ -847,17 +847,17 @@ namespace NLGUI
 			xmlAddChild( parentNode, node );
 
 			xmlSetProp( node, BAD_CAST "expr", BAD_CAST data.expr.c_str() );
-			
+
 			if( !data.target.empty() )
 				xmlSetProp( node, BAD_CAST "target", BAD_CAST data.target.c_str() );
-			
+
 			if( !data.action.empty() )
 			{
 				xmlSetProp( node, BAD_CAST "action", BAD_CAST data.action.c_str() );
-				
+
 				if( !data.params.empty() )
 					xmlSetProp( node, BAD_CAST "params", BAD_CAST data.params.c_str() );
-				
+
 				if( !data.cond.empty() )
 					xmlSetProp( node, BAD_CAST "cond", BAD_CAST data.cond.c_str() );
 			}
@@ -1792,7 +1792,7 @@ namespace NLGUI
 			CInterfaceGroup *pChild = *itg;
 			if (pChild->getActive())
 			{
-	//		bool bUnder = 
+	//		bool bUnder =
 				pChild->getViewsUnder (x, y, clipX, clipY, clipW, clipH, vVB);
 	//			if (bUnder && !vICL.empty())
 	//				return true;
@@ -1847,7 +1847,7 @@ namespace NLGUI
 			CInterfaceGroup *pChild = *itg;
 			if (pChild->getActive())
 			{
-	//		bool bUnder = 
+	//		bool bUnder =
 				pChild->getCtrlsUnder (x, y, clipX, clipY, clipW, clipH, vICL);
 	//			if (bUnder && !vICL.empty())
 	//				return true;
@@ -1903,7 +1903,7 @@ namespace NLGUI
 			CInterfaceGroup *pChild = *itg;
 			if (pChild->getActive())
 			{
-	//		bool bUnder = 
+	//		bool bUnder =
 				pChild->getGroupsUnder (x, y, clipX, clipY, clipW, clipH, vIGL);
 	//			if (bUnder && !vICL.empty())
 	//				return true;
@@ -2149,7 +2149,34 @@ namespace NLGUI
 	}
 
 	// ------------------------------------------------------------------------------------------------
-	void CInterfaceGroup::dumpGroups()
+	int CInterfaceGroup::luaDumpSize(CLuaState &ls)
+	{
+		const char *funcName = "dumpSize";
+		CLuaIHM::checkArgCount(ls, funcName, 0);
+		dumpSize();
+		return 0;
+	}
+
+	// ------------------------------------------------------------------------------------------------
+	int CInterfaceGroup::luaDumpEltsOrder(CLuaState &ls)
+	{
+		const char *funcName = "dumpEltsOrder";
+		CLuaIHM::checkArgCount(ls, funcName, 0);
+		dumpEltsOrder();
+		return 0;
+	}
+
+	// ------------------------------------------------------------------------------------------------
+	int CInterfaceGroup::luaDumpGroups(CLuaState &ls)
+	{
+		const char *funcName = "dumpGroups";
+		CLuaIHM::checkArgCount(ls, funcName, 0);
+		dumpGroups();
+		return 0;
+	}
+
+	// ------------------------------------------------------------------------------------------------
+	void CInterfaceGroup::dumpGroups() const
 	{
 		nlinfo("Num groups = %d", (int) _ChildrenGroups.size());
 		for(uint k = 0; k < _ChildrenGroups.size(); ++k)
@@ -2166,21 +2193,18 @@ namespace NLGUI
 	}
 
 	// ------------------------------------------------------------------------------------------------
-	void CInterfaceGroup::dumpEltsOrder()
+	void CInterfaceGroup::dumpEltsOrder() const
 	{
-		nlinfo("Num elements = %d", (int) _EltOrder.size());
+		nlinfo("Num elements = %d, num groups = %d", (int) _EltOrder.size(), _ChildrenGroups.size());
 		for(uint k = 0; k < _EltOrder.size(); ++k)
 		{
-			std::string typeName = "???";
-			if (_ChildrenGroups[k])
+			CInterfaceElement *el = _EltOrder[k];
+			if (el)
 			{
+				std::string typeName;
 				NLGUI::CViewBase *view = _EltOrder[k];
 				const type_info &ti = typeid(*view);
 				typeName = ti.name();
-			}
-			CInterfaceElement *el = _EltOrder[k];
-			if (el)
-			{
 				nlinfo("Element %d, name = %s, type=%s, x=%d, y=%d, parent_name=%s parentposname=%s xreal=%d, yreal=%d, wreal=%d, hreal=%d",
 					   k, el->getId().c_str(), typeName.c_str(), el->getX(), el->getY(), el->getParent() ? el->getParent()->getId().c_str() : "no parent",
 					   el->getParentPos() ? el->getParentPos()->getId().c_str() : "parent",
@@ -2595,7 +2619,7 @@ namespace NLGUI
 			e->setSizeRef("");
 
 			e->setParent(p);
-			
+
 			e->setParentPos(p);
 			e->setParentSize(p);
 			e->alignTo(p);
diff --git a/code/nel/src/misc/string_common.cpp b/code/nel/src/misc/string_common.cpp
index ee89fa981..8f032c7c5 100644
--- a/code/nel/src/misc/string_common.cpp
+++ b/code/nel/src/misc/string_common.cpp
@@ -146,7 +146,7 @@ std::string winCpToCp(const char *str, size_t len, UINT srcCp, UINT dstCp)
 		return std::string();
 	int tmpLen = MultiByteToWideChar(srcCp, 0,
 	    str, (int)(len + 1), /* include null-termination */
-	    tmp, (int)((len + 1) * 4));
+	    tmp, (int)((len + 1) * 2));
 	if (tmpLen <= 1)
 	{
 		_freea(tmp);
@@ -172,7 +172,7 @@ std::wstring winCpToWide(const char *str, size_t len, UINT cp)
 		return std::wstring();
 	int tmpLen = MultiByteToWideChar(cp, 0,
 	    str, (int)(len + 1), /* include null-termination */
-	    tmp, (int)((len + 1) * 4));
+	    tmp, (int)((len + 1) * 2));
 	if (tmpLen <= 1)
 	{
 		_freea(tmp);
diff --git a/code/nel/tools/3d/anim_builder/CMakeLists.txt b/code/nel/tools/3d/anim_builder/CMakeLists.txt
index 61188b461..eec238d39 100644
--- a/code/nel/tools/3d/anim_builder/CMakeLists.txt
+++ b/code/nel/tools/3d/anim_builder/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(anim_builder ${SRC})
 
diff --git a/code/nel/tools/3d/anim_builder/blue_pill.ico b/code/nel/tools/3d/anim_builder/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/nel/tools/3d/anim_builder/blue_pill.ico differ
diff --git a/code/nel/tools/3d/anim_builder/main.rc b/code/nel/tools/3d/anim_builder/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/nel/tools/3d/anim_builder/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/nel/tools/3d/build_clod_bank/CMakeLists.txt b/code/nel/tools/3d/build_clod_bank/CMakeLists.txt
index 2bd4846d7..52fd0df79 100644
--- a/code/nel/tools/3d/build_clod_bank/CMakeLists.txt
+++ b/code/nel/tools/3d/build_clod_bank/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_clod_bank ${SRC})
 
diff --git a/code/nel/tools/3d/build_clodtex/CMakeLists.txt b/code/nel/tools/3d/build_clodtex/CMakeLists.txt
index 558962421..956eaf651 100644
--- a/code/nel/tools/3d/build_clodtex/CMakeLists.txt
+++ b/code/nel/tools/3d/build_clodtex/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_clodtex ${SRC})
 
diff --git a/code/nel/tools/3d/build_coarse_mesh/CMakeLists.txt b/code/nel/tools/3d/build_coarse_mesh/CMakeLists.txt
index 93eba1bfc..cc51fd4f8 100644
--- a/code/nel/tools/3d/build_coarse_mesh/CMakeLists.txt
+++ b/code/nel/tools/3d/build_coarse_mesh/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_coarse_mesh ${SRC})
 
diff --git a/code/nel/tools/3d/build_far_bank/CMakeLists.txt b/code/nel/tools/3d/build_far_bank/CMakeLists.txt
index 7a858d560..59580ec1d 100644
--- a/code/nel/tools/3d/build_far_bank/CMakeLists.txt
+++ b/code/nel/tools/3d/build_far_bank/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_far_bank ${SRC})
 
diff --git a/code/nel/tools/3d/build_interface/CMakeLists.txt b/code/nel/tools/3d/build_interface/CMakeLists.txt
index 113fe2b84..66c8ba9b4 100644
--- a/code/nel/tools/3d/build_interface/CMakeLists.txt
+++ b/code/nel/tools/3d/build_interface/CMakeLists.txt
@@ -1,4 +1,4 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
 
 SOURCE_GROUP("" FILES ${SRC})
 
diff --git a/code/nel/tools/3d/build_shadow_skin/CMakeLists.txt b/code/nel/tools/3d/build_shadow_skin/CMakeLists.txt
index 78bbd712d..fbe504067 100644
--- a/code/nel/tools/3d/build_shadow_skin/CMakeLists.txt
+++ b/code/nel/tools/3d/build_shadow_skin/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_shadow_skin ${SRC})
 
diff --git a/code/nel/tools/3d/build_smallbank/CMakeLists.txt b/code/nel/tools/3d/build_smallbank/CMakeLists.txt
index 260f6b9aa..c284e1e2b 100644
--- a/code/nel/tools/3d/build_smallbank/CMakeLists.txt
+++ b/code/nel/tools/3d/build_smallbank/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_smallbank ${SRC})
 
diff --git a/code/nel/tools/3d/get_neighbors/CMakeLists.txt b/code/nel/tools/3d/get_neighbors/CMakeLists.txt
index d8de69ff5..dc32cbd0b 100644
--- a/code/nel/tools/3d/get_neighbors/CMakeLists.txt
+++ b/code/nel/tools/3d/get_neighbors/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(get_neighbors ${SRC})
 
diff --git a/code/nel/tools/3d/get_neighbors/blue_pill.ico b/code/nel/tools/3d/get_neighbors/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/nel/tools/3d/get_neighbors/blue_pill.ico differ
diff --git a/code/nel/tools/3d/get_neighbors/main.rc b/code/nel/tools/3d/get_neighbors/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/nel/tools/3d/get_neighbors/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/nel/tools/3d/hls_bank_maker/CMakeLists.txt b/code/nel/tools/3d/hls_bank_maker/CMakeLists.txt
index d2482c276..326871e5b 100644
--- a/code/nel/tools/3d/hls_bank_maker/CMakeLists.txt
+++ b/code/nel/tools/3d/hls_bank_maker/CMakeLists.txt
@@ -1,5 +1,7 @@
-FILE(GLOB SRC *.cpp *.h ../panoply_maker/hls_bank_texture_info.cpp ../panoply_maker/hls_bank_texture_info.h)
-		
+FILE(GLOB SRC *.cpp *.h ../panoply_maker/hls_bank_texture_info.cpp ../panoply_maker/hls_bank_texture_info.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
+
 ADD_EXECUTABLE(hls_bank_maker ${SRC})
 
 TARGET_LINK_LIBRARIES(hls_bank_maker s3tc_compressor nelmisc nel3d)
diff --git a/code/nel/tools/3d/hls_bank_maker/blue_pill.ico b/code/nel/tools/3d/hls_bank_maker/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/nel/tools/3d/hls_bank_maker/blue_pill.ico differ
diff --git a/code/nel/tools/3d/hls_bank_maker/main.rc b/code/nel/tools/3d/hls_bank_maker/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/nel/tools/3d/hls_bank_maker/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/nel/tools/3d/ig_add/CMakeLists.txt b/code/nel/tools/3d/ig_add/CMakeLists.txt
index 2ae993d51..6200232c8 100644
--- a/code/nel/tools/3d/ig_add/CMakeLists.txt
+++ b/code/nel/tools/3d/ig_add/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(ig_add ${SRC})
 
diff --git a/code/nel/tools/3d/ig_add/blue_pill.ico b/code/nel/tools/3d/ig_add/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/nel/tools/3d/ig_add/blue_pill.ico differ
diff --git a/code/nel/tools/3d/ig_add/main.rc b/code/nel/tools/3d/ig_add/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/nel/tools/3d/ig_add/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/nel/tools/3d/ig_elevation/CMakeLists.txt b/code/nel/tools/3d/ig_elevation/CMakeLists.txt
index fc584883c..9c3e0fe26 100644
--- a/code/nel/tools/3d/ig_elevation/CMakeLists.txt
+++ b/code/nel/tools/3d/ig_elevation/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(ig_elevation ${SRC})
 
diff --git a/code/nel/tools/3d/ig_elevation/blue_pill.ico b/code/nel/tools/3d/ig_elevation/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/nel/tools/3d/ig_elevation/blue_pill.ico differ
diff --git a/code/nel/tools/3d/ig_elevation/main.rc b/code/nel/tools/3d/ig_elevation/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/nel/tools/3d/ig_elevation/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/nel/tools/3d/ig_lighter/CMakeLists.txt b/code/nel/tools/3d/ig_lighter/CMakeLists.txt
index 54f703566..2f9e05732 100644
--- a/code/nel/tools/3d/ig_lighter/CMakeLists.txt
+++ b/code/nel/tools/3d/ig_lighter/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h ../ig_lighter_lib/*.cpp ../ig_lighter_lib/*.h)
+FILE(GLOB SRC *.cpp *.h ../ig_lighter_lib/*.cpp ../ig_lighter_lib/*.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(ig_lighter ${SRC})
 
diff --git a/code/nel/tools/3d/ig_lighter/blue_pill.ico b/code/nel/tools/3d/ig_lighter/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/nel/tools/3d/ig_lighter/blue_pill.ico differ
diff --git a/code/nel/tools/3d/ig_lighter/main.rc b/code/nel/tools/3d/ig_lighter/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/nel/tools/3d/ig_lighter/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/nel/tools/3d/lightmap_optimizer/CMakeLists.txt b/code/nel/tools/3d/lightmap_optimizer/CMakeLists.txt
index 36e5b2aa4..0f2c35074 100644
--- a/code/nel/tools/3d/lightmap_optimizer/CMakeLists.txt
+++ b/code/nel/tools/3d/lightmap_optimizer/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(lightmap_optimizer ${SRC})
 
diff --git a/code/nel/tools/3d/lightmap_optimizer/blue_pill.ico b/code/nel/tools/3d/lightmap_optimizer/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/nel/tools/3d/lightmap_optimizer/blue_pill.ico differ
diff --git a/code/nel/tools/3d/lightmap_optimizer/main.rc b/code/nel/tools/3d/lightmap_optimizer/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/nel/tools/3d/lightmap_optimizer/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/nel/tools/3d/mesh_export/CMakeLists.txt b/code/nel/tools/3d/mesh_export/CMakeLists.txt
index 838ce49c2..3a36fa667 100644
--- a/code/nel/tools/3d/mesh_export/CMakeLists.txt
+++ b/code/nel/tools/3d/mesh_export/CMakeLists.txt
@@ -1,9 +1,10 @@
 FILE(GLOB SRCS *.cpp)
 FILE(GLOB HDRS *.h)
+FILE(GLOB RECS *.rc)
 
-SOURCE_GROUP("" FILES ${SRCS} ${HDRS})
+SOURCE_GROUP("" FILES ${SRCS} ${HDRS} ${RECS})
 
-ADD_EXECUTABLE(mesh_export ${SRCS} ${HDRS})
+ADD_EXECUTABLE(mesh_export ${SRCS} ${HDRS} ${RECS})
 
 TARGET_LINK_LIBRARIES(mesh_export mesh_utils nel3d nelmisc)
 NL_DEFAULT_PROPS(mesh_export "NeL, Tools, 3D: Mesh Export")
diff --git a/code/nel/tools/3d/mesh_export/blue_pill.ico b/code/nel/tools/3d/mesh_export/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/nel/tools/3d/mesh_export/blue_pill.ico differ
diff --git a/code/nel/tools/3d/mesh_export/main.rc b/code/nel/tools/3d/mesh_export/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/nel/tools/3d/mesh_export/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/nel/tools/3d/panoply_maker/CMakeLists.txt b/code/nel/tools/3d/panoply_maker/CMakeLists.txt
index 8fd25fef6..c6524a9cc 100644
--- a/code/nel/tools/3d/panoply_maker/CMakeLists.txt
+++ b/code/nel/tools/3d/panoply_maker/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(panoply_maker ${SRC})
 
diff --git a/code/nel/tools/3d/panoply_maker/blue_pill.ico b/code/nel/tools/3d/panoply_maker/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/nel/tools/3d/panoply_maker/blue_pill.ico differ
diff --git a/code/nel/tools/3d/panoply_maker/main.rc b/code/nel/tools/3d/panoply_maker/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/nel/tools/3d/panoply_maker/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/nel/tools/3d/shapes_exporter/CMakeLists.txt b/code/nel/tools/3d/shapes_exporter/CMakeLists.txt
index 1df5eafa0..41fea6ade 100644
--- a/code/nel/tools/3d/shapes_exporter/CMakeLists.txt
+++ b/code/nel/tools/3d/shapes_exporter/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(shapes_exporter WIN32 ${SRC})
 
diff --git a/code/nel/tools/3d/shapes_exporter/gold_pill.ico b/code/nel/tools/3d/shapes_exporter/gold_pill.ico
new file mode 100644
index 000000000..618b67a5d
Binary files /dev/null and b/code/nel/tools/3d/shapes_exporter/gold_pill.ico differ
diff --git a/code/nel/tools/3d/shapes_exporter/main.rc b/code/nel/tools/3d/shapes_exporter/main.rc
new file mode 100644
index 000000000..604dd140d
--- /dev/null
+++ b/code/nel/tools/3d/shapes_exporter/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "gold_pill.ico"
diff --git a/code/nel/tools/3d/tga_2_dds/CMakeLists.txt b/code/nel/tools/3d/tga_2_dds/CMakeLists.txt
index 10620af5b..0b59f702c 100644
--- a/code/nel/tools/3d/tga_2_dds/CMakeLists.txt
+++ b/code/nel/tools/3d/tga_2_dds/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(tga2dds ${SRC})
 
diff --git a/code/nel/tools/3d/tga_2_dds/blue_pill.ico b/code/nel/tools/3d/tga_2_dds/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/nel/tools/3d/tga_2_dds/blue_pill.ico differ
diff --git a/code/nel/tools/3d/tga_2_dds/main.rc b/code/nel/tools/3d/tga_2_dds/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/nel/tools/3d/tga_2_dds/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/nel/tools/3d/tga_cut/CMakeLists.txt b/code/nel/tools/3d/tga_cut/CMakeLists.txt
index 6d0147328..d7fc886c4 100644
--- a/code/nel/tools/3d/tga_cut/CMakeLists.txt
+++ b/code/nel/tools/3d/tga_cut/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(tga_cut ${SRC})
 
diff --git a/code/nel/tools/3d/tga_cut/blue_pill.ico b/code/nel/tools/3d/tga_cut/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/nel/tools/3d/tga_cut/blue_pill.ico differ
diff --git a/code/nel/tools/3d/tga_cut/main.rc b/code/nel/tools/3d/tga_cut/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/nel/tools/3d/tga_cut/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/nel/tools/3d/unbuild_interface/CMakeLists.txt b/code/nel/tools/3d/unbuild_interface/CMakeLists.txt
index 2a10976d3..8befed3f4 100644
--- a/code/nel/tools/3d/unbuild_interface/CMakeLists.txt
+++ b/code/nel/tools/3d/unbuild_interface/CMakeLists.txt
@@ -1,11 +1,11 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
 
 SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(unbuild_interface ${SRC})
 
 TARGET_LINK_LIBRARIES(unbuild_interface nelmisc)
-NL_DEFAULT_PROPS(unbuild_interface "NeL, Tools, 3D: unbuild_interface")
+NL_DEFAULT_PROPS(unbuild_interface "NeL, Tools, 3D: Unbuild Interface")
 NL_ADD_RUNTIME_FLAGS(unbuild_interface)
 
 INSTALL(TARGETS unbuild_interface RUNTIME DESTINATION bin COMPONENT tools3d)
diff --git a/code/nel/tools/3d/unbuild_interface/gold_pill.ico b/code/nel/tools/3d/unbuild_interface/gold_pill.ico
new file mode 100644
index 000000000..618b67a5d
Binary files /dev/null and b/code/nel/tools/3d/unbuild_interface/gold_pill.ico differ
diff --git a/code/nel/tools/3d/unbuild_interface/main.rc b/code/nel/tools/3d/unbuild_interface/main.rc
new file mode 100644
index 000000000..604dd140d
--- /dev/null
+++ b/code/nel/tools/3d/unbuild_interface/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "gold_pill.ico"
diff --git a/code/nel/tools/3d/zone_dependencies/CMakeLists.txt b/code/nel/tools/3d/zone_dependencies/CMakeLists.txt
index 9efb49f0e..f638f026d 100644
--- a/code/nel/tools/3d/zone_dependencies/CMakeLists.txt
+++ b/code/nel/tools/3d/zone_dependencies/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h)
+FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(zone_dependencies ${SRC})
 
diff --git a/code/nel/tools/3d/zone_dependencies/blue_pill.ico b/code/nel/tools/3d/zone_dependencies/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/nel/tools/3d/zone_dependencies/blue_pill.ico differ
diff --git a/code/nel/tools/3d/zone_dependencies/main.rc b/code/nel/tools/3d/zone_dependencies/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/nel/tools/3d/zone_dependencies/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/nel/tools/3d/zone_ig_lighter/CMakeLists.txt b/code/nel/tools/3d/zone_ig_lighter/CMakeLists.txt
index 30f84cea8..21b332612 100644
--- a/code/nel/tools/3d/zone_ig_lighter/CMakeLists.txt
+++ b/code/nel/tools/3d/zone_ig_lighter/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h)
+FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(zone_ig_lighter ${SRC})
 
diff --git a/code/nel/tools/3d/zone_ig_lighter/blue_pill.ico b/code/nel/tools/3d/zone_ig_lighter/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/nel/tools/3d/zone_ig_lighter/blue_pill.ico differ
diff --git a/code/nel/tools/3d/zone_ig_lighter/main.rc b/code/nel/tools/3d/zone_ig_lighter/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/nel/tools/3d/zone_ig_lighter/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/nel/tools/3d/zone_lighter/CMakeLists.txt b/code/nel/tools/3d/zone_lighter/CMakeLists.txt
index e0c15f9e8..2fe58d3a2 100644
--- a/code/nel/tools/3d/zone_lighter/CMakeLists.txt
+++ b/code/nel/tools/3d/zone_lighter/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h)
+FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(zone_lighter ${SRC})
 
diff --git a/code/nel/tools/3d/zone_lighter/blue_pill.ico b/code/nel/tools/3d/zone_lighter/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/nel/tools/3d/zone_lighter/blue_pill.ico differ
diff --git a/code/nel/tools/3d/zone_lighter/main.rc b/code/nel/tools/3d/zone_lighter/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/nel/tools/3d/zone_lighter/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/nel/tools/3d/zone_welder/CMakeLists.txt b/code/nel/tools/3d/zone_welder/CMakeLists.txt
index 396d22f58..a236627a0 100644
--- a/code/nel/tools/3d/zone_welder/CMakeLists.txt
+++ b/code/nel/tools/3d/zone_welder/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h)
+FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(zone_welder ${SRC})
 
diff --git a/code/nel/tools/3d/zone_welder/blue_pill.ico b/code/nel/tools/3d/zone_welder/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/nel/tools/3d/zone_welder/blue_pill.ico differ
diff --git a/code/nel/tools/3d/zone_welder/main.rc b/code/nel/tools/3d/zone_welder/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/nel/tools/3d/zone_welder/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/nel/tools/misc/bnp_make/CMakeLists.txt b/code/nel/tools/misc/bnp_make/CMakeLists.txt
index d27252fb6..a917d4e1d 100644
--- a/code/nel/tools/misc/bnp_make/CMakeLists.txt
+++ b/code/nel/tools/misc/bnp_make/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(bnp_make ${SRC})
 
diff --git a/code/nel/tools/misc/bnp_make/blue_pill.ico b/code/nel/tools/misc/bnp_make/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/nel/tools/misc/bnp_make/blue_pill.ico differ
diff --git a/code/nel/tools/misc/bnp_make/main.rc b/code/nel/tools/misc/bnp_make/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/nel/tools/misc/bnp_make/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/nel/tools/misc/exec_timeout/CMakeLists.txt b/code/nel/tools/misc/exec_timeout/CMakeLists.txt
index 18654e169..75f4329f0 100644
--- a/code/nel/tools/misc/exec_timeout/CMakeLists.txt
+++ b/code/nel/tools/misc/exec_timeout/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(exec_timeout ${SRC})
 
diff --git a/code/nel/tools/misc/exec_timeout/main.rc b/code/nel/tools/misc/exec_timeout/main.rc
new file mode 100644
index 000000000..608225e47
--- /dev/null
+++ b/code/nel/tools/misc/exec_timeout/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "yellow_pill.ico"
diff --git a/code/nel/tools/misc/exec_timeout/yellow_pill.ico b/code/nel/tools/misc/exec_timeout/yellow_pill.ico
new file mode 100644
index 000000000..a8056d9d2
Binary files /dev/null and b/code/nel/tools/misc/exec_timeout/yellow_pill.ico differ
diff --git a/code/nel/tools/misc/make_sheet_id/CMakeLists.txt b/code/nel/tools/misc/make_sheet_id/CMakeLists.txt
index 553f7fddb..9c779f08e 100644
--- a/code/nel/tools/misc/make_sheet_id/CMakeLists.txt
+++ b/code/nel/tools/misc/make_sheet_id/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(make_sheet_id ${SRC})
 
diff --git a/code/nel/tools/misc/make_sheet_id/blue_pill.ico b/code/nel/tools/misc/make_sheet_id/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/nel/tools/misc/make_sheet_id/blue_pill.ico differ
diff --git a/code/nel/tools/misc/make_sheet_id/main.rc b/code/nel/tools/misc/make_sheet_id/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/nel/tools/misc/make_sheet_id/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/nel/tools/misc/message_box/CMakeLists.txt b/code/nel/tools/misc/message_box/CMakeLists.txt
index 764071d9d..4833b9264 100644
--- a/code/nel/tools/misc/message_box/CMakeLists.txt
+++ b/code/nel/tools/misc/message_box/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(message_box WIN32 ${SRC})
 
diff --git a/code/nel/tools/misc/message_box/main.rc b/code/nel/tools/misc/message_box/main.rc
new file mode 100644
index 000000000..608225e47
--- /dev/null
+++ b/code/nel/tools/misc/message_box/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "yellow_pill.ico"
diff --git a/code/nel/tools/misc/message_box/yellow_pill.ico b/code/nel/tools/misc/message_box/yellow_pill.ico
new file mode 100644
index 000000000..a8056d9d2
Binary files /dev/null and b/code/nel/tools/misc/message_box/yellow_pill.ico differ
diff --git a/code/nel/tools/misc/message_box_qt/CMakeLists.txt b/code/nel/tools/misc/message_box_qt/CMakeLists.txt
index be4dd2b63..a21ef6cf7 100644
--- a/code/nel/tools/misc/message_box_qt/CMakeLists.txt
+++ b/code/nel/tools/misc/message_box_qt/CMakeLists.txt
@@ -5,7 +5,9 @@ ENDIF()
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 
-FILE(GLOB MESSAGE_BOX_SRC *.cpp)
+FILE(GLOB MESSAGE_BOX_SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${MESSAGE_BOX_SRC})
 
 SET( QT_USE_QT3SUPPORT TRUE)
 SET( QT_USE_QTXML TRUE)
diff --git a/code/nel/tools/misc/message_box_qt/main.rc b/code/nel/tools/misc/message_box_qt/main.rc
new file mode 100644
index 000000000..608225e47
--- /dev/null
+++ b/code/nel/tools/misc/message_box_qt/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "yellow_pill.ico"
diff --git a/code/nel/tools/misc/message_box_qt/yellow_pill.ico b/code/nel/tools/misc/message_box_qt/yellow_pill.ico
new file mode 100644
index 000000000..a8056d9d2
Binary files /dev/null and b/code/nel/tools/misc/message_box_qt/yellow_pill.ico differ
diff --git a/code/nel/tools/pacs/build_ig_boxes/CMakeLists.txt b/code/nel/tools/pacs/build_ig_boxes/CMakeLists.txt
index fb2feedbe..cfeb3069e 100644
--- a/code/nel/tools/pacs/build_ig_boxes/CMakeLists.txt
+++ b/code/nel/tools/pacs/build_ig_boxes/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_ig_boxes ${SRC})
 
diff --git a/code/nel/tools/pacs/build_indoor_rbank/CMakeLists.txt b/code/nel/tools/pacs/build_indoor_rbank/CMakeLists.txt
index 85f1984bf..4d39639a2 100644
--- a/code/nel/tools/pacs/build_indoor_rbank/CMakeLists.txt
+++ b/code/nel/tools/pacs/build_indoor_rbank/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_indoor_rbank ${SRC})
 
diff --git a/code/nel/tools/pacs/build_rbank/CMakeLists.txt b/code/nel/tools/pacs/build_rbank/CMakeLists.txt
index 65e86394d..9b493b762 100644
--- a/code/nel/tools/pacs/build_rbank/CMakeLists.txt
+++ b/code/nel/tools/pacs/build_rbank/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_rbank ${SRC})
 
diff --git a/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
index 50cdea91e..70dc3e68b 100644
--- a/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
+++ b/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
@@ -997,11 +997,10 @@ void CDBCtrlSheet::updateCoords ()
 {
 	if (getActive())
 	{
-		if(!_SetupInit)
-			setupInit();
-
 		if (_Type != CCtrlSheetInfo::SheetType_Macro)
 		{
+			if (!_SetupInit) setupInit();
+
 			if (_LastSheetId != _SheetId.getSInt32())
 			{
 				updateActualType();
diff --git a/code/ryzom/tools/client/r2_islands_textures/CMakeLists.txt b/code/ryzom/tools/client/r2_islands_textures/CMakeLists.txt
index 76be43bc8..84de94439 100644
--- a/code/ryzom/tools/client/r2_islands_textures/CMakeLists.txt
+++ b/code/ryzom/tools/client/r2_islands_textures/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(r2_islands_textures ${SRC})
 
diff --git a/code/ryzom/tools/client/r2_islands_textures/blue_pill.ico b/code/ryzom/tools/client/r2_islands_textures/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/ryzom/tools/client/r2_islands_textures/blue_pill.ico differ
diff --git a/code/ryzom/tools/client/r2_islands_textures/main.rc b/code/ryzom/tools/client/r2_islands_textures/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/ryzom/tools/client/r2_islands_textures/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/ryzom/tools/leveldesign/prim_export/CMakeLists.txt b/code/ryzom/tools/leveldesign/prim_export/CMakeLists.txt
index 8fbd3912e..4902ee92b 100644
--- a/code/ryzom/tools/leveldesign/prim_export/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/prim_export/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(prim_export ${SRC})
 
diff --git a/code/ryzom/tools/leveldesign/prim_export/blue_pill.ico b/code/ryzom/tools/leveldesign/prim_export/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/ryzom/tools/leveldesign/prim_export/blue_pill.ico differ
diff --git a/code/ryzom/tools/leveldesign/prim_export/main.rc b/code/ryzom/tools/leveldesign/prim_export/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/ryzom/tools/leveldesign/prim_export/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/ryzom/tools/leveldesign/world_editor/land_export/CMakeLists.txt b/code/ryzom/tools/leveldesign/world_editor/land_export/CMakeLists.txt
index e1f7fe88c..f51b470db 100644
--- a/code/ryzom/tools/leveldesign/world_editor/land_export/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/world_editor/land_export/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(land_export ${SRC})
 
diff --git a/code/ryzom/tools/leveldesign/world_editor/land_export/blue_pill.ico b/code/ryzom/tools/leveldesign/world_editor/land_export/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/ryzom/tools/leveldesign/world_editor/land_export/blue_pill.ico differ
diff --git a/code/ryzom/tools/leveldesign/world_editor/land_export/main.rc b/code/ryzom/tools/leveldesign/world_editor/land_export/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/ryzom/tools/leveldesign/world_editor/land_export/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/ryzom/tools/patch_gen/CMakeLists.txt b/code/ryzom/tools/patch_gen/CMakeLists.txt
index 6cde9810b..330733cc2 100644
--- a/code/ryzom/tools/patch_gen/CMakeLists.txt
+++ b/code/ryzom/tools/patch_gen/CMakeLists.txt
@@ -1,14 +1,14 @@
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ryzom/client/src/seven_zip)
 
-SET(MAIN_SRC patch_gen_common.cpp patch_gen_main.cpp patch_gen_main.h)
-SET(SERVICE_SRC patch_gen_common.cpp patch_gen_service.cpp patch_gen_service.h)
+SET(MAIN_SRC patch_gen_common.cpp patch_gen_main.cpp patch_gen_main.h patch_gen.rc)
+SET(SERVICE_SRC patch_gen_common.cpp patch_gen_service.cpp patch_gen_service.h patch_gen_service.rc)
 
-ADD_EXECUTABLE(patch_gen ${MAIN_SRC})
+ADD_EXECUTABLE(patch_gen ${MAIN_SRC} ${RECS})
 TARGET_LINK_LIBRARIES(patch_gen ryzom_sevenzip ryzom_gameshare nelmisc nelnet nelligo nelgeorges)
 NL_DEFAULT_PROPS(patch_gen "Ryzom, Tools: Patch Generator")
 NL_ADD_RUNTIME_FLAGS(patch_gen)
 
-ADD_EXECUTABLE(patch_gen_service WIN32 ${SERVICE_SRC})
+ADD_EXECUTABLE(patch_gen_service WIN32 ${SERVICE_SRC} ${RECS})
 TARGET_LINK_LIBRARIES(patch_gen_service ryzom_sevenzip ryzom_gameshare nelmisc nelnet nelligo nelgeorges)
 NL_DEFAULT_PROPS(patch_gen_service "Ryzom, Tools: Patch Generator Service")
 NL_ADD_RUNTIME_FLAGS(patch_gen_service)
diff --git a/code/ryzom/tools/patch_gen/blue_pill.ico b/code/ryzom/tools/patch_gen/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/ryzom/tools/patch_gen/blue_pill.ico differ
diff --git a/code/ryzom/tools/patch_gen/patch_gen.rc b/code/ryzom/tools/patch_gen/patch_gen.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/ryzom/tools/patch_gen/patch_gen.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/ryzom/tools/patch_gen/patch_gen_service.rc b/code/ryzom/tools/patch_gen/patch_gen_service.rc
new file mode 100644
index 000000000..60ad969f2
--- /dev/null
+++ b/code/ryzom/tools/patch_gen/patch_gen_service.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "red_pill.ico"
diff --git a/code/ryzom/tools/patch_gen/red_pill.ico b/code/ryzom/tools/patch_gen/red_pill.ico
new file mode 100644
index 000000000..c5f250583
Binary files /dev/null and b/code/ryzom/tools/patch_gen/red_pill.ico differ
diff --git a/code/ryzom/tools/server/ai_build_wmap/CMakeLists.txt b/code/ryzom/tools/server/ai_build_wmap/CMakeLists.txt
index f6417611f..edafe195f 100644
--- a/code/ryzom/tools/server/ai_build_wmap/CMakeLists.txt
+++ b/code/ryzom/tools/server/ai_build_wmap/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.cpp)
+FILE(GLOB SRC *.cpp *.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.cpp *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(ai_build_wmap ${SRC})
 
diff --git a/code/ryzom/tools/server/ai_build_wmap/blue_pill.ico b/code/ryzom/tools/server/ai_build_wmap/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/ryzom/tools/server/ai_build_wmap/blue_pill.ico differ
diff --git a/code/ryzom/tools/server/ai_build_wmap/main.rc b/code/ryzom/tools/server/ai_build_wmap/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/ryzom/tools/server/ai_build_wmap/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/ryzom/tools/server/build_world_packed_col/CMakeLists.txt b/code/ryzom/tools/server/build_world_packed_col/CMakeLists.txt
index 672500092..e1d57f821 100644
--- a/code/ryzom/tools/server/build_world_packed_col/CMakeLists.txt
+++ b/code/ryzom/tools/server/build_world_packed_col/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.cpp)
+FILE(GLOB SRC *.cpp *.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.cpp *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_world_packed_col ${SRC})
 
diff --git a/code/ryzom/tools/sheets_packer/CMakeLists.txt b/code/ryzom/tools/sheets_packer/CMakeLists.txt
index 7e7d27c1d..45a344153 100644
--- a/code/ryzom/tools/sheets_packer/CMakeLists.txt
+++ b/code/ryzom/tools/sheets_packer/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(sheets_packer	${SRC} 
 				${CMAKE_SOURCE_DIR}/ryzom/client/src/continent_manager_build.cpp
diff --git a/code/ryzom/tools/sheets_packer/blue_pill.ico b/code/ryzom/tools/sheets_packer/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/ryzom/tools/sheets_packer/blue_pill.ico differ
diff --git a/code/ryzom/tools/sheets_packer/main.rc b/code/ryzom/tools/sheets_packer/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/ryzom/tools/sheets_packer/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/ryzom/tools/sheets_packer_shard/CMakeLists.txt b/code/ryzom/tools/sheets_packer_shard/CMakeLists.txt
index 554eafe3f..383bd8871 100644
--- a/code/ryzom/tools/sheets_packer_shard/CMakeLists.txt
+++ b/code/ryzom/tools/sheets_packer_shard/CMakeLists.txt
@@ -1,6 +1,12 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
+
 FILE(GLOB EGSSHEETS ${CMAKE_SOURCE_DIR}/ryzom/server/src/entities_game_service/egs_sheets/*.cpp ${CMAKE_SOURCE_DIR}/ryzom/server/src/entities_game_service/egs_sheets/*.h)
 
+SOURCE_GROUP("" FILES ${SRC})
+SOURCE_GROUP("EGS Sheets" FILES ${EGSSHEETS})
+
 ADD_EXECUTABLE(sheets_packer_shard	${SRC} ${EGSSHEETS}
 				${CMAKE_SOURCE_DIR}/ryzom/server/src/input_output_service/string_manager_sheet.cpp
 				${CMAKE_SOURCE_DIR}/ryzom/server/src/input_output_service/string_manager.h
diff --git a/code/ryzom/tools/sheets_packer_shard/blue_pill.ico b/code/ryzom/tools/sheets_packer_shard/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/ryzom/tools/sheets_packer_shard/blue_pill.ico differ
diff --git a/code/ryzom/tools/sheets_packer_shard/main.rc b/code/ryzom/tools/sheets_packer_shard/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/ryzom/tools/sheets_packer_shard/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"
diff --git a/code/ryzom/tools/translation_tools/CMakeLists.txt b/code/ryzom/tools/translation_tools/CMakeLists.txt
index 1db05b3ec..199cb4311 100644
--- a/code/ryzom/tools/translation_tools/CMakeLists.txt
+++ b/code/ryzom/tools/translation_tools/CMakeLists.txt
@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(translation_tools ${SRC})
 
diff --git a/code/ryzom/tools/translation_tools/blue_pill.ico b/code/ryzom/tools/translation_tools/blue_pill.ico
new file mode 100644
index 000000000..269907ec3
Binary files /dev/null and b/code/ryzom/tools/translation_tools/blue_pill.ico differ
diff --git a/code/ryzom/tools/translation_tools/main.rc b/code/ryzom/tools/translation_tools/main.rc
new file mode 100644
index 000000000..958fa5089
--- /dev/null
+++ b/code/ryzom/tools/translation_tools/main.rc
@@ -0,0 +1 @@
+IDI_MAIN_ICON           ICON    DISCARDABLE     "blue_pill.ico"