diff --git a/DoConfig/CMakeLists.txt b/DoConfig/CMakeLists.txt
index 2491d399..6df9ec78 100644
--- a/DoConfig/CMakeLists.txt
+++ b/DoConfig/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.12)
 
+option(PKG_CONFIG_STATIC_LIBS "On platforms with pkg-config, static-link the dependencies (good for Windows builds, so you don't need to bundle DLL files)" OFF)
+option(MSVC_LINK_STATIC_RUNTIME "Link the static MSVC runtime library (Visual Studio only)" OFF)
+
 option(FORCE_LOCAL_LIBS "Compile the built-in version of GLFW3 instead of using the system-provided one" OFF)
 
 project(DoConfig LANGUAGES C CXX)
@@ -40,12 +43,27 @@ target_link_libraries(DoConfig PRIVATE ${CMAKE_DL_LIBS})
 target_include_directories(DoConfig PRIVATE "../external/glad/include")
 target_compile_definitions(DoConfig PRIVATE IMGUI_IMPL_OPENGL_LOADER_GLAD)
 
+if(PKG_CONFIG_STATIC_LIBS)
+	target_link_options(DoConfig PRIVATE "-static")
+endif()
+
 if(MSVC)
 	# Disable warnings that normally fire up on MSVC when using "unsafe" functions instead of using MSVC's "safe" _s functions
 	target_compile_definitions(DoConfig PRIVATE _CRT_SECURE_NO_WARNINGS)
 
 	# Use `main` instead of `WinMain`
 	set_target_properties(DoConfig PROPERTIES LINK_FLAGS "/ENTRY:mainCRTStartup")
+
+	# This is messy as hell, and has been replaced by CMAKE_MSVC_RUNTIME_LIBRARY,
+	# but that's a very recent CMake addition, so we're still doing it this way for now
+	if(MSVC_LINK_STATIC_RUNTIME)
+		# Statically-link the CRT (vcpkg static libs do this)
+		foreach(flag_var CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+			if(${flag_var} MATCHES "/MD")
+				string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
+			endif()
+		endforeach()
+	endif()
 endif()
 
 
diff --git a/DoConfig/DoConfig.cpp b/DoConfig/DoConfig.cpp
index b7926b21..2c4cd6c4 100644
--- a/DoConfig/DoConfig.cpp
+++ b/DoConfig/DoConfig.cpp
@@ -75,6 +75,8 @@ int main(int argc, char *argv[])
 
 					IMGUI_CHECKVERSION();
 					ImGui::CreateContext();
+					ImGuiIO &io = ImGui::GetIO();
+					io.IniFilename = NULL;	// Disable `imgui.ini`
 
 					ImGui_ImplGlfw_InitForOpenGL(window, true);
 					ImGui_ImplOpenGL3_Init(glsl_version);
diff --git a/DoConfig/icon.rc b/DoConfig/icon.rc
index 8431cd4b..657ee6c7 100644
--- a/DoConfig/icon.rc
+++ b/DoConfig/icon.rc
@@ -1 +1 @@
-102 ICON "1.ico"
+GLFW_ICON ICON "1.ico"
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);