diff --git a/src/BizHawk.Client.EmuHawk/Properties/Resources.cs b/src/BizHawk.Client.EmuHawk/Properties/Resources.cs
index 2347a123bc..9db6a5d48b 100644
--- a/src/BizHawk.Client.EmuHawk/Properties/Resources.cs
+++ b/src/BizHawk.Client.EmuHawk/Properties/Resources.cs
@@ -16,6 +16,7 @@ namespace BizHawk.Client.EmuHawk.Properties
 		private static Bitmap ReadEmbeddedIconAsBitmap(string filename) => new Bitmap(EmuHawk.ReflectionCache.EmbeddedResourceStream($"images.{filename}.ico"));
 
 		internal static readonly Lazy<Bitmap> A78Joystick = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("ControllerImages.A78Joystick"));
+		internal static readonly Lazy<Bitmap> AmigaKeyboard = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("ControllerImages.AmigaKeyboard"));
 		internal static readonly Lazy<Bitmap> AppleIIKeyboard = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("ControllerImages.AppleIIKeyboard"));
 		internal static readonly Lazy<Bitmap> ArcadeController = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("ControllerImages.ArcadeController"));
 		internal static readonly Lazy<Bitmap> C64Joystick = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("ControllerImages.C64Joystick"));
diff --git a/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs b/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
index 9b4ae66856..57860d9bd3 100644
--- a/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
+++ b/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
@@ -52,6 +52,7 @@ namespace BizHawk.Client.EmuHawk
 			ControllerImages.Add("NeoGeo Portable Controller", Properties.Resources.NgpController);
 			ControllerImages.Add("MAME Controller", Properties.Resources.ArcadeController);
 			ControllerImages.Add("NDS Controller", Properties.Resources.DSController);
+			ControllerImages.Add("Amiga Controller", Properties.Resources.AmigaKeyboard);
 		}
 
 		protected override void OnActivated(EventArgs e)
diff --git a/src/BizHawk.Client.EmuHawk/images/ControllerImages/AmigaKeyboard.png b/src/BizHawk.Client.EmuHawk/images/ControllerImages/AmigaKeyboard.png
new file mode 100644
index 0000000000..612be262cb
Binary files /dev/null and b/src/BizHawk.Client.EmuHawk/images/ControllerImages/AmigaKeyboard.png differ