more ICONS & misc fixes