Better (isn) icon, remove leftover code