do small updates on icons, and on messages to include templates