Updated social buttons
Merging upstream changes