diff --git a/app/javascript/styles/_task-list.scss b/app/javascript/styles/_task-list.scss
index 603a6d55c..fda462e77 100644
--- a/app/javascript/styles/_task-list.scss
+++ b/app/javascript/styles/_task-list.scss
@@ -13,7 +13,6 @@
 
 .app-task-list__section {
   display: table;
-  @include govuk-font($size:24, $weight: bold);
 }
 
 .app-task-list__section-number {
diff --git a/app/views/case_logs/_tasklist.html.erb b/app/views/case_logs/_tasklist.html.erb
index 87eb00a7b..9d6fb4f34 100644
--- a/app/views/case_logs/_tasklist.html.erb
+++ b/app/views/case_logs/_tasklist.html.erb
@@ -1,7 +1,7 @@
 <ol class="app-task-list app-task-list--no-numbers">
   <% @form.sections.map do |section| %>
     <li>
-      <h2 class="app-task-list__section">
+      <h2 class="app-task-list__section govuk-heading-m">
         <span class="app-task-list__section-number">
           <%= section.label %>
         </span>
diff --git a/app/views/case_logs/edit.html.erb b/app/views/case_logs/edit.html.erb
index 96ad4b5de..1445ef508 100644
--- a/app/views/case_logs/edit.html.erb
+++ b/app/views/case_logs/edit.html.erb
@@ -1,10 +1,10 @@
 <%= turbo_frame_tag "case_log_form", target: "_top" do %>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds-from-desktop">
-      <h1 class="govuk-heading-xl">Tasklist for log
+      <h1 class="govuk-heading-l">Tasklist for log
         <%= @case_log.id %></h1>
 
-      <h2 class="govuk-heading-s govuk-!-margin-bottom-2">This submission is
+      <h2 class="govuk-heading-m govuk-!-margin-bottom-2">This submission is
         <%= @case_log.status.to_s.humanize.downcase %></h2>
       <p class="govuk-body govuk-!-margin-bottom-7">You've completed <%= get_subsections_count(@form, @case_log, :completed) %> of <%= get_subsections_count(@form, @case_log, :all) %> sections.</p>
       <p class="govuk-body govuk-!-margin-bottom-7">
diff --git a/app/views/case_logs/index.html.erb b/app/views/case_logs/index.html.erb
index ea3d45436..ef1bc3975 100644
--- a/app/views/case_logs/index.html.erb
+++ b/app/views/case_logs/index.html.erb
@@ -1,6 +1,6 @@
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-full">
-    <h1 class="govuk-heading-xl">Your logs</h1>
+    <h1 class="govuk-heading-l">Your logs</h1>
   </div>
   <div class="govuk-grid-column-two-thirds-from-desktop">
 
diff --git a/app/views/form/_checkbox_question.html.erb b/app/views/form/_checkbox_question.html.erb
index f02e7fb3f..6d16052e5 100644
--- a/app/views/form/_checkbox_question.html.erb
+++ b/app/views/form/_checkbox_question.html.erb
@@ -1,5 +1,5 @@
 <%= f.govuk_check_boxes_fieldset question.id.to_sym,
-    legend: { text: question.header.html_safe, size: "l" },
+    legend: { text: question.header.html_safe, size: page_header.nil? ? "l" : "m", tag: page_header.nil? ? "h2" : "h1"},
     hint: { text: question.hint_text } do %>
 
     <% question.answer_options.map do |key, val| %>
diff --git a/app/views/form/_date_question.html.erb b/app/views/form/_date_question.html.erb
index 032f9a7c5..ddf0947bf 100644
--- a/app/views/form/_date_question.html.erb
+++ b/app/views/form/_date_question.html.erb
@@ -1,6 +1,6 @@
 <%= f.govuk_date_field question.id.to_sym,
     hint: { text: question.hint_text },
-    legend: { text: question.header.html_safe, size: "l"},
+    legend: { text: question.header.html_safe, size: page_header.nil? ? "l" : "m", tag: page_header.nil? ? "h2" : "h1"},
     width: 20,
     **stimulus_html_attributes(question)
 %>
diff --git a/app/views/form/_numeric_question.html.erb b/app/views/form/_numeric_question.html.erb
index ff6237318..509e65406 100644
--- a/app/views/form/_numeric_question.html.erb
+++ b/app/views/form/_numeric_question.html.erb
@@ -1,6 +1,6 @@
 <%= f.govuk_number_field question.id.to_sym,
     hint: { text: question.hint_text },
-    label: { text: question.header.html_safe, size: "l"},
+    label: { text: question.header.html_safe, size: page_header.nil? ? "l" : "m", tag: page_header.nil? ? "h2" : "h1"},
     min: question.min, max: question.max, step: question.step,
     width: 20, :readonly => question.read_only?,
    **stimulus_html_attributes(question)
diff --git a/app/views/form/_radio_question.html.erb b/app/views/form/_radio_question.html.erb
index 2c96f5391..a922fc3e0 100644
--- a/app/views/form/_radio_question.html.erb
+++ b/app/views/form/_radio_question.html.erb
@@ -1,5 +1,5 @@
 <%= f.govuk_radio_buttons_fieldset question.id.to_sym,
-    legend: { text: question.header.html_safe, size: "l" },
+    legend: { text: question.header.html_safe, size: page_header.nil? ? "l" : "m", tag: page_header.nil? ? "h2" : "h1" },
     hint: { text: question.hint_text },
     small: (question.answer_options.size > 5) do %>
 
diff --git a/app/views/form/_select_question.html.erb b/app/views/form/_select_question.html.erb
index 4e43a3d84..73e4e4cab 100644
--- a/app/views/form/_select_question.html.erb
+++ b/app/views/form/_select_question.html.erb
@@ -3,6 +3,6 @@
     answers,
     :name,
     :name,
-    label: { text: question.header},
+    label: { text: question.header, size: page_header.nil? ? "l" : "m", tag: page_header.nil? ? "h2" : "h1"},
     hint: { text: question.hint_text }
  %>
diff --git a/app/views/form/_text_question.html.erb b/app/views/form/_text_question.html.erb
index 50e9f6dec..d51a27cbb 100644
--- a/app/views/form/_text_question.html.erb
+++ b/app/views/form/_text_question.html.erb
@@ -1,6 +1,6 @@
 <%= f.govuk_text_field question.id.to_sym,
     hint: { text: question.hint_text },
-    label: { text: question.header.html_safe, size: "l"},
+    label: { text: question.header.html_safe, size: page_header.nil? ? "l" : "m", tag: page_header.nil? ? "h2" : "h1"},
     width: 20,
     **stimulus_html_attributes(question)
 %>
diff --git a/app/views/form/page.html.erb b/app/views/form/page.html.erb
index 3aa77fc77..f66aeee50 100644
--- a/app/views/form/page.html.erb
+++ b/app/views/form/page.html.erb
@@ -6,7 +6,7 @@
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds-from-desktop">
       <% if page.header.present? %>
-        <h1 class="govuk-heading-xl">
+        <h1 class="govuk-heading-l">
           <%= page.header %>
         </h1>
       <% end %>
@@ -14,7 +14,7 @@
         <%= f.govuk_error_summary %>
         <% page.questions.map do |question| %>
           <div id=<%= question.id + "_div " %><%= display_question_key_div(page, question) %> >
-            <%= render partial: "form/#{question.type}_question", locals: { question: question, f: f } %>
+            <%= render partial: "form/#{question.type}_question", locals: { question: question, page_header: page.header, f: f } %>
           </div>
         <% end %>