Merge 882571bd97 into 1d9247f0f5

bakerydemo/base/models.py

@@ -480,7 +480,7 @@ class FormPage(AbstractEmailForm):
     ]
 
 
-@register_setting(icon="cog")
+@register_setting
 class GenericSettings(ClusterableModel, BaseGenericSetting):
     twitter_url = models.URLField(verbose_name="Twitter URL", blank=True)
     github_url = models.URLField(verbose_name="GitHub URL", blank=True)
@@ -498,7 +498,7 @@ class GenericSettings(ClusterableModel, BaseGenericSetting):
     ]
 
 
-@register_setting(icon="site")
+@register_setting
 class SiteSettings(BaseSiteSetting):
     title_suffix = models.CharField(
         verbose_name="Title suffix",