diff --git a/hypha/apply/funds/templates/funds/application_base.html b/hypha/apply/funds/templates/funds/application_base.html
index 99a6a2de7b82ac02ffea49ba66644ec68387b9a1..b9a20a31a55678f51479f90a5470a5553c3d7baf 100644
--- a/hypha/apply/funds/templates/funds/application_base.html
+++ b/hypha/apply/funds/templates/funds/application_base.html
@@ -50,10 +50,10 @@
                 {% else %}
                     {% if field.group_number > 1 %}
                         <div class="field-group-{{ field.group_number }}{% if not show_all_group_fields %} js-hidden{% endif %}">
-                            {{ field }}
+                            {% include_block field.block with block_id=field.block.id %}
                         </div>
                     {% else %}
-                        {{ field }}
+                        {% include_block field.block with block_id=field.block.id %}
                     {% endif %}
                 {% endif %}
             {% endfor %}
diff --git a/hypha/apply/stream_forms/templates/stream_forms/heading_field.html b/hypha/apply/stream_forms/templates/stream_forms/heading_field.html
index d0939d606aa3d0582286efee16a0bd3200ff7edf..35aeffd07266a1054866d9ab1d6608da208c7f47 100644
--- a/hypha/apply/stream_forms/templates/stream_forms/heading_field.html
+++ b/hypha/apply/stream_forms/templates/stream_forms/heading_field.html
@@ -1,11 +1,12 @@
-{% block data_display %}
-    {% if self.size == 'h2' %}
-            <h2>{{ self.heading_text }}</h2>
+{% with 'h1 h2 h3' as sizelist %}
+    {% if self.size in sizelist.split %}
+    <{{ self.size }} id="{{ block_id }}">{{ self.heading_text }}
+        <a href="#{{ block_id }}">
+            <svg class="icon icon--anchor-link">
+                <use xlink:href="#anchor-link"></use>
+            </svg>
+        </a>
+    </{{ self.size }}>
 
-        {% elif self.size == 'h3' %}
-            <h3>{{ self.heading_text }}</h3>
-
-        {% elif self.size == 'h4' %}
-            <h4>{{ self.heading_text }}</h4>
     {% endif %}
-{% endblock %}
\ No newline at end of file
+{% endwith %}
\ No newline at end of file
diff --git a/hypha/static_src/src/sass/public/components/_icon.scss b/hypha/static_src/src/sass/public/components/_icon.scss
index c2d4970c9cb2987fa29f4658b8e104d7430e88fc..43755b2043589644dc057ff49fb6e6aa73728578 100644
--- a/hypha/static_src/src/sass/public/components/_icon.scss
+++ b/hypha/static_src/src/sass/public/components/_icon.scss
@@ -159,4 +159,12 @@
             display: block;
         }
     }
+
+    &--anchor-link {
+        background-size: contain;
+        margin-left: 7px;
+        margin-top: 15px;
+        fill: $color--tomato;
+    }
+
 }
diff --git a/hypha/templates/includes/sprites.html b/hypha/templates/includes/sprites.html
index a69598aaaa62d2d7d1c3718ed834062079d98026..ebe021589cd7a9834f0b2a19959bdd6434d2c9af 100644
--- a/hypha/templates/includes/sprites.html
+++ b/hypha/templates/includes/sprites.html
@@ -328,4 +328,8 @@
             <path d="M3 4h5v7H3zM2 2h7v1H2zM5 1h1v1H5z" fill="#f05e54"/>
         </g>
     </symbol>
+
+    <symbol id="anchor-link" viewBox="0 0 512 512">
+        <path fill="currentColor" d="M326.612 185.391c59.747 59.809 58.927 155.698.36 214.59-.11.12-.24.25-.36.37l-67.2 67.2c-59.27 59.27-155.699 59.262-214.96 0-59.27-59.26-59.27-155.7 0-214.96l37.106-37.106c9.84-9.84 26.786-3.3 27.294 10.606.648 17.722 3.826 35.527 9.69 52.721 1.986 5.822.567 12.262-3.783 16.612l-13.087 13.087c-28.026 28.026-28.905 73.66-1.155 101.96 28.024 28.579 74.086 28.749 102.325.51l67.2-67.19c28.191-28.191 28.073-73.757 0-101.83-3.701-3.694-7.429-6.564-10.341-8.569a16.037 16.037 0 0 1-6.947-12.606c-.396-10.567 3.348-21.456 11.698-29.806l21.054-21.055c5.521-5.521 14.182-6.199 20.584-1.731a152.482 152.482 0 0 1 20.522 17.197zM467.547 44.449c-59.261-59.262-155.69-59.27-214.96 0l-67.2 67.2c-.12.12-.25.25-.36.37-58.566 58.892-59.387 154.781.36 214.59a152.454 152.454 0 0 0 20.521 17.196c6.402 4.468 15.064 3.789 20.584-1.731l21.054-21.055c8.35-8.35 12.094-19.239 11.698-29.806a16.037 16.037 0 0 0-6.947-12.606c-2.912-2.005-6.64-4.875-10.341-8.569-28.073-28.073-28.191-73.639 0-101.83l67.2-67.19c28.239-28.239 74.3-28.069 102.325.51 27.75 28.3 26.872 73.934-1.155 101.96l-13.087 13.087c-4.35 4.35-5.769 10.79-3.783 16.612 5.864 17.194 9.042 34.999 9.69 52.721.509 13.906 17.454 20.446 27.294 10.606l37.106-37.106c59.271-59.259 59.271-155.699.001-214.959z"></path>
+    </symbol>
 </svg>