diff --git a/files/server-icon.c b/files/server-icon.c
new file mode 100644
index 0000000..fa0d38c
--- /dev/null
+++ b/files/server-icon.c
@@ -0,0 +1,167 @@
+/* GPLv3
+ * Valware © 2025
+*/
+/*** <<<MODULE MANAGER START>>>
+module
+{
+		documentation "https://github.com/ObsidianIRC/UnrealIRCd-Modules/blob/main/README.md#favicon-module";
+		troubleshooting "In case of problems, check the documentation or e-mail me at v.a.pond@outlook.com";
+		min-unrealircd-version "6.1";
+		max-unrealircd-version "6.*";
+		post-install-text {
+				"The module is installed. Now all you need to do is add a loadmodule line:";
+				"loadmodule \"third/server-icon\";";
+				"The module needs no other configuration.";
+				"Once you're good to go, you can finally type in your shell: ./unrealircd rehash";
+		}
+}
+*** <<<MODULE MANAGER END>>>
+
+*/
+
+#include "unrealircd.h"
+
+#define CONF_FAVICON "server-icon"
+
+/* ICON config struct */
+struct
+{
+	char *isupport_line;
+	MultiLine *hosts;
+	unsigned short int has_hosts;
+} cfg;
+
+
+int favicon_configtest(ConfigFile *cf, ConfigEntry *ce, int type, int *errs);
+int favicon_configrun(ConfigFile *cf, ConfigEntry *ce, int type);
+void setconf(void);
+void freeconf(void);
+
+ModuleHeader MOD_HEADER
+	= {
+	"third/server-icon",
+	"1.0",
+	"Provides the ICON ISUPPORT token with a configurable value (IRCv3 draft)",
+	"Valware",
+	"unrealircd-6",
+};
+
+MOD_TEST()
+{
+	setconf();
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, favicon_configtest);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, favicon_configrun);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	ISupport *is;
+	if (!(is = ISupportAdd(modinfo->handle, "ICON", cfg.isupport_line)))
+		return MOD_FAILED;
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	freeconf();
+	return MOD_SUCCESS;
+}
+
+void setconf(void)
+{
+	memset(&cfg, 0, sizeof(cfg));
+	cfg.has_hosts = 0;
+	safe_strdup(cfg.isupport_line,"");
+}
+
+void freeconf(void)
+{
+	freemultiline(cfg.hosts);
+	cfg.has_hosts = 0;
+	safe_free(cfg.isupport_line);
+	memset(&cfg, 0, sizeof(cfg));
+}
+
+
+int favicon_configtest(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	int errors = 0;
+	ConfigEntry *cep;
+		freeconf();
+		setconf();
+	if (type != CONFIG_MAIN)
+		return 0;
+
+	if (!ce || !ce->name)
+				return 0;
+
+		if (strcmp(ce->name, CONF_FAVICON))
+		return 0;
+
+	for (cep = ce->items; cep; cep = cep->next)
+	{
+		if (!cep->name)
+		{
+			config_error("%s:%i: blank %s item", cep->file->filename, cep->line_number, CONF_FAVICON);
+			++errors;
+			continue;
+		}
+		if (!strcasecmp(cep->name, "host"))
+		{
+			if (!BadPtr(cep->value))
+				cfg.has_hosts = 1;
+
+			else
+				config_error("%s:%i: Empty host at %s::%s", cep->file->filename, cep->line_number, CONF_FAVICON, cep->name);
+
+			continue;
+		}
+
+		// Anything else is unknown to us =]
+		config_warn("%s:%i: unknown item %s::%s", cep->file->filename, cep->line_number, CONF_FAVICON, cep->name); // So display just a warning
+	}
+
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+int favicon_configrun(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	ConfigEntry *cep;
+	char buf[BUFSIZE] = "\0";
+	
+	if (type != CONFIG_MAIN)
+		return 0;
+
+	if (!ce || !ce->name)
+		return 0;
+
+	if (strcmp(ce->name, "icon"))
+		return 0;
+
+	for (cep = ce->items; cep; cep = cep->next)
+	{
+		if (!cep->name)
+			continue;
+
+		if (!strcmp(cep->name, "host"))
+			addmultiline(&cfg.hosts, cep->value);
+	}
+		
+	for (MultiLine *m = cfg.hosts; m; m = m->next)
+	{
+		strlcat(buf,m->line, sizeof(buf));
+		if (m->next)
+			strlcat(buf,"\\x20",sizeof(buf));
+	}
+	if (strlen(buf))
+		safe_strdup(cfg.isupport_line, buf);
+
+	return 1;
+}