Replace icon logic with new wrapped icon logic.
Fixing some bugs with the new icon model.