Merge "Updates to TCMS icons rewritting." into rvc-dev