diff --git a/app/components/header/header-account-custom-html.njk b/app/components/header/header-account-custom-html.njk
new file mode 100644
index 000000000..62ac659d6
--- /dev/null
+++ b/app/components/header/header-account-custom-html.njk
@@ -0,0 +1,44 @@
+{% set html_style = "background-color: #f0f4f5;" %}
+{% set title = "Header with account (logged in, custom html)" %}
+{% from "components/header/macro.njk" import header %}
+{% extends "layout.njk" %}
+
+{% block body %}
+  <style>
+    .app-count {
+      align-self: center;
+      align-items: center;
+      background-color: #d5281b;
+      border-radius: 1em;
+      color: #fff;
+      font-size: 14px;
+      height: 1.5em;
+      line-height: 1.5em;
+      min-width: 1.5em;
+      padding: 0.25em;
+      display: inline-flex;
+      justify-content: center;
+    }
+  </style>
+
+  {{ header({
+    account: {
+      items: [
+        {
+          href: "#",
+          text: "Check your profile"
+        },
+        {
+          html: '<a class="nhsuk-header__account-link" href="#">Notifications</a> <span class="app-count">8</span>'
+        },
+        {
+          href: "#",
+          text: "Sign out"
+        }
+      ]
+    },
+    service: {
+      name: "Profile manager"
+    }
+  }) }}
+{% endblock %}
diff --git a/app/components/header/header-account-logged-in.njk b/app/components/header/header-account-logged-in.njk
new file mode 100644
index 000000000..03316549d
--- /dev/null
+++ b/app/components/header/header-account-logged-in.njk
@@ -0,0 +1,43 @@
+{% set html_style = "background-color: #f0f4f5;" %}
+{% set title = "Header with account (logged in)" %}
+{% from "components/header/macro.njk" import header %}
+{% extends "layout.njk" %}
+
+{% block body %}
+  {{ header({
+    account: {
+      items: [
+        {
+          href: "#",
+          text: "florence.nightingale@nhs.net",
+          icon: true
+        },
+        {
+          href: "#",
+          text: "Log out"
+        }
+      ]
+    },
+    primaryLinks: [
+      {
+        url: "#",
+        label: "Home"
+      },
+      {
+        url: "#",
+        label: "Services"
+      },
+      {
+        url: "#",
+        label: "Your health"
+      },
+      {
+        url: "#",
+        label: "Messages"
+      }, {
+        url: "#",
+        label: "Help and support"
+      }
+    ]
+  }) }}
+{% endblock %}
diff --git a/app/components/header/header-account-logged-out.njk b/app/components/header/header-account-logged-out.njk
new file mode 100644
index 000000000..a95356c81
--- /dev/null
+++ b/app/components/header/header-account-logged-out.njk
@@ -0,0 +1,17 @@
+{% set html_style = "background-color: #f0f4f5;" %}
+{% set title = "Header with account (logged out)" %}
+{% from "components/header/macro.njk" import header %}
+{% extends "layout.njk" %}
+
+{% block body %}
+  {{ header({
+    account: {
+      items: [
+        {
+          href: "#",
+          text: "Log in"
+        }
+      ]
+    }
+  }) }}
+{% endblock %}
diff --git a/app/components/header/header-account-rbac.njk b/app/components/header/header-account-rbac.njk
new file mode 100644
index 000000000..95dc74752
--- /dev/null
+++ b/app/components/header/header-account-rbac.njk
@@ -0,0 +1,50 @@
+{% set html_style = "background-color: #f0f4f5;" %}
+{% set title = "Header with account (logged in, RBAC)" %}
+{% from "components/header/macro.njk" import header %}
+{% extends "layout.njk" %}
+
+{% block body %}
+  {{ header({
+    account: {
+      items: [
+        {
+          href: "#",
+          text: "Florence Nightingale",
+          icon: true
+        },
+        {
+          text: "RA Manager, Hull and East Yorkshire Hospitals NHS Trust (RWA)"
+        },
+        {
+          href: "#",
+          text: "Change role"
+        },
+        {
+          href: "#",
+          text: "Log out"
+        }
+      ]
+    },
+    search: {
+      placeholder: "User name, UUID or NI number",
+      visuallyHiddenLabel: "Search for a user"
+    },
+    service: {
+      name: "CIS2 - Care Identity Management"
+    },
+    primaryLinks: [
+      {
+        url: "#",
+        label: "Home"
+      },
+      {
+        url: "#",
+        label: "Create user"
+      },
+      {
+        url: "#",
+        label: "Find user"
+      }
+    ]
+  }) }}
+{% endblock %}
diff --git a/app/components/header/header-org-white-account.njk b/app/components/header/header-org-white-account.njk
new file mode 100644
index 000000000..90c820993
--- /dev/null
+++ b/app/components/header/header-org-white-account.njk
@@ -0,0 +1,55 @@
+{% set html_style = "background-color: #f0f4f5;" %}
+{% set title = "Header organisational with account (logged in)" %}
+{% from "components/header/macro.njk" import header %}
+{% extends "layout.njk" %}
+
+{% block body %}
+
+{{ header({
+    classes: "nhsuk-header--white nhsuk-header--white-nav",
+    account: {
+      items: [
+        {
+          text: "Florence Nightingale",
+          icon: true
+        },
+        {
+          href: "#",
+          text: "Log out"
+        }
+      ]
+    },
+    organisation: {
+      name: "Anytown Anyplace",
+      split: "Anywhere",
+      descriptor: "NHS Foundation Trust"
+    },
+    primaryLinks: [
+      {
+        url: "#",
+        label: "Your hospital visit"
+      },
+      {
+        url: "#",
+        label: "Wards and departments"
+      },
+      {
+        url: "#",
+        label: "Conditions and treatments"
+      },
+      {
+        url: "#",
+        label: "Our people"
+      },
+      {
+        url: "#",
+        label: "Our research"
+      }
+    ],
+    search: {
+      visuallyHiddenLabel: "Search the Anytown Anyplace Anywhere website"
+    }
+  })
+}}
+
+{% endblock %}
diff --git a/app/components/header/header-service-name-with-account-search-nav.njk b/app/components/header/header-service-name-with-account-search-nav.njk
new file mode 100644
index 000000000..57f19ec8c
--- /dev/null
+++ b/app/components/header/header-service-name-with-account-search-nav.njk
@@ -0,0 +1,51 @@
+{% set html_style = "background-color: #f0f4f5;" %}
+{% set title = "Header with account, navigation and search" %}
+{% from "components/header/macro.njk" import header %}
+{% extends "layout.njk" %}
+
+{% block body %}
+  {{ header({
+    account: {
+      items: [
+        {
+          text: "Florence Nightingale",
+          icon: true
+        },
+        {
+          href: "#",
+          text: "Log out"
+        }
+      ]
+    },
+    service: {
+      name: "Digital service manual"
+    },
+    search: true,
+    primaryLinks: [
+      {
+        url: "#",
+        label: "NHS service standard"
+      },
+      {
+        url: "#",
+        label: "Design system"
+      },
+      {
+        url: "#",
+        label: "Design principles"
+      },
+      {
+        url: "#",
+        label: "Content guide"
+      },
+      {
+        url: "#",
+        label: "Accessibility"
+      },
+      {
+        url: "#",
+        label: "Community and contribution"
+      }
+    ]
+  }) }}
+{% endblock %}
diff --git a/app/pages/examples.njk b/app/pages/examples.njk
index 61f434c56..d0c535425 100644
--- a/app/pages/examples.njk
+++ b/app/pages/examples.njk
@@ -79,12 +79,18 @@
     <li><a href="../components/header/index.html">Header (default)</a></li>
     <li><a href="../components/header/header-navigation.html">Header with navigation</a></li>
     <li><a href="../components/header/header-search.html">Header with search</a></li>
+    <li><a href="../components/header/header-account-logged-in.html">Header with account (logged in)</a></li>
+    <li><a href="../components/header/header-account-logged-out.html">Header with account (logged out)</a></li>
+    <li><a href="../components/header/header-account-custom-html.html">Header with account (logged in, custom HTML)</a></li>
+    <li><a href="../components/header/header-account-rbac.html">Header with account (logged in, RBAC)</a></li>
     <li><a href="../components/header/header-logo.html">Header with logo only</a></li>
     <li><a href="../components/header/header-service-name.html">Header with a service name</a></li>
     <li><a href="../components/header/header-service-name-with-nav.html">Header with a service name, search and navigation</a></li>
+    <li><a href="../components/header/header-service-name-with-account-search-nav.html">Header with a service name, account, search and navigation</a></li>
     <li><a href="../components/header/header-transactional-service-name.html">Header transactional with service name</a></li>
     <li><a href="../components/header/header-org.html">Header organisational</a></li>
     <li><a href="../components/header/header-org-white.html">Header organisational with white header</a></li>
+    <li><a href="../components/header/header-org-white-account.html">Header organisational with white header and account (logged in)</a></li>
     <li><a href="../components/header/header-org-white-nav.html">Header organisational with white header and navigation</a></li>
     <li><a href="../components/hero/index.html">Hero</a></li>
     <li><a href="../components/hero/hero-image.html">Hero with image</a></li>
@@ -133,7 +139,7 @@
     <li><a href="../components/warning-callout/index.html">Warning callout</a></li>
     <li><a href="../components/warning-callout/custom-heading.html">Warning callout with custom heading</a></li>
   </ul>
-  
+
 {% endblock %}
 
 {% block footer %}
diff --git a/packages/components/header/README.md b/packages/components/header/README.md
index 86b633ded..033c122c7 100644
--- a/packages/components/header/README.md
+++ b/packages/components/header/README.md
@@ -25,9 +25,9 @@ compiled JavaScript for all components `nhsuk.min.js` or the individual componen
         <svg class="nhsuk-logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 16" height="40" width="100"><path fill="currentcolor" d="M200 0v80H0V0h200Zm-27.5 5.5c-14.5 0-29 5-29 22 0 10.2 7.7 13.5 14.7 16.3l.7.3c5.4 2 10.1 3.9 10.1 8.4 0 6.5-8.5 7.5-14 7.5s-12.5-1.5-16-3.5L135 70c5.5 2 13.5 3.5 20 3.5 15.5 0 32-4.5 32-22.5 0-19.5-25.5-16.5-25.5-25.5 0-5.5 5.5-6.5 12.5-6.5a35 35 0 0 1 14.5 3l4-13.5c-4.5-2-12-3-20-3Zm-131 2h-22l-14 65H22l9-45h.5l13.5 45h21.5l14-65H64l-9 45h-.5l-13-45Zm63 0h-18l-13 65h17l6-28H117l-5.5 28H129l13.5-65H125L119.5 32h-20l5-24.5Z"/></svg>
       </a>
     </div>
-    <div class="nhsuk-header__content" id="content-header">
+    <div class="nhsuk-header__content">
       <div class="nhsuk-header__search">
-        <div class="nhsuk-header__search-wrap" id="wrap-search">
+        <div class="nhsuk-header__search-wrap">
           <form class="nhsuk-header__search-form" id="search" action="https://www.nhs.uk/search/" method="get" role="search">
             <label class="nhsuk-u-visually-hidden" for="search-field">Search the NHS website</label>
             <input class="nhsuk-search__input" id="search-field" name="search-field" type="search" placeholder="Search" autocomplete="off">
@@ -240,9 +240,9 @@ compiled JavaScript for all components `nhsuk.min.js` or the individual componen
         <svg class="nhsuk-logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 16" height="40" width="100"><path fill="currentcolor" d="M200 0v80H0V0h200Zm-27.5 5.5c-14.5 0-29 5-29 22 0 10.2 7.7 13.5 14.7 16.3l.7.3c5.4 2 10.1 3.9 10.1 8.4 0 6.5-8.5 7.5-14 7.5s-12.5-1.5-16-3.5L135 70c5.5 2 13.5 3.5 20 3.5 15.5 0 32-4.5 32-22.5 0-19.5-25.5-16.5-25.5-25.5 0-5.5 5.5-6.5 12.5-6.5a35 35 0 0 1 14.5 3l4-13.5c-4.5-2-12-3-20-3Zm-131 2h-22l-14 65H22l9-45h.5l13.5 45h21.5l14-65H64l-9 45h-.5l-13-45Zm63 0h-18l-13 65h17l6-28H117l-5.5 28H129l13.5-65H125L119.5 32h-20l5-24.5Z"/></svg>
       </a>
     </div>
-    <div class="nhsuk-header__content" id="content-header">
+    <div class="nhsuk-header__content">
       <div class="nhsuk-header__search">
-        <div class="nhsuk-header__search-wrap" id="wrap-search">
+        <div class="nhsuk-header__search-wrap">
           <form class="nhsuk-header__search-form" id="search" action="https://www.nhs.uk/search/" method="get" role="search">
             <label class="nhsuk-u-visually-hidden" for="search-field">Search the NHS website</label>
             <input class="nhsuk-search__input" id="search-field" name="search-field" type="search" placeholder="Search" autocomplete="off" >
@@ -346,9 +346,9 @@ compiled JavaScript for all components `nhsuk.min.js` or the individual componen
         <span class="nhsuk-organisation-descriptor">NHS Foundation Trust</span>
       </a>
     </div>
-    <div class="nhsuk-header__content" id="content-header">
+    <div class="nhsuk-header__content">
       <div class="nhsuk-header__search">
-        <div class="nhsuk-header__search-wrap" id="wrap-search">
+        <div class="nhsuk-header__search-wrap">
           <form class="nhsuk-header__search-form" id="search" action="https://www.nhs.uk/search/" method="get" role="search">
             <label class="nhsuk-u-visually-hidden" for="search-field">Search the NHS website</label>
             <input class="nhsuk-search__input" id="search-field" name="search-field" type="search" placeholder="Search" autocomplete="off" >
@@ -458,19 +458,19 @@ compiled JavaScript for all components `nhsuk.min.js` or the individual componen
         <span class="nhsuk-organisation-descriptor">NHS Foundation Trust</span>
       </a>
     </div>
-    <div class="nhsuk-header__content" id="content-header">
+    <div class="nhsuk-header__content">
       <div class="nhsuk-header__search">
-          <div class="nhsuk-header__search-wrap" id="wrap-search">
-            <form class="nhsuk-header__search-form" id="search" action="https://www.nhs.uk/search/" method="get" role="search">
-              <label class="nhsuk-u-visually-hidden" for="search-field">Search the NHS website</label>
-              <input class="nhsuk-search__input" id="search-field" name="search-field" type="search" placeholder="Search" autocomplete="off" >
-              <button class="nhsuk-search__submit" type="submit">
-                <svg class="nhsuk-icon nhsuk-icon__search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><path d="M19.71 18.29l-4.11-4.1a7 7 0 1 0-1.41 1.41l4.1 4.11a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 10a5 5 0 1 1 5 5 5 5 0 0 1-5-5z"></path></svg>
-                <span class="nhsuk-u-visually-hidden">Search</span>
-              </button>
-            </form>
-          </div>
+        <div class="nhsuk-header__search-wrap">
+          <form class="nhsuk-header__search-form" id="search" action="https://www.nhs.uk/search/" method="get" role="search">
+            <label class="nhsuk-u-visually-hidden" for="search-field">Search the NHS website</label>
+            <input class="nhsuk-search__input" id="search-field" name="search-field" type="search" placeholder="Search" autocomplete="off" >
+            <button class="nhsuk-search__submit" type="submit">
+              <svg class="nhsuk-icon nhsuk-icon__search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><path d="M19.71 18.29l-4.11-4.1a7 7 0 1 0-1.41 1.41l4.1 4.11a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 10a5 5 0 1 1 5 5 5 5 0 0 1-5-5z"></path></svg>
+              <span class="nhsuk-u-visually-hidden">Search</span>
+            </button>
+          </form>
         </div>
+      </div>
     </div>
   </div>
   <div class="nhsuk-navigation-container">
@@ -571,9 +571,9 @@ compiled JavaScript for all components `nhsuk.min.js` or the individual componen
         <span class="nhsuk-organisation-descriptor">NHS Foundation Trust</span>
       </a>
     </div>
-    <div class="nhsuk-header__content" id="content-header">
+    <div class="nhsuk-header__content">
       <div class="nhsuk-header__search">
-        <div class="nhsuk-header__search-wrap" id="wrap-search">
+        <div class="nhsuk-header__search-wrap">
           <form class="nhsuk-header__search-form" id="search" action="https://www.nhs.uk/search/" method="get" role="search">
             <label class="nhsuk-u-visually-hidden" for="search-field">Search the NHS website</label>
             <input class="nhsuk-search__input" id="search-field" name="search-field" type="search" placeholder="Search" autocomplete="off" >
diff --git a/packages/components/header/_header-white.scss b/packages/components/header/_header-white.scss
index 725952711..2d8529921 100644
--- a/packages/components/header/_header-white.scss
+++ b/packages/components/header/_header-white.scss
@@ -17,6 +17,16 @@
     }
   }
 
+  .nhsuk-header__account,
+  .nhsuk-header__account-item {
+    background-color: $color_nhsuk-grey-5;
+    outline-color: $color_nhsuk-grey-4;
+  }
+
+  .nhsuk-header__account-link {
+    @include nhsuk-link-style-no-visited-state;
+  }
+
   .nhsuk-search__input {
     border-color: $color_nhsuk-grey-3;
 
diff --git a/packages/components/header/_header.scss b/packages/components/header/_header.scss
index 77b8cfd2f..cbc8b2727 100644
--- a/packages/components/header/_header.scss
+++ b/packages/components/header/_header.scss
@@ -25,10 +25,10 @@
 
 .nhsuk-header__container {
   @include govuk-width-container;
-  padding: nhsuk-spacing(3) 0;
   display: flex;
+  flex-flow: column wrap;
   gap: nhsuk-spacing(3);
-  flex-direction: column;
+  padding: nhsuk-spacing(3) 0;
 
   @include mq($from: tablet) {
     flex-direction: row;
@@ -36,13 +36,22 @@
 }
 
 /**
- * Logo and transaction/service name area (top-left)
+ * Logo and transaction/service name
  */
+.nhsuk-header__logo {
+  display: flex;
+  flex-grow: 999;
+
+  .nhsuk-header__transactional & {
+    flex-grow: 0;
+  }
+}
+
 .nhsuk-header__link {
   align-items: center;
   display: flex;
   flex-wrap: wrap;
-  gap: nhsuk-spacing(3);
+  gap: nhsuk-spacing(2) nhsuk-spacing(3);
 
   @include mq($media-type: print) {
     color: $color_nhsuk-black;
@@ -65,32 +74,69 @@
   }
 }
 
-.nhsuk-header__service-name {
-  margin-bottom: -(nhsuk-spacing(2));
-  margin-top: -(nhsuk-spacing(2));
-}
-
 .nhsuk-header__transactional-service-name {
   align-items: center;
   display: flex;
-  margin-bottom: -(nhsuk-spacing(2));
-  margin-top: -(nhsuk-spacing(2));
+  flex-grow: 1;
+  margin-right: auto;
 }
 
 /**
- * Content area (top-right)
+ * Account
  */
-.nhsuk-header__content {
+.nhsuk-header__account {
+  background: shade($color_nhsuk-blue, 20%);
+  border-radius: $nhsuk-border-radius;
+  flex-grow: 1;
+  outline: 1px solid shade($color_nhsuk-blue, 20%);
+  margin-bottom: 1px;
+
   @include mq($from: tablet) {
-    margin-left: auto;
+    align-self: start;
   }
 }
 
+.nhsuk-header__account-list {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 1px;
+  list-style: none;
+  margin: 0;
+  overflow: hidden;
+  padding: 0;
+}
+
+.nhsuk-header__account-item {
+  @include nhsuk-font(16);
+  background-color: shade($color_nhsuk-blue, 20%);
+  display: flex;
+  flex-grow: 1;
+  gap: nhsuk-spacing(2);
+  margin: 0;
+  outline: 1px solid $color_nhsuk-blue;
+  padding: nhsuk-spacing(2) 12px;
+}
+
+.nhsuk-header__account-item:nth-last-child(2) {
+  margin-right: auto;
+}
+
+.nhsuk-header__account-item:last-child {
+  flex-grow: 0;
+}
+
+.nhsuk-header__account-link {
+  @include nhsuk-link-style-header;
+  display: flex;
+  gap: nhsuk-spacing(2);
+}
+
 /**
  * Search
  */
 .nhsuk-header__search {
   @include print-hide();
+  flex-grow: 1;
   position: relative;
   z-index: 13;
 }
@@ -110,14 +156,15 @@
   border-radius: $nhsuk-border-radius 0 0 $nhsuk-border-radius;
   font-size: $nhsuk-base-font-size;
   height: 40px;
-  padding: 0 nhsuk-spacing(3);
+  padding: 0 12px;
+  width: 100%;
 
   &:focus {
     border: nhsuk-spacing(1) solid $nhsuk-focus-text-color;
     box-shadow: 0 0 0 $nhsuk-focus-width $nhsuk-focus-color;
     outline: $nhsuk-focus-width solid transparent;
     outline-offset: $nhsuk-focus-width;
-    padding: 0 13px;
+    padding: 0 9px;
   }
 
   &::placeholder {
@@ -127,7 +174,6 @@
 
   @include mq($until: tablet) {
     border-radius: $nhsuk-border-radius;
-    width: 100%;
   }
 }
 
@@ -156,16 +202,15 @@
     cursor: pointer;
   }
 
-  &:focus {
-    @include nhsuk-focused-button();
-    box-shadow:
-      0 -2px $nhsuk-focus-color,
-      0 $nhsuk-focus-width $nhsuk-focus-text-color;
-  }
-
   &:active {
     background-color: $color_shade_nhsuk-blue-50;
   }
+
+  &:focus {
+    @include nhsuk-focused-button();
+    background-color: $nhsuk-focus-color;
+    box-shadow: inset 0 -4px 0 0 $nhsuk-focus-text-color;
+  }
 }
 
 /**
diff --git a/packages/components/header/template.njk b/packages/components/header/template.njk
index fc4406547..69f2ed876 100644
--- a/packages/components/header/template.njk
+++ b/packages/components/header/template.njk
@@ -12,6 +12,15 @@
 </svg>
 {% endset %}
 
+{% macro _accountItem(item) %}
+{% if item.icon %}
+<svg class="nhsuk-icon nhsuk-icon__user" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 16 16" aria-hidden="true" focusable="false">
+  <path d="M8 0c4.4 0 8 3.6 8 8s-3.6 8-8 8-8-3.6-8-8 3.6-8 8-8Zm0 1a7 7 0 1 0 0 14A7 7 0 0 0 8 1Zm-1.5 9h3a2.5 2.5 0 0 1 2.5 2.5V14a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1v-1.5A2.5 2.5 0 0 1 6.5 10ZM8 9C6.368 9 5 7.684 5 6s1.316-3 3-3c1.632 0 3 1.316 3 3S9.632 9 8 9"/>
+</svg>
+{% endif -%}
+{{- item.html | safe if item.html else item.text -}}
+{% endmacro %}
+
 <header class="nhsuk-header
 {%- if params.transactionalService %} nhsuk-header__transactional{% endif %}
 {%- if params.organisation %} nhsuk-header--organisation{% endif %}
@@ -46,23 +55,41 @@
 {%- endif %}
 
 {%- if params.search %}
-    <div class="nhsuk-header__content" id="content-header">
-      <div class="nhsuk-header__search">
-        <div class="nhsuk-header__search-wrap" id="wrap-search">
-          <form class="nhsuk-header__search-form" id="search" action="{{ searchAction }}" method="get" role="search">
-            <label class="nhsuk-u-visually-hidden" for="search-field">{{ searchVisuallyHiddenLabel }}</label>
-            <input class="nhsuk-search__input" id="search-field" name="{{ searchName }}" type="search" placeholder="Search" autocomplete="off">
-            <button class="nhsuk-search__submit" type="submit">
-              <svg class="nhsuk-icon nhsuk-icon__search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
-                <path d="M19.71 18.29l-4.11-4.1a7 7 0 1 0-1.41 1.41l4.1 4.11a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 10a5 5 0 1 1 5 5 5 5 0 0 1-5-5z"></path>
-              </svg>
-              <span class="nhsuk-u-visually-hidden">{{ searchVisuallyHiddenButton }}</span>
-            </button>
-          </form>
-        </div>
+    <div class="nhsuk-header__search">
+      <div class="nhsuk-header__search-wrap">
+        <form class="nhsuk-header__search-form" id="search" action="{{ searchAction }}" method="get" role="search">
+          <label class="nhsuk-u-visually-hidden" for="search-field">{{ searchVisuallyHiddenLabel }}</label>
+          <input class="nhsuk-search__input" id="search-field" name="{{ searchName }}" type="search" placeholder="{{ searchPlaceholder }}" autocomplete="off">
+          <button class="nhsuk-search__submit" type="submit">
+            <svg class="nhsuk-icon nhsuk-icon__search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
+              <path d="M19.71 18.29l-4.11-4.1a7 7 0 1 0-1.41 1.41l4.1 4.11a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 10a5 5 0 1 1 5 5 5 5 0 0 1-5-5z"></path>
+            </svg>
+            <span class="nhsuk-u-visually-hidden">{{ searchVisuallyHiddenButton }}</span>
+          </button>
+        </form>
       </div>
     </div>
 {%- endif %}
+
+{% if params.account %}
+    <nav class="nhsuk-header__account" aria-label="Account">
+      <ul class="nhsuk-header__account-list">
+      {% for item in params.account.items %}
+        {% if item %}
+        <li class="nhsuk-header__account-item {%- if item.classes %} {{ item.classes }}{% endif %}">
+        {% if item.href %}
+          <a class="nhsuk-header__account-link" href="{{ item.href }}">
+            {{ _accountItem(item) }}
+          </a>
+        {% else %}
+          {{ _accountItem(item) }}
+        {% endif %}
+        </li>
+        {% endif %}
+      {% endfor %}
+      </ul>
+    </nav>
+{%- endif %}
   </div>
 
 {%- if params.primaryLinks and params.primaryLinks.length > 0 %}
diff --git a/packages/core/styles/_icons.scss b/packages/core/styles/_icons.scss
index c96788a7e..9f549ce39 100644
--- a/packages/core/styles/_icons.scss
+++ b/packages/core/styles/_icons.scss
@@ -17,6 +17,12 @@
   width: 28px;
 }
 
+.nhsuk-icon__user {
+  fill: currentColor;
+  height: 22px;
+  width: 22px;
+}
+
 .nhsuk-icon__chevron-left {
   fill: $color_nhsuk-blue;
 }