I would leave the rivets right where they are.