See individual commits. Do any of the places with setupEngine removed need the icon engine added?
setupEngine