add ICON icontrols
Merge branch 'miguelBergen'