Override social bookmarks icons affinitic refs #6030
Merge remote-tracking branch 'origin/master'