Icon overhaul