Merge "Update Select Icon for new style." into rvc-dev