Reordered symbol markers for scatter/timeline and adjusted size of diamond.

Relates to:
  #728