diff --git a/app/assets/stylesheets/components/page-footer.scss b/app/assets/stylesheets/components/page-footer.scss
index 31e7e5ab0..04b6a31b1 100644
--- a/app/assets/stylesheets/components/page-footer.scss
+++ b/app/assets/stylesheets/components/page-footer.scss
@@ -39,6 +39,10 @@
 
   }
 
+  &-delete-link-without-button {
+    padding-left: 0;
+  }
+
   &-secondary-link {
     display: block;
     margin-top: $gutter;
diff --git a/app/main/views/templates.py b/app/main/views/templates.py
index e034f5647..7a9e94beb 100644
--- a/app/main/views/templates.py
+++ b/app/main/views/templates.py
@@ -311,12 +311,8 @@ def delete_service_template(service_id, template_id):
         return redirect(url_for(
             '.choose_template',
             service_id=service_id,
-            template_type=template['template_type']
         ))
 
-    template['template_content'] = template['content']
-    form = form_objects[template['template_type']](**template)
-
     try:
         last_used_notification = template_statistics_client.get_template_statistics_for_template(
             service_id, template['id']
@@ -334,11 +330,17 @@ def delete_service_template(service_id, template_id):
             raise e
 
     flash('{}. Are you sure you want to delete it?'.format(message), 'delete')
+
     return render_template(
-        'views/edit-{}-template.html'.format(template['template_type']),
-        h1='Edit template',
-        form=form,
-        template_id=template_id)
+        'views/templates/template.html',
+        template=get_template(
+            template,
+            current_service,
+            expand_emails=True,
+            letter_preview_url=url_for('.view_template', service_id=service_id, template_id=template['id']),
+            show_recipient=True,
+        )
+    )
 
 
 @main.route('/services/<service_id>/templates/<template_id>/versions')
diff --git a/app/templates/components/page-footer.html b/app/templates/components/page-footer.html
index bdd5be23f..5dcc69e4f 100644
--- a/app/templates/components/page-footer.html
+++ b/app/templates/components/page-footer.html
@@ -17,7 +17,7 @@
       <a class="page-footer-back-link" href="{{ back_link }}">{{ back_link_text }}</a>
     {% endif %}
     {% if delete_link %}
-      <span class="page-footer-delete-link">
+      <span class="page-footer-delete-link {% if not button_text %}page-footer-delete-link-without-button{% endif %}">
         <a href="{{ delete_link }}">{{ delete_link_text }}</a>
       </span>
     {% endif %}
diff --git a/app/templates/flash_messages.html b/app/templates/flash_messages.html
index ebb2463d4..0107749a1 100644
--- a/app/templates/flash_messages.html
+++ b/app/templates/flash_messages.html
@@ -2,12 +2,14 @@
 {% with messages = get_flashed_messages(with_categories=true) %}
   {% if messages %}
     {% for category, message in messages %}
-      {{ banner(
-        message,
-        'default' if ((category == 'default') or (category == 'default_with_tick')) else 'dangerous',
-        delete_button="Yes, {}".format(category) if category in ['delete', 'suspend', 'resume', 'remove'] else None,
-        with_tick=True if category == 'default_with_tick' else False
-      )}}
+      <div class="bottom-gutter">
+        {{ banner(
+          message,
+          'default' if ((category == 'default') or (category == 'default_with_tick')) else 'dangerous',
+          delete_button="Yes, {}".format(category) if category in ['delete', 'suspend', 'resume', 'remove'] else None,
+          with_tick=True if category == 'default_with_tick' else False
+        )}}
+      </div>
     {% endfor %}
   {% endif %}
 {% endwith %}
diff --git a/app/templates/views/edit-email-template.html b/app/templates/views/edit-email-template.html
index 0319820a1..a309b1e00 100644
--- a/app/templates/views/edit-email-template.html
+++ b/app/templates/views/edit-email-template.html
@@ -23,9 +23,7 @@
              {{ radios(form.process_type) }}
           {% endif %}
           {{ page_footer(
-            'Save',
-            delete_link=url_for('.delete_service_template', service_id=current_service.id, template_id=template_id) if template_id or None,
-            delete_link_text='Delete this template'
+            'Save'
           ) }}
         </div>
         <aside class="column-whole">
diff --git a/app/templates/views/edit-letter-template.html b/app/templates/views/edit-letter-template.html
index 5cb345e55..804e40339 100644
--- a/app/templates/views/edit-letter-template.html
+++ b/app/templates/views/edit-letter-template.html
@@ -19,9 +19,7 @@
           {{ textbox(form.subject, width='1-1', highlight_tags=True, rows=2) }}
           {{ textbox(form.template_content, highlight_tags=True, width='1-1', rows=8) }}
           {{ page_footer(
-            'Save',
-            delete_link=url_for('.delete_service_template', service_id=current_service.id, template_id=template_id) if template_id or None,
-            delete_link_text='Delete this template'
+            'Save'
           ) }}
         </div>
         <aside class="column-three-quarters">
diff --git a/app/templates/views/edit-sms-template.html b/app/templates/views/edit-sms-template.html
index 33f636dc2..a61f38b0c 100644
--- a/app/templates/views/edit-sms-template.html
+++ b/app/templates/views/edit-sms-template.html
@@ -24,9 +24,7 @@
             {{ radios(form.process_type) }}
           {% endif %}
           {{ page_footer(
-            'Save',
-            delete_link=url_for('.delete_service_template', service_id=current_service.id, template_id=template_id) if template_id or None,
-            delete_link_text='Delete this template'
+            'Save'
           ) }}
         </div>
         <aside class="column-whole">
diff --git a/app/templates/views/templates/template.html b/app/templates/views/templates/template.html
index b1f827535..ab564ef2b 100644
--- a/app/templates/views/templates/template.html
+++ b/app/templates/views/templates/template.html
@@ -23,7 +23,7 @@
   </div>
 
   {% if template._template.updated_at %}
-    <div class="bottom-gutter-2">
+    <div class="bottom-gutter-1-2">
       <h2 class="heading-small">Last edited {{ template._template.updated_at|format_delta }}</h2>
       <p>
         <a href="{{ url_for('.view_template_versions', service_id=current_service.id, template_id=template.id) }}">See previous versions</a>
@@ -31,4 +31,13 @@
     </div>
   {% endif %}
 
+  {% if current_user.has_permissions(permissions=['manage_templates'], admin_override=True) %}
+    <div class="bottom-gutter">
+      {{ page_footer(
+        delete_link=url_for('.delete_service_template', service_id=current_service.id, template_id=template.id),
+        delete_link_text='Delete this template'
+      ) }}
+    </div>
+  {% endif %}
+
 {% endblock %}
diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py
index 8f5d68ccb..0531fa245 100644
--- a/tests/app/main/views/test_templates.py
+++ b/tests/app/main/views/test_templates.py
@@ -595,7 +595,7 @@ def test_should_redirect_when_deleting_a_template(
     assert response.status_code == 302
     assert response.location == url_for(
         '.choose_template',
-        service_id=service_id, template_type=type_, _external=True)
+        service_id=service_id, _external=True)
     mock_get_service_template.assert_called_with(
         service_id, template_id)
     mock_delete_service_template.assert_called_with(