diff --git a/common/src/Utilities/wxHelpers.cpp b/common/src/Utilities/wxHelpers.cpp
index 278f7d53a2..a72dce86e6 100644
--- a/common/src/Utilities/wxHelpers.cpp
+++ b/common/src/Utilities/wxHelpers.cpp
@@ -107,9 +107,9 @@ void wxDialogWithHelpers::AddOkCancel( wxSizer &sizer, bool hasApply )
 	if( m_hasContextHelp )
 	{
 		SetExtraStyle( wxDIALOG_EX_CONTEXTHELP );
-#ifndef __WXMSW__
-		s_buttons += new wxContextHelpButton(this);
-#endif
+//#ifndef __WXMSW__
+		*m_extraButtonSizer += new wxContextHelpButton(this) | StdButton();
+//#endif
 	}
 
 	// create a sizer to hold the help and ok/cancel buttons, for platforms
diff --git a/pcsx2/Pcsx2Config.cpp b/pcsx2/Pcsx2Config.cpp
index ed2c6df0e6..298c9d3e2b 100644
--- a/pcsx2/Pcsx2Config.cpp
+++ b/pcsx2/Pcsx2Config.cpp
@@ -124,7 +124,7 @@ void Pcsx2Config::RecompilerOptions::ApplySanityCheck()
 		fpuIsRight = fpuOverflow;
 
 	if( fpuFullMode )
-		fpuIsRight = !fpuOverflow && !fpuExtraOverflow;
+		fpuIsRight = fpuOverflow && fpuExtraOverflow;
 
 	if( !fpuIsRight )
 	{
diff --git a/pcsx2/gui/Resources/ButtonIcon_Camera.png b/pcsx2/gui/Resources/ButtonIcon_Camera.png
index e698e2943f..546f4a900c 100644
Binary files a/pcsx2/gui/Resources/ButtonIcon_Camera.png and b/pcsx2/gui/Resources/ButtonIcon_Camera.png differ