diff --git a/pinaxcon/templates/site_base.html b/pinaxcon/templates/site_base.html
index 82967b64ed105758453cc4c511db7df73820c534..ffb52e34b15261cbcb8bbf3fe606624c24413014 100644
--- a/pinaxcon/templates/site_base.html
+++ b/pinaxcon/templates/site_base.html
@@ -17,35 +17,19 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   
   <title>{% block head_title_base %}{% if SITE_NAME %}{{ SITE_NAME }} | {% endif %}{% block head_title %}{% endblock %}{% endblock %}</title>
-  
+  <link rel="apple-touch-icon" sizes="180x180" href="{% static 'assets/favicon/apple-touch-icon.png' %}">
+  <link rel="icon" type="image/png" sizes="32x32" href="{% static 'assets/favicon/favicon-32x32.png' %}">
+  <link rel="icon" type="image/png" sizes="16x16" href="{% static 'assets/favicon/favicon-16x16.png' %}">
+  <link rel="manifest" href="{% static 'assets/favicon/site.webmanifest' %}">
+  <link rel="mask-icon" href="{% static 'assets/favicon/safari-pinned-tab.svg' %}" color="#0f7c11">
+  <meta name="msapplication-TileColor" content="#00a300">
+  <meta name="theme-color" content="#ffffff">
   {% block styles %}
   <link href="{% sass_src 'scss/app.scss' %}" rel="stylesheet" type="text/css" />
-  
-  <link rel="apple-touch-icon-precomposed" sizes="57x57" href="{% static 'lca2018/images/apple-touch-icon-57x57.png' %}" />
-  <link rel="apple-touch-icon-precomposed" sizes="114x114" href="{% static 'lca2018/images/apple-touch-icon-114x114.png' %}" />
-  <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{% static 'lca2018/images/apple-touch-icon-72x72.png' %}" />
-  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{% static 'lca2018/images/apple-touch-icon-144x144.png' %}" />
-  <link rel="apple-touch-icon-precomposed" sizes="60x60" href="{% static 'lca2018/images/apple-touch-icon-60x60.png' %}" />
-  <link rel="apple-touch-icon-precomposed" sizes="120x120" href="{% static 'lca2018/images/apple-touch-icon-120x120.png' %}" />
-  <link rel="apple-touch-icon-precomposed" sizes="76x76" href="{% static 'lca2018/images/apple-touch-icon-76x76.png' %}" />
-  <link rel="apple-touch-icon-precomposed" sizes="152x152" href="{% static 'lca2018/images/apple-touch-icon-152x152.png' %}" />
-  <link rel="icon" type="image/png" href="{% static 'lca2018/images/favicon-196x196.png' %}" sizes="196x196" />
-  <link rel="icon" type="image/png" href="{% static 'lca2018/images/favicon-96x96.png' %}" sizes="96x96" />
-  <link rel="icon" type="image/png" href="{% static 'lca2018/images/favicon-32x32.png' %}" sizes="32x32" />
-  <link rel="icon" type="image/png" href="{% static 'lca2018/images/favicon-16x16.png' %}" sizes="16x16" />
-  <link rel="icon" type="image/png" href="{% static 'lca2018/images/favicon-128.png' %}" sizes="128x128" />
-  <link rel="icon" href="{% static 'lca2018/images/favicon.png' %}" sizes="512x512" />
-  <meta name="application-name" content="&nbsp;"/>
-  <meta name="msapplication-TileColor" content="#FFFFFF" />
-  <meta name="msapplication-TileImage" content="{% static 'lca2018/images/mstile-144x144.png' %}" />
-  <meta name="msapplication-square70x70logo" content="{% static 'lca2018/images/mstile-70x70.png' %}" />
-  <meta name="msapplication-square150x150logo" content="{% static 'lca2018/images/mstile-150x150.png' %}" />
-  <meta name="msapplication-wide310x150logo" content="{% static 'lca2018/images/mstile-310x150.png' %}" />
-  <meta name="msapplication-square310x310logo" content="{% static 'lca2018/images/mstile-310x310.png' %}" />
-  
   {% block extra_style %}{% endblock %}
   {% endblock %}
   
+  
   {% block extra_head_base %}
   {% block extra_head %}{% endblock %}
   {% endblock %}
@@ -88,11 +72,11 @@
     {% endblock %}
     
     {% block scripts %}
+    <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
     <script src="{% static 'js/app.js' %}" type="text/javascript"></script>
     <script src="{% static 'js/jquery.formset.js' %}"></script>
-    <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
-    <script src="{% static 'bootstrap/js/bootstrap.min.js' %}"></script>
+    <script src="{% static 'bootstrap/js/bootstrap.bundle.min.js' %}"></script>
     {% block extra_script %}
     {% endblock %}
     {% block scripts_extra %}{% endblock %}
@@ -104,7 +88,7 @@
     {% endblock %}
   </main>
 
-  <footer class="bg-white text-primary py-5">
+  <footer class="bg-white text-primary py-xl-5 py-2">
     <p>
       &copy; 2018 linux.conf.au <br />
       and Linux Australia. <br />