3 files changed, 9 insertions, 14 deletions
diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html
index 7018ecdac..e69dac27d 100644
--- a/templates/web/default/common_header_tags.html
+++ b/templates/web/default/common_header_tags.html
@@ -11,13 +11,8 @@
 [% IF rss %]
     <link rel="alternate" type="application/rss+xml" title="[% rss.0 %]" href="[% rss.1 %]">
 [% END %]
-[% legacy_rss %]
 
 <title>
-    [% IF legacy_title %]
-        [% legacy_title %]
-    [% ELSE %]
-        [% "$title :: " | html IF title %]
-        [% c.cobrand.site_title %]
-    [% END %]
+    [% "$title :: " | html IF title %]
+    [% c.cobrand.site_title %]
 </title>
diff --git a/templates/web/default/footer.html b/templates/web/default/footer.html
index 19af59198..9222436e2 100644
--- a/templates/web/default/footer.html
+++ b/templates/web/default/footer.html
@@ -4,10 +4,10 @@
 <h2 class="v">[% loc('Navigation') %]</h2>
 <ul id="navigation">
 <li><a href="/">[% loc("Report a problem") %]</a></li>
-<li><a href="/reports">[% loc("All reports")      %]</a></li>
-<li><a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]">[% loc("Local alerts")   %]</a></li>
-<li><a href="/faq">[% loc("Help")             %]</a></li>
-<li><a href="/contact">[% loc("Contact")          %]</a></li>
+<li><a href="/reports">[% loc("All reports") %]</a></li>
+<li><a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]">[% loc("Local alerts") %]</a></li>
+<li><a href="/faq">[% loc("Help") %]</a></li>
+<li><a href="/contact">[% loc("Contact") %]</a></li>
 </ul>
 
 [% loc('<a href="http://www.mysociety.org/"><img id="logo" width="133" height="26" src="/i/mysociety-dark.png" alt="View mySociety.org"><span id="logoie"></span></a>') %]
diff --git a/templates/web/default/header.html b/templates/web/default/header.html
index 491329c5d..52f066663 100644
--- a/templates/web/default/header.html
+++ b/templates/web/default/header.html
@@ -12,9 +12,9 @@
     </head>
     <body>
 
-        <div id="header">
-            <a href="/">[% loc('Fix<span id="my">My</span>Street') %]</a>
-        </div>
+        [% IF NOT title AND NOT c.req.path %]<h1 id="header">[% ELSE %]<div id="header"><a href="/">[% END %]
+            [%- loc('Fix<span id="my">My</span>Street') %]
+        [%- IF NOT title AND NOT c.req.path %]</h1>[% ELSE %]</a></div>[% END %]
 
         <div id="wrapper"><div id="mysociety">