I'm still really uncomfortable with replacing the icon that someone has chosen with a different icon, even if it's their default, even if you can go look at the icon they chose. Would providing people with styles that just didn't display icons make the confusion go away?