A few seconds after switching the conversation was to display the original stock icon.
Merge branch 'develop'