When the fuel tank is refurbished it is a good time to renew as many of the old fittings, graphics, fuel lines etc as you can afford - it is so much easier when the tank has been stripped down for painting/repair to replace the essential parts that go to make up the complete assembly.
You may wish to consider the components listed below:
Add as many items as you wish to the same shopping cart new bolts 9701306035, screws 9014906011 and anti-vibe damper 3Y62418300 for example, and still only pay the same single fixed price shipping cost.
This component may have other applications in the Yamaha model range.