Fix various issues with rendering scattermap icons
#7825
+60
−10
Merged