diff --git a/assets/img/favicon.png b/assets/img/favicon.png
new file mode 100644
index 000000000..f28959417
Binary files /dev/null and b/assets/img/favicon.png differ
diff --git a/assets/img/icon.svg b/assets/img/icon.svg
new file mode 100644
index 000000000..be3490823
--- /dev/null
+++ b/assets/img/icon.svg
@@ -0,0 +1,84 @@
+<?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="144"
+   height="144"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   inkscape:export-filename="/Users/fred/Devel/websites/miniflux/favicon.png"
+   inkscape:export-xdpi="40"
+   inkscape:export-ydpi="40"
+   sodipodi:docname="icon.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="125.35606"
+     inkscape:cy="101.67816"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="720"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <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(0,-908.36218)">
+    <text
+       xml:space="preserve"
+       style="font-size:32.87251282px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#d40000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="-0.76592249"
+       y="865.71136"
+       id="text3769"
+       sodipodi:linespacing="125%"
+       transform="scale(0.83777396,1.1936394)"><tspan
+         sodipodi:role="line"
+         id="tspan3771"
+         x="-0.76592249"
+         y="865.71136"
+         style="font-size:118.34104919px;font-weight:bold;fill:#d40000;-inkscape-font-specification:Sans Bold">K</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:130.11079407px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#2b0000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="78.060204"
+       y="932.96344"
+       id="text3102"
+       sodipodi:linespacing="125%"
+       transform="scale(0.90196969,1.1086847)"><tspan
+         sodipodi:role="line"
+         id="tspan3104"
+         x="78.060204"
+         y="932.96344">B</tspan></text>
+  </g>
+</svg>
diff --git a/assets/img/touch-icon-ipad-retina.png b/assets/img/touch-icon-ipad-retina.png
new file mode 100644
index 000000000..9336a60bf
Binary files /dev/null and b/assets/img/touch-icon-ipad-retina.png differ
diff --git a/assets/img/touch-icon-ipad.png b/assets/img/touch-icon-ipad.png
new file mode 100644
index 000000000..6e573c5ef
Binary files /dev/null and b/assets/img/touch-icon-ipad.png differ
diff --git a/assets/img/touch-icon-iphone-retina.png b/assets/img/touch-icon-iphone-retina.png
new file mode 100644
index 000000000..f21bb3cbe
Binary files /dev/null and b/assets/img/touch-icon-iphone-retina.png differ
diff --git a/assets/img/touch-icon-iphone.png b/assets/img/touch-icon-iphone.png
new file mode 100644
index 000000000..00e337f17
Binary files /dev/null and b/assets/img/touch-icon-iphone.png differ
diff --git a/templates/layout.php b/templates/layout.php
index 7739db1af..1c89f2abf 100644
--- a/templates/layout.php
+++ b/templates/layout.php
@@ -4,14 +4,11 @@
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width">
         <link rel="stylesheet" href="assets/css/app.css" media="screen">
-        <!--
         <link rel="icon" type="image/png" href="assets/img/favicon.png">
-        <link rel="shortcut icon" href="favicon.ico">
         <link rel="apple-touch-icon" href="assets/img/touch-icon-iphone.png">
         <link rel="apple-touch-icon" sizes="72x72" href="assets/img/touch-icon-ipad.png">
         <link rel="apple-touch-icon" sizes="114x114" href="assets/img/touch-icon-iphone-retina.png">
         <link rel="apple-touch-icon" sizes="144x144" href="assets/img/touch-icon-ipad-retina.png">
-        -->
         <title><?= isset($title) ? Helper\escape($title) : 'Kanboard' ?></title>
     </head>
     <body>