optimized icon-object
icon object modifications
Merge branch 'feature/icon-object' into develop