Fixed numerous issues and added new icons
Merge branch 'master' of https://github.com/dawithers/rootsmapper