Added new icons, minor changes to export