Delete EH, add get icon group by type, WIP