diff --git a/radiant/main.cpp b/radiant/main.cpp
index a74d7ce9..b00784ae 100644
--- a/radiant/main.cpp
+++ b/radiant/main.cpp
@@ -430,6 +430,8 @@ int main( int argc, char* argv[] ){
 
 	Sys_LogFile( true );
 
+	QApplication::setWindowIcon( new_local_icon( "radiant.ico" ) ); // before any windows, after paths_init()
+
 	show_splash();
 
 	create_global_pid();
@@ -450,7 +452,6 @@ int main( int argc, char* argv[] ){
 
 //	user_shortcuts_init();
 
-	g_pParentWnd = 0;
 	g_pParentWnd = new MainFrame();
 
 	hide_splash();
@@ -468,7 +469,7 @@ int main( int argc, char* argv[] ){
 
 	remove_local_pid();
 
-	qapplication.exec();
+	QApplication::exec();
 
 	Map_Free();
 
diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 3ba75871..e65f60d5 100644
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -1665,8 +1665,6 @@ void MainFrame::Create(){
 
 	GlobalWindowObservers_connectTopLevel( window );
 
-	QApplication::setWindowIcon( new_local_icon( "radiant.ico" ) );
-
 	/* GlobalCommands_insert plugins commands */
 	GetPlugInMgr().Init( window );
 	/* then load shortcuts cfg */