diff --git a/src/osd/windows/debugwin.c b/src/osd/windows/debugwin.c
index ad0143e7329..8903b52cfe3 100644
--- a/src/osd/windows/debugwin.c
+++ b/src/osd/windows/debugwin.c
@@ -407,7 +407,7 @@ void debugwin_init_windows(running_machine &machine)
 		wc.hInstance		= GetModuleHandle(NULL);
 		wc.lpfnWndProc		= debugwin_window_proc;
 		wc.hCursor			= LoadCursor(NULL, IDC_ARROW);
-		wc.hIcon			= LoadIcon(NULL, IDI_APPLICATION);
+		wc.hIcon			= LoadIcon(wc.hInstance, MAKEINTRESOURCE(2));
 		wc.lpszMenuName		= NULL;
 		wc.hbrBackground	= NULL;
 		wc.style			= 0;
diff --git a/src/osd/windows/mame.rc b/src/osd/windows/mame.rc
index 99017f0660a..0b0e6b66de3 100644
--- a/src/osd/windows/mame.rc
+++ b/src/osd/windows/mame.rc
@@ -44,4 +44,4 @@
 
 1                       24      MOVEABLE PURE   "mame.man"
 
-IDI_ICON_MAME           ICON    DISCARDABLE     "mame.ico"
+2                       ICON    DISCARDABLE     "mame.ico"
diff --git a/src/osd/windows/window.c b/src/osd/windows/window.c
index 78870ba9dff..52cd872ffe3 100644
--- a/src/osd/windows/window.c
+++ b/src/osd/windows/window.c
@@ -877,7 +877,7 @@ static void create_window_class(void)
 		wc.hInstance		= GetModuleHandle(NULL);
 		wc.lpfnWndProc		= winwindow_video_window_proc_ui;
 		wc.hCursor			= LoadCursor(NULL, IDC_ARROW);
-		wc.hIcon			= LoadIcon(NULL, IDI_APPLICATION);
+		wc.hIcon			= LoadIcon(wc.hInstance, MAKEINTRESOURCE(2));
 
 		// register the class; fail if we can't
 		if (!RegisterClass(&wc))