Revert "Revert "Removing unnecessary iconFactory class when gene..."

Revert submission 25518508-revert-25483550-themed-badge-GJNKEECDMN

Reason for revert: Fixed badging bug

Reverted changes: /q/submissionid:25518508-revert-25483550-themed-badge-GJNKEECDMN

Change-Id: I0f378eaabcb7bdea855b80a33bdec007c9b11436
2 files changed