diff --git a/assets/resources/CSE2.rc b/assets/resources/CSE2.rc
index 48848b9a..02239a9d 100644
--- a/assets/resources/CSE2.rc
+++ b/assets/resources/CSE2.rc
@@ -66,8 +66,7 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-101                       ICON                    "ICON/0.ico"
-102                       ICON                    "ICON/ICON_MINI.ico"
+GLFW_ICON                 ICON                    "ICON/GLFW_ICON.ico"
 #endif    // Japanese resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/assets/resources/ICON/0.ico b/assets/resources/ICON/0.ico
deleted file mode 100644
index 33fc2aa3..00000000
Binary files a/assets/resources/ICON/0.ico and /dev/null differ
diff --git a/assets/resources/ICON/GLFW_ICON.ico b/assets/resources/ICON/GLFW_ICON.ico
new file mode 100644
index 00000000..4139b41e
Binary files /dev/null and b/assets/resources/ICON/GLFW_ICON.ico differ
diff --git a/assets/resources/ICON/ICON_MINI.ico b/assets/resources/ICON/ICON_MINI.ico
deleted file mode 100644
index b540fd2f..00000000
Binary files a/assets/resources/ICON/ICON_MINI.ico and /dev/null differ
diff --git a/src/Backends/Platform/SDL2.cpp b/src/Backends/Platform/SDL2.cpp
index b24deb70..1c221881 100644
--- a/src/Backends/Platform/SDL2.cpp
+++ b/src/Backends/Platform/SDL2.cpp
@@ -27,11 +27,6 @@ void PlatformBackend_Init(void)
 {
 	SDL_Init(SDL_INIT_EVENTS);
 
-#ifdef _WIN32	// On Windows, we use native icons instead (so we can give the taskbar and window separate icons, like the original EXE does)
-	SDL_SetHint(SDL_HINT_WINDOWS_INTRESOURCE_ICON, "101");
-	SDL_SetHint(SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL, "102");
-#endif
-
 	SDL_InitSubSystem(SDL_INIT_VIDEO);
 
 	puts("Available SDL2 video drivers:");
diff --git a/src/Main.cpp b/src/Main.cpp
index 8f577866..50b7dc06 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -273,7 +273,6 @@ int main(int argc, char *argv[])
 #endif
 
 	// Set up window icon
-	// TODO - GLFW_ICON
 #ifndef _WIN32	// On Windows, we use native icons instead (so we can give the taskbar and window separate icons, like the original EXE does)
 	size_t window_icon_resource_size;
 	const unsigned char *window_icon_resource_data = FindResource("ICON_MINI", "ICON", &window_icon_resource_size);