diff --git a/package-lock.json b/package-lock.json
index 2b73f9f..4475cb8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4640,6 +4640,25 @@
         }
       }
     },
+    "serve-favicon": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.3.tgz",
+      "integrity": "sha1-WYaxewUCZCtkHCH4GLGszjICXSM=",
+      "requires": {
+        "etag": "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz",
+        "fresh": "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz",
+        "ms": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+        "parseurl": "1.3.1",
+        "safe-buffer": "5.0.1"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
+          "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c="
+        }
+      }
+    },
     "serve-static": {
       "version": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz",
       "integrity": "sha1-n0uhni8wMMVH+K+ZEHg47DjVseI=",
diff --git a/package.json b/package.json
index 29af1c8..06296f1 100644
--- a/package.json
+++ b/package.json
@@ -51,6 +51,7 @@
     "oauth-libre": "^0.9.17",
     "objection": "^0.8.4",
     "pug": "^2.0.0-rc.3",
+    "serve-favicon": "^2.4.3",
     "stylus": "^0.54.5",
     "thirty-two": "^1.0.2",
     "toml": "^2.3.2",
diff --git a/server/server.js b/server/server.js
index 83927db..440311b 100644
--- a/server/server.js
+++ b/server/server.js
@@ -1,9 +1,10 @@
-import express from 'express'
-import session from 'express-session'
-import bodyParser from 'body-parser'
 import connectSession from 'connect-redis'
-import path from 'path'
+import session from 'express-session'
+import favicon from 'serve-favicon'
+import bodyParser from 'body-parser'
+import express from 'express'
 import crypto from 'crypto'
+import path from 'path'
 
 import routes from './routes'
 import flash from '../scripts/flash'
@@ -59,6 +60,8 @@ app.use((req, res, next) => {
   next()
 })
 
+app.use(favicon(path.join(__dirname, '..', 'static', 'image', 'icynet.ico')))
+
 module.exports = (args) => {
   app.set('view options', {layout: false})
   app.set('view engine', 'pug')
diff --git a/static/image/icynet-icon-large.png b/static/image/icynet-icon-large.png
new file mode 100644
index 0000000..69c4eb0
Binary files /dev/null and b/static/image/icynet-icon-large.png differ
diff --git a/static/image/icynet-icon.png b/static/image/icynet-icon.png
new file mode 100644
index 0000000..0fa1c85
Binary files /dev/null and b/static/image/icynet-icon.png differ
diff --git a/static/image/icynet-icon.svg b/static/image/icynet-icon.svg
new file mode 100644
index 0000000..7c21d99
--- /dev/null
+++ b/static/image/icynet-icon.svg
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="29.898235mm"
+   height="29.898235mm"
+   viewBox="0 0 29.898235 29.898235"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   sodipodi:docname="icynet-icon.svg"
+   inkscape:export-filename="/home/diamond/IcyNetwork/IcyNet.eu/static/image/icynet-icon-large.png"
+   inkscape:export-xdpi="460.05008"
+   inkscape:export-ydpi="460.05008">
+  <defs
+     id="defs2">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1378"
+       x="-0.024088247"
+       width="1.0481765"
+       y="-0.023912397"
+       height="1.0478248">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.19860895"
+         id="feGaussianBlur1380" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568543"
+     inkscape:cx="38.38993"
+     inkscape:cy="45.763944"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1.2029979e-7,-0.00176382)">
+    <rect
+       transform="rotate(-3.5293181)"
+       y="3.4147503"
+       x="1.5723678"
+       height="24.856066"
+       width="24.856066"
+       id="rect1083"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#00a1b5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;font-variant-east_asian:normal" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#00e1fd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;font-variant-east_asian:normal"
+       id="rect815"
+       width="24.856066"
+       height="24.856066"
+       x="0.13787289"
+       y="4.5749965"
+       transform="rotate(-8.5307657)" />
+    <rect
+       transform="rotate(2.4309033e-4)"
+       y="2.5227857"
+       x="2.5211489"
+       height="24.856066"
+       width="24.856066"
+       id="rect817"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#6fefff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:52.66549683px;line-height:0;font-family:'Open Sans';-inkscape-font-specification:'Open Sans';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.61717373px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter1378)"
+       x="14.788064"
+       y="14.919127"
+       id="text1264"><tspan
+         id="tspan1260"
+         sodipodi:role="line"
+         x="14.788064"
+         y="14.919127"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.16637421px;line-height:0;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';text-align:center;text-anchor:middle;fill:#0059a0;fill-opacity:1;stroke-width:0.61717373px">ICY</tspan><tspan
+         id="tspan1262"
+         sodipodi:role="line"
+         x="14.788064"
+         y="25.230335"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.05188179px;line-height:0;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';text-align:center;text-anchor:middle;fill:#007104;fill-opacity:1;stroke-width:0.61717373px">net</tspan></text>
+    <text
+       id="text839"
+       y="14.615795"
+       x="14.558904"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:52.66549683px;line-height:0;font-family:'Open Sans';-inkscape-font-specification:'Open Sans';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.61717373px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.16637421px;line-height:0;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';text-align:center;text-anchor:middle;fill:#03a9f4;fill-opacity:1;stroke-width:0.61717373px"
+         y="14.615795"
+         x="14.558904"
+         sodipodi:role="line"
+         id="tspan1252">ICY</tspan><tspan
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.05188179px;line-height:0;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';text-align:center;text-anchor:middle;fill:#00b300;fill-opacity:1;stroke-width:0.61717373px"
+         y="24.927004"
+         x="14.558904"
+         sodipodi:role="line"
+         id="tspan1258">net</tspan></text>
+  </g>
+</svg>
diff --git a/static/image/icynet-highres.png b/static/image/icynet-large.png
similarity index 100%
rename from static/image/icynet-highres.png
rename to static/image/icynet-large.png
diff --git a/static/image/icynet.ico b/static/image/icynet.ico
new file mode 100644
index 0000000..6e135cf
Binary files /dev/null and b/static/image/icynet.ico differ
diff --git a/static/image/icynet.svg b/static/image/icynet.svg
new file mode 100644
index 0000000..a4ae9c8
--- /dev/null
+++ b/static/image/icynet.svg
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="303.82721"
+   height="35.330757"
+   version="1.1"
+   viewBox="0 0 80.387615 9.3479292"
+   id="svg3874">
+  <metadata
+     id="metadata3880">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3878">
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter5033"
+       x="0"
+       y="0"
+       width="1.04"
+       height="1.0599999">
+      <feFlood
+         flood-opacity="1"
+         flood-color="rgb(0,89,160)"
+         result="flood"
+         id="feFlood5023" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite5025" />
+      <feOffset
+         dx="0.4"
+         dy="0.4"
+         result="offset"
+         id="feOffset5029" />
+      <feGaussianBlur
+         in="offset"
+         stdDeviation="0.3"
+         result="blur"
+         id="feGaussianBlur5027" />
+      <feComposite
+         in="SourceGraphic"
+         in2="blur"
+         operator="over"
+         result="composite2"
+         id="feComposite5031" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter5045"
+       x="0"
+       y="0"
+       width="1.01"
+       height="1.0599999">
+      <feFlood
+         flood-opacity="1"
+         flood-color="rgb(0,113,4)"
+         result="flood"
+         id="feFlood5035" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite5037" />
+      <feOffset
+         dx="0.4"
+         dy="0.4"
+         result="offset"
+         id="feOffset5041" />
+      <feGaussianBlur
+         in="offset"
+         stdDeviation="0.3"
+         result="blur"
+         id="feGaussianBlur5039" />
+      <feComposite
+         in="SourceGraphic"
+         in2="blur"
+         operator="over"
+         result="composite2"
+         id="feComposite5043" />
+    </filter>
+  </defs>
+  <!--style>
+        text {
+            font-family: "Open Sans";
+            font-weight: bold;
+            text-transform: uppercase;
+            text-align: center;
+            text-shadow: 2px 2px 1px #007104;
+            color: #00b300;
+            user-select: none;
+            cursor: default;
+        }
+        #ts1 {
+            color: #03a9f4;
+            text-shadow: 2px 2px 1px #0059a0;
+        }
+    </style-->
+  <g
+     transform="translate(-50.340659,-159.82899)"
+     id="g3872"
+     style="filter:url(#filter5045)">
+    <text
+       x="69.641945"
+       y="168.53017"
+       xml:space="preserve"
+       id="text3870"><tspan
+         id="ts2"
+         x="69.641945"
+         y="168.53017"
+         style="color:#00b300;font-weight:bold;font-family:'Open Sans';text-align:center;text-transform:uppercase;fill:#00b300;fill-opacity:1">NETWORK</tspan></text>
+  </g>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:141.11109924px;line-height:1.25;font-family:P052;-inkscape-font-specification:P052;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+     x="16.607485"
+     y="2.4248574"
+     id="text4974"><tspan
+       id="tspan4972"
+       x="16.607485"
+       y="122.5104"
+       style="stroke-width:0.26458332" /></text>
+  <g
+     transform="translate(-82.121269,-160.8011)"
+     id="g3872-7">
+    <text
+       x="81.043144"
+       y="169.50345"
+       xml:space="preserve"
+       id="text3870-0"
+       style="fill:#03a9f4;fill-opacity:1;filter:url(#filter5033)"><tspan
+         id="ts2-3"
+         x="81.043144"
+         y="169.50345"
+         style="color:#00b300;font-weight:bold;font-family:'Open Sans';text-align:center;text-transform:uppercase;fill:#03a9f4;fill-opacity:1">ICY</tspan></text>
+  </g>
+</svg>
diff --git a/static/image/icynet.svgz b/static/image/icynet.svgz
deleted file mode 100644
index ecaefb4..0000000
Binary files a/static/image/icynet.svgz and /dev/null differ