diff --git a/hypha/apply/funds/models/mixins.py b/hypha/apply/funds/models/mixins.py
index a620ce0af76ec24b15b1cef6c35ed78de5a3247c..31612c8efffc5c506b300c112325143ff41e02b4 100644
--- a/hypha/apply/funds/models/mixins.py
+++ b/hypha/apply/funds/models/mixins.py
@@ -109,7 +109,7 @@ class AccessFormData:
         # PERFORMANCE NOTE:
         # Do not attempt to iterate over form_fields - that will fully instantiate the form_fields
         # including any sub queries that they do
-        for i, field_data in enumerate(form_fields.stream_data):
+        for i, field_data in enumerate(form_fields.raw_data):
             block = form_fields.stream_block.child_blocks[field_data['type']]
             if isinstance(block, UploadableMediaBlock):
                 field_id = field_data.get('id')
diff --git a/hypha/apply/stream_forms/blocks.py b/hypha/apply/stream_forms/blocks.py
index e6b07d45ca1d86d00ebebba81b80536f3bcf0a66..f4bba3a4b423fd89b6792ed4e17639d501887765 100644
--- a/hypha/apply/stream_forms/blocks.py
+++ b/hypha/apply/stream_forms/blocks.py
@@ -1,5 +1,6 @@
 # Credit to https://github.com/BertrandBordage for initial implementation
 import bleach
+from anyascii import anyascii
 from dateutil.parser import isoparse, parse
 from django import forms
 from django.conf import settings
@@ -11,7 +12,6 @@ from django.utils.html import conditional_escape
 from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
 from django_bleach.templatetags.bleach_tags import bleach_value
-from unidecode import unidecode
 from wagtail.core.blocks import (
     BooleanBlock,
     CharBlock,
@@ -44,7 +44,7 @@ class FormFieldBlock(StructBlock):
         template = 'stream_forms/render_field.html'
 
     def get_slug(self, struct_value):
-        return force_str(slugify(unidecode(struct_value['field_label'])))
+        return force_str(slugify(anyascii(struct_value['field_label'])))
 
     def get_field_class(self, struct_value):
         return self.field_class
diff --git a/hypha/apply/stream_forms/models.py b/hypha/apply/stream_forms/models.py
index eb810d9a17a3fb6175f38309d0252d0d0616b6a7..92b19fbc516b9acba6fc36aaf495ca060cf1def2 100644
--- a/hypha/apply/stream_forms/models.py
+++ b/hypha/apply/stream_forms/models.py
@@ -32,7 +32,7 @@ class BaseStreamForm:
         # PERFORMANCE NOTE:
         # Do not attempt to iterate over form_fields - that will fully instantiate the form_fields
         # including any sub queries that they do
-        for i, field_data in enumerate(form_fields.stream_data):
+        for i, field_data in enumerate(form_fields.raw_data):
             block = form_fields.stream_block.child_blocks[field_data['type']]
             field_id = field_data.get('id')
             try:
diff --git a/hypha/public/navigation/models.py b/hypha/public/navigation/models.py
index 8bdde4a92c384cced4832806b993a6c84fb1c4a6..f54f9b637b511ac5a550d6aef0818710fbf6f933 100644
--- a/hypha/public/navigation/models.py
+++ b/hypha/public/navigation/models.py
@@ -13,7 +13,7 @@ class LinkBlock(blocks.StructBlock):
         template = 'navigation/blocks/menu_item.html',
 
 
-@register_setting(icon='list-ul')
+@register_setting(icon='', classnames='icon icon-list-ul')
 class NavigationSettings(BaseSetting, ClusterableModel):
     primary_navigation = StreamField(
         [('link', LinkBlock()), ],
diff --git a/requirements.txt b/requirements.txt
index f21a54142513de305cfa553bff1b901a742edc1e..576973c6d61ffc729d698be5f17b0ba02a4a7cfb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -42,7 +42,7 @@ psycopg2==2.8.6
 reportlab==3.5.59
 social_auth_app_django==4.0.0
 tomd==0.1.3
-wagtail-cache==1.0.1
+wagtail-cache==1.0.2
 wagtail-purge==0.1
-wagtail==2.11.7
+wagtail==2.13
 whitenoise==5.2.0