diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 463542e3f..10d1a41d9 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -1592,11 +1592,15 @@ static void gui_init2(int argc, char** argv)
 		}
 		else
 		{
-/* TODO: Specify icon when run from Shell */
+			ULONG noicon = TAG_IGNORE;
+
+			if (nsoption_bool(hide_docky_icon))
+				noicon = REGAPP_NoIcon;
+
 			ami_appid = RegisterApplication(messages_get("NetSurf"),
 				REGAPP_URLIdentifier, "netsurf-browser.org",
 				REGAPP_FileName, argv[0],
-				REGAPP_NoIcon, TRUE,
+				noicon, TRUE,
 				REGAPP_HasPrefsWindow, TRUE,
 				REGAPP_CanCreateNewDocs, TRUE,
 				REGAPP_UniqueApplication, TRUE,