both have their merits.  i'm not sure which to vote for.  i like the more abstract FS1 way of doing it, especially on fighter wings, but the icon quality is a bit bland.  something kindof irks me about the FS2 icons representing a specific ship class and the icons are a picture of a different class.  so i guess i'd say my ideal briefing would be FS1-esq triangles for fighters, and more icon-y and less picture-y capital ships, unique to each one.  for retail anyway, since there aren't terribly many different classes.  if there were quite a few cap ships of each role designation, i'd say one representative in each per species.  maybe add a two-letter class designation above it or something.