Order is long then lat.  Updated icons.