Mast Step

The 4 rivets that attach the mast step casting to the forward crossbar on my HC18 are slightly loose, which allows the casting to wiggle a little bit. Should I replace the rivets and if so what size are they?