More icons cleanup