social icon theming
fix merge conflict