diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp
index a389a981ca..7635becd41 100644
--- a/Source/Core/Core/Src/CoreParameter.cpp
+++ b/Source/Core/Core/Src/CoreParameter.cpp
@@ -44,7 +44,7 @@ SCoreStartupParameter::SCoreStartupParameter()
   bSkipIdle(true), bNTSC(false),
   bHLE_BS2(true), bUseFastMem(false),
   bLockThreads(false),
-  bEnableCheats(false), bEnableIsoCache(false),
+  bEnableCheats(false),
   bRunCompareServer(false), bRunCompareClient(false),
   iTLBHack(0), SelectedLanguage(0),
   bWii(false),
diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h
index 463a9f882a..0a6c073877 100644
--- a/Source/Core/Core/Src/CoreParameter.h
+++ b/Source/Core/Core/Src/CoreParameter.h
@@ -75,7 +75,6 @@ struct SCoreStartupParameter
 	bool bUseFastMem;
 	bool bLockThreads;
 	bool bEnableCheats;
-	bool bEnableIsoCache;
 
 	bool bRunCompareServer;
 	bool bRunCompareClient;
diff --git a/Source/Core/DebuggerWX/Src/SConscript b/Source/Core/DebuggerWX/Src/SConscript
index 28ecd04e9b..87f3f39b2c 100644
--- a/Source/Core/DebuggerWX/Src/SConscript
+++ b/Source/Core/DebuggerWX/Src/SConscript
@@ -20,7 +20,6 @@ files = [
 wxenv = env.Clone()
 wxenv.Append(
 	CPPDEFINES = [
-		'USE_XPM_BITMAPS',
 		'wxNEEDS_CHARPP'
 		],
 	LINKFLAGS = [
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index 165908a8e0..4795bcf0cc 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -238,7 +238,7 @@ EVT_MENU(wxID_OPEN, CFrame::OnOpen)
 EVT_MENU(wxID_EXIT, CFrame::OnQuit)
 EVT_MENU(IDM_HELPWEBSITE, CFrame::OnHelp)
 EVT_MENU(IDM_HELPGOOGLECODE, CFrame::OnHelp)
-EVT_MENU(IDM_HELPABOUT, CFrame::OnHelp)
+EVT_MENU(wxID_ABOUT, CFrame::OnHelp)
 EVT_MENU(wxID_REFRESH, CFrame::OnRefresh)
 EVT_MENU(IDM_PLAY, CFrame::OnPlay)
 EVT_MENU(IDM_STOP, CFrame::OnStop)
@@ -248,7 +248,7 @@ EVT_MENU(IDM_PLAYRECORD, CFrame::OnPlayRecording)
 EVT_MENU(IDM_FRAMESTEP, CFrame::OnFrameStep)
 EVT_MENU(IDM_LUA, CFrame::OnOpenLuaWindow)
 EVT_MENU(IDM_SCREENSHOT, CFrame::OnScreenshot)
-EVT_MENU(IDM_CONFIG_MAIN, CFrame::OnConfigMain)
+EVT_MENU(wxID_PREFERENCES, CFrame::OnConfigMain)
 EVT_MENU(IDM_CONFIG_GFX_PLUGIN, CFrame::OnPluginGFX)
 EVT_MENU(IDM_CONFIG_DSP_PLUGIN, CFrame::OnPluginDSP)
 EVT_MENU(IDM_CONFIG_PAD_PLUGIN, CFrame::OnPluginPAD)
@@ -498,10 +498,6 @@ CFrame::CFrame(wxFrame* parent,
 	m_bControlsCreated = true;
 	UpdateGUI();
 
-	//if we are ever going back to optional iso caching:
-	//m_GameListCtrl->Update(SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableIsoCache);
-	if (m_GameListCtrl) m_GameListCtrl->Update();
-
 	// If we are rerecording create the status bar now instead of later when a game starts
 	#ifdef RERECORDING
 		ModifyStatusBar();
diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h
index 68f1a770bc..d01c4b812b 100644
--- a/Source/Core/DolphinWX/Src/Frame.h
+++ b/Source/Core/DolphinWX/Src/Frame.h
@@ -121,6 +121,7 @@ class CFrame : public CRenderFrame
 		bool bRenderToMain;
 		bool bNoWiimoteMsg;
 		void UpdateGUI();
+		void UpdateGameList();
 		void ToggleLogWindow(bool, int i = -1);
 		void ToggleConsole(bool, int i = -1);		
 		void PostEvent(wxCommandEvent& event);
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index e720b6f458..8bafc8aa15 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -166,7 +166,7 @@ void CFrame::CreateMenu()
 
 	// Options menu
 	wxMenu* pOptionsMenu = new wxMenu;
-	pOptionsMenu->Append(IDM_CONFIG_MAIN, _T("Co&nfigure..."));
+	pOptionsMenu->Append(wxID_PREFERENCES, _T("Co&nfigure..."));
 	pOptionsMenu->AppendSeparator();
 	pOptionsMenu->Append(IDM_CONFIG_GFX_PLUGIN, _T("&Graphics Settings"));
 	pOptionsMenu->Append(IDM_CONFIG_DSP_PLUGIN, _T("&DSP Settings"));
@@ -259,12 +259,12 @@ void CFrame::CreateMenu()
 
 	// Help menu
 	wxMenu* helpMenu = new wxMenu;
-	/*helpMenu->Append(wxID_HELP, _T("&Help"));
-	re-enable when there's something useful to display*/
+	// Re-enable when there's something useful to display */
+	// helpMenu->Append(wxID_HELP, _T("&Help"));
 	helpMenu->Append(IDM_HELPWEBSITE, _T("Dolphin &Web Site"));
 	helpMenu->Append(IDM_HELPGOOGLECODE, _T("Dolphin at &Google Code"));
 	helpMenu->AppendSeparator();
-	helpMenu->Append(IDM_HELPABOUT, _T("&About..."));
+	helpMenu->Append(wxID_ABOUT, _T("&About..."));
 	m_MenuBar->Append(helpMenu, _T("&Help"));
 
 	// Associate the menu bar with the frame
@@ -329,7 +329,7 @@ void CFrame::PopulateToolbar(wxAuiToolBar* ToolBar)
 	ToolBar->AddTool(IDM_TOGGLE_FULLSCREEN, _T("FullScr"),  m_Bitmaps[Toolbar_FullScreen], _T("Toggle Fullscreen"));
 	ToolBar->AddTool(IDM_SCREENSHOT, _T("ScrShot"),   m_Bitmaps[Toolbar_FullScreen], _T("Take Screenshot"));
 	ToolBar->AddSeparator();
-	ToolBar->AddTool(IDM_CONFIG_MAIN, _T("Config"), m_Bitmaps[Toolbar_PluginOptions], _T("Configure..."));
+	ToolBar->AddTool(wxID_PREFERENCES, _T("Config"), m_Bitmaps[Toolbar_PluginOptions], _T("Configure..."));
 	ToolBar->AddTool(IDM_CONFIG_GFX_PLUGIN, _T("Graphics"),  m_Bitmaps[Toolbar_PluginGFX], _T("Graphics settings"));
 	ToolBar->AddTool(IDM_CONFIG_DSP_PLUGIN, _T("DSP"),  m_Bitmaps[Toolbar_PluginDSP], _T("DSP settings"));
 	ToolBar->AddTool(IDM_CONFIG_PAD_PLUGIN, _T("GCPad"),  m_Bitmaps[Toolbar_PluginPAD], _T("Gamecube Pad settings"));
@@ -961,7 +961,7 @@ void CFrame::OnHelp(wxCommandEvent& event)
 {
 	switch (event.GetId())
 	{
-	case IDM_HELPABOUT:
+	case wxID_ABOUT:
 		{
 			AboutDolphin frame(this);
 			frame.ShowModal();
@@ -1327,6 +1327,11 @@ void CFrame::UpdateGUI()
 	m_Mgr->Update();
 }
 
+void CFrame::UpdateGameList()
+{
+	m_GameListCtrl->Update();
+}
+
 void CFrame::GameListChanged(wxCommandEvent& event)
 {
 	switch (event.GetId())
diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
index 1cfa5cada9..3b1e080dc1 100644
--- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp
+++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
@@ -35,22 +35,18 @@
 #include "WxUtils.h"
 #include "Main.h"
 
-#if USE_XPM_BITMAPS
-	#include "../resources/Flag_Europe.xpm"
-	#include "../resources/Flag_France.xpm"
-	#include "../resources/Flag_Italy.xpm"
-	#include "../resources/Flag_Japan.xpm"
-	#include "../resources/Flag_USA.xpm"
-	#include "../resources/Flag_Taiwan.xpm"
-	#include "../resources/Flag_Korea.xpm"
-	#include "../resources/Flag_Unknown.xpm"
-
-	#include "../resources/Platform_Wad.xpm"
-	#include "../resources/Platform_Wii.xpm"
-	#include "../resources/Platform_Gamecube.xpm"
-
-	#include "../resources/rating_gamelist.h"
-#endif // USE_XPM_BITMAPS
+#include "../resources/Flag_Europe.xpm"
+#include "../resources/Flag_France.xpm"
+#include "../resources/Flag_Italy.xpm"
+#include "../resources/Flag_Japan.xpm"
+#include "../resources/Flag_USA.xpm"
+#include "../resources/Flag_Taiwan.xpm"
+#include "../resources/Flag_Korea.xpm"
+#include "../resources/Flag_Unknown.xpm"
+#include "../resources/Platform_Wad.xpm"
+#include "../resources/Platform_Wii.xpm"
+#include "../resources/Platform_Gamecube.xpm"
+#include "../resources/rating_gamelist.h"
 
 size_t CGameListCtrl::m_currentItem = 0;
 size_t CGameListCtrl::m_numberItem = 0;
@@ -137,49 +133,48 @@ void CGameListCtrl::InitBitmaps()
 {
 	m_imageListSmall = new wxImageList(96, 32);
 	SetImageList(m_imageListSmall, wxIMAGE_LIST_SMALL);
-	wxIcon iconTemp;
 
 	m_FlagImageIndex.resize(DiscIO::IVolume::NUMBER_OF_COUNTRIES);
-	iconTemp.CopyFromBitmap(wxBitmap(Flag_Europe_xpm));
-	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_EUROPE] = m_imageListSmall->Add(iconTemp);
-	iconTemp.CopyFromBitmap(wxBitmap(Flag_France_xpm));
-	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_FRANCE] = m_imageListSmall->Add(iconTemp);
-	iconTemp.CopyFromBitmap(wxBitmap(Flag_USA_xpm));
-	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_USA] = m_imageListSmall->Add(iconTemp);
-	iconTemp.CopyFromBitmap(wxBitmap(Flag_Japan_xpm));
-	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_JAPAN] = m_imageListSmall->Add(iconTemp);
-	iconTemp.CopyFromBitmap(wxBitmap(Flag_Korea_xpm));
-	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_KOREA] = m_imageListSmall->Add(iconTemp);
-	iconTemp.CopyFromBitmap(wxBitmap(Flag_Italy_xpm));
-	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_ITALY] = m_imageListSmall->Add(iconTemp);
-	iconTemp.CopyFromBitmap(wxBitmap(Flag_Taiwan_xpm));
-	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_TAIWAN] = m_imageListSmall->Add(iconTemp);
-	iconTemp.CopyFromBitmap(wxBitmap(Flag_Unknown_xpm));
-	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_SDK] = m_imageListSmall->Add(iconTemp);
-	iconTemp.CopyFromBitmap(wxBitmap(Flag_Unknown_xpm));
-	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_UNKNOWN] = m_imageListSmall->Add(iconTemp);
+	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_EUROPE] =
+		m_imageListSmall->Add(wxBitmap(Flag_Europe_xpm), wxNullBitmap);
+	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_FRANCE] =
+		m_imageListSmall->Add(wxBitmap(Flag_France_xpm), wxNullBitmap);
+	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_USA] =
+		m_imageListSmall->Add(wxBitmap(Flag_USA_xpm), wxNullBitmap);
+	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_JAPAN] =
+		m_imageListSmall->Add(wxBitmap(Flag_Japan_xpm), wxNullBitmap);
+	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_KOREA] =
+		m_imageListSmall->Add(wxBitmap(Flag_Korea_xpm), wxNullBitmap);
+	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_ITALY] =
+		m_imageListSmall->Add(wxBitmap(Flag_Italy_xpm), wxNullBitmap);
+	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_TAIWAN] =
+		m_imageListSmall->Add(wxBitmap(Flag_Taiwan_xpm), wxNullBitmap);
+	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_SDK] =
+		m_imageListSmall->Add(wxBitmap(Flag_Unknown_xpm), wxNullBitmap);
+	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_UNKNOWN] =
+		m_imageListSmall->Add(wxBitmap(Flag_Unknown_xpm), wxNullBitmap);
 
 	m_PlatformImageIndex.resize(3);
-	iconTemp.CopyFromBitmap(wxBitmap(Platform_Gamecube_xpm));
-	m_PlatformImageIndex[0] = m_imageListSmall->Add(iconTemp);
-	iconTemp.CopyFromBitmap(wxBitmap(Platform_Wii_xpm));
-	m_PlatformImageIndex[1] = m_imageListSmall->Add(iconTemp);
-	iconTemp.CopyFromBitmap(wxBitmap(Platform_Wad_xpm));
-	m_PlatformImageIndex[2] = m_imageListSmall->Add(iconTemp);
+	m_PlatformImageIndex[0] =
+		m_imageListSmall->Add(wxBitmap(Platform_Gamecube_xpm), wxNullBitmap);
+	m_PlatformImageIndex[1] =
+		m_imageListSmall->Add(wxBitmap(Platform_Wii_xpm), wxNullBitmap);
+	m_PlatformImageIndex[2] =
+		m_imageListSmall->Add(wxBitmap(Platform_Wad_xpm), wxNullBitmap);
 
 	m_EmuStateImageIndex.resize(6);
-	iconTemp.CopyFromBitmap(wxBitmap(rating_0));
-	m_EmuStateImageIndex[0] = m_imageListSmall->Add(iconTemp);
-	iconTemp.CopyFromBitmap(wxBitmap(rating_1));
-	m_EmuStateImageIndex[1] = m_imageListSmall->Add(iconTemp);
-	iconTemp.CopyFromBitmap(wxBitmap(rating_2));
-	m_EmuStateImageIndex[2] = m_imageListSmall->Add(iconTemp);
-	iconTemp.CopyFromBitmap(wxBitmap(rating_3));
-	m_EmuStateImageIndex[3] = m_imageListSmall->Add(iconTemp);
-	iconTemp.CopyFromBitmap(wxBitmap(rating_4));
-	m_EmuStateImageIndex[4] = m_imageListSmall->Add(iconTemp);
-	iconTemp.CopyFromBitmap(wxBitmap(rating_5));
-	m_EmuStateImageIndex[5] = m_imageListSmall->Add(iconTemp);
+	m_EmuStateImageIndex[0] =
+		m_imageListSmall->Add(wxBitmap(rating_0), wxNullBitmap);
+	m_EmuStateImageIndex[1] =
+		m_imageListSmall->Add(wxBitmap(rating_1), wxNullBitmap);
+	m_EmuStateImageIndex[2] =
+		m_imageListSmall->Add(wxBitmap(rating_2), wxNullBitmap);
+	m_EmuStateImageIndex[3] =
+		m_imageListSmall->Add(wxBitmap(rating_3), wxNullBitmap);
+	m_EmuStateImageIndex[4] =
+		m_imageListSmall->Add(wxBitmap(rating_4), wxNullBitmap);
+	m_EmuStateImageIndex[5] =
+		m_imageListSmall->Add(wxBitmap(rating_5), wxNullBitmap);
 }
 
 void CGameListCtrl::BrowseForDirectory()
diff --git a/Source/Core/DolphinWX/Src/Globals.h b/Source/Core/DolphinWX/Src/Globals.h
index 4ec49b29a1..c530df24bd 100644
--- a/Source/Core/DolphinWX/Src/Globals.h
+++ b/Source/Core/DolphinWX/Src/Globals.h
@@ -88,7 +88,7 @@ enum
 	IDM_DRIVE1,
 	IDM_DRIVE24 = IDM_DRIVE1 + 23,//248,
 
-	IDM_MEMCARD, // Misc menu
+	IDM_MEMCARD, // Tools menu
 	IDM_CHEATS,
 	IDM_NETPLAY,
 	IDM_RESTART,
@@ -116,11 +116,9 @@ enum
 	IDM_LISTDRIVES,
 	IDM_PURGECACHE,
 
-	IDM_HELPABOUT, // Help menu
-	IDM_HELPWEBSITE,
+	IDM_HELPWEBSITE, // Help menu
 	IDM_HELPGOOGLECODE,
 
-	IDM_CONFIG_MAIN,
 	IDM_CONFIG_GFX_PLUGIN,
 	IDM_CONFIG_DSP_PLUGIN,
 	IDM_CONFIG_PAD_PLUGIN,
diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp
index f87e856268..cb65e72a00 100644
--- a/Source/Core/DolphinWX/Src/ISOProperties.cpp
+++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp
@@ -25,11 +25,9 @@
 #include "ConfigManager.h"
 #include "StringUtil.h"
 
-#if USE_XPM_BITMAPS
-	#include "../resources/isoprop_file.xpm"
-	#include "../resources/isoprop_folder.xpm"
-	#include "../resources/isoprop_disc.xpm"
-#endif // USE_XPM_BITMAPS
+#include "../resources/isoprop_file.xpm"
+#include "../resources/isoprop_folder.xpm"
+#include "../resources/isoprop_disc.xpm"
 
 struct WiiPartition
 {
@@ -414,7 +412,7 @@ void CISOProperties::CreateGUIControls(bool IsWad)
 	// ISO Details
 	sbISODetails = new wxStaticBoxSizer(wxVERTICAL, m_Information, _("ISO Details"));
 	sISODetails = new wxGridBagSizer(0, 0);
-	sISODetails->AddGrowableCol(1);
+	// XXX sISODetails->AddGrowableCol(0);
 	m_NameText = new wxStaticText(m_Information, ID_NAME_TEXT, _("Name:"), wxDefaultPosition, wxDefaultSize);
 	m_Name = new wxTextCtrl(m_Information, ID_NAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
 	m_GameIDText = new wxStaticText(m_Information, ID_GAMEID_TEXT, _("Game ID:"), wxDefaultPosition, wxDefaultSize);
@@ -431,7 +429,7 @@ void CISOProperties::CreateGUIControls(bool IsWad)
 	// Banner Details
 	sbBannerDetails = new wxStaticBoxSizer(wxVERTICAL, m_Information, _("Banner Details"));
 	sBannerDetails = new wxGridBagSizer(0, 0);
-	sBannerDetails->AddGrowableCol(1); sBannerDetails->AddGrowableCol(2); sBannerDetails->AddGrowableCol(3);
+	// XXX sBannerDetails->AddGrowableCol(1); sBannerDetails->AddGrowableCol(2); sBannerDetails->AddGrowableCol(3);
 	m_LangText = new wxStaticText(m_Information, ID_LANG_TEXT, _("Show Language:"), wxDefaultPosition, wxDefaultSize);
 	arrayStringFor_Lang.Add(_("English"));
 	arrayStringFor_Lang.Add(_("German"));
diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp
index 60232dd1bf..eab4c21aa2 100644
--- a/Source/Core/DolphinWX/Src/Main.cpp
+++ b/Source/Core/DolphinWX/Src/Main.cpp
@@ -52,6 +52,10 @@
 
 IMPLEMENT_APP(DolphinApp)
 
+BEGIN_EVENT_TABLE(DolphinApp, wxApp)
+	EVT_TIMER(wxID_ANY, DolphinApp::AfterInit)
+END_EVENT_TABLE()
+
 #include <wx/stdpaths.h>
 bool wxMsgAlert(const char*, const char*, bool, int);
 
@@ -451,9 +455,19 @@ bool DolphinApp::OnInit()
 	XInitThreads();
 #endif 
 
+	// Postpone final actions until event handler is running
+	m_afterinit = new wxTimer(this, wxID_ANY);
+	m_afterinit->Start(1, wxTIMER_ONE_SHOT);
+
 	return true;
 }
 
+void DolphinApp::AfterInit(wxTimerEvent& WXUNUSED(event))
+{
+	delete m_afterinit;
+
+	main_frame->UpdateGameList();
+}
 
 void DolphinApp::OnEndSession()
 {
diff --git a/Source/Core/DolphinWX/Src/Main.h b/Source/Core/DolphinWX/Src/Main.h
index 207e2236f3..2d51c6a863 100644
--- a/Source/Core/DolphinWX/Src/Main.h
+++ b/Source/Core/DolphinWX/Src/Main.h
@@ -29,6 +29,13 @@ public:
 	void OnEndSession();
 	int OnExit();
 	CFrame* GetCFrame();
+
+private:
+	DECLARE_EVENT_TABLE()
+
+	wxTimer *m_afterinit;
+
+	void AfterInit(wxTimerEvent& WXUNUSED(event));
 };
 
 DECLARE_APP(DolphinApp);
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript
index 5e3ba57908..bba8ef5e38 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@@ -45,7 +45,6 @@ if wxenv['HAVE_WX']:
 		]
 
         CPPDEFINES = [
-                'USE_XPM_BITMAPS',
                 'wxNEEDS_CHARPP',
                 ],