Polishing Around Rivets...

Look up a company called Rotobuff. They make awesome polishing tools as well as having a great polishing compound.