getting the favicon right

_config.yml

@@ -3,7 +3,7 @@ permalink:        pretty
 
 # Setup
 title:               KWARC
-tagline:             'KWARC:  Knowledge Adaptation and Reasoning for Content '
+tagline:             'Knowledge Adaptation and Reasoning for Content '
 description:         'The Research Group of the Professorship for Knowledge Representation
 and Processing at <a href="http://fau.de">FAU Erlangen-Nürnberg</a> <a
 href="http://cs.fau.de">Computer Science</a>'

_includes/head.html

@@ -29,14 +29,12 @@
     <![endif]-->
 
     <!-- Icons -->
-    <link rel="shortcut icon" href="{{ site.baseurl }}/public/favicon.png">
-    <link rel="apple-touch-icon-precomposed apple-touch-icon" sizes="144x144" type="image/png" href="{{ site.baseurl }}/public/favicon.png">
-
+    <link rel="shortcut icon" type="image/png" sizes="96x96" href="/public/favicon-96x96.png">
     <!-- RSS -->
-    <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ site.baseurl }}/atom.xml">
+    <link rel="alternate" type="application/rss+xml" title="RSS" href="/atom.xml">
 
     <!-- jQuery (necessary for Bootstrap's JavaScript plugins and calendar) -->
-    <script src="{{ site.baseurl }}/public/js/jquery.min.js"></script>
+    <script src="/public/js/jquery.min.js"></script>
 
 
     <!-- Piwik Analytics plugin -->

_layouts/default.html

@@ -13,7 +13,7 @@
 	<div class="row">
 	  <div class="odk-logo" >
 	    <a href="{{ site.baseurl }}/">
-              <img class="img-responsive" src="{{ site.baseurl }}/public/logos/kwarc-logo-transparent.jpg" alt="KWARC logo" />
+              <img class="img-responsive" src="{{ site.baseurl }}/public/logos/kwarc-logo-blue-transparent.png" alt="KWARC logo" />
             </a>
           </div>
           <div class="site-heading">