diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.cs b/BizHawk.Client.EmuHawk/Properties/Resources.cs
index 090220844c..318f0af7ab 100644
--- a/BizHawk.Client.EmuHawk/Properties/Resources.cs
+++ b/BizHawk.Client.EmuHawk/Properties/Resources.cs
@@ -62,7 +62,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
 		internal static readonly Lazy<Bitmap> NGPController = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("ControllerImages.NGPController"));
 		internal static readonly Lazy<Bitmap> PCEngineController = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("ControllerImages.PCEngineController"));
 		internal static readonly Lazy<Bitmap> psx_dualshock = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("ControllerImages.psx_dualshock"));
-		internal static readonly Lazy<Bitmap> PSX_Original_Controller = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("ControllerImages.PSX-Original-Controller"));
 		internal static readonly Lazy<Bitmap> SaturnController = new Lazy<Bitmap>(() => ReadEmbeddedBitmapAt("images.ControllerImages.SaturnController.jpg"));
 		internal static readonly Lazy<Bitmap> SMSController = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("ControllerImages.SMSController"));
 		internal static readonly Lazy<Bitmap> SNES_Controller = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("ControllerImages.SNES_Controller"));
diff --git a/BizHawk.Client.EmuHawk/config/ControllerConfig.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
index a1dc26ae31..9efcf1df1c 100644
--- a/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
+++ b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
@@ -45,8 +45,7 @@ namespace BizHawk.Client.EmuHawk
 
 			ControllerImages.Add("WonderSwan Controller", Properties.Resources.WonderSwanColor);
 			ControllerImages.Add("Lynx Controller", Properties.Resources.Lynx);
-			ControllerImages.Add("PSX Gamepad Controller", Properties.Resources.PSX_Original_Controller);
-			ControllerImages.Add("PSX DualShock Controller", Properties.Resources.psx_dualshock);
+			ControllerImages.Add("PSX Front Panel", Properties.Resources.psx_dualshock);
 			ControllerImages.Add("Apple IIe Keyboard", Properties.Resources.AppleIIKeyboard);
 			ControllerImages.Add("VirtualBoy Controller", Properties.Resources.VBoyController);
 			ControllerImages.Add("NeoGeo Portable Controller", Properties.Resources.NGPController);
diff --git a/BizHawk.Client.EmuHawk/images/ControllerImages/PSX-Original-Controller.png b/BizHawk.Client.EmuHawk/images/ControllerImages/PSX-Original-Controller.png
deleted file mode 100644
index 6dd8398dae..0000000000
Binary files a/BizHawk.Client.EmuHawk/images/ControllerImages/PSX-Original-Controller.png and /dev/null differ
diff --git a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
index 18dd9b77d3..7f6f2ceaa3 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
@@ -216,7 +216,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
 			StudySaveBufferSize();
 		}
 
-		public string SystemId { get { return "PSX"; } }
+		public string SystemId => "PSX";
 
 		public static ControllerDefinition CreateControllerDefinition(SyncSettings syncSettings)
 		{