Added an alternative exit method and support for a main icon
Initial creation