diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index 226bd4ef4e..91917ed45c 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -210,6 +210,9 @@
   <ItemGroup>
     <None Include="config\ControllerImages\PCEngineController.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="config\ControllerImages\GENController.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/BizHawk.MultiClient/Properties/Resources.Designer.cs b/BizHawk.MultiClient/Properties/Resources.Designer.cs
index 3fc8146bc3..8f31258e4b 100644
--- a/BizHawk.MultiClient/Properties/Resources.Designer.cs
+++ b/BizHawk.MultiClient/Properties/Resources.Designer.cs
@@ -95,6 +95,13 @@ namespace BizHawk.MultiClient.Properties {
             }
         }
         
+        internal static System.Drawing.Bitmap GENController {
+            get {
+                object obj = ResourceManager.GetObject("GENController", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap InserSeparator {
             get {
                 object obj = ResourceManager.GetObject("InserSeparator", resourceCulture);
diff --git a/BizHawk.MultiClient/Properties/Resources.resx b/BizHawk.MultiClient/Properties/Resources.resx
index 7112fbd9e3..f1cf700c6e 100644
--- a/BizHawk.MultiClient/Properties/Resources.resx
+++ b/BizHawk.MultiClient/Properties/Resources.resx
@@ -133,6 +133,9 @@
   <data name="GBController" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\config\ControllerImages\GBController.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <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="InserSeparator" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\InserSeparator.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
diff --git a/BizHawk.MultiClient/config/ControllerImages/GENController.png b/BizHawk.MultiClient/config/ControllerImages/GENController.png
new file mode 100644
index 0000000000..04a2f07527
Binary files /dev/null and b/BizHawk.MultiClient/config/ControllerImages/GENController.png differ
diff --git a/BizHawk.MultiClient/config/InputConfig.cs b/BizHawk.MultiClient/config/InputConfig.cs
index 15fa7cc840..0952b9cd8d 100644
--- a/BizHawk.MultiClient/config/InputConfig.cs
+++ b/BizHawk.MultiClient/config/InputConfig.cs
@@ -20,6 +20,7 @@ namespace BizHawk.MultiClient
         private void DoSMS()
         {
             this.Text = ControllerStr + "SMS / GG / SG-1000";
+            ControllerImage.Image = BizHawk.MultiClient.Properties.Resources.SMSController;
 
             Label UpLabel = new Label();
             UpLabel.Text = "Up";
@@ -70,10 +71,6 @@ namespace BizHawk.MultiClient
             ButtonsGroupBox.Controls.Add(IButtonLabel);
             ButtonsGroupBox.Controls.Add(IIButton);
             ButtonsGroupBox.Controls.Add(IIButtonLabel);
-            
-
-            ControllerImage.Image = BizHawk.MultiClient.Properties.Resources.SMSController;
-
         }
 
         private void DoPCE()
@@ -85,6 +82,7 @@ namespace BizHawk.MultiClient
         private void DoGen()
         {
             this.Text = ControllerStr + "Sega Genesis";
+            ControllerImage.Image = BizHawk.MultiClient.Properties.Resources.GENController;
         }
 
         private void DoTI83()