Icon rework