Merge "Revert "Revert "Removing unnecessary iconFactory class when gene..."" into main