Updated spritesheet to resize social icons to 70x70.
Resolved merge conflicts.