New icon and code cleanup

Version 1.2.0