diff --git a/aegisub/dialog_attachments.cpp b/aegisub/dialog_attachments.cpp
index 92e32002b..bb5b2b988 100644
--- a/aegisub/dialog_attachments.cpp
+++ b/aegisub/dialog_attachments.cpp
@@ -52,6 +52,9 @@
 DialogAttachments::DialogAttachments(wxWindow *parent)
 : wxDialog(parent,-1,_("Attachment List"),wxDefaultPosition,wxDefaultSize,wxDEFAULT_DIALOG_STYLE)
 {
+	// Set icon
+	SetIcon(BitmapToIcon(wxBITMAP(attach_button)));
+
 	// List view
 	listView = new wxListView(this,ATTACHMENT_LIST,wxDefaultPosition,wxSize(500,200));
 	UpdateList();
diff --git a/aegisub/dialog_automation.cpp b/aegisub/dialog_automation.cpp
index 1faa98bfc..1e272ca03 100644
--- a/aegisub/dialog_automation.cpp
+++ b/aegisub/dialog_automation.cpp
@@ -37,6 +37,7 @@
 #include "dialog_automation.h"
 #include "auto4_base.h"
 #include "options.h"
+#include "utils.h"
 #include <wx/filename.h>
 #include <wx/filedlg.h>
 
@@ -44,6 +45,9 @@
 DialogAutomation::DialogAutomation(wxWindow *parent, Automation4::ScriptManager *_local_manager)
 : wxDialog(parent, -1, _("Automation Manager"), wxDefaultPosition, wxDefaultSize)
 {
+	// Set icon
+	SetIcon(BitmapToIcon(wxBITMAP(automation_toolbutton)));
+
 	local_manager = _local_manager;
 	global_manager = wxGetApp().global_scripts;
 
diff --git a/aegisub/dialog_fonts_collector.cpp b/aegisub/dialog_fonts_collector.cpp
index 7d511faf5..2e7bfc669 100644
--- a/aegisub/dialog_fonts_collector.cpp
+++ b/aegisub/dialog_fonts_collector.cpp
@@ -68,6 +68,9 @@ enum IDs {
 DialogFontsCollector::DialogFontsCollector(wxWindow *parent)
 : wxDialog(parent,-1,_("Fonts Collector"),wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
 {
+	// Set icon
+	SetIcon(BitmapToIcon(wxBITMAP(font_collector_button)));
+
 	// Parent
 	main = (FrameMain*) parent;
 
diff --git a/aegisub/dialog_jumpto.cpp b/aegisub/dialog_jumpto.cpp
index e77facb00..bf1524f7e 100644
--- a/aegisub/dialog_jumpto.cpp
+++ b/aegisub/dialog_jumpto.cpp
@@ -39,6 +39,7 @@
 #include "dialog_jumpto.h"
 #include "vfr.h"
 #include "video_context.h"
+#include "utils.h"
 
 
 ///////
@@ -54,6 +55,9 @@ enum {
 DialogJumpTo::DialogJumpTo (wxWindow *parent)
 : wxDialog(parent, -1, _("Jump to"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE, _T("JumpTo"))
 {
+	// Set icon
+	SetIcon(BitmapToIcon(wxBITMAP(jumpto_button)));
+
 	// Set initial values
 	ready = false;
 	jumpframe = VideoContext::Get()->GetFrameN();
diff --git a/aegisub/dialog_kanji_timer.cpp b/aegisub/dialog_kanji_timer.cpp
index 247738949..d7eb8e373 100644
--- a/aegisub/dialog_kanji_timer.cpp
+++ b/aegisub/dialog_kanji_timer.cpp
@@ -52,6 +52,7 @@
 #include "subs_grid.h"
 #include "validators.h"
 #include "video_context.h"
+#include "utils.h"
 
 
 ///////////////
@@ -59,6 +60,9 @@
 DialogKanjiTimer::DialogKanjiTimer(wxWindow *parent, SubtitlesGrid *_grid)
 : wxDialog (parent,-1,_("Kanji timing"),wxDefaultPosition)
 {
+	// Set icon
+	SetIcon(BitmapToIcon(wxBITMAP(kanji_timer_button)));
+
 	// Variables
 	AssFile *subs = AssFile::top;
 	grid = _grid;
diff --git a/aegisub/dialog_options.cpp b/aegisub/dialog_options.cpp
index 67b46b790..4a1346a57 100644
--- a/aegisub/dialog_options.cpp
+++ b/aegisub/dialog_options.cpp
@@ -62,6 +62,7 @@
 #include "video_context.h"
 #include "browse_button.h"
 #include "tooltip_manager.h"
+#include "utils.h"
 
 
 ///////
@@ -77,6 +78,9 @@ enum {
 DialogOptions::DialogOptions(wxWindow *parent)
 : wxDialog(parent, -1, _T("Options"), wxDefaultPosition, wxDefaultSize)
 {
+	// Set icon
+	SetIcon(BitmapToIcon(wxBITMAP(options_button)));
+
 	// Create book
 	book = new wxTreebook(this,-1,wxDefaultPosition,wxSize(400,300));
 	needsRestart = false;
diff --git a/aegisub/dialog_properties.cpp b/aegisub/dialog_properties.cpp
index a9a01eb09..d53608949 100644
--- a/aegisub/dialog_properties.cpp
+++ b/aegisub/dialog_properties.cpp
@@ -42,6 +42,7 @@
 #include "video_display.h"
 #include "validators.h"
 #include "video_provider.h"
+#include "utils.h"
 
 
 ///////////////
@@ -49,6 +50,9 @@
 DialogProperties::DialogProperties (wxWindow *parent)
 : wxDialog(parent, -1, _("Script Properties"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
 {
+	// Set icon
+	SetIcon(BitmapToIcon(wxBITMAP(properties_toolbutton)));
+
 	// Setup
 	AssFile *subs = AssFile::top;
 
diff --git a/aegisub/dialog_resample.cpp b/aegisub/dialog_resample.cpp
index a6ac3f2cb..36be5126b 100644
--- a/aegisub/dialog_resample.cpp
+++ b/aegisub/dialog_resample.cpp
@@ -44,6 +44,7 @@
 #include "subs_grid.h"
 #include "validators.h"
 #include "video_context.h"
+#include "utils.h"
 
 
 ///////////////
@@ -51,6 +52,9 @@
 DialogResample::DialogResample(wxWindow *parent, SubtitlesGrid *_grid)
 : wxDialog (parent,-1,_("Resample resolution"),wxDefaultPosition)
 {
+	// Set icon
+	SetIcon(BitmapToIcon(wxBITMAP(resample_toolbutton)));
+
 	// Variables
 	AssFile *subs = AssFile::top;
 	grid = _grid;
diff --git a/aegisub/dialog_shift_times.cpp b/aegisub/dialog_shift_times.cpp
index a5c5b6a82..4cd28d6d5 100644
--- a/aegisub/dialog_shift_times.cpp
+++ b/aegisub/dialog_shift_times.cpp
@@ -51,6 +51,7 @@
 #include "ass_time.h"
 #include "ass_dialogue.h"
 #include "subs_edit_box.h"
+#include "utils.h"
 
 
 ///////////////
@@ -58,6 +59,9 @@
 DialogShiftTimes::DialogShiftTimes (wxWindow *parent,SubtitlesGrid *_grid)
 : wxDialog(parent, -1, _("Shift Times"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE, _T("JumpTo"))
 {
+	// Set icon
+	SetIcon(BitmapToIcon(wxBITMAP(shift_times_toolbutton)));
+
 	// Set initial values
 	ready = true;
 	grid = _grid;
diff --git a/aegisub/dialog_spellchecker.cpp b/aegisub/dialog_spellchecker.cpp
index adb1345ea..54c116abe 100644
--- a/aegisub/dialog_spellchecker.cpp
+++ b/aegisub/dialog_spellchecker.cpp
@@ -65,6 +65,9 @@ enum {
 DialogSpellChecker::DialogSpellChecker(wxFrame *parent)
 : wxDialog(parent, -1, _("Spell Checker"), wxDefaultPosition, wxDefaultSize)
 {
+	// Set icon
+	SetIcon(BitmapToIcon(wxBITMAP(spellcheck_toolbutton)));
+
 	// Get spell checker
 	spellchecker = SpellCheckerFactory::GetSpellChecker();
 	if (!spellchecker) {
diff --git a/aegisub/dialog_style_editor.cpp b/aegisub/dialog_style_editor.cpp
index c4f90e45d..abe1bbc1b 100644
--- a/aegisub/dialog_style_editor.cpp
+++ b/aegisub/dialog_style_editor.cpp
@@ -94,6 +94,9 @@ enum {
 DialogStyleEditor::DialogStyleEditor (wxWindow *parent, AssStyle *_style, SubtitlesGrid *_grid)
 : wxDialog (parent,-1,_("Style Editor"),wxDefaultPosition,wxDefaultSize,wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER,_T("DialogStyleEditor"))
 {
+	// Set icon
+	SetIcon(BitmapToIcon(wxBITMAP(style_toolbutton)));
+
 	wxStopWatch performance_timer;
 	// Set styles
 	grid = _grid;
diff --git a/aegisub/dialog_style_manager.cpp b/aegisub/dialog_style_manager.cpp
index 73b597402..9b92a22de 100644
--- a/aegisub/dialog_style_manager.cpp
+++ b/aegisub/dialog_style_manager.cpp
@@ -47,6 +47,7 @@
 #include "standard_paths.h"
 #include "options.h"
 #include "subs_grid.h"
+#include "utils.h"
 
 
 ///////////////
@@ -55,9 +56,7 @@ DialogStyleManager::DialogStyleManager (wxWindow *parent,SubtitlesGrid *_grid)
 : wxDialog (parent,-1,_("Styles Manager"),wxDefaultPosition,wxDefaultSize,wxDEFAULT_DIALOG_STYLE,_T("DialogStylesManager"))
 {
 	// Set icon
-	wxIcon ico;
-	ico.CopyFromBitmap(wxBITMAP(style_toolbutton));
-	SetIcon(ico);
+	SetIcon(BitmapToIcon(wxBITMAP(style_toolbutton)));
 
 	// Vars
 	grid = _grid;
diff --git a/aegisub/dialog_styling_assistant.cpp b/aegisub/dialog_styling_assistant.cpp
index ae083942d..5bae1cc67 100644
--- a/aegisub/dialog_styling_assistant.cpp
+++ b/aegisub/dialog_styling_assistant.cpp
@@ -48,6 +48,7 @@
 #include "audio_display.h"
 #include "audio_box.h"
 #include "hotkeys.h"
+#include "utils.h"
 
 
 ///////////////
@@ -55,6 +56,9 @@
 DialogStyling::DialogStyling (wxWindow *parent,SubtitlesGrid *_grid) :
 wxDialog (parent, -1, _("Styling assistant"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxRESIZE_BORDER)
 {
+	// Set icon
+	SetIcon(BitmapToIcon(wxBITMAP(styling_toolbutton)));
+
 	// Variables
 	grid = _grid;
 	audio = VideoContext::Get()->audio->box->audioDisplay;
diff --git a/aegisub/dialog_timing_processor.cpp b/aegisub/dialog_timing_processor.cpp
index 5377f61d8..709fb4d59 100644
--- a/aegisub/dialog_timing_processor.cpp
+++ b/aegisub/dialog_timing_processor.cpp
@@ -53,6 +53,9 @@
 DialogTimingProcessor::DialogTimingProcessor(wxWindow *parent,SubtitlesGrid *_grid)
 : wxDialog(parent,-1,_("Timing Post-Processor"),wxDefaultPosition,wxSize(400,250),wxDEFAULT_DIALOG_STYLE)
 {
+	// Set icon
+	SetIcon(BitmapToIcon(wxBITMAP(timing_processor_toolbutton)));
+
 	// Set variables
 	grid = _grid;
 	leadInTime = Options.AsText(_T("Audio lead in"));
diff --git a/aegisub/dialog_translation.cpp b/aegisub/dialog_translation.cpp
index a878befbb..d44ae498f 100644
--- a/aegisub/dialog_translation.cpp
+++ b/aegisub/dialog_translation.cpp
@@ -48,6 +48,7 @@
 #include "audio_display.h"
 #include "frame_main.h"
 #include "hotkeys.h"
+#include "utils.h"
 
 
 ///////////////
@@ -55,6 +56,9 @@
 DialogTranslation::DialogTranslation (wxWindow *parent,AssFile *_subs,SubtitlesGrid *_grid,int startrow,bool preview)
 : wxDialog(parent, -1, _("Translation Assistant"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxMINIMIZE_BOX, _T("TranslationAssistant"))
 {
+	// Set icon
+	SetIcon(BitmapToIcon(wxBITMAP(translation_toolbutton)));
+
 	// Set variables
 	enablePreview = preview;
 	main = parent;
diff --git a/aegisub/utils.cpp b/aegisub/utils.cpp
index de9a6e633..255a20d89 100644
--- a/aegisub/utils.cpp
+++ b/aegisub/utils.cpp
@@ -347,3 +347,28 @@ int StringToFix(const wxString &str,size_t decimalPlaces,size_t start,size_t end
 	for (size_t i=0;i<decimalPlaces;i++) major *= 10;
 	return (major + minor)*sign;
 }
+
+
+////////////////////////////////
+// Convert a wxBitmap to wxIcon
+// This is needed because wxIcon has to be 16x16 to work properly on win32
+wxIcon BitmapToIcon(wxBitmap iconBmp) {
+	// Create the icon and background bmp
+	wxIcon ico;
+	wxBitmap bmp(16,16);
+
+	// Blit bitmap into 16x16 one (don't remove brackets)
+	{
+		wxMemoryDC dc;
+		dc.SelectObject(bmp);
+		dc.SetBackground(wxColour(192,192,192));
+		dc.Clear();
+		dc.DrawBitmap(iconBmp,0,0,false);
+	}
+
+	// Create mask and convert to icon
+	wxMask *mask = new wxMask(bmp,wxColour(192,192,192));
+	bmp.SetMask(mask);
+	ico.CopyFromBitmap(bmp);
+	return ico;
+}
diff --git a/aegisub/utils.h b/aegisub/utils.h
index 626fa7052..4b464cf2b 100644
--- a/aegisub/utils.h
+++ b/aegisub/utils.h
@@ -68,6 +68,7 @@ int SmallestPowerOf2(int x);
 void GetWordBoundaries(const wxString text,IntPairVector &results,int start=0,int end=-1);
 int StringToInt(const wxString &str,size_t start=0,size_t end=-1);
 int StringToFix(const wxString &str,size_t decimalPlaces,size_t start=0,size_t end=-1);
+wxIcon BitmapToIcon(wxBitmap bmp);
 
 
 //////////