diff --git a/pcsx2/Config.h b/pcsx2/Config.h
index 5d8d164b22..0c584e5cf6 100644
--- a/pcsx2/Config.h
+++ b/pcsx2/Config.h
@@ -176,6 +176,7 @@ public:
 	};
 
 	// ------------------------------------------------------------------------
+	// NOTE: The GUI's GameFixes panel is dependent on the order of bits in this structure.
 	struct GamefixOptions
 	{
 		BITFIELD32()
diff --git a/pcsx2/windows/AppIcon.ico b/pcsx2/windows/AppIcon.ico
new file mode 100644
index 0000000000..693c4f2e61
Binary files /dev/null and b/pcsx2/windows/AppIcon.ico differ
diff --git a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj
index d19524e556..f2a84c0048 100644
--- a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj
+++ b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj
@@ -2105,6 +2105,10 @@
 			<Filter
 				Name="Resources"
 				>
+				<File
+					RelativePath="..\..\gui\Resources\AppIcon.ico"
+					>
+				</File>
 				<File
 					RelativePath="..\..\gui\Resources\AppIcon.png"
 					>
@@ -2415,10 +2419,6 @@
 					RelativePath=".\..\resource.h"
 					>
 				</File>
-				<File
-					RelativePath=".\..\testing.ico"
-					>
-				</File>
 				<File
 					RelativePath=".\..\wxResources.rc"
 					>
diff --git a/pcsx2/windows/testing.ico b/pcsx2/windows/testing.ico
deleted file mode 100644
index 7276362e92..0000000000
Binary files a/pcsx2/windows/testing.ico and /dev/null differ
diff --git a/pcsx2/windows/wxResources.rc b/pcsx2/windows/wxResources.rc
index 37a7d25d0d..daa61c1579 100644
--- a/pcsx2/windows/wxResources.rc
+++ b/pcsx2/windows/wxResources.rc
@@ -54,7 +54,7 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_ICON2               ICON                    "testing.ico"
+IDI_ICON2               ICON                    "AppIcon.ico"
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////