Index: src/app/qgisapp.cpp
===================================================================
--- src/app/qgisapp.cpp	(revision 12391)
+++ src/app/qgisapp.cpp	(working copy)
@@ -84,7 +84,6 @@
 //
 // QGIS Specific Includes
 //
-#include "../../images/themes/default/qgis.xpm"
 #include "qgisapp.h"
 #include "qgisappinterface.h"
 #include "qgis.h"
@@ -377,9 +376,6 @@
   addDockWidget( Qt::LeftDockWidgetArea, mUndoWidget );
   mUndoWidget->hide();
 
-  // set application's icon
-  setWindowIcon( QPixmap( qgis_xpm ) );
-
 #ifdef Q_WS_MAC
   // action for Window menu (create before generating WindowTitleChange event))
   mWindowAction = new QAction( this );
Index: src/core/qgsapplication.cpp
===================================================================
--- src/core/qgsapplication.cpp	(revision 12391)
+++ src/core/qgsapplication.cpp	(working copy)
@@ -23,6 +23,11 @@
 #include <QPalette>
 #include <QSettings>
 
+#ifndef Q_WS_WIN    // (if Windows, use icon from resource)
+#include "../../images/themes/default/qgis.xpm" // Linux/Mac
+#include <QIcon>
+#endif
+
 #include "qgsconfig.h"
 
 // for htonl
@@ -63,6 +68,11 @@
   QString myPrefix = myDir.absolutePath();
   setPrefixPath( myPrefix, true );
 #endif
+
+  // set application's icon
+#ifndef Q_WS_WIN	// (if Windows, use icon from resource)
+  setWindowIcon( QPixmap( qgis_xpm ) );	// Linux/Mac
+#endif
 }
 
 QgsApplication::~QgsApplication()