Added error handling for loading the icon, and included the icon
(whoops, forgot to do that before).