Fixed alignment and an icon bug in messages