Fix icons and point color in graph