Add icon files and retina status item
Restructure and refactor some of the code