I'm using layer effects on the rivets
Very easy: paint white rivets, enable "outer glow" on the layer effects, set it to a darker color and multiply. After this set the complete layer to overlay or soft light

much easier and additional you don't have any light direction in your rivets (because of this there're no problems with a concave or convex appereance)