diff --git a/publichealth/home/models/admin.py b/publichealth/home/models/admin.py
index e250a41..1d72f5b 100644
--- a/publichealth/home/models/admin.py
+++ b/publichealth/home/models/admin.py
@@ -9,7 +9,7 @@ from wagtail.contrib.settings.models import BaseSetting, register_setting
 
 # A simple feedback module built into the site admin
 
-@register_setting(icon='help')
+@register_setting(icon='', classnames='icon icon-help')
 class DataletsSettings(BaseSetting):
     feedback_question = models.TextField(verbose_name='Name',
         help_text='Who should we reply to for questions?', blank=True)
diff --git a/tests/testapp/settings.py b/tests/testapp/settings.py
index a0e8f43..f85ffae 100644
--- a/tests/testapp/settings.py
+++ b/tests/testapp/settings.py
@@ -28,8 +28,8 @@ MIDDLEWARE = (
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.middleware.security.SecurityMiddleware',
-    'wagtail.core.middleware.SiteMiddleware',
     'wagtail.contrib.redirects.middleware.RedirectMiddleware',
+    # 'wagtail.contrib.legacy.sitemiddleware.SiteMiddleware', # deprecated in 2.11
 )
 
 ROOT_URLCONF = 'tests.testapp.urls'