diff --git a/app/templates/views/add-service.html b/app/templates/views/add-service.html
index 27074cf92..9502ae7d1 100644
--- a/app/templates/views/add-service.html
+++ b/app/templates/views/add-service.html
@@ -3,7 +3,7 @@
{% from "components/page-footer.html" import page_footer %}
{% block page_title %}
-GOV.UK Notify | Set up service
+ {{heading}} – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/api-keys.html b/app/templates/views/api-keys.html
index 3884d35db..7ae0c1b90 100644
--- a/app/templates/views/api-keys.html
+++ b/app/templates/views/api-keys.html
@@ -2,7 +2,7 @@
{% from "components/table.html" import list_table, field, hidden_field_heading %}
{% block page_title %}
- GOV.UK Notify | API keys and documentation
+ API keys – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/api-keys/create.html b/app/templates/views/api-keys/create.html
index 4791ece27..1be4bf326 100644
--- a/app/templates/views/api-keys/create.html
+++ b/app/templates/views/api-keys/create.html
@@ -3,7 +3,7 @@
{% from "components/textbox.html" import textbox %}
{% block page_title %}
- GOV.UK Notify | API keys and documentation
+ Add a new API key – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/api-keys/revoke.html b/app/templates/views/api-keys/revoke.html
index 101885a17..bf79c08b5 100644
--- a/app/templates/views/api-keys/revoke.html
+++ b/app/templates/views/api-keys/revoke.html
@@ -3,7 +3,7 @@
{% from "components/api-key.html" import api_key %}
{% block page_title %}
- GOV.UK Notify | API keys and documentation
+ Revoke API key – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/api-keys/show.html b/app/templates/views/api-keys/show.html
index 55357ec5f..6258dfa30 100644
--- a/app/templates/views/api-keys/show.html
+++ b/app/templates/views/api-keys/show.html
@@ -3,7 +3,7 @@
{% from "components/api-key.html" import api_key %}
{% block page_title %}
- GOV.UK Notify | API keys and documentation
+ New API key – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/check-email.html b/app/templates/views/check-email.html
index 167ee59d3..3ca4830bf 100644
--- a/app/templates/views/check-email.html
+++ b/app/templates/views/check-email.html
@@ -1,7 +1,7 @@
{% extends "withnav_template.html" %}
{% block page_title %}
-GOV.UK Notify | Send email
+ Send email – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/check-sms.html b/app/templates/views/check-sms.html
index 61950804b..2a61a83f2 100644
--- a/app/templates/views/check-sms.html
+++ b/app/templates/views/check-sms.html
@@ -5,7 +5,7 @@
{% from "components/page-footer.html" import page_footer %}
{% block page_title %}
- GOV.UK Notify | Send text messages
+ Check and confirm – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/choose-service.html b/app/templates/views/choose-service.html
index 429eb83bf..38fe8efc2 100644
--- a/app/templates/views/choose-service.html
+++ b/app/templates/views/choose-service.html
@@ -2,7 +2,7 @@
{% from "components/browse-list.html" import browse_list %}
{% block page_title %}
- GOV.UK Notify | Dashboard
+ Choose service – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/choose-sms-template.html b/app/templates/views/choose-sms-template.html
index 9478c45ab..e12ed204f 100644
--- a/app/templates/views/choose-sms-template.html
+++ b/app/templates/views/choose-sms-template.html
@@ -4,7 +4,7 @@
{% from "components/textbox.html" import textbox %}
{% block page_title %}
- GOV.UK Notify | Send text messages
+ Send text messages – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/documentation.html b/app/templates/views/documentation.html
index 924c467ec..4d9c5a648 100644
--- a/app/templates/views/documentation.html
+++ b/app/templates/views/documentation.html
@@ -3,7 +3,7 @@
{% from "components/api-key.html" import api_key %}
{% block page_title %}
-GOV.UK Notify | API keys and documentation
+ Developer documentation – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/edit-template.html b/app/templates/views/edit-template.html
index c591acacb..ae3d5005e 100644
--- a/app/templates/views/edit-template.html
+++ b/app/templates/views/edit-template.html
@@ -3,7 +3,7 @@
{% from "components/page-footer.html" import page_footer %}
{% block page_title %}
-GOV.UK Notify | Edit template
+ {{ h1 }} – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/email-not-received.html b/app/templates/views/email-not-received.html
index a8400a05c..5b98d330a 100644
--- a/app/templates/views/email-not-received.html
+++ b/app/templates/views/email-not-received.html
@@ -3,7 +3,7 @@
{% from "components/page-footer.html" import page_footer %}
{% block page_title %}
-GOV.UK Notify
+ Check your email address – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/forgot-password.html b/app/templates/views/forgot-password.html
index e2d8b6d27..0a42f905f 100644
--- a/app/templates/views/forgot-password.html
+++ b/app/templates/views/forgot-password.html
@@ -3,7 +3,7 @@
{% from "components/page-footer.html" import page_footer %}
{% block page_title %}
-GOV.UK Notify
+Create a new password – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/job.html b/app/templates/views/job.html
index eda5d8875..08fa08d5d 100644
--- a/app/templates/views/job.html
+++ b/app/templates/views/job.html
@@ -5,7 +5,7 @@
{% from "components/sms-message.html" import sms_message %}
{% block page_title %}
- GOV.UK Notify | Notifications activity
+ {{ uploaded_file_name }} – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/jobs.html b/app/templates/views/jobs.html
index ae52bd253..aac99a211 100644
--- a/app/templates/views/jobs.html
+++ b/app/templates/views/jobs.html
@@ -2,7 +2,7 @@
{% from "components/table.html" import list_table, field, right_aligned_field_heading %}
{% block page_title %}
-GOV.UK Notify | Notifications activity
+ Notifications activity – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/manage-templates.html b/app/templates/views/manage-templates.html
index a5c1519c9..2d3da827e 100644
--- a/app/templates/views/manage-templates.html
+++ b/app/templates/views/manage-templates.html
@@ -4,12 +4,12 @@
{% from "components/browse-list.html" import browse_list %}
{% block page_title %}
-GOV.UK Notify | Manage templates
+Manage templates – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
-
Templates
+ Manage templates
{% if not has_jobs %}
diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html
index a1771222c..ac881a790 100644
--- a/app/templates/views/manage-users.html
+++ b/app/templates/views/manage-users.html
@@ -3,7 +3,7 @@
{% from "components/page-footer.html" import page_footer %}
{% block page_title %}
-GOV.UK Notify | Manage users
+Manage users – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/new-password.html b/app/templates/views/new-password.html
index 8956f612e..511bff626 100644
--- a/app/templates/views/new-password.html
+++ b/app/templates/views/new-password.html
@@ -3,7 +3,7 @@
{% from "components/page-footer.html" import page_footer %}
{% block page_title %}
-GOV.UK Notify
+ Create a new password – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/notification.html b/app/templates/views/notification.html
index 3303885a5..0cc1d5ff9 100644
--- a/app/templates/views/notification.html
+++ b/app/templates/views/notification.html
@@ -4,7 +4,7 @@
{% from "components/page-footer.html" import page_footer %}
{% block page_title %}
-GOV.UK Notify | Notifications activity
+ Text message – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/password-reset-sent.html b/app/templates/views/password-reset-sent.html
index 4fcb6cdbd..9fc600a4a 100644
--- a/app/templates/views/password-reset-sent.html
+++ b/app/templates/views/password-reset-sent.html
@@ -1,7 +1,7 @@
{% extends "withoutnav_template.html" %}
{% block page_title %}
-GOV.UK Notify |
+GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/register-from-invite.html b/app/templates/views/register-from-invite.html
index b77c1b589..4e1b14eaf 100644
--- a/app/templates/views/register-from-invite.html
+++ b/app/templates/views/register-from-invite.html
@@ -1,7 +1,7 @@
{% extends "withoutnav_template.html" %}
{% block page_title %}
-GOV.UK Notify | Create a user account
+Create an account – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/register.html b/app/templates/views/register.html
index c89257022..01e86f1ed 100644
--- a/app/templates/views/register.html
+++ b/app/templates/views/register.html
@@ -3,7 +3,7 @@
{% from "components/page-footer.html" import page_footer %}
{% block page_title %}
-GOV.UK Notify | Create an account
+Create an account – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/send-email.html b/app/templates/views/send-email.html
index 31dd3bbe4..3fe253f32 100644
--- a/app/templates/views/send-email.html
+++ b/app/templates/views/send-email.html
@@ -1,7 +1,7 @@
{% extends "withnav_template.html" %}
{% block page_title %}
-GOV.UK Notify | Send email
+Send email – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/send-sms.html b/app/templates/views/send-sms.html
index 2f5c62935..66f7491ee 100644
--- a/app/templates/views/send-sms.html
+++ b/app/templates/views/send-sms.html
@@ -4,7 +4,7 @@
{% from "components/file-upload.html" import file_upload %}
{% block page_title %}
- GOV.UK Notify | Send text messages
+ Send text messages – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html
index 6bced7eab..c285f6c7d 100644
--- a/app/templates/views/service-settings.html
+++ b/app/templates/views/service-settings.html
@@ -2,7 +2,7 @@
{% from "components/browse-list.html" import browse_list %}
{% block page_title %}
- GOV.UK Notify | Service settings
+ Service settings – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/service-settings/confirm.html b/app/templates/views/service-settings/confirm.html
index dee31453d..37d69881c 100644
--- a/app/templates/views/service-settings/confirm.html
+++ b/app/templates/views/service-settings/confirm.html
@@ -3,7 +3,7 @@
{% from "components/page-footer.html" import page_footer %}
{% block page_title %}
-GOV.UK Notify | Service settings
+ {{ heading }} – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/service-settings/delete.html b/app/templates/views/service-settings/delete.html
index 8d2641d01..04d526c26 100644
--- a/app/templates/views/service-settings/delete.html
+++ b/app/templates/views/service-settings/delete.html
@@ -2,7 +2,7 @@
{% from "components/page-footer.html" import page_footer %}
{% block page_title %}
- GOV.UK Notify | Service settings
+ Delete service – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/service-settings/name.html b/app/templates/views/service-settings/name.html
index f28988794..5094dcace 100644
--- a/app/templates/views/service-settings/name.html
+++ b/app/templates/views/service-settings/name.html
@@ -3,7 +3,7 @@
{% from "components/page-footer.html" import page_footer %}
{% block page_title %}
-GOV.UK Notify | Service settings
+ Change your service name – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/service-settings/request-to-go-live.html b/app/templates/views/service-settings/request-to-go-live.html
index a4805e95e..3b6a2fcdc 100644
--- a/app/templates/views/service-settings/request-to-go-live.html
+++ b/app/templates/views/service-settings/request-to-go-live.html
@@ -2,7 +2,7 @@
{% from "components/page-footer.html" import page_footer %}
{% block page_title %}
- GOV.UK Notify | Service settings
+ Request to go live – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/service-settings/status.html b/app/templates/views/service-settings/status.html
index 384c67636..dc33d36ff 100644
--- a/app/templates/views/service-settings/status.html
+++ b/app/templates/views/service-settings/status.html
@@ -2,7 +2,7 @@
{% from "components/page-footer.html" import page_footer %}
{% block page_title %}
-GOV.UK Notify | Service settings
+ Temporrily suspend API keys – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/service_dashboard.html b/app/templates/views/service_dashboard.html
index 8dbec1142..09443fc40 100644
--- a/app/templates/views/service_dashboard.html
+++ b/app/templates/views/service_dashboard.html
@@ -3,7 +3,7 @@
{% from "components/big-number.html" import big_number %}
{% block page_title %}
- GOV.UK Notify | Dashboard
+ {{ session.get('service_name', 'Dashboard') }} – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html
index 36f0563f4..d4ab329d9 100644
--- a/app/templates/views/signedout.html
+++ b/app/templates/views/signedout.html
@@ -1,7 +1,7 @@
{% extends "withoutnav_template.html" %}
{% block page_title %}
-GOV.UK Notify | Get started
+ GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/signin.html b/app/templates/views/signin.html
index e886e673e..44906ff98 100644
--- a/app/templates/views/signin.html
+++ b/app/templates/views/signin.html
@@ -3,7 +3,7 @@
{% from "components/page-footer.html" import page_footer %}
{% block page_title %}
-Sign in
+ Sign in – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/text-not-received-2.html b/app/templates/views/text-not-received-2.html
index 01b93bdfe..4e10ac956 100644
--- a/app/templates/views/text-not-received-2.html
+++ b/app/templates/views/text-not-received-2.html
@@ -1,7 +1,7 @@
{% extends "withoutnav_template.html" %}
{% block page_title %}
-GOV.UK Notify
+Check your mobile number – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/text-not-received.html b/app/templates/views/text-not-received.html
index c2e577819..e6bab7546 100644
--- a/app/templates/views/text-not-received.html
+++ b/app/templates/views/text-not-received.html
@@ -3,7 +3,7 @@
{% from "components/page-footer.html" import page_footer %}
{% block page_title %}
-GOV.UK Notify
+Check your mobile number – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/two-factor.html b/app/templates/views/two-factor.html
index 5008a1abe..bbc121bc9 100644
--- a/app/templates/views/two-factor.html
+++ b/app/templates/views/two-factor.html
@@ -3,7 +3,7 @@
{% from "components/page-footer.html" import page_footer %}
{% block page_title %}
-GOV.UK Notify | Text verification
+ Text verification – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/user-profile.html b/app/templates/views/user-profile.html
index 6af27f604..4a563d0ad 100644
--- a/app/templates/views/user-profile.html
+++ b/app/templates/views/user-profile.html
@@ -2,7 +2,7 @@
{% from "components/table.html" import list_table, row, field %}
{% block page_title %}
- GOV.UK Notify | Your profile
+ Your profile – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/verification-not-received.html b/app/templates/views/verification-not-received.html
index fdd3b7275..412f62625 100644
--- a/app/templates/views/verification-not-received.html
+++ b/app/templates/views/verification-not-received.html
@@ -1,7 +1,7 @@
{% extends "withoutnav_template.html" %}
{% block page_title %}
-GOV.UK Notify
+ Resend verification code – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/verify-mobile.html b/app/templates/views/verify-mobile.html
index 12c4028ca..2ed9dbdd1 100644
--- a/app/templates/views/verify-mobile.html
+++ b/app/templates/views/verify-mobile.html
@@ -1,7 +1,7 @@
{% extends "withoutnav_template.html" %}
{% block page_title %}
-GOV.UK Notify | Confirm mobile number
+Confirm your mobile number – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
diff --git a/app/templates/views/verify.html b/app/templates/views/verify.html
index 292c777f5..fc8eeb071 100644
--- a/app/templates/views/verify.html
+++ b/app/templates/views/verify.html
@@ -3,7 +3,7 @@
{% from "components/page-footer.html" import page_footer %}
{% block page_title %}
-GOV.UK Notify | Confirm email address and mobile number
+ Enter the codes we’ve sent you – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}