I refactored the circle element, using SVG similarly as for triangle.