more updates to icons, messages, and for clear code