diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index cdfa8efd4d..80f901f6ad 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -1544,6 +1544,7 @@
     <None Include="images\genplus.png" />
     <None Include="images\gambatte.png" />
     <None Include="images\dual.png" />
+    <None Include="config\ControllerImages\WonderSwanColor.png" />
     <Content Include="images\logo.ico" />
     <None Include="images\Paste.png" />
     <None Include="images\reboot.png" />
diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs
index 79d5d0450c..ea22bb70fc 100644
--- a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs
+++ b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18444
+//     Runtime Version:4.0.30319.1022
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -60,9 +60,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap A78Joystick {
             get {
                 object obj = ResourceManager.GetObject("A78Joystick", resourceCulture);
@@ -70,9 +67,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap addWatch {
             get {
                 object obj = ResourceManager.GetObject("addWatch", resourceCulture);
@@ -80,9 +74,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap alt_about_image {
             get {
                 object obj = ResourceManager.GetObject("alt_about_image", resourceCulture);
@@ -90,9 +81,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap atari_controller {
             get {
                 object obj = ResourceManager.GetObject("atari_controller", resourceCulture);
@@ -100,9 +88,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap AudioHS {
             get {
                 object obj = ResourceManager.GetObject("AudioHS", resourceCulture);
@@ -110,9 +95,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap AutoSearch {
             get {
                 object obj = ResourceManager.GetObject("AutoSearch", resourceCulture);
@@ -120,9 +102,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap AVI {
             get {
                 object obj = ResourceManager.GetObject("AVI", resourceCulture);
@@ -130,9 +109,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Back {
             get {
                 object obj = ResourceManager.GetObject("Back", resourceCulture);
@@ -140,9 +116,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap BackMore {
             get {
                 object obj = ResourceManager.GetObject("BackMore", resourceCulture);
@@ -150,9 +123,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Blank {
             get {
                 object obj = ResourceManager.GetObject("Blank", resourceCulture);
@@ -160,9 +130,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap BlueDown {
             get {
                 object obj = ResourceManager.GetObject("BlueDown", resourceCulture);
@@ -170,9 +137,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap BlueUp {
             get {
                 object obj = ResourceManager.GetObject("BlueUp", resourceCulture);
@@ -180,9 +144,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Both {
             get {
                 object obj = ResourceManager.GetObject("Both", resourceCulture);
@@ -190,9 +151,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap bsnes {
             get {
                 object obj = ResourceManager.GetObject("bsnes", resourceCulture);
@@ -200,9 +158,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Bug {
             get {
                 object obj = ResourceManager.GetObject("Bug", resourceCulture);
@@ -210,9 +165,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap C64Joystick {
             get {
                 object obj = ResourceManager.GetObject("C64Joystick", resourceCulture);
@@ -220,9 +172,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap C64Keyboard {
             get {
                 object obj = ResourceManager.GetObject("C64Keyboard", resourceCulture);
@@ -230,9 +179,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap C64Symbol {
             get {
                 object obj = ResourceManager.GetObject("C64Symbol", resourceCulture);
@@ -240,9 +186,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap calculator {
             get {
                 object obj = ResourceManager.GetObject("calculator", resourceCulture);
@@ -250,9 +193,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap camera {
             get {
                 object obj = ResourceManager.GetObject("camera", resourceCulture);
@@ -260,9 +200,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap cheat {
             get {
                 object obj = ResourceManager.GetObject("cheat", resourceCulture);
@@ -270,9 +207,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
-        /// </summary>
         internal static System.Drawing.Icon Cheats {
             get {
                 object obj = ResourceManager.GetObject("Cheats", resourceCulture);
@@ -280,9 +214,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap checkbox {
             get {
                 object obj = ResourceManager.GetObject("checkbox", resourceCulture);
@@ -290,9 +221,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Close {
             get {
                 object obj = ResourceManager.GetObject("Close", resourceCulture);
@@ -300,9 +228,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap colecovisioncontroller {
             get {
                 object obj = ResourceManager.GetObject("colecovisioncontroller", resourceCulture);
@@ -310,9 +235,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap console16x16 {
             get {
                 object obj = ResourceManager.GetObject("console16x16", resourceCulture);
@@ -320,9 +242,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap console32x32 {
             get {
                 object obj = ResourceManager.GetObject("console32x32", resourceCulture);
@@ -330,9 +249,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap CopyFolderHS {
             get {
                 object obj = ResourceManager.GetObject("CopyFolderHS", resourceCulture);
@@ -340,9 +256,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap corphawk {
             get {
                 object obj = ResourceManager.GetObject("corphawk", resourceCulture);
@@ -350,9 +263,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap CorpHawkSmall {
             get {
                 object obj = ResourceManager.GetObject("CorpHawkSmall", resourceCulture);
@@ -360,9 +270,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap CutHS {
             get {
                 object obj = ResourceManager.GetObject("CutHS", resourceCulture);
@@ -370,9 +277,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Debugger {
             get {
                 object obj = ResourceManager.GetObject("Debugger", resourceCulture);
@@ -380,9 +284,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Delete {
             get {
                 object obj = ResourceManager.GetObject("Delete", resourceCulture);
@@ -390,9 +291,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap dual {
             get {
                 object obj = ResourceManager.GetObject("dual", resourceCulture);
@@ -400,9 +298,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Duplicate {
             get {
                 object obj = ResourceManager.GetObject("Duplicate", resourceCulture);
@@ -410,9 +305,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap emu7800 {
             get {
                 object obj = ResourceManager.GetObject("emu7800", resourceCulture);
@@ -420,9 +312,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Erase {
             get {
                 object obj = ResourceManager.GetObject("Erase", resourceCulture);
@@ -430,9 +319,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ExclamationRed {
             get {
                 object obj = ResourceManager.GetObject("ExclamationRed", resourceCulture);
@@ -440,9 +326,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap FastForward {
             get {
                 object obj = ResourceManager.GetObject("FastForward", resourceCulture);
@@ -450,9 +333,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap FindHS {
             get {
                 object obj = ResourceManager.GetObject("FindHS", resourceCulture);
@@ -460,9 +340,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Forward {
             get {
                 object obj = ResourceManager.GetObject("Forward", resourceCulture);
@@ -470,9 +347,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ForwardMore {
             get {
                 object obj = ResourceManager.GetObject("ForwardMore", resourceCulture);
@@ -480,9 +354,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Freeze {
             get {
                 object obj = ResourceManager.GetObject("Freeze", resourceCulture);
@@ -490,9 +361,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Fullscreen {
             get {
                 object obj = ResourceManager.GetObject("Fullscreen", resourceCulture);
@@ -500,9 +368,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap gambatte {
             get {
                 object obj = ResourceManager.GetObject("gambatte", resourceCulture);
@@ -510,9 +375,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap GameController {
             get {
                 object obj = ResourceManager.GetObject("GameController", resourceCulture);
@@ -520,9 +382,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap GBA_Controller {
             get {
                 object obj = ResourceManager.GetObject("GBA_Controller", resourceCulture);
@@ -530,9 +389,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap gba_icon {
             get {
                 object obj = ResourceManager.GetObject("gba_icon", resourceCulture);
@@ -540,9 +396,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap GBController {
             get {
                 object obj = ResourceManager.GetObject("GBController", resourceCulture);
@@ -550,9 +403,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap GENController {
             get {
                 object obj = ResourceManager.GetObject("GENController", resourceCulture);
@@ -560,9 +410,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap GenesisControllerIcon {
             get {
                 object obj = ResourceManager.GetObject("GenesisControllerIcon", resourceCulture);
@@ -570,9 +417,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap genplus {
             get {
                 object obj = ResourceManager.GetObject("genplus", resourceCulture);
@@ -580,9 +424,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap GreenCheck {
             get {
                 object obj = ResourceManager.GetObject("GreenCheck", resourceCulture);
@@ -590,9 +431,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Hack {
             get {
                 object obj = ResourceManager.GetObject("Hack", resourceCulture);
@@ -600,9 +438,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Help {
             get {
                 object obj = ResourceManager.GetObject("Help", resourceCulture);
@@ -610,9 +445,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap HomeBrew {
             get {
                 object obj = ResourceManager.GetObject("HomeBrew", resourceCulture);
@@ -620,9 +452,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap HotKeys {
             get {
                 object obj = ResourceManager.GetObject("HotKeys", resourceCulture);
@@ -630,9 +459,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Import {
             get {
                 object obj = ResourceManager.GetObject("Import", resourceCulture);
@@ -640,9 +466,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap InsertSeparator {
             get {
                 object obj = ResourceManager.GetObject("InsertSeparator", resourceCulture);
@@ -650,9 +473,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap IntVController {
             get {
                 object obj = ResourceManager.GetObject("IntVController", resourceCulture);
@@ -660,9 +480,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Lightning {
             get {
                 object obj = ResourceManager.GetObject("Lightning", resourceCulture);
@@ -670,9 +487,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap LightOff {
             get {
                 object obj = ResourceManager.GetObject("LightOff", resourceCulture);
@@ -680,9 +494,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap LightOn {
             get {
                 object obj = ResourceManager.GetObject("LightOn", resourceCulture);
@@ -690,9 +501,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap LoadConfig {
             get {
                 object obj = ResourceManager.GetObject("LoadConfig", resourceCulture);
@@ -700,9 +508,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
-        /// </summary>
         internal static System.Drawing.Icon logo {
             get {
                 object obj = ResourceManager.GetObject("logo", resourceCulture);
@@ -710,9 +515,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Lua {
             get {
                 object obj = ResourceManager.GetObject("Lua", resourceCulture);
@@ -720,9 +522,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap MessageConfig {
             get {
                 object obj = ResourceManager.GetObject("MessageConfig", resourceCulture);
@@ -730,9 +529,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap meteor {
             get {
                 object obj = ResourceManager.GetObject("meteor", resourceCulture);
@@ -740,9 +536,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap monitor {
             get {
                 object obj = ResourceManager.GetObject("monitor", resourceCulture);
@@ -750,9 +543,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap MoveDown {
             get {
                 object obj = ResourceManager.GetObject("MoveDown", resourceCulture);
@@ -760,9 +550,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap MoveLeft {
             get {
                 object obj = ResourceManager.GetObject("MoveLeft", resourceCulture);
@@ -770,9 +557,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap MoveRight {
             get {
                 object obj = ResourceManager.GetObject("MoveRight", resourceCulture);
@@ -780,9 +564,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap MoveUp {
             get {
                 object obj = ResourceManager.GetObject("MoveUp", resourceCulture);
@@ -790,9 +571,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap N64 {
             get {
                 object obj = ResourceManager.GetObject("N64", resourceCulture);
@@ -800,9 +578,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap NES_Controller {
             get {
                 object obj = ResourceManager.GetObject("NES_Controller", resourceCulture);
@@ -810,9 +585,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap NESControllerIcon {
             get {
                 object obj = ResourceManager.GetObject("NESControllerIcon", resourceCulture);
@@ -820,9 +592,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap NewFile {
             get {
                 object obj = ResourceManager.GetObject("NewFile", resourceCulture);
@@ -830,18 +599,12 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
-        /// </summary>
         internal static System.IO.UnmanagedMemoryStream nothawk {
             get {
                 return ResourceManager.GetStream("nothawk", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap OpenFile {
             get {
                 object obj = ResourceManager.GetObject("OpenFile", resourceCulture);
@@ -849,9 +612,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Paste {
             get {
                 object obj = ResourceManager.GetObject("Paste", resourceCulture);
@@ -859,9 +619,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Pause {
             get {
                 object obj = ResourceManager.GetObject("Pause", resourceCulture);
@@ -869,9 +626,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap pcb {
             get {
                 object obj = ResourceManager.GetObject("pcb", resourceCulture);
@@ -879,9 +633,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap pcejin1 {
             get {
                 object obj = ResourceManager.GetObject("pcejin1", resourceCulture);
@@ -889,9 +640,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap PCEngineController {
             get {
                 object obj = ResourceManager.GetObject("PCEngineController", resourceCulture);
@@ -899,9 +647,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap pencil {
             get {
                 object obj = ResourceManager.GetObject("pencil", resourceCulture);
@@ -909,9 +654,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Play {
             get {
                 object obj = ResourceManager.GetObject("Play", resourceCulture);
@@ -919,9 +661,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap poke {
             get {
                 object obj = ResourceManager.GetObject("poke", resourceCulture);
@@ -929,9 +668,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ppsspp {
             get {
                 object obj = ResourceManager.GetObject("ppsspp", resourceCulture);
@@ -939,9 +675,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Previous {
             get {
                 object obj = ResourceManager.GetObject("Previous", resourceCulture);
@@ -949,9 +682,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap PrintPreviewHS {
             get {
                 object obj = ResourceManager.GetObject("PrintPreviewHS", resourceCulture);
@@ -959,9 +689,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap QuickNes {
             get {
                 object obj = ResourceManager.GetObject("QuickNes", resourceCulture);
@@ -969,9 +696,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ReadOnly {
             get {
                 object obj = ResourceManager.GetObject("ReadOnly", resourceCulture);
@@ -979,9 +703,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap reboot {
             get {
                 object obj = ResourceManager.GetObject("reboot", resourceCulture);
@@ -989,9 +710,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Recent {
             get {
                 object obj = ResourceManager.GetObject("Recent", resourceCulture);
@@ -999,9 +717,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap RecordHS {
             get {
                 object obj = ResourceManager.GetObject("RecordHS", resourceCulture);
@@ -1009,9 +724,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap redo {
             get {
                 object obj = ResourceManager.GetObject("redo", resourceCulture);
@@ -1019,9 +731,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Refresh {
             get {
                 object obj = ResourceManager.GetObject("Refresh", resourceCulture);
@@ -1029,9 +738,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Refresh1 {
             get {
                 object obj = ResourceManager.GetObject("Refresh1", resourceCulture);
@@ -1039,9 +745,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap restart {
             get {
                 object obj = ResourceManager.GetObject("restart", resourceCulture);
@@ -1049,9 +752,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap RetroQuestion {
             get {
                 object obj = ResourceManager.GetObject("RetroQuestion", resourceCulture);
@@ -1059,9 +759,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap SaturnController {
             get {
                 object obj = ResourceManager.GetObject("SaturnController", resourceCulture);
@@ -1069,9 +766,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Save {
             get {
                 object obj = ResourceManager.GetObject("Save", resourceCulture);
@@ -1079,9 +773,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap SaveAs {
             get {
                 object obj = ResourceManager.GetObject("SaveAs", resourceCulture);
@@ -1089,9 +780,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap SaveConfig {
             get {
                 object obj = ResourceManager.GetObject("SaveConfig", resourceCulture);
@@ -1099,9 +787,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Scan {
             get {
                 object obj = ResourceManager.GetObject("Scan", resourceCulture);
@@ -1109,9 +794,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap search {
             get {
                 object obj = ResourceManager.GetObject("search", resourceCulture);
@@ -1119,9 +801,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap sms_icon {
             get {
                 object obj = ResourceManager.GetObject("sms_icon", resourceCulture);
@@ -1129,9 +808,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap SMSController {
             get {
                 object obj = ResourceManager.GetObject("SMSController", resourceCulture);
@@ -1139,9 +815,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap SNES_Controller {
             get {
                 object obj = ResourceManager.GetObject("SNES_Controller", resourceCulture);
@@ -1149,9 +822,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap SNESControllerIcon {
             get {
                 object obj = ResourceManager.GetObject("SNESControllerIcon", resourceCulture);
@@ -1159,9 +829,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Stop {
             get {
                 object obj = ResourceManager.GetObject("Stop", resourceCulture);
@@ -1169,9 +836,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap TAStudio {
             get {
                 object obj = ResourceManager.GetObject("TAStudio", resourceCulture);
@@ -1179,9 +843,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap textdoc {
             get {
                 object obj = ResourceManager.GetObject("textdoc", resourceCulture);
@@ -1189,9 +850,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap TI83_Controller {
             get {
                 object obj = ResourceManager.GetObject("TI83_Controller", resourceCulture);
@@ -1199,9 +857,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap TI83Calculator {
             get {
                 object obj = ResourceManager.GetObject("TI83Calculator", resourceCulture);
@@ -1209,9 +864,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap ToolBox {
             get {
                 object obj = ResourceManager.GetObject("ToolBox", resourceCulture);
@@ -1219,9 +871,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Translation {
             get {
                 object obj = ResourceManager.GetObject("Translation", resourceCulture);
@@ -1229,9 +878,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap TruncateFromFile {
             get {
                 object obj = ResourceManager.GetObject("TruncateFromFile", resourceCulture);
@@ -1239,9 +885,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap TruncateFromRW {
             get {
                 object obj = ResourceManager.GetObject("TruncateFromRW", resourceCulture);
@@ -1249,9 +892,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap TurboFastForward {
             get {
                 object obj = ResourceManager.GetObject("TurboFastForward", resourceCulture);
@@ -1259,9 +899,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap tvIcon {
             get {
                 object obj = ResourceManager.GetObject("tvIcon", resourceCulture);
@@ -1269,9 +906,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap undo {
             get {
                 object obj = ResourceManager.GetObject("undo", resourceCulture);
@@ -1279,9 +913,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap Unfreeze {
             get {
                 object obj = ResourceManager.GetObject("Unfreeze", resourceCulture);
@@ -1289,9 +920,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap WarningHS {
             get {
                 object obj = ResourceManager.GetObject("WarningHS", resourceCulture);
@@ -1299,9 +927,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap watch {
             get {
                 object obj = ResourceManager.GetObject("watch", resourceCulture);
@@ -1309,9 +934,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap whiteTriDown {
             get {
                 object obj = ResourceManager.GetObject("whiteTriDown", resourceCulture);
@@ -1319,9 +941,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap whiteTriLeft {
             get {
                 object obj = ResourceManager.GetObject("whiteTriLeft", resourceCulture);
@@ -1329,9 +948,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap whiteTriRight {
             get {
                 object obj = ResourceManager.GetObject("whiteTriRight", resourceCulture);
@@ -1339,9 +955,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap whiteTriUp {
             get {
                 object obj = ResourceManager.GetObject("whiteTriUp", resourceCulture);
@@ -1349,9 +962,13 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
+        internal static System.Drawing.Bitmap WonderSwanColor {
+            get {
+                object obj = ResourceManager.GetObject("WonderSwanColor", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap yabause {
             get {
                 object obj = ResourceManager.GetObject("yabause", resourceCulture);
diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.resx b/BizHawk.Client.EmuHawk/Properties/Resources.resx
index 2029f740c7..9bb6717da7 100644
--- a/BizHawk.Client.EmuHawk/Properties/Resources.resx
+++ b/BizHawk.Client.EmuHawk/Properties/Resources.resx
@@ -933,4 +933,7 @@
   <data name="dual" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\dual.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="WonderSwanColor" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\config\ControllerImages\WonderSwanColor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/config/ControllerConfig.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
index 095a5875b3..2c7990c928 100644
--- a/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
+++ b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
@@ -38,6 +38,8 @@ namespace BizHawk.Client.EmuHawk
 			ControllerImages.Add("PC Engine Controller", Properties.Resources.PCEngineController);
 			ControllerImages.Add("Commodore 64 Controller", Properties.Resources.C64Joystick);
 			ControllerImages.Add("TI83 Controller", Properties.Resources.TI83_Controller);
+
+			ControllerImages.Add("WonderSwan Controller", Properties.Resources.WonderSwanColor);
 		}
 
 		private ControllerConfig()
diff --git a/BizHawk.Client.EmuHawk/config/ControllerImages/WonderSwanColor.png b/BizHawk.Client.EmuHawk/config/ControllerImages/WonderSwanColor.png
new file mode 100644
index 0000000000..e6ef63cd48
Binary files /dev/null and b/BizHawk.Client.EmuHawk/config/ControllerImages/WonderSwanColor.png differ