Add user icon for conversation partner, and their name if they de-anonymize
Merged style issues