diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 9d15932567..4ade3c7628 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -1192,6 +1192,7 @@
     <None Include="config\ControllerImages\GENController.png" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="images\pcejin1.bmp" />
     <None Include="images\watch.ico" />
     <None Include="images\TurboFastForward.png" />
     <None Include="images\cheat.png" />
diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs
index 424e3bd154..ba55318a04 100644
--- a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs
+++ b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs
@@ -769,6 +769,16 @@ 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);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.resx b/BizHawk.Client.EmuHawk/Properties/Resources.resx
index a027ea9e09..ebb48ded0a 100644
--- a/BizHawk.Client.EmuHawk/Properties/Resources.resx
+++ b/BizHawk.Client.EmuHawk/Properties/Resources.resx
@@ -882,4 +882,7 @@
   <data name="alt_about_image" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\alt_about_image.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="pcejin1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\pcejin1.bmp;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/images/pcejin1.bmp b/BizHawk.Client.EmuHawk/images/pcejin1.bmp
new file mode 100644
index 0000000000..172b953b33
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/pcejin1.bmp differ
diff --git a/BizHawk.Client.EmuHawk/tools/ToolBox.Designer.cs b/BizHawk.Client.EmuHawk/tools/ToolBox.Designer.cs
index 03475d45e5..34e97e4123 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolBox.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolBox.Designer.cs
@@ -47,6 +47,7 @@
 			this.SNESGameGenieToolbarItem = new System.Windows.Forms.ToolStripButton();
 			this.GGGameGenieToolbarItem = new System.Windows.Forms.ToolStripButton();
 			this.GBGameGenieToolbarItem = new System.Windows.Forms.ToolStripButton();
+			this.PceBgViewerToolbarItem = new System.Windows.Forms.ToolStripButton();
 			this.ToolBoxStrip.SuspendLayout();
 			this.SuspendLayout();
 			// 
@@ -89,7 +90,8 @@
             this.SNESGraphicsDebuggerToolbarItem,
             this.SNESGameGenieToolbarItem,
             this.GGGameGenieToolbarItem,
-            this.GBGameGenieToolbarItem});
+            this.GBGameGenieToolbarItem,
+            this.PceBgViewerToolbarItem});
 			this.ToolBoxStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;
 			this.ToolBoxStrip.Location = new System.Drawing.Point(2, 2);
 			this.ToolBoxStrip.Name = "ToolBoxStrip";
@@ -251,6 +253,16 @@
 			this.GBGameGenieToolbarItem.ToolTipText = "Gameboy Game Genie Encoder/Decoder";
 			this.GBGameGenieToolbarItem.Click += new System.EventHandler(this.GBGameGenieToolbarItem_Click);
 			// 
+			// PceBgViewerToolbarItem
+			// 
+			this.PceBgViewerToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pcejin1;
+			this.PceBgViewerToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.PceBgViewerToolbarItem.Name = "PceBgViewerToolbarItem";
+			this.PceBgViewerToolbarItem.Size = new System.Drawing.Size(42, 20);
+			this.PceBgViewerToolbarItem.Text = "BG";
+			this.PceBgViewerToolbarItem.ToolTipText = "PC Engine Background Viewer";
+			this.PceBgViewerToolbarItem.Click += new System.EventHandler(this.PceBgViewerToolbarItem_Click);
+			// 
 			// ToolBox
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -288,8 +300,9 @@
 		private System.Windows.Forms.ToolStripButton SNESGameGenieToolbarItem;
 		private System.Windows.Forms.ToolStripButton TAStudioToolbarItem;
 		private System.Windows.Forms.ToolStripButton GGGameGenieToolbarItem;
-		private System.Windows.Forms.ToolStripButton GBGameGenieToolbarItem;
+		private System.Windows.Forms.ToolStripButton PceBgViewerToolbarItem;
 		private System.Windows.Forms.Button CloseBtn;
+		private System.Windows.Forms.ToolStripButton GBGameGenieToolbarItem;
 
 	}
 }
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/tools/ToolBox.cs b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
index 8d8508d017..bfce1ec48b 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
@@ -8,6 +8,7 @@ using BizHawk.Client.Common;
 using BizHawk.Emulation.Cores.Calculators;
 using BizHawk.Emulation.Cores.Nintendo.NES;
 using BizHawk.Emulation.Cores.Nintendo.SNES;
+using BizHawk.Emulation.Cores.PCEngine;
 
 namespace BizHawk.Client.EmuHawk
 {
@@ -56,16 +57,15 @@ namespace BizHawk.Client.EmuHawk
 			GGGameGenieToolbarItem.Visible =
 				Global.Game.System == "GG";
 
+			PceBgViewerToolbarItem.Visible = Global.Emulator is PCEngine;
+			
 			GBGameGenieToolbarItem.Visible = Global.Game.System == "GB";
 
 			foreach (var button in ToolBoxItems)
 			{
-				//if (button is ToolStripButton)
-				//{
-					var toolBtn = button as ToolStripButton;
-					toolBtn.Click += (o, e) => Close();
-					toolBtn.Paint += (o, e) => SetText();
-				//}
+				var toolBtn = button as ToolStripButton;
+				toolBtn.Click += (o, e) => Close();
+				toolBtn.Paint += (o, e) => SetText();
 			}
 
 			SetSize();
@@ -221,6 +221,19 @@ namespace BizHawk.Client.EmuHawk
 			GlobalWin.MainForm.LoadGameGenieEc();
 		}
 
+		private void PceBgViewerToolbarItem_Click(object sender, EventArgs e)
+		{
+			if (Global.Emulator is PCEngine)
+			{
+				GlobalWin.Tools.Load<PCEBGViewer>();
+			}
+		}
+
 		#endregion
+
+		private void toolStripButton1_Click(object sender, EventArgs e)
+		{
+
+		}
 	}
 }