diff --git a/.gitignore b/.gitignore
index 7b511c7..da8247b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 .idea
 node_modules
-static
 gruntfile.js
 gulpfile.js
 gloo_errors.txt
diff --git a/gloo/routes.js b/gloo/routes.js
index 8f51d25..fbdcdbb 100644
--- a/gloo/routes.js
+++ b/gloo/routes.js
@@ -5,8 +5,6 @@ const config = require("./../config");
 const express = require("express");
 
 module.exports = function(app) {
-    //Sometime later we might want to do something with the favicon.ico.
-    app.get("/favicon.ico", (req, res) => res.status(404).send());
 
     // Static assets will be available on the same path as their directory,
     // i.e. assets => /assets, static => /static
diff --git a/static/favicon-16x16.png b/static/favicon-16x16.png
new file mode 100644
index 0000000..5bbb715
Binary files /dev/null and b/static/favicon-16x16.png differ
diff --git a/static/favicon-32x32.png b/static/favicon-32x32.png
new file mode 100644
index 0000000..29a7d28
Binary files /dev/null and b/static/favicon-32x32.png differ
diff --git a/static/favicon-96x96.png b/static/favicon-96x96.png
new file mode 100644
index 0000000..eff1b55
Binary files /dev/null and b/static/favicon-96x96.png differ
diff --git a/static/favicon.ico b/static/favicon.ico
new file mode 100644
index 0000000..be3da5e
Binary files /dev/null and b/static/favicon.ico differ
diff --git a/templates/_404.nunj b/templates/_404.nunj
index f1f04ee..0d6d79b 100644
--- a/templates/_404.nunj
+++ b/templates/_404.nunj
@@ -2,4 +2,5 @@
 
 {% block body %}
     <h1>404</h1>
+    Sidan finns ej
 {% endblock %}
\ No newline at end of file
diff --git a/templates/_default.nunj b/templates/_default.nunj
index 5106ca1..b43b4ca 100644
--- a/templates/_default.nunj
+++ b/templates/_default.nunj
@@ -6,13 +6,18 @@
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <title>{{ title }} - Datasektionens styrdokument</title>
         <link rel="stylesheet" href="{{ static }}" />
+        <link rel="icon" type="image/png" sizes="32x32" href="/static/favicon-32x32.png">
+        <link rel="icon" type="image/png" sizes="96x96" href="/static/favicon-96x96.png">
+        <link rel="icon" type="image/png" sizes="16x16" href="/static/favicon-16x16.png">
+        <link rel="icon" type="image/png" sizes="16x16" href="/static/favicon-16x16.png">
+        <link rel="shortcut icon" href="/static/favicon.ico">
         <script type="text/javascript">
           window.methone_conf = {
             system_name: "styrdokument",
-            color_scheme: "cerice",
+            color_scheme: "cerise",
             login_text: "",
             login_link: "#",
-            topbar_items: [
+            links: [
               {
                 str: "Styrdokument",
                 href: "/"