icon_url support

Support `icon_url`, plus some other miscellaneous changes.