3 files changed, 12 insertions, 9 deletions
diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html
index e5a4d25f2..321e45649 100644
--- a/templates/web/base/common_header_tags.html
+++ b/templates/web/base/common_header_tags.html
@@ -1,7 +1,5 @@
 [% SET start = c.config.ADMIN_BASE_URL IF admin %]
 
-<link rel="stylesheet" href="[% version('/vendor/OpenLayers/theme/default/style.css') %]">
-
 <meta http-equiv="content-type" content="text/html; charset=utf-8"
     id="js-meta-data" data-page="[% page %]"
     data-cobrand="[% c.cobrand.moniker %]">
diff --git a/templates/web/base/header.html b/templates/web/base/header.html
index 4e537a7ec..37c81f454 100644
--- a/templates/web/base/header.html
+++ b/templates/web/base/header.html
@@ -19,13 +19,7 @@
         <meta name="mobileoptimized" content="0">
 
         [% INCLUDE 'header_opengraph.html' %]
-        <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.asset_moniker _ '/base.css') %]">
-        <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.asset_moniker _ '/layout.css') %]" media="(min-width:48em)">
-        [% extra_css %]
-        <!--[if (lt IE 9) & (!IEMobile)]>
-            <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.asset_moniker _ '/layout.css') %]">
-        <![endif]-->
-
+        [% INCLUDE 'header/css.html' %]
         [% INCLUDE 'common_header_tags.html' %]
 
         [% IF c.req.uri.host == 'osm.fixmystreet.com' %]
diff --git a/templates/web/base/header/css.html b/templates/web/base/header/css.html
new file mode 100644
index 000000000..219369465
--- /dev/null
+++ b/templates/web/base/header/css.html
@@ -0,0 +1,11 @@
+[% SET base_css = version('/cobrands/' _ c.cobrand.asset_moniker _ '/base.css') %]
+[% SET layout_css = version('/cobrands/' _ c.cobrand.asset_moniker _ '/layout.css') %]
+
+<link rel="stylesheet" href="[% base_css %]">
+<link rel="stylesheet" href="[% layout_css %]" media="screen and (min-width:48em)">
+<!--[if (lt IE 9) & (!IEMobile)]>
+    <link rel="stylesheet" href="[% layout_css %]">
+<![endif]-->
+<link rel="stylesheet" href="[% version('/vendor/OpenLayers/theme/default/style.css') %]">
+
+[% extra_css %]