Finishing merge of social icon code