More icons, better code