diff --git a/assets/scss/application.scss b/assets/scss/application.scss
index b4b2b8ed..9f74ea9b 100755
--- a/assets/scss/application.scss
+++ b/assets/scss/application.scss
@@ -15,7 +15,7 @@ $govuk-page-width: $moj-page-width;
 @import './components/field-and-button-group';
 @import './components/header';
 @import './components/footer';
-@import './components/key-prisoner-details';
+@import './components/mini-profile-header';
 @import './components/prisoner-photo';
 @import './components/sortable-table';
 @import './page/list';
diff --git a/assets/scss/components/_key-prisoner-details.scss b/assets/scss/components/_mini-profile-header.scss
similarity index 64%
rename from assets/scss/components/_key-prisoner-details.scss
rename to assets/scss/components/_mini-profile-header.scss
index f728466c..4afa021d 100644
--- a/assets/scss/components/_key-prisoner-details.scss
+++ b/assets/scss/components/_mini-profile-header.scss
@@ -1,23 +1,23 @@
-.app-key-prisoner-details {
-  @extend .govuk-\!-padding-4;
+.dps-mini-profile-header {
+  @extend .govuk-\!-padding-3;
   display: flex;
   flex-direction: row;
   align-items: start;
   background: govuk-colour('light-grey');
 
   .app-prisoner-photo--small {
-    margin-right: 50px;
+    margin-right: govuk-spacing(6);
   }
 
   dl {
-    margin-right: 80px;
+    margin-right: govuk-spacing(9);
 
     &:last-child {
       margin-right: 0;
     }
   }
 
-  .app-key-prisoner-details--align-right {
+  .dps-mini-profile-header--align-right {
     align-self: center;
     margin-left: auto;
 
@@ -35,6 +35,14 @@
 
     dl {
       margin-right: 0;
+
+      &:last-child {
+        margin-bottom: 0;
+
+        dd {
+          margin-bottom: 0;
+        }
+      }
     }
   }
 }
diff --git a/assets/scss/components/_prisoner-photo.scss b/assets/scss/components/_prisoner-photo.scss
index 25815b53..48c9041e 100644
--- a/assets/scss/components/_prisoner-photo.scss
+++ b/assets/scss/components/_prisoner-photo.scss
@@ -4,7 +4,7 @@
 
 .app-prisoner-photo--small {
   @extend .app-prisoner-photo;
-  width: 70px;
+  width: 80px;
 }
 
 .app-prisoner-photo--large {
diff --git a/integration_tests/e2e/list.cy.ts b/integration_tests/e2e/list.cy.ts
index f7af2337..cc9b3d7b 100644
--- a/integration_tests/e2e/list.cy.ts
+++ b/integration_tests/e2e/list.cy.ts
@@ -24,9 +24,9 @@ context('List non-associations page', () => {
   })
 
   it('should show key prisoner’s details', () => {
-    listPage.keyPrisonerBox.should('contain.text', 'Jones, David')
-    listPage.keyPrisonerBox.should('contain.text', davidJones.prisonerNumber)
-    listPage.keyPrisonerBox.should('contain.text', davidJones.cellLocation)
+    listPage.miniProfileHeader.should('contain.text', 'Jones, David')
+    listPage.miniProfileHeader.should('contain.text', davidJones.prisonerNumber)
+    listPage.miniProfileHeader.should('contain.text', davidJones.cellLocation)
   })
 
   it('should have open tab selected', () => {
diff --git a/integration_tests/e2e/view.cy.ts b/integration_tests/e2e/view.cy.ts
index 7113c8cd..3385e718 100644
--- a/integration_tests/e2e/view.cy.ts
+++ b/integration_tests/e2e/view.cy.ts
@@ -16,10 +16,10 @@ context('View non-association details page', () => {
   })
 
   it('should show key prisoner’s details', () => {
-    viewPage.keyPrisonerBox.should('contain.text', 'Jones, David')
-    viewPage.keyPrisonerBox.should('contain.text', davidJones.prisonerNumber)
-    viewPage.keyPrisonerBox.should('contain.text', davidJones.cellLocation)
-    viewPage.keyPrisonerBox.should('contain.text', 'Perpetrator')
+    viewPage.miniProfileHeader.should('contain.text', 'Jones, David')
+    viewPage.miniProfileHeader.should('contain.text', davidJones.prisonerNumber)
+    viewPage.miniProfileHeader.should('contain.text', davidJones.cellLocation)
+    viewPage.miniProfileHeader.should('contain.text', 'Perpetrator')
   })
 
   it('should show other prisoner’s details', () => {
diff --git a/integration_tests/pages/nonAssociations/list.ts b/integration_tests/pages/nonAssociations/list.ts
index 9209e6b2..1bb8f648 100644
--- a/integration_tests/pages/nonAssociations/list.ts
+++ b/integration_tests/pages/nonAssociations/list.ts
@@ -21,8 +21,8 @@ export default class ListPage extends Page {
     return this.tabs.eq(1)
   }
 
-  get keyPrisonerBox(): PageElement<HTMLDivElement> {
-    return cy.get('.app-key-prisoner-details')
+  get miniProfileHeader(): PageElement<HTMLDivElement> {
+    return cy.get('.dps-mini-profile-header')
   }
 
   get tables(): PageElement<HTMLTableElement> {
diff --git a/integration_tests/pages/nonAssociations/view.ts b/integration_tests/pages/nonAssociations/view.ts
index 7ab281bb..8ae338ab 100644
--- a/integration_tests/pages/nonAssociations/view.ts
+++ b/integration_tests/pages/nonAssociations/view.ts
@@ -8,8 +8,8 @@ export default class ViewPage extends Page {
     super(`Non-association: ${prisonerName} and ${otherPrisonerName}`)
   }
 
-  get keyPrisonerBox(): PageElement<HTMLDivElement> {
-    return cy.get('.app-key-prisoner-details')
+  get miniProfileHeader(): PageElement<HTMLDivElement> {
+    return cy.get('.dps-mini-profile-header')
   }
 
   get otherPrisonerBox(): PageElement<HTMLDivElement> {
diff --git a/server/views/pages/list.njk b/server/views/pages/list.njk
index ebb9bc03..ef9a1565 100644
--- a/server/views/pages/list.njk
+++ b/server/views/pages/list.njk
@@ -21,7 +21,7 @@
     {{ prisonerName | possessiveName}} non-associations
   </h1>
 
-  {% include "../partials/keyPrisonerDetailsForList.njk" %}
+  {% include "../partials/miniProfileHeaderForList.njk" %}
 
   <nav class="govuk-!-margin-top-6 govuk-!-margin-bottom-6">
     <ul class="govuk-tabs__list">
diff --git a/server/views/pages/view.njk b/server/views/pages/view.njk
index fd5a0b0b..491c6233 100644
--- a/server/views/pages/view.njk
+++ b/server/views/pages/view.njk
@@ -2,7 +2,7 @@
 
 {% from "govuk/components/button/macro.njk" import govukButton %}
 {% from "govuk/components/table/macro.njk" import govukTable %}
-{% from "moj/components/badge/macro.njk" import mojBadge %}
+{% from "govuk/components/tag/macro.njk" import govukTag %}
 
 {% set pageTitle = "Non-association details" %}
 
@@ -13,7 +13,7 @@
     {{ prisonerName }} and {{ otherPrisonerName }}
   </h1>
 
-  {% include "../partials/keyPrisonerDetailsForView.njk" %}
+  {% include "../partials/miniProfileHeaderForView.njk" %}
 
   <div class="govuk-grid-row govuk-!-margin-top-8">
     <div class="govuk-grid-column-two-thirds app-view__other-prisoner-details">
@@ -110,9 +110,9 @@
 
       {% if nonAssociation.isClosed %}
         <p>
-          {{ mojBadge({
+          {{ govukTag({
             text: "Closed",
-            classes: "moj-badge--red"
+            classes: "govuk-tag--red"
           }) }}
         </p>
       {% endif %}
diff --git a/server/views/partials/keyPrisonerDetails.njk b/server/views/partials/miniProfileHeader.njk
similarity index 84%
rename from server/views/partials/keyPrisonerDetails.njk
rename to server/views/partials/miniProfileHeader.njk
index 678b8c94..a785a223 100644
--- a/server/views/partials/keyPrisonerDetails.njk
+++ b/server/views/partials/miniProfileHeader.njk
@@ -1,6 +1,6 @@
 {% set canViewProfile = user.permissions.canViewProfile(prisoner) %}
 
-<div class="app-key-prisoner-details">
+<div class="dps-mini-profile-header">
   {% if canViewProfile %}
     <img src="{{ routeUrls.prisonerPhoto(prisoner.prisonerNumber) }}" alt="Photo of {{ prisoner| nameOfPerson }}" class="app-prisoner-photo--small" />
   {% else %}
@@ -12,10 +12,14 @@
     <dd>
       {% if canViewProfile %}
         <a href="{{ dpsUrl }}/prisoner/{{ prisoner.prisonerNumber }}">
-          {{ prisoner | reversedNameOfPerson }}
+          <strong>
+            {{ prisoner | reversedNameOfPerson }}
+          </strong>
         </a>
       {% else %}
-        {{ prisoner | reversedNameOfPerson }}
+        <strong>
+          {{ prisoner | reversedNameOfPerson }}
+        </strong>
       {% endif %}
       <br />
       {{ prisoner.prisonerNumber }}
diff --git a/server/views/partials/keyPrisonerDetailsForList.njk b/server/views/partials/miniProfileHeaderForList.njk
similarity index 81%
rename from server/views/partials/keyPrisonerDetailsForList.njk
rename to server/views/partials/miniProfileHeaderForList.njk
index eccfedd6..35586591 100644
--- a/server/views/partials/keyPrisonerDetailsForList.njk
+++ b/server/views/partials/miniProfileHeaderForList.njk
@@ -1,8 +1,8 @@
-{% extends "./keyPrisonerDetails.njk" %}
+{% extends "./miniProfileHeader.njk" %}
 
 {% block extraDetails %}
   {% if canAddNonAssociation %}
-    <div class="app-key-prisoner-details--align-right">
+    <div class="dps-mini-profile-header--align-right">
       <p class="hmpps-action-button">
         <img src="/assets/images/add-non-association.svg" alt="Icon representing a non-association" aria-hidden="true" />
         <a href="{{ routeUrls.prisonerSearch(prisonerNumber) }}" class="govuk-link--no-visited-state">
diff --git a/server/views/partials/keyPrisonerDetailsForView.njk b/server/views/partials/miniProfileHeaderForView.njk
similarity index 84%
rename from server/views/partials/keyPrisonerDetailsForView.njk
rename to server/views/partials/miniProfileHeaderForView.njk
index b70fdf3e..14b508fb 100644
--- a/server/views/partials/keyPrisonerDetailsForView.njk
+++ b/server/views/partials/miniProfileHeaderForView.njk
@@ -1,4 +1,4 @@
-{% extends "./keyPrisonerDetails.njk" %}
+{% extends "./miniProfileHeader.njk" %}
 
 {% block extraDetails %}
   <dl>