diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 2e6f6caff0a127726fbf854cab71ea111b7e8021..235dcf4a84503c6cc29e98f8878f8f70fae9bd23 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.205 2002-11-03 04:26:07 geuzaine Exp $
+// $Id: GUI.cpp,v 1.206 2002-11-03 16:49:55 geuzaine Exp $
 //
 // Copyright (C) 1997 - 2002 C. Geuzaine, J.-F. Remacle
 //
@@ -48,7 +48,7 @@
 #include "GUI.h"
 #include "Callbacks.h"
 #include "Bitmaps.h"
-#include "Icon.h"
+#include "Win32Icon.h"
 #include "OpenFile.h"
 #include "CommandLine.h"
 #include "Solvers.h"
diff --git a/Fltk/Icon.rc b/Fltk/Icon.rc
deleted file mode 100644
index 5c885f15cfb3f5c01e38e8c3cc697ca48e198ddc..0000000000000000000000000000000000000000
--- a/Fltk/Icon.rc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "Icon.h"
-
-IDI_ICON   ICON    DISCARDABLE     "Icon.ico"
-
diff --git a/Fltk/Makefile b/Fltk/Makefile
index dfa779c0379e86c999bd8b680dc7f2dd7f653d8f..1c586ce124fd731d99089dbe84bd763917c35f3e 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.37 2002-09-24 02:04:34 geuzaine Exp $
+# $Id: Makefile,v 1.38 2002-11-03 16:49:55 geuzaine Exp $
 #
 # Makefile for "libGmshFltk.a"
 #
@@ -43,7 +43,7 @@ $(LIB): $(OBJ)
 	$(CXX) $(CFLAGS) -c $<
 
 res:
-	windres Icon.rc -O coff Icon.res
+	windres Win32Icon.rc -O coff Win32Icon.res
 
 clean:
 	$(RM) $(RMFLAGS) *.o
diff --git a/Fltk/Icon.h b/Fltk/Win32Icon.h
similarity index 100%
rename from Fltk/Icon.h
rename to Fltk/Win32Icon.h
diff --git a/Fltk/Icon.ico b/Fltk/Win32Icon.ico
similarity index 100%
rename from Fltk/Icon.ico
rename to Fltk/Win32Icon.ico
diff --git a/Fltk/Win32Icon.rc b/Fltk/Win32Icon.rc
new file mode 100644
index 0000000000000000000000000000000000000000..aa943b83eafea9eb9716f440cbf5b12ff34a6140
--- /dev/null
+++ b/Fltk/Win32Icon.rc
@@ -0,0 +1,5 @@
+
+#include "Win32Icon.h"
+
+IDI_ICON   ICON    DISCARDABLE     "Win32Icon.ico"
+
diff --git a/Fltk/Icon.res b/Fltk/Win32Icon.res
similarity index 100%
rename from Fltk/Icon.res
rename to Fltk/Win32Icon.res
diff --git a/Makefile b/Makefile
index f20525abd0e6347a56a263303ac6de7a40bea773..20415afbc96472f8b1322b2315593ee926484c4f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.236 2002-11-01 22:30:03 geuzaine Exp $
+# $Id: Makefile,v 1.237 2002-11-03 16:49:55 geuzaine Exp $
 
 GMSH_MAJOR_VERSION = 1
 GMSH_MINOR_VERSION = 35
@@ -375,7 +375,7 @@ compile-cygwin: initialtag
         ); done
 link-cygwin:
 	g++ -Wl,--subsystem,windows -mwindows -o $(GMSH_BIN_DIR)/gmsh.exe\
-                 $(GMSH_FLTK_LIB) Fltk/Icon.res $(FLTK_DIR)/lib/libfltk_gl.a\
+                 $(GMSH_FLTK_LIB) Fltk/Win32Icon.res $(FLTK_DIR)/lib/libfltk_gl.a\
                  -lglu32 -lopengl32 $(FLTK_DIR)/lib/libfltk.a \
                  -lole32 -luuid -lcomctl32 -lwsock32 -lm
 cygwin: compile-cygwin link-cygwin
@@ -399,7 +399,7 @@ cygwin-gertha-buro: initialtag
            "GUI_INCLUDE=-I../../fltk" \
         ); done
 	g++ -Wl,--subsystem,windows -o $(GMSH_BIN_DIR)/gmsh.exe $(GMSH_FLTK_LIB)\
-                 Fltk/Icon.res ../fltk/lib/libfltk.a\
+                 Fltk/Win32Icon.res ../fltk/lib/libfltk.a\
                  -lglu32 -lopengl32 -lgdi32 -lwsock32 -lm
 
 #
@@ -416,7 +416,7 @@ cygwin-laptopjf: initialtag
            "GUI_INCLUDE=-I../../fltk-1.0.9" \
         ); done
 	g++ -Wl,--subsystem,windows -o $(GMSH_BIN_DIR)/gmsh-cyg.exe $(GMSH_FLTK_LIB)\
-                 Fltk/Icon.res ../fltk-1.0.9/lib/libfltk.a\
+                 Fltk/Win32Icon.res ../fltk-1.0.9/lib/libfltk.a\
                  -lglu32 -lopengl32 -lgdi32 -lwsock32 -lm
 cygwin-laptopjf_tag: tag cygwin-laptopjf