diff --git a/Cxbx.dsp b/Cxbx.dsp
index da2f7e273..9e9a7d514 100644
--- a/Cxbx.dsp
+++ b/Cxbx.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "Include" /I "Include/Win32/" /I "Include/Win32/Cxbxkrnl" /I "Include/Win32/Cxbx" /I "Resource" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "Include" /I "Include/Win32/" /I "Include/Win32/Cxbxkrnl" /I "Include/Win32/Cxbx" /I "Resource" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -145,6 +145,10 @@ SOURCE=.\Include\Cxbx.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\Resource\CxbxRes.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\Include\Win32\Cxbx\EmuExe.h
 # End Source File
 # Begin Source File
@@ -161,7 +165,7 @@ SOURCE=.\Include\Win32\Cxbx\Prolog.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\Resource\resource.h
+SOURCE=.\Resource\ResCxbx.h
 # End Source File
 # Begin Source File
 
diff --git a/Cxbx.vcproj b/Cxbx.vcproj
index 60f2fa8c3..68762c1aa 100644
--- a/Cxbx.vcproj
+++ b/Cxbx.vcproj
@@ -196,7 +196,7 @@ upxCxbx.bat
 				RelativePath=".\Include\Core\Xbe.h">
 			</File>
 			<File
-				RelativePath=".\Resource\resource.h">
+				RelativePath=".\Resource\CxbxRes.h">
 			</File>
 		</Filter>
 		<Filter
diff --git a/CxbxKrnl.dsp b/CxbxKrnl.dsp
index 0488f8bda..0e367d95f 100644
--- a/CxbxKrnl.dsp
+++ b/CxbxKrnl.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CXBXKRNL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "Include" /I "Include/Win32/" /I "Include/Win32/Cxbxkrnl" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CXBXKRNL_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "Include" /I "Include/Win32/" /I "Include/Win32/Cxbxkrnl" /I "Resource" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CXBXKRNL_EXPORTS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CXBXKRNL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "Include" /I "Include/Win32/" /I "Include/Win32/Cxbx" /I "Include/Win32/Cxbxkrnl" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CXBXKRNL_EXPORTS" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "Include" /I "Include/Win32/" /I "Include/Win32/Cxbx" /I "Include/Win32/Cxbxkrnl" /I "Resource" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CXBXKRNL_EXPORTS" /FR /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -168,6 +168,10 @@ SOURCE=.\Include\Win32\CxbxKrnl\OOVPA.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\Resource\ResCxbxKrnl.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\Include\Win32\CxbxKrnl\Xapi.1.0.4361.h
 # End Source File
 # Begin Source File
@@ -182,6 +186,10 @@ SOURCE=.\Include\Win32\CxbxKrnl\xntdll.h
 # Begin Group "Resource"
 
 # PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\Resource\CxbxDll.rc
+# End Source File
 # End Group
 # Begin Group "Source"
 
@@ -235,5 +243,9 @@ SOURCE=.\Source\Win32\CxbxKrnl\Xapi.1.0.4361.inl
 SOURCE=.\Source\Win32\CxbxKrnl\Xapi.1.0.4627.inl
 # End Source File
 # End Group
+# Begin Source File
+
+SOURCE=.\Resource\Cxbx.ico
+# End Source File
 # End Target
 # End Project
diff --git a/Resource/Cxbx.ico b/Resource/Cxbx.ico
index 18904e40a..6c9f9f478 100644
Binary files a/Resource/Cxbx.ico and b/Resource/Cxbx.ico differ
diff --git a/Resource/Cxbx.rc b/Resource/Cxbx.rc
index 2058fe1c1..27dd2d55e 100644
--- a/Resource/Cxbx.rc
+++ b/Resource/Cxbx.rc
@@ -1,6 +1,6 @@
 //Microsoft Developer Studio generated resource script.
 //
-#include "resource.h"
+#include "ResCxbx.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -38,7 +38,7 @@ IDI_CXBX                ICON    DISCARDABLE     "Cxbx.ico"
 
 1 TEXTINCLUDE DISCARDABLE 
 BEGIN
-    "resource.h\0"
+    "CxbxRes.h\0"
 END
 
 2 TEXTINCLUDE DISCARDABLE 
diff --git a/Resource/CxbxDll.rc b/Resource/CxbxDll.rc
new file mode 100644
index 000000000..dc72cb7b4
--- /dev/null
+++ b/Resource/CxbxDll.rc
@@ -0,0 +1,72 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "ResCxbxDll.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "ResCxbxDll.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_CXBX                ICON    DISCARDABLE     "Cxbx.ico"
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/Resource/resource.h b/Resource/ResCxbx.h
similarity index 97%
rename from Resource/resource.h
rename to Resource/ResCxbx.h
index ee2d06935..4d3ade995 100644
--- a/Resource/resource.h
+++ b/Resource/ResCxbx.h
@@ -34,7 +34,7 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        110
+#define _APS_NEXT_RESOURCE_VALUE        111
 #define _APS_NEXT_COMMAND_VALUE         40041
 #define _APS_NEXT_CONTROL_VALUE         1000
 #define _APS_NEXT_SYMED_VALUE           103
diff --git a/Resource/ResCxbxDll.h b/Resource/ResCxbxDll.h
new file mode 100644
index 000000000..58e811340
--- /dev/null
+++ b/Resource/ResCxbxDll.h
@@ -0,0 +1,16 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by CxbxDll.rc
+//
+#define IDI_CXBX                        101
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        102
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1000
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/Source/Win32/Cxbx/Wnd.cpp b/Source/Win32/Cxbx/Wnd.cpp
index ce7c1125d..fba4e0b40 100644
--- a/Source/Win32/Cxbx/Wnd.cpp
+++ b/Source/Win32/Cxbx/Wnd.cpp
@@ -34,7 +34,7 @@
 #include "Cxbx.h"
 #include "Wnd.h"
 
-#include "resource.h"
+#include "ResCxbx.h"
 
 // ******************************************************************
 // * constructor
@@ -71,6 +71,8 @@ bool Wnd::ProcessMessages()
     // initialize window
     if(!m_initialized)
     {
+        HMODULE hCxbxDll = GetModuleHandle("Cxbx.dll");
+
         m_initialized = true;
 
         WNDCLASS wnd_class;
@@ -79,7 +81,7 @@ bool Wnd::ProcessMessages()
         wnd_class.lpszClassName = m_classname;
         wnd_class.lpfnWndProc   = WndProcForward;
         wnd_class.style         = m_clsstyle;
-        wnd_class.hIcon         = LoadIcon(m_hInstance, MAKEINTRESOURCE(IDI_CXBX));
+        wnd_class.hIcon         = LoadIcon(hCxbxDll, MAKEINTRESOURCE(IDI_CXBX));
         wnd_class.hCursor       = LoadCursor(NULL, IDC_ARROW);
         wnd_class.lpszMenuName  = NULL;
         wnd_class.cbClsExtra    = 0;
diff --git a/Source/Win32/Cxbx/WndAbout.cpp b/Source/Win32/Cxbx/WndAbout.cpp
index 42ac7cf28..e02a14de9 100644
--- a/Source/Win32/Cxbx/WndAbout.cpp
+++ b/Source/Win32/Cxbx/WndAbout.cpp
@@ -34,7 +34,7 @@
 #include "Cxbx.h"
 #include "WndAbout.h"
 
-#include "resource.h"
+#include "ResCxbx.h"
 
 // ******************************************************************
 // * constructor
diff --git a/Source/Win32/Cxbx/WndMain.cpp b/Source/Win32/Cxbx/WndMain.cpp
index 050df9c3c..277267022 100644
--- a/Source/Win32/Cxbx/WndMain.cpp
+++ b/Source/Win32/Cxbx/WndMain.cpp
@@ -35,7 +35,7 @@
 #include "EmuExe.h"
 #include "WndMain.h"
 #include "WndAbout.h"
-#include "resource.h"
+#include "ResCxbx.h"
 
 #include <stdio.h>
 
diff --git a/Source/Win32/CxbxKrnl/EmuXD3D.cpp b/Source/Win32/CxbxKrnl/EmuXD3D.cpp
index 371068938..826bb0a0a 100644
--- a/Source/Win32/CxbxKrnl/EmuXD3D.cpp
+++ b/Source/Win32/CxbxKrnl/EmuXD3D.cpp
@@ -40,6 +40,8 @@ namespace win32
     #include <process.h>
 }
 
+#include "ResCxbxDll.h"
+
 using namespace win32;
 
 // ******************************************************************
@@ -67,7 +69,7 @@ VOID xboxkrnl::EmuXInitD3D()
         _beginthread(EmuXRenderWindow, 0, NULL);
 
         while(g_EmuXWindow == NULL)
-            Sleep(10);
+            Sleep(100);
     }
 
     // ******************************************************************
@@ -88,13 +90,15 @@ void EmuXRenderWindow(PVOID)
     // * register window class
     // ******************************************************************
     {
+        HMODULE hCxbxDll = GetModuleHandle("Cxbx.dll");
+
         WNDCLASSEX wc =
         {
             sizeof(WNDCLASSEX),
             CS_CLASSDC,
             EmuXMsgProc,
             0, 0, GetModuleHandle(NULL),
-            NULL, LoadCursor(NULL, IDC_ARROW), (HBRUSH)(COLOR_APPWORKSPACE + 1), NULL,
+            LoadIcon(hCxbxDll, MAKEINTRESOURCE(IDI_CXBX)), LoadCursor(NULL, IDC_ARROW), (HBRUSH)(COLOR_APPWORKSPACE + 1), NULL,
             "CxbxRender",
             NULL
         };