Re-add icon code, update comment