More icons and some tweaks to how the icons are retrieved