I've replaced some of the metal, allen head, button screws on the fairing with BMW stainless torx screws. I see no practicle way nor reason to do the same replacement of the plastic rivets. The rivets are effective, easy to use and cheap to replace (if you do not buy them from Yamaha). I replaced the screws with the torx because I had them on hand, I carry torx tools because all of Spousal Unit's bikes are BMWs, the torx screw heads are less likely to get bunged-up and I like them. Additionally, the torx screws have a pointed tip that is easier to start in the captured nuts than the OEM hardware. I have BMW caps on my tire air valves too.