I went with the round ones that Classic and NPD claim are original and correct. However, I few posters said that they have only seen square ones on Firebirds and have square ones on their cars.
Once I know this is installing correctly or I return for a different one (but you said your's is the same), I'll update you on the clips.
