Code cleanup, launcher & bookmark images

Added proper support for launcher and bookmark images + some minor code
cleanup
Merge pull request #27 from Herrie82/master

Code cleanup, launcher & bookmark images