Improved iconography