Fixed Icons, Added Graph by Points