moved form-icon + toggle to core