Version 2.1 push

Changed the icon set + made some changes to functionality.