diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 88905b1301..f60c4d22af 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -719,11 +719,11 @@
     <Compile Include="PresentationPanel.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="RomStatusPicker.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -2100,6 +2100,7 @@
     <None Include="images\LightOn.png" />
     <None Include="images\Both.png" />
     <None Include="config\ControllerImages\A78Joystick.png" />
+    <None Include="config\ControllerImages\VBoyController.png" />
     <None Include="config\ControllerImages\IntVController.png" />
     <None Include="config\ControllerImages\Lynx.png" />
     <Content Include="config\ControllerImages\N64.png" />
diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs
index 08544fa997..d10c6a132e 100644
--- a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs
+++ b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs
@@ -69,6 +69,16 @@ namespace BizHawk.Client.EmuHawk.Properties {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
+
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap VBoyController {
+            get {
+                object obj = ResourceManager.GetObject("VBoyController", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
         
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.resx b/BizHawk.Client.EmuHawk/Properties/Resources.resx
index 54487806a0..df49e012cf 100644
--- a/BizHawk.Client.EmuHawk/Properties/Resources.resx
+++ b/BizHawk.Client.EmuHawk/Properties/Resources.resx
@@ -142,6 +142,9 @@
   <data name="A78Joystick" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\ControllerImages\A78Joystick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="VBoyController" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\ControllerImages\VBoyController.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="cdlogger" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\cdlogger.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -1557,4 +1560,7 @@
   <data name="WSW" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\WSW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="VBoyController" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\ControllerImages\VBoyController.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 0c78e0720e..3bf38a554a 100644
--- a/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
+++ b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
@@ -45,6 +45,7 @@ namespace BizHawk.Client.EmuHawk
 			ControllerImages.Add("PSX Gamepad Controller", Properties.Resources.PSX_Original_Controller);
 			ControllerImages.Add("PSX DualShock Controller", Properties.Resources.psx_dualshock);
 			ControllerImages.Add("Apple IIe Keyboard", Properties.Resources.AppleIIKeyboard);
+			ControllerImages.Add("VirtualBoy Controller", Properties.Resources.VBoyController);
 			
 		}
 
diff --git a/BizHawk.Client.EmuHawk/images/ControllerImages/VBoyController.png b/BizHawk.Client.EmuHawk/images/ControllerImages/VBoyController.png
new file mode 100644
index 0000000000..59bef68ff7
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/ControllerImages/VBoyController.png differ