diff --git a/pcsx2/GS/GS.natvis b/pcsx2/GS/GS.natvis
new file mode 100644
index 0000000000..8e1f66222a
--- /dev/null
+++ b/pcsx2/GS/GS.natvis
@@ -0,0 +1,36 @@
+
+
+
+ {{ size={m_free_indexes_stack_top} }}
+
+ - m_free_indexes_stack_top
+ - m_capacity - 1
+
+
+
+
+ m_free_indexes_stack_top
+
+ - m_buffer[index].data,na
+ index = m_buffer[index].next_index
+
+
+
+
+
+
+ {{ {x}, {y} }}
+
+
+
+ {{ {F32[0]}, {F32[1]}, {F32[2]}, {F32[3]} }}
+
+
+ {{ {I32[0]}, {I32[1]}, {I32[2]}, {I32[3]} }}
+
+
+
+ {{ RT @ BP={m_TEX0.TBP0,X}-{m_end_block,X} BW={m_TEX0.TBW} PSM={m_TEX0.PSM,X} {m_unscaled_size.x}x{m_unscaled_size.y} {m_valid.z},{m_valid.w} }}
+ {{ Depth @ BP={m_TEX0.TBP0,X}-{m_end_block,X} BW={m_TEX0.TBW} PSM={m_TEX0.PSM,X} {m_unscaled_size.x}x{m_unscaled_size.y} {m_valid.z},{m_valid.w} }}
+
+
diff --git a/pcsx2/GS/Renderers/Common/GSFastList.natvis b/pcsx2/GS/Renderers/Common/GSFastList.natvis
deleted file mode 100644
index ea7646461b..0000000000
--- a/pcsx2/GS/Renderers/Common/GSFastList.natvis
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
- {{ size={m_free_indexes_stack_top} }}
-
- - m_free_indexes_stack_top
- - m_capacity - 1
-
-
-
-
- m_free_indexes_stack_top
-
- - m_buffer[index].data,na
- index = m_buffer[index].next_index
-
-
-
-
-
diff --git a/pcsx2/GS/Renderers/HW/GSTextureCache.natvis b/pcsx2/GS/Renderers/HW/GSTextureCache.natvis
deleted file mode 100644
index 01dd922e71..0000000000
--- a/pcsx2/GS/Renderers/HW/GSTextureCache.natvis
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- {{ RT @ BP={m_TEX0.TBP0,X}-{m_end_block,X} BW={m_TEX0.TBW} PSM={m_TEX0.PSM,X} {m_unscaled_size.x}x{m_unscaled_size.y} {m_valid.z},{m_valid.w} }}
- {{ Depth @ BP={m_TEX0.TBP0,X}-{m_end_block,X} BW={m_TEX0.TBW} PSM={m_TEX0.PSM,X} {m_unscaled_size.x}x{m_unscaled_size.y} {m_valid.z},{m_valid.w} }}
-
-
diff --git a/pcsx2/pcsx2core.vcxproj b/pcsx2/pcsx2core.vcxproj
index 5bb65a0a06..c39a5f564a 100644
--- a/pcsx2/pcsx2core.vcxproj
+++ b/pcsx2/pcsx2core.vcxproj
@@ -853,8 +853,7 @@
-
-
+
diff --git a/pcsx2/pcsx2core.vcxproj.filters b/pcsx2/pcsx2core.vcxproj.filters
index 8e2b59cae3..73ac9d7e3a 100644
--- a/pcsx2/pcsx2core.vcxproj.filters
+++ b/pcsx2/pcsx2core.vcxproj.filters
@@ -2283,11 +2283,8 @@
-
+
System\Ps2\GS
-
- System\Ps2\GS\Renderers\Hardware
-
\ No newline at end of file