Rename overwrite to be meaningful
Update Social
Toolbar i18n and site_client links