Finalized IconAnnotation tool and more improvements/fixes