diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.resx b/BizHawk.Client.EmuHawk/Properties/Resources.resx
index 89669678e4..cd949e296c 100644
--- a/BizHawk.Client.EmuHawk/Properties/Resources.resx
+++ b/BizHawk.Client.EmuHawk/Properties/Resources.resx
@@ -119,7 +119,7 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="C64Keyboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\config\ControllerImages\C64Keyboard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\images\ControllerImages\C64Keyboard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="checkbox" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\checkbox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -137,7 +137,7 @@
     <value>..\images\console16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="SaturnController" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\config\controllerimages\saturncontroller.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\images\controllerimages\saturncontroller.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Stop" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\Stop.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -155,7 +155,7 @@
     <value>..\images\textdoc.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="SMSController" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\config\ControllerImages\SMSController.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\images\ControllerImages\SMSController.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="MoveRight" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\MoveRight.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -167,7 +167,7 @@
     <value>..\images\poke.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="A78Joystick" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\config\ControllerImages\A78Joystick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\images\ControllerImages\A78Joystick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <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>
@@ -233,10 +233,10 @@
     <value>..\images\Recent.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="N64" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\config\ControllerImages\N64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\images\ControllerImages\N64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="colecovisioncontroller" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\config\ControllerImages\colecovisioncontroller.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\images\ControllerImages\colecovisioncontroller.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Unfreeze" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\Unfreeze.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -251,7 +251,7 @@
     <value>..\images\pcb.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>
+    <value>..\images\ControllerImages\SNES_Controller.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="LightOff" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\LightOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -320,7 +320,7 @@
     <value>..\images\camera.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>
+    <value>..\images\ControllerImages\PCEngineController.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Freeze" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\Freeze.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -781,7 +781,7 @@
     <value>..\images\console32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.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>
+    <value>..\images\ControllerImages\GBController.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Previous" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\Previous.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -841,10 +841,10 @@
     <value>..\images\Duplicate.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="C64Joystick" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\config\ControllerImages\C64Joystick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\images\ControllerImages\C64Joystick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="GBA_Controller" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\config\ControllerImages\GBA_Controller.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\images\ControllerImages\GBA_Controller.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Import" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\Import.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -856,19 +856,19 @@
     <value>..\images\Forward.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="IntVController" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\config\ControllerImages\IntVController.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\images\ControllerImages\IntVController.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="C64Symbol" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\C64Symbol.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <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>
+    <value>..\images\ControllerImages\TI83Calculator.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="TAStudio" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\TAStudio.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>
+    <value>..\images\ControllerImages\GENController.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="atari_controller" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\atari_controller.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -880,10 +880,10 @@
     <value>..\images\ReadOnly.png;System.Drawing.Bitmap, System.Drawing, Version=2.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>
+    <value>..\images\ControllerImages\TI83_Controller.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <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>
+    <value>..\images\ControllerImages\NES_Controller.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Lua" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\Lua.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -931,7 +931,7 @@
     <value>..\images\dual.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="WonderSwanColor" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\config\ControllerImages\WonderSwanColor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\images\ControllerImages\WonderSwanColor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="alt_about_image" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\alt_about_image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1465,10 +1465,10 @@
     <value>..\images\user_blue_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Lynx" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\config\ControllerImages\Lynx.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\images\ControllerImages\Lynx.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="psx_dualshock" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\config\ControllerImages\psx_dualshock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\images\ControllerImages\psx_dualshock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="add" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1486,7 +1486,7 @@
     <value>..\images\Triangle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="PSX_Original_Controller" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\config\ControllerImages\PSX-Original-Controller.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\images\ControllerImages\PSX-Original-Controller.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="HawkInLove" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\HawkInLove.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
diff --git a/BizHawk.Client.EmuHawk/images/ControllerImages/A78Joystick.png b/BizHawk.Client.EmuHawk/images/ControllerImages/A78Joystick.png
new file mode 100644
index 0000000000..1c1dad9150
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/ControllerImages/A78Joystick.png differ
diff --git a/BizHawk.Client.EmuHawk/images/ControllerImages/C64Joystick.png b/BizHawk.Client.EmuHawk/images/ControllerImages/C64Joystick.png
new file mode 100644
index 0000000000..d5ce8bde37
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/ControllerImages/C64Joystick.png differ
diff --git a/BizHawk.Client.EmuHawk/images/ControllerImages/C64Keyboard.png b/BizHawk.Client.EmuHawk/images/ControllerImages/C64Keyboard.png
new file mode 100644
index 0000000000..2c87e91ce0
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/ControllerImages/C64Keyboard.png differ
diff --git a/BizHawk.Client.EmuHawk/images/ControllerImages/GBA_Controller.png b/BizHawk.Client.EmuHawk/images/ControllerImages/GBA_Controller.png
new file mode 100644
index 0000000000..9eee422dc5
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/ControllerImages/GBA_Controller.png differ
diff --git a/BizHawk.Client.EmuHawk/images/ControllerImages/GBController.png b/BizHawk.Client.EmuHawk/images/ControllerImages/GBController.png
new file mode 100644
index 0000000000..2bbbd380b5
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/ControllerImages/GBController.png differ
diff --git a/BizHawk.Client.EmuHawk/images/ControllerImages/GENController.png b/BizHawk.Client.EmuHawk/images/ControllerImages/GENController.png
new file mode 100644
index 0000000000..898b8cac19
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/ControllerImages/GENController.png differ
diff --git a/BizHawk.Client.EmuHawk/images/ControllerImages/IntVController.png b/BizHawk.Client.EmuHawk/images/ControllerImages/IntVController.png
new file mode 100644
index 0000000000..0a6fe8b09f
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/ControllerImages/IntVController.png differ
diff --git a/BizHawk.Client.EmuHawk/images/ControllerImages/Lynx.png b/BizHawk.Client.EmuHawk/images/ControllerImages/Lynx.png
new file mode 100644
index 0000000000..ab135c6d7d
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/ControllerImages/Lynx.png differ
diff --git a/BizHawk.Client.EmuHawk/images/ControllerImages/N64.png b/BizHawk.Client.EmuHawk/images/ControllerImages/N64.png
new file mode 100644
index 0000000000..d4403059a9
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/ControllerImages/N64.png differ
diff --git a/BizHawk.Client.EmuHawk/images/ControllerImages/NES_Controller.png b/BizHawk.Client.EmuHawk/images/ControllerImages/NES_Controller.png
new file mode 100644
index 0000000000..da59820a7d
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/ControllerImages/NES_Controller.png differ
diff --git a/BizHawk.Client.EmuHawk/images/ControllerImages/PCEngineController.png b/BizHawk.Client.EmuHawk/images/ControllerImages/PCEngineController.png
new file mode 100644
index 0000000000..d2637c411e
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/ControllerImages/PCEngineController.png differ
diff --git a/BizHawk.Client.EmuHawk/images/ControllerImages/PSX-Original-Controller.png b/BizHawk.Client.EmuHawk/images/ControllerImages/PSX-Original-Controller.png
new file mode 100644
index 0000000000..6dd8398dae
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/ControllerImages/PSX-Original-Controller.png differ
diff --git a/BizHawk.Client.EmuHawk/images/ControllerImages/SMSController.png b/BizHawk.Client.EmuHawk/images/ControllerImages/SMSController.png
new file mode 100644
index 0000000000..7ebf0fe021
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/ControllerImages/SMSController.png differ
diff --git a/BizHawk.Client.EmuHawk/images/ControllerImages/SNES_Controller.png b/BizHawk.Client.EmuHawk/images/ControllerImages/SNES_Controller.png
new file mode 100644
index 0000000000..86e997787f
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/ControllerImages/SNES_Controller.png differ
diff --git a/BizHawk.Client.EmuHawk/images/ControllerImages/SaturnController.jpg b/BizHawk.Client.EmuHawk/images/ControllerImages/SaturnController.jpg
new file mode 100644
index 0000000000..7888841362
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/ControllerImages/SaturnController.jpg differ
diff --git a/BizHawk.Client.EmuHawk/images/ControllerImages/TI83Calculator.png b/BizHawk.Client.EmuHawk/images/ControllerImages/TI83Calculator.png
new file mode 100644
index 0000000000..3036917333
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/ControllerImages/TI83Calculator.png differ
diff --git a/BizHawk.Client.EmuHawk/images/ControllerImages/TI83_Controller.png b/BizHawk.Client.EmuHawk/images/ControllerImages/TI83_Controller.png
new file mode 100644
index 0000000000..51e57f97a1
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/ControllerImages/TI83_Controller.png differ
diff --git a/BizHawk.Client.EmuHawk/images/ControllerImages/WonderSwanColor.png b/BizHawk.Client.EmuHawk/images/ControllerImages/WonderSwanColor.png
new file mode 100644
index 0000000000..e6ef63cd48
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/ControllerImages/WonderSwanColor.png differ
diff --git a/BizHawk.Client.EmuHawk/images/ControllerImages/colecovisioncontroller.png b/BizHawk.Client.EmuHawk/images/ControllerImages/colecovisioncontroller.png
new file mode 100644
index 0000000000..e865a07b86
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/ControllerImages/colecovisioncontroller.png differ
diff --git a/BizHawk.Client.EmuHawk/images/ControllerImages/psx_dualshock.png b/BizHawk.Client.EmuHawk/images/ControllerImages/psx_dualshock.png
new file mode 100644
index 0000000000..3ca47a305a
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/ControllerImages/psx_dualshock.png differ