Added control icons, fixed ControlColorer