Merge "Rewrite Icons from the TCS." into rvc-dev