more tweaks to icon implementation (2)