Managed to get the icons done (fixes issue #380)