diff --git a/README.md b/README.md
index 4c2236df..9c5a8d54 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 
 Kimai v2 - the open source time-tracking application with a mobile-first approach, read more at the [official website](http://v2.kimai.org).
 
+[![Latest Stable Version](https://poser.pugx.org/kevinpapst/kimai2/v/stable)](https://packagist.org/packages/kevinpapst/kimai2)
+[![License](https://poser.pugx.org/kevinpapst/kimai2/license)](https://packagist.org/packages/kevinpapst/kimai2)
 [![Travis Status](https://travis-ci.org/kevinpapst/kimai2.svg?branch=master)](https://travis-ci.org/kevinpapst/kimai2)
 [![Code Quality](https://scrutinizer-ci.com/g/kevinpapst/kimai2/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/kevinpapst/kimai2/?branch=master)
 [![Code Coverage](https://scrutinizer-ci.com/g/kevinpapst/kimai2/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/kevinpapst/kimai2/?branch=master)
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
index 7ae0d6c3..3668f51d 100644
Binary files a/public/apple-touch-icon.png and b/public/apple-touch-icon.png differ
diff --git a/public/browserconfig.xml b/public/browserconfig.xml
new file mode 100644
index 00000000..ae0b5776
--- /dev/null
+++ b/public/browserconfig.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square70x70logo src="favicon/mstile-small.jpg"/>
+            <square150x150logo src="favicon/mstile-medium.jpg"/>
+            <wide310x150logo src="favicon/mstile-wide.jpg"/>
+            <square310x310logo src="favicon/mstile-large.jpg"/>
+            <TileColor>#00a300</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
\ No newline at end of file
diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png
new file mode 100644
index 00000000..e8a0715f
Binary files /dev/null and b/public/favicon-32x32.png differ
diff --git a/public/favicon.ico b/public/favicon.ico
index f2277c94..1967c973 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/favicon/mstile-large.jpg b/public/favicon/mstile-large.jpg
new file mode 100755
index 00000000..b2a7dde3
Binary files /dev/null and b/public/favicon/mstile-large.jpg differ
diff --git a/public/favicon/mstile-medium.jpg b/public/favicon/mstile-medium.jpg
new file mode 100755
index 00000000..f82eae98
Binary files /dev/null and b/public/favicon/mstile-medium.jpg differ
diff --git a/public/favicon/mstile-small.jpg b/public/favicon/mstile-small.jpg
new file mode 100755
index 00000000..6052ee0c
Binary files /dev/null and b/public/favicon/mstile-small.jpg differ
diff --git a/public/favicon/mstile-wide.jpg b/public/favicon/mstile-wide.jpg
new file mode 100755
index 00000000..45957458
Binary files /dev/null and b/public/favicon/mstile-wide.jpg differ
diff --git a/public/manifest.json b/public/manifest.json
new file mode 100644
index 00000000..56059b39
--- /dev/null
+++ b/public/manifest.json
@@ -0,0 +1,21 @@
+{
+  "name": "Kimai Time-Tracker",
+  "short_name": "Kimai 2",
+  "icons": [
+    {
+      "src": "favicon-32x32.png",
+      "sizes": "32x32",
+      "type": "image/png",
+      "density": "0.75"
+    },
+    {
+      "src": "touch-icon-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png",
+      "density": "4.0"
+    }
+  ],
+  "theme_color": "#ffffff",
+  "background_color": "#ffffff",
+  "display": "standalone"
+}
\ No newline at end of file
diff --git a/public/touch-icon-192x192.png b/public/touch-icon-192x192.png
new file mode 100644
index 00000000..a22c7704
Binary files /dev/null and b/public/touch-icon-192x192.png differ
diff --git a/templates/base.html.twig b/templates/base.html.twig
index 4d23afbc..fd8b3c09 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -87,6 +87,7 @@
 {% block head %}
     {{ parent() }}
     <script src="{{ asset('build/app.js') }}"></script>
+    {% include 'partials/head.html.twig' %}
 {% endblock %}
 
 {% block javascripts %}
diff --git a/templates/bundles/AdminLTEBundle/Partials/_head.html.twig b/templates/bundles/AdminLTEBundle/Partials/_head.html.twig
deleted file mode 100644
index 6d82e571..00000000
--- a/templates/bundles/AdminLTEBundle/Partials/_head.html.twig
+++ /dev/null
@@ -1,9 +0,0 @@
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-<link rel="stylesheet" href="{{ asset('build/app.css') }}">
-<script src="{{ asset('build/app.js') }}"></script>
-<!--[if lt IE 9]>
-<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-<![endif]-->
diff --git a/templates/partials/head.html.twig b/templates/partials/head.html.twig
new file mode 100644
index 00000000..8a81ff9b
--- /dev/null
+++ b/templates/partials/head.html.twig
@@ -0,0 +1,10 @@
+<link rel="shortcut icon" type="image/x-icon" href="{{ asset('favicon.ico') }}">
+<link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}">
+<link rel="icon" type="image/png" href="{{ asset('favicon-32x32.png') }}" sizes="32x32">
+<link rel="apple-touch-icon" href="{{ asset('apple-touch-icon.png') }}">
+<link rel="manifest" href="{{ asset('manifest.json') }}">
+<meta name="apple-mobile-web-app-title" content="Kimai 2">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="mobile-web-app-capable" content="yes">
+<meta name="application-name" content="Kimai 2">
+<meta name="msapplication-config" content="{{ asset('browserconfig.xml') }}">
diff --git a/templates/security/login.html.twig b/templates/security/login.html.twig
index 50b79e8b..40c258a9 100644
--- a/templates/security/login.html.twig
+++ b/templates/security/login.html.twig
@@ -12,3 +12,8 @@
 {% block login_form_end %}
     <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}"/>
 {% endblock %}
+
+{% block head %}
+    {{ parent() }}
+    {% include 'partials/head.html.twig' %}
+{% endblock %}