Few bugfixes.
Fixed icon not always showing, and a typo in message box.