diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index 90cf4cab75..eea1b5dbed 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -838,6 +838,9 @@
     <None Include="images\atari_controller.png" />
     <None Include="config\ControllerImages\snes-controlpad.jpg" />
     <None Include="config\ControllerImages\SNESController.jpg" />
+    <None Include="config\ControllerImages\NES_Controller.png" />
+    <None Include="config\ControllerImages\SNES_Controller.png" />
+    <None Include="config\ControllerImages\TI83_Controller.png" />
     <Content Include="images\logo.ico" />
     <None Include="images\Paste.png" />
     <Content Include="output\gamedb_sega_md.txt" />
diff --git a/BizHawk.MultiClient/Properties/Resources.Designer.cs b/BizHawk.MultiClient/Properties/Resources.Designer.cs
index f5026dba05..1a4dd77f91 100644
--- a/BizHawk.MultiClient/Properties/Resources.Designer.cs
+++ b/BizHawk.MultiClient/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17626
+//     Runtime Version:4.0.30319.269
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -60,9 +60,6 @@ namespace BizHawk.MultiClient.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);
@@ -70,9 +67,6 @@ namespace BizHawk.MultiClient.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);
@@ -80,9 +74,6 @@ namespace BizHawk.MultiClient.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);
@@ -90,9 +81,6 @@ namespace BizHawk.MultiClient.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);
@@ -100,9 +88,6 @@ namespace BizHawk.MultiClient.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);
@@ -110,9 +95,6 @@ namespace BizHawk.MultiClient.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);
@@ -120,9 +102,6 @@ namespace BizHawk.MultiClient.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);
@@ -130,9 +109,6 @@ namespace BizHawk.MultiClient.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);
@@ -140,9 +116,6 @@ namespace BizHawk.MultiClient.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);
@@ -150,9 +123,6 @@ namespace BizHawk.MultiClient.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);
@@ -160,9 +130,6 @@ namespace BizHawk.MultiClient.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);
@@ -170,9 +137,6 @@ namespace BizHawk.MultiClient.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);
@@ -180,9 +144,6 @@ namespace BizHawk.MultiClient.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);
@@ -190,9 +151,6 @@ namespace BizHawk.MultiClient.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);
@@ -200,9 +158,6 @@ namespace BizHawk.MultiClient.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);
@@ -210,9 +165,6 @@ namespace BizHawk.MultiClient.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);
@@ -220,9 +172,6 @@ namespace BizHawk.MultiClient.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);
@@ -230,9 +179,6 @@ namespace BizHawk.MultiClient.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);
@@ -240,9 +186,6 @@ namespace BizHawk.MultiClient.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);
@@ -250,9 +193,6 @@ namespace BizHawk.MultiClient.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);
@@ -260,9 +200,6 @@ namespace BizHawk.MultiClient.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);
@@ -270,9 +207,6 @@ namespace BizHawk.MultiClient.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);
@@ -280,9 +214,6 @@ namespace BizHawk.MultiClient.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);
@@ -290,9 +221,6 @@ namespace BizHawk.MultiClient.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);
@@ -300,9 +228,6 @@ namespace BizHawk.MultiClient.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);
@@ -310,9 +235,6 @@ namespace BizHawk.MultiClient.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);
@@ -320,9 +242,6 @@ namespace BizHawk.MultiClient.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);
@@ -330,9 +249,6 @@ namespace BizHawk.MultiClient.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);
@@ -340,9 +256,6 @@ namespace BizHawk.MultiClient.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);
@@ -350,9 +263,6 @@ namespace BizHawk.MultiClient.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);
@@ -360,9 +270,6 @@ namespace BizHawk.MultiClient.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);
@@ -370,9 +277,6 @@ namespace BizHawk.MultiClient.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);
@@ -380,9 +284,6 @@ namespace BizHawk.MultiClient.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);
@@ -390,9 +291,6 @@ namespace BizHawk.MultiClient.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);
@@ -400,9 +298,6 @@ namespace BizHawk.MultiClient.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);
@@ -410,9 +305,6 @@ namespace BizHawk.MultiClient.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);
@@ -420,9 +312,6 @@ namespace BizHawk.MultiClient.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);
@@ -430,9 +319,6 @@ namespace BizHawk.MultiClient.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);
@@ -440,9 +326,6 @@ namespace BizHawk.MultiClient.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);
@@ -450,9 +333,6 @@ namespace BizHawk.MultiClient.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);
@@ -460,9 +340,6 @@ namespace BizHawk.MultiClient.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);
@@ -470,9 +347,6 @@ namespace BizHawk.MultiClient.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);
@@ -480,9 +354,6 @@ namespace BizHawk.MultiClient.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);
@@ -490,9 +361,6 @@ namespace BizHawk.MultiClient.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);
@@ -500,9 +368,6 @@ namespace BizHawk.MultiClient.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);
@@ -510,9 +375,6 @@ namespace BizHawk.MultiClient.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);
@@ -520,9 +382,6 @@ namespace BizHawk.MultiClient.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);
@@ -530,9 +389,6 @@ namespace BizHawk.MultiClient.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);
@@ -540,9 +396,6 @@ namespace BizHawk.MultiClient.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);
@@ -550,9 +403,6 @@ namespace BizHawk.MultiClient.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);
@@ -560,19 +410,13 @@ namespace BizHawk.MultiClient.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap NESController {
+        internal static System.Drawing.Bitmap NES_Controller {
             get {
-                object obj = ResourceManager.GetObject("NESController", resourceCulture);
+                object obj = ResourceManager.GetObject("NES_Controller", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
         
-        /// <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);
@@ -580,9 +424,6 @@ namespace BizHawk.MultiClient.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);
@@ -590,18 +431,12 @@ namespace BizHawk.MultiClient.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);
@@ -609,9 +444,6 @@ namespace BizHawk.MultiClient.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);
@@ -619,9 +451,6 @@ namespace BizHawk.MultiClient.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);
@@ -629,9 +458,6 @@ namespace BizHawk.MultiClient.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);
@@ -639,9 +465,6 @@ namespace BizHawk.MultiClient.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);
@@ -649,9 +472,6 @@ namespace BizHawk.MultiClient.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);
@@ -659,9 +479,6 @@ namespace BizHawk.MultiClient.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);
@@ -669,9 +486,6 @@ namespace BizHawk.MultiClient.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);
@@ -679,9 +493,6 @@ namespace BizHawk.MultiClient.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);
@@ -689,9 +500,6 @@ namespace BizHawk.MultiClient.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);
@@ -699,9 +507,6 @@ namespace BizHawk.MultiClient.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);
@@ -709,9 +514,6 @@ namespace BizHawk.MultiClient.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);
@@ -719,9 +521,6 @@ namespace BizHawk.MultiClient.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);
@@ -729,9 +528,6 @@ namespace BizHawk.MultiClient.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);
@@ -739,9 +535,6 @@ namespace BizHawk.MultiClient.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);
@@ -749,9 +542,6 @@ namespace BizHawk.MultiClient.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);
@@ -759,9 +549,6 @@ namespace BizHawk.MultiClient.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);
@@ -769,9 +556,6 @@ namespace BizHawk.MultiClient.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);
@@ -779,9 +563,6 @@ namespace BizHawk.MultiClient.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);
@@ -789,9 +570,6 @@ namespace BizHawk.MultiClient.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);
@@ -799,9 +577,6 @@ namespace BizHawk.MultiClient.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);
@@ -809,9 +584,6 @@ namespace BizHawk.MultiClient.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);
@@ -819,19 +591,13 @@ namespace BizHawk.MultiClient.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap SNESController {
+        internal static System.Drawing.Bitmap SNES_Controller {
             get {
-                object obj = ResourceManager.GetObject("SNESController", resourceCulture);
+                object obj = ResourceManager.GetObject("SNES_Controller", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
         
-        /// <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);
@@ -839,9 +605,6 @@ namespace BizHawk.MultiClient.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);
@@ -849,9 +612,6 @@ namespace BizHawk.MultiClient.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);
@@ -859,9 +619,13 @@ namespace BizHawk.MultiClient.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);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap TI83Calculator {
             get {
                 object obj = ResourceManager.GetObject("TI83Calculator", resourceCulture);
@@ -869,19 +633,6 @@ namespace BizHawk.MultiClient.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap TI83CalculatorCrop {
-            get {
-                object obj = ResourceManager.GetObject("TI83CalculatorCrop", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <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);
@@ -889,9 +640,6 @@ namespace BizHawk.MultiClient.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);
@@ -899,9 +647,6 @@ namespace BizHawk.MultiClient.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);
@@ -909,9 +654,6 @@ namespace BizHawk.MultiClient.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);
@@ -919,9 +661,6 @@ namespace BizHawk.MultiClient.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);
@@ -929,9 +668,6 @@ namespace BizHawk.MultiClient.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);
@@ -939,9 +675,6 @@ namespace BizHawk.MultiClient.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);
@@ -949,9 +682,6 @@ namespace BizHawk.MultiClient.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);
@@ -959,9 +689,6 @@ namespace BizHawk.MultiClient.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);
@@ -969,9 +696,6 @@ namespace BizHawk.MultiClient.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);
@@ -979,9 +703,6 @@ namespace BizHawk.MultiClient.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);
@@ -989,9 +710,6 @@ namespace BizHawk.MultiClient.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);
diff --git a/BizHawk.MultiClient/Properties/Resources.resx b/BizHawk.MultiClient/Properties/Resources.resx
index 23fc96476c..8d00393179 100644
--- a/BizHawk.MultiClient/Properties/Resources.resx
+++ b/BizHawk.MultiClient/Properties/Resources.resx
@@ -127,9 +127,6 @@
   <data name="GENController" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\config\ControllerImages\GENController.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="NESController" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\config\ControllerImages\NESController.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="PCEngineController" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\config\ControllerImages\PCEngineController.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -609,9 +606,6 @@
   <data name="TI83Calculator" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\config\ControllerImages\TI83Calculator.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="TI83CalculatorCrop" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\config\ControllerImages\TI83CalculatorCrop.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="whiteTriUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\whiteTriUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -822,7 +816,13 @@
   <data name="Paste" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\Paste.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="SNESController" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\config\ControllerImages\SNESController.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="NES_Controller" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\config\ControllerImages\NES_Controller.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SNES_Controller" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\config\ControllerImages\SNES_Controller.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="TI83_Controller" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\config\ControllerImages\TI83_Controller.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.MultiClient/config/ControllerImages/NESController.png b/BizHawk.MultiClient/config/ControllerImages/NESController.png
deleted file mode 100644
index 56fe1417a6..0000000000
Binary files a/BizHawk.MultiClient/config/ControllerImages/NESController.png and /dev/null differ
diff --git a/BizHawk.MultiClient/config/ControllerImages/NES_Controller.png b/BizHawk.MultiClient/config/ControllerImages/NES_Controller.png
new file mode 100644
index 0000000000..effdd81e07
Binary files /dev/null and b/BizHawk.MultiClient/config/ControllerImages/NES_Controller.png differ
diff --git a/BizHawk.MultiClient/config/ControllerImages/SNESController.jpg b/BizHawk.MultiClient/config/ControllerImages/SNESController.jpg
deleted file mode 100644
index cb6f93f4d7..0000000000
Binary files a/BizHawk.MultiClient/config/ControllerImages/SNESController.jpg and /dev/null differ
diff --git a/BizHawk.MultiClient/config/ControllerImages/SNES_Controller.png b/BizHawk.MultiClient/config/ControllerImages/SNES_Controller.png
new file mode 100644
index 0000000000..86e997787f
Binary files /dev/null and b/BizHawk.MultiClient/config/ControllerImages/SNES_Controller.png differ
diff --git a/BizHawk.MultiClient/config/ControllerImages/TI83CalculatorCrop.png b/BizHawk.MultiClient/config/ControllerImages/TI83CalculatorCrop.png
deleted file mode 100644
index c8c6f1c6b0..0000000000
Binary files a/BizHawk.MultiClient/config/ControllerImages/TI83CalculatorCrop.png and /dev/null differ
diff --git a/BizHawk.MultiClient/config/ControllerImages/TI83_Controller.png b/BizHawk.MultiClient/config/ControllerImages/TI83_Controller.png
new file mode 100644
index 0000000000..51e57f97a1
Binary files /dev/null and b/BizHawk.MultiClient/config/ControllerImages/TI83_Controller.png differ
diff --git a/BizHawk.MultiClient/config/InputConfig.cs b/BizHawk.MultiClient/config/InputConfig.cs
index ca8a0c0af7..896d6d82ca 100644
--- a/BizHawk.MultiClient/config/InputConfig.cs
+++ b/BizHawk.MultiClient/config/InputConfig.cs
@@ -112,7 +112,7 @@ namespace BizHawk.MultiClient
 					autoController = Global.Config.GBAutoController;
 					break;
 				case "NES":
-					ControllerImage.Image = BizHawk.MultiClient.Properties.Resources.NESController;
+					ControllerImage.Image = BizHawk.MultiClient.Properties.Resources.NES_Controller;
 					controller = Global.Config.NESController;
 					autoController = Global.Config.NESAutoController;
 					break;
@@ -132,11 +132,11 @@ namespace BizHawk.MultiClient
 					autoController = Global.Config.SMSAutoController;
 					break;
 				case "TI-83":
-					ControllerImage.Image = BizHawk.MultiClient.Properties.Resources.TI83CalculatorCrop;
+					ControllerImage.Image = BizHawk.MultiClient.Properties.Resources.TI83_Controller;
 					controller = Global.Config.TI83Controller;
 					break;
 				case "SNES":
-					ControllerImage.Image = BizHawk.MultiClient.Properties.Resources.SNESController;
+					ControllerImage.Image = BizHawk.MultiClient.Properties.Resources.SNES_Controller;
 					controller = Global.Config.SNESController;
 					break;
 				default: