Added icons for messages as they are now mandatory