check-iconclose Shapewarning-iconfilesearch

Optimisations