[FOLLOWUP][TASK] Use only one instance of iconFactory per class