Icons fix for iPad
Hot Swap Avatar for messages