Fixed map objects where not cleared on exit
Added access to icons for plugins