Merge pull request #27 from Herrie82/master

Code cleanup, launcher & bookmark images