Wasn't sure what dialogue you were referring to, but if it was that way in RSC I also agree that it should stay. Great point by MV.
As for point #2, absolutely fix this for convenience sake but it's not going to be at the top of the priority list (as it shouldn't be) it'll be fixed when a developer has some extra time on hand.
Point #3, If you change the kite it will look too much like the gold/trimmed version, which will lessen the appeal and value of them. It's not harming anyone for the square and kite to look exactly the same, I think it is best to leave them be. (If anything, change the square shield and leave the kite as is)