Removed reference to BaseIcon for Annex library
Merging in updates to master