diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index 12482f68cf..100e82f538 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -366,10 +366,10 @@ void CFrame::InitBitmaps()
 	#endif
 
 	// Scale to 24x24 for toolbar. Toolbar_Log is already 24x24
-	for (size_t n = Toolbar_FileOpen; n <= Toolbar_Help; n++)
+	for (size_t n = Toolbar_FileOpen; n < WXSIZEOF(m_Bitmaps); n++)
 	{
 		m_Bitmaps[n] = wxBitmap(m_Bitmaps[n].ConvertToImage().Scale(24, 24));
-	}	
+	}
 }
 
 
diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h
index 07e15b9ee5..b52bd32023 100644
--- a/Source/Core/DolphinWX/Src/Frame.h
+++ b/Source/Core/DolphinWX/Src/Frame.h
@@ -94,16 +94,16 @@ class CFrame : public wxFrame
 			Toolbar_Refresh,
 			Toolbar_Browse,
 			Toolbar_Play,
-			Toolbar_Stop, Toolbar_Stop_Dis,
+			Toolbar_Stop,
 			Toolbar_Pause,
 			Toolbar_PluginOptions,
 			Toolbar_PluginGFX,
-			Toolbar_PluginDSP, Toolbar_PluginDSP_Dis,
+			Toolbar_PluginDSP,
 			Toolbar_PluginPAD,
 			Toolbar_FullScreen,
 			Toolbar_Help,
 			#ifdef MUSICMOD
-				Toolbar_Log, Toolbar_Log_Dis,
+				Toolbar_Log,
 			#endif
 			Bitmaps_Max,
 			END