Added icons
Adjusted messages template