more tweaks to icon implementation (1)