diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index d0c9cbdd76..7e4f539473 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -201,6 +201,9 @@
   <ItemGroup>
     <None Include="config\ControllerImages\SMSController.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="config\ControllerImages\GBController.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 b0e33df7fe..f9a468744d 100644
--- a/BizHawk.MultiClient/Properties/Resources.Designer.cs
+++ b/BizHawk.MultiClient/Properties/Resources.Designer.cs
@@ -88,6 +88,13 @@ namespace BizHawk.MultiClient.Properties {
             }
         }
         
+        internal static System.Drawing.Bitmap GBController {
+            get {
+                object obj = ResourceManager.GetObject("GBController", 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 9a1ce7b7df..d447273dd9 100644
--- a/BizHawk.MultiClient/Properties/Resources.resx
+++ b/BizHawk.MultiClient/Properties/Resources.resx
@@ -130,6 +130,9 @@
   <data name="FindHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\FindHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <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="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/GBController.png b/BizHawk.MultiClient/config/ControllerImages/GBController.png
new file mode 100644
index 0000000000..93179e60db
Binary files /dev/null and b/BizHawk.MultiClient/config/ControllerImages/GBController.png differ
diff --git a/BizHawk.MultiClient/config/InputConfig.cs b/BizHawk.MultiClient/config/InputConfig.cs
index 960992723d..63b268bddd 100644
--- a/BizHawk.MultiClient/config/InputConfig.cs
+++ b/BizHawk.MultiClient/config/InputConfig.cs
@@ -45,7 +45,18 @@ namespace BizHawk.MultiClient
             RightLabel.Location = new Point(8, 92);
             TextBox Right = new TextBox();
             Right.Location = new Point(48, 92);
-            
+
+            Label IButtonLabel = new Label();
+            IButtonLabel.Text = "I";
+            IButtonLabel.Location = new Point(8, 140);
+            TextBox IButton = new TextBox();
+            IButton.Location = new Point(48, 140);
+
+            Label IIButtonLabel = new Label();
+            IIButtonLabel.Text = "II";
+            IIButtonLabel.Location = new Point(8, 164);
+            TextBox IIButton = new TextBox();
+            IIButton.Location = new Point(48, 164);
 
             ButtonsGroupBox.Controls.Add(Up);
             ButtonsGroupBox.Controls.Add(UpLabel);
@@ -55,6 +66,11 @@ namespace BizHawk.MultiClient
             ButtonsGroupBox.Controls.Add(LeftLabel);
             ButtonsGroupBox.Controls.Add(Right);
             ButtonsGroupBox.Controls.Add(RightLabel);
+            ButtonsGroupBox.Controls.Add(IButton);
+            ButtonsGroupBox.Controls.Add(IButtonLabel);
+            ButtonsGroupBox.Controls.Add(IIButton);
+            ButtonsGroupBox.Controls.Add(IIButtonLabel);
+            
 
             ControllerImage.Image = BizHawk.MultiClient.Properties.Resources.SMSController;
 
@@ -78,6 +94,7 @@ namespace BizHawk.MultiClient
         private void DoGameBoy()
         {
             this.Text = ControllerStr + "Gameboy";
+            ControllerImage.Image = BizHawk.MultiClient.Properties.Resources.GBController;
         }
 
         private void InputConfig_Load(object sender, EventArgs e)