add icons, more tweaks