diff --git a/pages_builder/pages/forms/single-question-page.yml b/pages_builder/pages/forms/single-question-page.yml
index f10319da..1c6a7753 100644
--- a/pages_builder/pages/forms/single-question-page.yml
+++ b/pages_builder/pages/forms/single-question-page.yml
@@ -12,7 +12,7 @@ examples:
           <input type="hidden" name="csrf_token" value="##fa3c0dda184bfbb021bac53fd569ca3d077997b8">
           <div class="question" id="duns_number">
             <label for="input-duns_number">
-              <span class="question-heading-with-hint">DUNS number</span>
+              <span class="question-heading">DUNS number</span>
             </label>
             <span class="question-advice" id="input-duns_number-question-advice">
               <p>The Digital Marketplace uses your head office’s 9‑digit DUNS number to see if you’re already a supplier on the G‑Cloud framework.</p>
diff --git a/spec/javascripts/unit/ListEntrySpec.js b/spec/javascripts/unit/ListEntrySpec.js
index 57e71e71..886b9394 100644
--- a/spec/javascripts/unit/ListEntrySpec.js
+++ b/spec/javascripts/unit/ListEntrySpec.js
@@ -9,7 +9,7 @@ describe("ListEntryField", function () {
       ),
       wrapperHTML = (
           '<fieldset class="question" id="features">' +
-            '<legend class="question-heading question-heading-with-hint ">Service features</legend>' +
+            '<legend class="question-heading">Service features</legend>' +
             '<p class="question-hint">Include the technical features of your product, eg graphical workflow, remote access. (Maximum 10 words per feature. Maximum 10 features.)</p>' +
             '<div class="input-list" data-list-item-name="feature" id="list-entry-features">' +
             '</div>' +
diff --git a/toolkit/templates/forms/list-entry.html b/toolkit/templates/forms/list-entry.html
index 72bcf168..4b236570 100644
--- a/toolkit/templates/forms/list-entry.html
+++ b/toolkit/templates/forms/list-entry.html
@@ -13,7 +13,7 @@
 {% endif %}
   <fieldset class="question {% if first_question %}first-question{% endif %}" id="{{ id }}">
     <legend>
-      <span class="question-heading {% if hint or question_advice %}question-heading-with-hint{% endif %}">
+      <span class="question-heading">
         {% if question_number %}
           <span class="question-number">
             {{ question_number }}
diff --git a/toolkit/templates/forms/pricing.html b/toolkit/templates/forms/pricing.html
index 27b3ac5f..421f6e6b 100644
--- a/toolkit/templates/forms/pricing.html
+++ b/toolkit/templates/forms/pricing.html
@@ -62,7 +62,7 @@
 {% else %}
   <fieldset class="question first-question" id="{{ name }}">
     <legend>
-      <span class="question-heading{% if hint or question_advice %} question-heading-with-hint{% endif %}">
+      <span class="question-heading">
         {{ question }}
       </span>
       {% if error %}
diff --git a/toolkit/templates/forms/selection-buttons.html b/toolkit/templates/forms/selection-buttons.html
index e5a6c093..af24b5ed 100644
--- a/toolkit/templates/forms/selection-buttons.html
+++ b/toolkit/templates/forms/selection-buttons.html
@@ -10,7 +10,7 @@
 {% endif %}
   <fieldset class="question first-question{% if inline or type=='boolean' %} inline{% endif %}" id="{{ name }}">
     <legend>
-      <span class="question-heading{% if hint or question_advice %} question-heading-with-hint{% endif %}">
+      <span class="question-heading{% if hint_underneath %} question-heading-with-hint-underneath{% endif %}">
         {% if question_number %}
           <span class="question-number">
             {{ question_number }}
diff --git a/toolkit/templates/forms/textbox.html b/toolkit/templates/forms/textbox.html
index 0590aa4d..f1824596 100644
--- a/toolkit/templates/forms/textbox.html
+++ b/toolkit/templates/forms/textbox.html
@@ -10,7 +10,7 @@
 {% endif %}
   <div class="question{% if hidden %} js-hidden{% endif %}{% if hidden is defined %} related-information{% endif %}" id="{{ name }}">
     <label for="input-{{ name }}">
-      <span class="question-heading{% if hint or question_advice %}-with-hint{% endif %}">
+      <span class="question-heading">
         {% if question_number %}
           <span class="question-number">
             {{ question_number }}
diff --git a/toolkit/templates/forms/upload.html b/toolkit/templates/forms/upload.html
index cf450e5e..78973d7f 100644
--- a/toolkit/templates/forms/upload.html
+++ b/toolkit/templates/forms/upload.html
@@ -11,7 +11,7 @@
   <div class="question" id="{{ name }}">
     <label for="input-{{ name }}">
       {% if question %}
-        <span class="question-heading{% if hint or question_advice %}-with-hint{% endif %}">
+        <span class="question-heading">
           {% if question_number %}
             <span class="question-number">
               {{ question_number }}