Merge "Choose correct icon shade of grey" into oc-dr1-dev