Merged Vlado's vertex icon work and my changes to it