This will fix the icon issue(s) as #11784