diff --git a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
index 4c0c273c9..f2b4963d2 100644
--- a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
+++ b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
@@ -1840,11 +1840,7 @@
 			Name="Resources"
 			>
 			<File
-				RelativePath="..\..\src\libresrc\icons.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\libresrc\icons.h"
+				RelativePath="..\..\src\libresrc\libresrc.cpp"
 				>
 			</File>
 			<File
@@ -1855,10 +1851,6 @@
 				RelativePath="..\..\src\res.rc"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\libresrc\resrc.cpp"
-				>
-			</File>
 		</Filter>
 		<File
 			RelativePath="..\..\src\changelog.txt"
diff --git a/aegisub/src/audio_box.cpp b/aegisub/src/audio_box.cpp
index 5a8f595ad..5d27175c5 100644
--- a/aegisub/src/audio_box.cpp
+++ b/aegisub/src/audio_box.cpp
@@ -52,8 +52,8 @@
 #include "hotkeys.h"
 #include "tooltip_manager.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
-#include "libresrc/icons.h"
+
+
 
 //#ifdef __WXMAC__
 //#include "bevelButton.h"
diff --git a/aegisub/src/dialog_about.cpp b/aegisub/src/dialog_about.cpp
index b602b6ac3..05275fdea 100644
--- a/aegisub/src/dialog_about.cpp
+++ b/aegisub/src/dialog_about.cpp
@@ -46,7 +46,7 @@
 #include "version.h"
 #include "options.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 
 ///////////////
diff --git a/aegisub/src/dialog_attachments.cpp b/aegisub/src/dialog_attachments.cpp
index eb77b08e5..e9f94abb9 100644
--- a/aegisub/src/dialog_attachments.cpp
+++ b/aegisub/src/dialog_attachments.cpp
@@ -51,7 +51,7 @@
 #include "options.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 
 ///////////////
diff --git a/aegisub/src/dialog_automation.cpp b/aegisub/src/dialog_automation.cpp
index 2cf39f311..d43887046 100644
--- a/aegisub/src/dialog_automation.cpp
+++ b/aegisub/src/dialog_automation.cpp
@@ -49,7 +49,7 @@
 #include <wx/log.h>
 #include <wx/msgdlg.h>
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 
 DialogAutomation::DialogAutomation(wxWindow *parent, Automation4::ScriptManager *_local_manager)
diff --git a/aegisub/src/dialog_colorpicker.cpp b/aegisub/src/dialog_colorpicker.cpp
index effebca97..d932ba026 100644
--- a/aegisub/src/dialog_colorpicker.cpp
+++ b/aegisub/src/dialog_colorpicker.cpp
@@ -54,7 +54,7 @@
 #include "help_button.h"
 #include "utils.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 #include <stdio.h>
 
diff --git a/aegisub/src/dialog_fonts_collector.cpp b/aegisub/src/dialog_fonts_collector.cpp
index 07d0b666b..73de493c9 100644
--- a/aegisub/src/dialog_fonts_collector.cpp
+++ b/aegisub/src/dialog_fonts_collector.cpp
@@ -58,7 +58,7 @@
 #include "help_button.h"
 #include "scintilla_text_ctrl.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 
 ///////
diff --git a/aegisub/src/dialog_jumpto.cpp b/aegisub/src/dialog_jumpto.cpp
index d51eca4fa..472fc65aa 100644
--- a/aegisub/src/dialog_jumpto.cpp
+++ b/aegisub/src/dialog_jumpto.cpp
@@ -48,7 +48,7 @@
 #include "video_context.h"
 #include "utils.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 
 ///////
diff --git a/aegisub/src/dialog_kanji_timer.cpp b/aegisub/src/dialog_kanji_timer.cpp
index c854d1690..d7f174f91 100644
--- a/aegisub/src/dialog_kanji_timer.cpp
+++ b/aegisub/src/dialog_kanji_timer.cpp
@@ -53,7 +53,7 @@
 #include "ass_karaoke.h"
 #include <wx/string.h>
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 
 
diff --git a/aegisub/src/dialog_options.cpp b/aegisub/src/dialog_options.cpp
index d9ac9d398..989367999 100644
--- a/aegisub/src/dialog_options.cpp
+++ b/aegisub/src/dialog_options.cpp
@@ -67,7 +67,7 @@
 #include "utils.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 
 ///////
diff --git a/aegisub/src/dialog_properties.cpp b/aegisub/src/dialog_properties.cpp
index f486a82af..a398e2705 100644
--- a/aegisub/src/dialog_properties.cpp
+++ b/aegisub/src/dialog_properties.cpp
@@ -51,7 +51,7 @@
 #include "utils.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 
 ///////////////
diff --git a/aegisub/src/dialog_resample.cpp b/aegisub/src/dialog_resample.cpp
index 83e09484a..6d9b13f02 100644
--- a/aegisub/src/dialog_resample.cpp
+++ b/aegisub/src/dialog_resample.cpp
@@ -50,7 +50,7 @@
 #include "subs_edit_box.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 
 ///////////////
diff --git a/aegisub/src/dialog_shift_times.cpp b/aegisub/src/dialog_shift_times.cpp
index 7bcdc358d..85f0a482a 100644
--- a/aegisub/src/dialog_shift_times.cpp
+++ b/aegisub/src/dialog_shift_times.cpp
@@ -57,7 +57,7 @@
 #include "help_button.h"
 #include "charset_conv.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 
 ///////////////
diff --git a/aegisub/src/dialog_spellchecker.cpp b/aegisub/src/dialog_spellchecker.cpp
index adf3d1a48..48a0ddc7b 100644
--- a/aegisub/src/dialog_spellchecker.cpp
+++ b/aegisub/src/dialog_spellchecker.cpp
@@ -49,7 +49,7 @@
 #include "options.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 
 ///////
diff --git a/aegisub/src/dialog_splash.cpp b/aegisub/src/dialog_splash.cpp
index c8a43d2f5..953df7b5c 100644
--- a/aegisub/src/dialog_splash.cpp
+++ b/aegisub/src/dialog_splash.cpp
@@ -45,7 +45,7 @@
 #include "options.h"
 #include "dialog_tip.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 
 ///////////////
diff --git a/aegisub/src/dialog_style_editor.cpp b/aegisub/src/dialog_style_editor.cpp
index 5cb124d15..887964f08 100644
--- a/aegisub/src/dialog_style_editor.cpp
+++ b/aegisub/src/dialog_style_editor.cpp
@@ -57,7 +57,7 @@
 #include "ass_style_storage.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 
 ///////
diff --git a/aegisub/src/dialog_style_manager.cpp b/aegisub/src/dialog_style_manager.cpp
index c968ba677..50204b85d 100644
--- a/aegisub/src/dialog_style_manager.cpp
+++ b/aegisub/src/dialog_style_manager.cpp
@@ -55,7 +55,7 @@
 #include "utils.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 
 ///////////////
diff --git a/aegisub/src/dialog_styling_assistant.cpp b/aegisub/src/dialog_styling_assistant.cpp
index 472f26062..c160bc1ff 100644
--- a/aegisub/src/dialog_styling_assistant.cpp
+++ b/aegisub/src/dialog_styling_assistant.cpp
@@ -55,7 +55,7 @@
 #include "help_button.h"
 #include "subs_edit_box.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 
 ///////////////
diff --git a/aegisub/src/dialog_timing_processor.cpp b/aegisub/src/dialog_timing_processor.cpp
index 3866d4c7a..591f61b13 100644
--- a/aegisub/src/dialog_timing_processor.cpp
+++ b/aegisub/src/dialog_timing_processor.cpp
@@ -50,7 +50,7 @@
 #include "utils.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 
 ///////////////
diff --git a/aegisub/src/dialog_translation.cpp b/aegisub/src/dialog_translation.cpp
index 033dbe9f5..f832623db 100644
--- a/aegisub/src/dialog_translation.cpp
+++ b/aegisub/src/dialog_translation.cpp
@@ -54,7 +54,7 @@
 #include "utils.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 
 ///////////////
diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp
index 276686c8c..ea8407862 100644
--- a/aegisub/src/frame_main.cpp
+++ b/aegisub/src/frame_main.cpp
@@ -82,7 +82,7 @@
 #endif
 #include "charset_conv.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 
 
diff --git a/aegisub/src/frame_main_events.cpp b/aegisub/src/frame_main_events.cpp
index cf7086f7d..2e2fcf35c 100644
--- a/aegisub/src/frame_main_events.cpp
+++ b/aegisub/src/frame_main_events.cpp
@@ -90,7 +90,7 @@
 #include "keyframe.h"
 #include "charset_conv.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 
 ////////////////////
diff --git a/aegisub/src/subs_edit_box.cpp b/aegisub/src/subs_edit_box.cpp
index a22e5a750..fb85381ba 100644
--- a/aegisub/src/subs_edit_box.cpp
+++ b/aegisub/src/subs_edit_box.cpp
@@ -63,7 +63,7 @@
 #include "tooltip_manager.h"
 #include "osx_bevelButton.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 
 ///////////////
diff --git a/aegisub/src/video_box.cpp b/aegisub/src/video_box.cpp
index 088a9759f..968edc9e7 100644
--- a/aegisub/src/video_box.cpp
+++ b/aegisub/src/video_box.cpp
@@ -62,7 +62,7 @@
 #include "visual_tool.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 
 ///////////////
diff --git a/aegisub/src/visual_tool_drag.cpp b/aegisub/src/visual_tool_drag.cpp
index 6f26eb3d6..152a2dd73 100644
--- a/aegisub/src/visual_tool_drag.cpp
+++ b/aegisub/src/visual_tool_drag.cpp
@@ -46,7 +46,7 @@
 #include "utils.h"
 #include "vfr.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 
 ///////
diff --git a/aegisub/src/visual_tool_vector_clip.cpp b/aegisub/src/visual_tool_vector_clip.cpp
index 78887f65c..c40b4f345 100644
--- a/aegisub/src/visual_tool_vector_clip.cpp
+++ b/aegisub/src/visual_tool_vector_clip.cpp
@@ -41,7 +41,7 @@
 #include "visual_tool_vector_clip.h"
 #include "ass_dialogue.h"
 #include "libresrc/libresrc.h"
-#include "libresrc/icons.h"
+
 
 
 ///////
diff --git a/aegisub/tools/common-respack.vcproj b/aegisub/tools/common-respack.vcproj
index 9dabe211b..6a379c8e1 100644
--- a/aegisub/tools/common-respack.vcproj
+++ b/aegisub/tools/common-respack.vcproj
@@ -88,7 +88,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="$(TargetPath) $(SolutionDir)\..\..\src\libresrc\icons.cpp $(SolutionDir)\..\..\src\bitmaps\16 $(SolutionDir)\..\..\src\bitmaps\24 $(SolutionDir)\..\..\src\bitmaps\misc"
+				CommandLine="$(TargetPath) $(SolutionDir)\..\..\src\libresrc\libresrc.cpp $(SolutionDir)\..\..\src\bitmaps\16 $(SolutionDir)\..\..\src\bitmaps\24 $(SolutionDir)\..\..\src\bitmaps\misc"
 			/>
 		</Configuration>
 		<Configuration
@@ -163,7 +163,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="$(TargetPath) $(SolutionDir)\..\..\src\libresrc\icons.cpp $(SolutionDir)\..\..\src\bitmaps\16 $(SolutionDir)\..\..\src\bitmaps\24 $(SolutionDir)\..\..\src\bitmaps\misc"
+				CommandLine="$(TargetPath) $(SolutionDir)\..\..\src\libresrc\libresrc.cpp $(SolutionDir)\..\..\src\bitmaps\16 $(SolutionDir)\..\..\src\bitmaps\24 $(SolutionDir)\..\..\src\bitmaps\misc"
 			/>
 		</Configuration>
 		<Configuration
@@ -236,7 +236,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="$(TargetPath) $(SolutionDir)\..\..\src\libresrc\icons.cpp $(SolutionDir)\..\..\src\bitmaps\16 $(SolutionDir)\..\..\src\bitmaps\24 $(SolutionDir)\..\..\src\bitmaps\misc"
+				CommandLine="$(TargetPath) $(SolutionDir)\..\..\src\libresrc\libresrc.cpp $(SolutionDir)\..\..\src\bitmaps\16 $(SolutionDir)\..\..\src\bitmaps\24 $(SolutionDir)\..\..\src\bitmaps\misc"
 			/>
 		</Configuration>
 		<Configuration
@@ -312,7 +312,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="$(TargetPath) $(SolutionDir)\..\..\src\libresrc\icons.cpp $(SolutionDir)\..\..\src\bitmaps\16 $(SolutionDir)\..\..\src\bitmaps\24 $(SolutionDir)\..\..\src\bitmaps\misc"
+				CommandLine="$(TargetPath) $(SolutionDir)\..\..\src\libresrc\libresrc.cpp $(SolutionDir)\..\..\src\bitmaps\16 $(SolutionDir)\..\..\src\bitmaps\24 $(SolutionDir)\..\..\src\bitmaps\misc"
 			/>
 		</Configuration>
 	</Configurations>