Merge changes I3f220769,I4c9af08c into rvc-dev

* changes:
  Fixed the coloring of the background of the conversation icons
  Add back the conversation icon in the expanded view