Added icon and separated sync into send/receive