Fixed icon logic
v1.4.1