Added new icons, refactor code, started working on adding and removing shortcut from startup