Merge "Convert signal icon to be custom drawable" into oc-dev