Merge "Add user icon to the other user preferences." into oc-dev