diff --git a/app/views/bill-licences/remove.njk b/app/views/bill-licences/remove.njk
index fed0e95127..bb4be3016c 100644
--- a/app/views/bill-licences/remove.njk
+++ b/app/views/bill-licences/remove.njk
@@ -5,7 +5,7 @@
 {% from "govuk/components/inset-text/macro.njk" import govukInsetText %}
 {% from "govuk/components/summary-list/macro.njk" import govukSummaryList %}
 
-{% from "macros/badge.njk" import statusBadge %}
+{% from "macros/bill-run-status-tag.njk" import statusTag %}
 
 {% block breadcrumbs %}
   {# Back link #}
@@ -32,9 +32,9 @@
   <div class="govuk-grid-row govuk-!-margin-bottom-0">
     <div class="govuk-grid-column-full">
 
-      {# Status badge #}
+      {# Status tag #}
       <p class="govuk-body">
-        {{ statusBadge(billRunStatus) }}
+        {{ statusTag(billRunStatus) }}
       </p>
 
       {# Bill run meta-data #}
diff --git a/app/views/bill-runs/cancel.njk b/app/views/bill-runs/cancel.njk
index ffd3dc41f9..65bbb0e282 100644
--- a/app/views/bill-runs/cancel.njk
+++ b/app/views/bill-runs/cancel.njk
@@ -3,7 +3,7 @@
 {% from "govuk/components/button/macro.njk" import govukButton %}
 {% from "govuk/components/summary-list/macro.njk" import govukSummaryList %}
 
-{% from "macros/badge.njk" import statusBadge %}
+{% from "macros/bill-run-status-tag.njk" import statusTag %}
 
 {% block breadcrumbs %}
   {# Back link #}
@@ -26,9 +26,9 @@
   <div class="govuk-grid-row govuk-!-margin-bottom-0">
     <div class="govuk-grid-column-full">
 
-      {# Status badge #}
+      {# Status tag #}
       <p class="govuk-body">
-        {{ statusBadge(billRunStatus) }}
+        {{ statusTag(billRunStatus) }}
       </p>
 
       {# Bill run meta-data #}
diff --git a/app/views/bill-runs/empty.njk b/app/views/bill-runs/empty.njk
index 7d6f038b4f..75ab34cf99 100644
--- a/app/views/bill-runs/empty.njk
+++ b/app/views/bill-runs/empty.njk
@@ -4,7 +4,7 @@
 {% from "govuk/components/error-summary/macro.njk" import govukErrorSummary %}
 {% from "govuk/components/summary-list/macro.njk" import govukSummaryList %}
 
-{% from "macros/badge.njk" import statusBadge %}
+{% from "macros/bill-run-status-tag.njk" import statusTag %}
 
 {% block breadcrumbs %}
   {# Back link #}
@@ -38,9 +38,9 @@
   <div class="govuk-grid-row govuk-!-margin-bottom-0">
     <div class="govuk-grid-column-full">
 
-      {# Status badge #}
+      {# Status tag #}
       <p class="govuk-body">
-        {{ statusBadge(billRunStatus) }}
+        {{ statusTag(billRunStatus) }}
       </p>
 
       {# Bill run meta-data #}
diff --git a/app/views/bill-runs/errored.njk b/app/views/bill-runs/errored.njk
index 78fa155403..bed31cdee1 100644
--- a/app/views/bill-runs/errored.njk
+++ b/app/views/bill-runs/errored.njk
@@ -4,7 +4,7 @@
 {% from "govuk/components/error-summary/macro.njk" import govukErrorSummary %}
 {% from "govuk/components/summary-list/macro.njk" import govukSummaryList %}
 
-{% from "macros/badge.njk" import statusBadge %}
+{% from "macros/bill-run-status-tag.njk" import statusTag %}
 
 {% block breadcrumbs %}
   {# Back link #}
@@ -38,9 +38,9 @@
   <div class="govuk-grid-row govuk-!-margin-bottom-0">
     <div class="govuk-grid-column-full">
 
-      {# Status badge #}
+      {# Status tag #}
       <p class="govuk-body">
-        {{ statusBadge(billRunStatus) }}
+        {{ statusTag(billRunStatus) }}
       </p>
 
       {# Bill run meta-data #}
diff --git a/app/views/bill-runs/review-licence.njk b/app/views/bill-runs/review-licence.njk
index ed413f12e8..348f545630 100644
--- a/app/views/bill-runs/review-licence.njk
+++ b/app/views/bill-runs/review-licence.njk
@@ -1,11 +1,9 @@
 {% extends 'layout.njk' %}
 {% from "govuk/components/back-link/macro.njk" import govukBackLink %}
-{% from "govuk/components/tag/macro.njk" import govukTag %}
 {% from "govuk/components/table/macro.njk" import govukTable %}
 {% from "govuk/components/summary-list/macro.njk" import govukSummaryList %}
 {% from "govuk/components/details/macro.njk" import govukDetails %}
-{% from "macros/badge.njk" import badge %}
-
+{% from "macros/review-status-tag.njk" import statusTag %}
 
 {% block breadcrumbs %}
   {# Back link #}
@@ -24,18 +22,8 @@
       <span class="govuk-caption-l">{{region}} two-part tariff bill run</span>
       <h1 class="govuk-heading-xl govuk-!-margin-bottom-3">{{pageTitle}}</h1>
 
-      {# Status badge #}
-      {% if licence.status == 'review' %}
-        {% set colour = "govuk-tag--blue govuk-!-font-size-16" %}
-      {% else %}
-        {% set colour = "govuk-tag--green govuk-!-font-size-16" %}
-      {% endif %}
-
       <p class="govuk-body">
-        {{govukTag({
-          text: licence.status,
-          classes: colour
-        })}}
+        {{ statusTag(licence.status) }}
       </p>
     </div>
   </div>
@@ -84,13 +72,10 @@
       {% set matchedReturnIndex = loop.index0 %}
 
       {% if return.returnStatus == 'overdue' or return.returnStatus == 'query' %}
-        {% set colour = "govuk-tag--red"%}
         {% set returnLink = "/return/internal?returnId=" + return.returnId %}
       {% elif return.status == 'void' %}
-        {% set colour = "govuk-tag--grey" %}
         {% set returnLink = "/return/internal?returnId=" + return.returnId %}
       {% else %}
-        {% set colour = "govuk-tag--green" %}
         {% set returnLink = "/returns/return?id=" + return.returnId%}
       {% endif %}
 
@@ -106,11 +91,8 @@
           {{ return.description }}
       {% endset %}
 
-      {% set statusTag %}
-        {{govukTag({
-          text: return.returnStatus,
-          classes: colour + ' govuk-!-font-size-14'
-        })}}
+      {% set tag %}
+        {{ statusTag(return.returnStatus) }}
       {% endset %}
 
       {% set issues = '' %}
@@ -130,7 +112,7 @@
           attributes: { 'data-test': 'matched-return-summary' + matchedReturnIndex }
           },
         {
-          html: statusTag,
+          html: tag,
           classes: 'govuk-body-s',
           attributes: { 'data-test': 'matched-return-status' + matchedReturnIndex }
         },
@@ -176,14 +158,6 @@
     {% for return in unmatchedReturns %}
       {% set unmatchedReturnIndex = loop.index0 %}
 
-      {% if return.returnStatus == 'overdue' or return.returnStatus == 'query' %}
-        {% set colour = "govuk-tag--red"%}
-      {% elif return.status == 'void' %}
-        {% set colour = "govuk-tag--grey" %}
-      {% else %}
-        {% set colour = "govuk-tag--green" %}
-      {% endif %}
-
       {% set action %}
         <a class="govuk-link" href="/licences/{{ licence.licenceId }}#returns">{{ return.reference }}<span class="govuk-visually-hidden"></a>
         <div>{{return.dates}}</div>
@@ -196,11 +170,8 @@
           {{ return.description }}
       {% endset %}
 
-      {% set statusTag %}
-        {{govukTag({
-          text: return.returnStatus,
-          classes: colour + ' govuk-!-font-size-14'
-        })}}
+      {% set tag %}
+        {{ statusTag(return.returnStatus) }}
       {% endset %}
 
       {% set issues = '' %}
@@ -220,7 +191,7 @@
           attributes: { 'data-test': 'unmatched-return-summary' + unmatchedReturnIndex }
         },
         {
-          html: statusTag,
+          html: tag,
           classes: 'govuk-body-s',
           attributes: { 'data-test': 'unmatched-return-status' + unmatchedReturnIndex }
         },
@@ -349,21 +320,11 @@
                   {% set chargeElementIndex = loop.index0 %}
                     {% set elementRows = [] %}
 
-                    {# Status badge #}
-                    {% if chargeElement.elementStatus == 'review' %}
-                      {% set elementColour = "govuk-tag--blue govuk-!-font-size-16" %}
-                    {% else %}
-                      {% set elementColour = "govuk-tag--green govuk-!-font-size-16" %}
-                    {% endif %}
-
                     <div class="govuk-!-margin-top-6">
                       <div class="tag-wrapper">
                         <span class="govuk-body govuk-!-font-weight-regular">{{chargeElement.elementNumber}}</span>
                         <span class="tag-element">
-                          {{govukTag({
-                            text: chargeElement.elementStatus,
-                            classes: elementColour
-                          })}}
+                          {{ statusTag(chargeElement.elementStatus) }}
                         </span>
                         <h3 class="govuk-heading-s govuk-!-margin-bottom-1">{{chargeElement.elementDescription}}
                           <div>
diff --git a/app/views/bill-runs/review.njk b/app/views/bill-runs/review.njk
index 1a2825cfb3..1d384d8423 100644
--- a/app/views/bill-runs/review.njk
+++ b/app/views/bill-runs/review.njk
@@ -8,7 +8,9 @@
 {% from "govuk/components/radios/macro.njk" import govukRadios %}
 {% from "govuk/components/summary-list/macro.njk" import govukSummaryList %}
 {% from "govuk/components/table/macro.njk" import govukTable %}
-{% from "govuk/components/tag/macro.njk" import govukTag %}
+
+{% from "macros/bill-run-status-tag.njk" import statusTag as billRunStatusTag %}
+{% from "macros/review-status-tag.njk" import statusTag as reviewStatusTag %}
 
 {% block breadcrumbs %}
   {# Back link #}
@@ -25,18 +27,8 @@
       <span class="govuk-caption-l">{{ region }} {{ billRunType }} bill run</span>
       <h1 class="govuk-heading-xl govuk-!-margin-bottom-3">{{ pageTitle }}</h1>
 
-      {# Status badge #}
-      {% if status == 'review' %}
-        {% set colour = "govuk-tag--blue govuk-!-font-size-27" %}
-      {% else %}
-        {% set colour = "govuk-tag--green govuk-!-font-size-27" %}
-      {% endif %}
-
       <p class="govuk-body">
-        {{ govukTag({
-          text: status,
-          classes: colour
-        }) }}
+        {{ billRunStatusTag(status) }}
       </p>
 
       {# Bill run meta-data #}
@@ -263,17 +255,8 @@
   {% set tableRows = [] %}
     {% if preparedLicences.length > 0 %}
       {% for licence in preparedLicences %}
-        {% if licence.status == 'review' %}
-          {% set colour = "govuk-tag--blue" %}
-        {% else %}
-          {% set colour = "govuk-tag--green" %}
-        {% endif %}
-
         {% set statusTag %}
-          {{govukTag({
-            text: licence.status,
-            classes: colour
-          })}}
+          {{ reviewStatusTag(licence.status) }}
         {% endset %}
 
         {% set action %}
diff --git a/app/views/bill-runs/send.njk b/app/views/bill-runs/send.njk
index 20f4f67682..385068d19e 100644
--- a/app/views/bill-runs/send.njk
+++ b/app/views/bill-runs/send.njk
@@ -3,7 +3,7 @@
 {% from "govuk/components/button/macro.njk" import govukButton %}
 {% from "govuk/components/summary-list/macro.njk" import govukSummaryList %}
 
-{% from "macros/badge.njk" import statusBadge %}
+{% from "macros/bill-run-status-tag.njk" import statusTag %}
 
 {% block breadcrumbs %}
   {# Back link #}
@@ -26,9 +26,9 @@
   <div class="govuk-grid-row govuk-!-margin-bottom-0">
     <div class="govuk-grid-column-full">
 
-      {# Status badge #}
+      {# Status tag #}
       <p class="govuk-body">
-        {{ statusBadge(billRunStatus) }}
+        {{ statusTag(billRunStatus) }}
       </p>
 
       {# Bill run meta-data #}
diff --git a/app/views/bill-runs/setup/create.njk b/app/views/bill-runs/setup/create.njk
index 334ee7bf1c..fbb5333ef4 100644
--- a/app/views/bill-runs/setup/create.njk
+++ b/app/views/bill-runs/setup/create.njk
@@ -4,7 +4,7 @@
 {% from "govuk/components/summary-list/macro.njk" import govukSummaryList %}
 {% from "govuk/components/warning-text/macro.njk" import govukWarningText %}
 
-{% from "macros/badge.njk" import statusBadge %}
+{% from "macros/bill-run-status-tag.njk" import statusTag %}
 
 {% block breadcrumbs %}
   {# Back link #}
@@ -32,9 +32,9 @@
         iconFallbackText: 'Warning'
       }) }}
 
-      {# Status badge #}
+      {# Status tag #}
       <p class="govuk-body">
-        {{ statusBadge(billRunStatus) }}
+        {{ statusTag(billRunStatus) }}
       </p>
 
       {# Bill run meta-data #}
diff --git a/app/views/bill-runs/view.njk b/app/views/bill-runs/view.njk
index f1d5a1f12d..326c78d304 100644
--- a/app/views/bill-runs/view.njk
+++ b/app/views/bill-runs/view.njk
@@ -5,7 +5,7 @@
 {% from "govuk/components/summary-list/macro.njk" import govukSummaryList %}
 {% from "govuk/components/table/macro.njk" import govukTable %}
 
-{% from "macros/badge.njk" import statusBadge %}
+{% from "macros/bill-run-status-tag.njk" import statusTag %}
 
 {% block breadcrumbs %}
   {# Back link #}
@@ -28,9 +28,9 @@
   <div class="govuk-grid-row govuk-!-margin-bottom-0">
     <div class="govuk-grid-column-full">
 
-      {# Status badge #}
+      {# Status tag #}
       <p class="govuk-body">
-        {{ statusBadge(billRunStatus) }}
+        {{ statusTag(billRunStatus) }}
       </p>
 
       {# Bill run meta-data #}
diff --git a/app/views/bills/remove.njk b/app/views/bills/remove.njk
index ee4e853200..c620d53201 100644
--- a/app/views/bills/remove.njk
+++ b/app/views/bills/remove.njk
@@ -5,7 +5,7 @@
 {% from "govuk/components/inset-text/macro.njk" import govukInsetText %}
 {% from "govuk/components/summary-list/macro.njk" import govukSummaryList %}
 
-{% from "macros/badge.njk" import statusBadge %}
+{% from "macros/bill-run-status-tag.njk" import statusTag %}
 
 {% block breadcrumbs %}
   {# Back link #}
@@ -32,9 +32,9 @@
   <div class="govuk-grid-row govuk-!-margin-bottom-0">
     <div class="govuk-grid-column-full">
 
-      {# Status badge #}
+      {# Status tag #}
       <p class="govuk-body">
-        {{ statusBadge(billRunStatus) }}
+        {{ statusTag(billRunStatus) }}
       </p>
 
       {# Bill run meta-data #}
diff --git a/app/views/bills/view-multi-licence.njk b/app/views/bills/view-multi-licence.njk
index b932591f32..0ceab86e8e 100644
--- a/app/views/bills/view-multi-licence.njk
+++ b/app/views/bills/view-multi-licence.njk
@@ -6,7 +6,7 @@
 {% from "govuk/components/table/macro.njk" import govukTable %}
 {% from "govuk/components/warning-text/macro.njk" import govukWarningText %}
 
-{% from "macros/badge.njk" import statusBadge %}
+{% from "macros/bill-run-status-tag.njk" import statusTag %}
 
 {% block breadcrumbs %}
   {# Back link #}
@@ -29,9 +29,9 @@
   <div class="govuk-grid-row govuk-!-margin-bottom-0">
     <div class="govuk-grid-column-full">
 
-      {# Status badge #}
+      {# Status tag #}
       <p class="govuk-body">
-        {{ statusBadge(billRunStatus) }}
+        {{ statusTag(billRunStatus) }}
       </p>
 
       {# Bill meta-data #}
diff --git a/app/views/bills/view-single-licence-presroc.njk b/app/views/bills/view-single-licence-presroc.njk
index b7ad20b619..394914f2e0 100644
--- a/app/views/bills/view-single-licence-presroc.njk
+++ b/app/views/bills/view-single-licence-presroc.njk
@@ -6,7 +6,7 @@
 {% from "govuk/components/table/macro.njk" import govukTable %}
 {% from "govuk/components/warning-text/macro.njk" import govukWarningText %}
 
-{% from "macros/badge.njk" import statusBadge %}
+{% from "macros/bill-run-status-tag.njk" import statusTag %}
 
 {% block breadcrumbs %}
   {# Back link #}
@@ -29,9 +29,9 @@
   <div class="govuk-grid-row govuk-!-margin-bottom-0">
     <div class="govuk-grid-column-full">
 
-      {# Status badge #}
+      {# Status tag #}
       <p class="govuk-body">
-        {{ statusBadge(billRunStatus) }}
+        {{ statusTag(billRunStatus) }}
       </p>
 
       {# Bill meta-data #}
diff --git a/app/views/bills/view-single-licence-sroc.njk b/app/views/bills/view-single-licence-sroc.njk
index 6d17946ff8..9f5bafaeec 100644
--- a/app/views/bills/view-single-licence-sroc.njk
+++ b/app/views/bills/view-single-licence-sroc.njk
@@ -6,7 +6,7 @@
 {% from "govuk/components/table/macro.njk" import govukTable %}
 {% from "govuk/components/warning-text/macro.njk" import govukWarningText %}
 
-{% from "macros/badge.njk" import statusBadge %}
+{% from "macros/bill-run-status-tag.njk" import statusTag %}
 
 {% block breadcrumbs %}
   {# Back link #}
@@ -29,9 +29,9 @@
   <div class="govuk-grid-row govuk-!-margin-bottom-0">
     <div class="govuk-grid-column-full">
 
-      {# Status badge #}
+      {# Status tag #}
       <p class="govuk-body">
-        {{ statusBadge(billRunStatus) }}
+        {{ statusTag(billRunStatus) }}
       </p>
 
       {# Bill meta-data #}
diff --git a/app/views/macros/badge.njk b/app/views/macros/bill-run-status-tag.njk
similarity index 54%
rename from app/views/macros/badge.njk
rename to app/views/macros/bill-run-status-tag.njk
index e71df59b7c..1b5be516d3 100644
--- a/app/views/macros/badge.njk
+++ b/app/views/macros/bill-run-status-tag.njk
@@ -1,38 +1,24 @@
 {% from "govuk/components/tag/macro.njk" import govukTag %}
 
-{% macro badge(text, type) %}
-  {% if type === 'error' %}
-    {% set classes = "govuk-tag--red govuk-!-font-size-27" %}
-  {% elif type === 'inactive' %}
-    {% set classes = "govuk-tag--grey govuk-!-font-size-27" %}
-  {% elif type === 'info' %}
+{% macro statusTag(status) %}
+  {% if status === 'ready' %}
     {% set classes = "govuk-tag--blue govuk-!-font-size-27" %}
-  {% elif type === 'warning' %}
-    {% set classes = "govuk-tag--orange govuk-!-font-size-27" %}
-  {% elif type === 'success' %}
+  {% elif status === 'review' %}
+    {% set classes = "govuk-tag--blue govuk-!-font-size-27" %}
+  {% elif status === 'sent' %}
     {% set classes = "govuk-tag--green govuk-!-font-size-27" %}
+  {% elif status === 'empty' %}
+    {% set classes = "govuk-tag--grey govuk-!-font-size-27" %}
+  {% elif status === 'error' %}
+    {% set classes = "govuk-tag--red govuk-!-font-size-27" %}
   {% else %}
     {% set classes = "govuk-tag--blue govuk-!-font-size-27" %}
   {% endif %}
 
   {{
     govukTag({
-      text: text,
+      text: status,
       classes: classes
     })
   }}
 {% endmacro %}
-
-{% macro statusBadge(status) %}
-  {% if status === 'ready' %}
-    {% set badgeType = 'info' %}
-  {% elif status === 'sent' %}
-    {% set badgeType = 'success' %}
-  {% elif status === 'empty' %}
-    {% set badgeType = 'inactive' %}
-  {% elif status === 'error' %}
-    {% set badgeType = 'error' %}
-  {% endif %}
-
-  {{ badge(status, badgeType) }}
-{% endmacro %}
diff --git a/app/views/macros/review-status-tag.njk b/app/views/macros/review-status-tag.njk
new file mode 100644
index 0000000000..121efa745a
--- /dev/null
+++ b/app/views/macros/review-status-tag.njk
@@ -0,0 +1,28 @@
+{% from "govuk/components/tag/macro.njk" import govukTag %}
+
+{% macro statusTag(status) %}
+  {% if status === 'ready' %}
+    {% set classes = "govuk-tag--green" %}
+  {% elif status === 'review' %}
+    {% set classes = "govuk-tag--blue" %}
+  {% elif status === 'completed' %}
+    {% set classes = "govuk-tag--green govuk-!-font-size-14" %}
+  {% elif status === 'overdue' %}
+    {% set classes = "govuk-tag--red govuk-!-font-size-14" %}
+  {% elif status === 'query' %}
+    {% set classes = "govuk-tag--red govuk-!-font-size-14" %}
+  {% elif status === 'received' %}
+    {% set classes = "govuk-tag--blue govuk-!-font-size-14" %}
+  {% elif status === 'void' %}
+    {% set classes = "govuk-tag--grey govuk-!-font-size-14" %}
+  {% else %}
+    {% set classes = "govuk-tag--blue govuk-!-font-size-14" %}
+  {% endif %}
+
+  {{
+    govukTag({
+      text: status,
+      classes: classes
+    })
+  }}
+{% endmacro %}