Adding Icons and Launch Images

Some code cleanup as well