diff --git a/app/jobs/views.py b/app/jobs/views.py
index d84e77ea6de611a94695723b1198db12bef222ec..a5bbe7231d7383aea9d9d5805383fcaf3b8855be 100644
--- a/app/jobs/views.py
+++ b/app/jobs/views.py
@@ -14,8 +14,7 @@ def job(job_id):
     job = Job.query.get_or_404(job_id)
     if not (job.creator == current_user or current_user.is_administrator()):
         abort(403)
-    return render_template('jobs/job.html.j2', job=job,
-                           title='<i class="material-icons left service" data-service="{service}" style="font-size: inherit;"></i>Job'.format(service=job.service))
+    return render_template('jobs/job.html.j2', job=job, title='Job')
 
 
 @jobs.route('/<int:job_id>/delete')
diff --git a/app/templates/jobs/job.html.j2 b/app/templates/jobs/job.html.j2
index f288032b59d042e01df0ea5ee0a0daf0715c22c6..674a566f60599b22e62bb97e5ec93ac642d515ad 100644
--- a/app/templates/jobs/job.html.j2
+++ b/app/templates/jobs/job.html.j2
@@ -2,6 +2,7 @@
 
 {% set full_width = False %}
 {% set roadmap = False %}
+{% set title_override = '<i class="material-icons left service" data-service="{service}" style="font-size: inherit;"></i>Job'.format(service=job.service) %}
 
 {% block page_content %}
 <div class="col s12 m4">
diff --git a/app/templates/nopaque.html.j2 b/app/templates/nopaque.html.j2
index 880e1738ed5c80562995c8468b8f3c7ccdf8cc6a..18a8e518923ff515432c2a891c03f5d5e0d3efdf 100644
--- a/app/templates/nopaque.html.j2
+++ b/app/templates/nopaque.html.j2
@@ -94,7 +94,15 @@
       {% endif %}
         <div class="row">
           <div class="col s12">
-            <h2>{% if title %}{{ title }}{% else %}Unnamed page{% endif %}</h2>
+            <h2>
+              {% if title_override %}
+              {{ title_override }}
+              {% elif title %}
+              {{ title }}
+              {% else %}
+              Unnamed page
+              {% endif %}
+            </h2>
           </div>
           {% if roadmap %}
           <div class="col s12 m9 l10">