diff --git a/public/assets/images/favicon/android-chrome-192x192.png b/public/assets/images/favicon/android-chrome-192x192.png
new file mode 100644
index 00000000..125e1514
Binary files /dev/null and b/public/assets/images/favicon/android-chrome-192x192.png differ
diff --git a/public/assets/images/favicon/android-chrome-512x512.png b/public/assets/images/favicon/android-chrome-512x512.png
new file mode 100644
index 00000000..35e80ddb
Binary files /dev/null and b/public/assets/images/favicon/android-chrome-512x512.png differ
diff --git a/public/assets/images/favicon/apple-touch-icon.png b/public/assets/images/favicon/apple-touch-icon.png
new file mode 100644
index 00000000..88e80659
Binary files /dev/null and b/public/assets/images/favicon/apple-touch-icon.png differ
diff --git a/public/assets/images/favicon/browserconfig.xml b/public/assets/images/favicon/browserconfig.xml
new file mode 100644
index 00000000..b3930d0f
--- /dev/null
+++ b/public/assets/images/favicon/browserconfig.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/mstile-150x150.png"/>
+            <TileColor>#da532c</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
diff --git a/public/assets/images/favicon/favicon-16x16.png b/public/assets/images/favicon/favicon-16x16.png
new file mode 100644
index 00000000..61844afd
Binary files /dev/null and b/public/assets/images/favicon/favicon-16x16.png differ
diff --git a/public/assets/images/favicon/favicon-32x32.png b/public/assets/images/favicon/favicon-32x32.png
new file mode 100644
index 00000000..30645c8a
Binary files /dev/null and b/public/assets/images/favicon/favicon-32x32.png differ
diff --git a/public/assets/images/favicon/favicon.ico b/public/assets/images/favicon/favicon.ico
new file mode 100644
index 00000000..26665a58
Binary files /dev/null and b/public/assets/images/favicon/favicon.ico differ
diff --git a/public/assets/images/favicon/manifest.json b/public/assets/images/favicon/manifest.json
new file mode 100644
index 00000000..4fbe1818
--- /dev/null
+++ b/public/assets/images/favicon/manifest.json
@@ -0,0 +1,18 @@
+{
+    "name": "",
+    "icons": [
+        {
+            "src": "/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
+    "display": "standalone"
+}
\ No newline at end of file
diff --git a/public/assets/images/favicon/mstile-150x150.png b/public/assets/images/favicon/mstile-150x150.png
new file mode 100644
index 00000000..1ba41ceb
Binary files /dev/null and b/public/assets/images/favicon/mstile-150x150.png differ
diff --git a/templates/base.html.twig b/templates/base.html.twig
index fa26348c..1eb23ccf 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -27,7 +27,11 @@
         <link href="assets/demo/default/base/style.bundle.css" rel="stylesheet" type="text/css" />
         <!--end::Base Styles -->
 
-        <link rel="shortcut icon" href="assets/demo/default/media/img/logo/favicon.ico" />
+        <link rel="apple-touch-icon" sizes="180x180" href="assets/images/favicon/apple-touch-icon.png">
+        <link rel="icon" type="image/png" sizes="32x32" href="assets/images/favicon/favicon-32x32.png">
+        <link rel="icon" type="image/png" sizes="16x16" href="assets/images/favicon/favicon-16x16.png">
+        <link rel="manifest" href="assets/images/favicon/manifest.json">
+        <meta name="theme-color" content="#ffffff">
 
         <!--begin::Extra Styles -->  
         {% block stylesheets %}{% endblock %}
@@ -695,7 +699,7 @@
         <!--end::Page Snippets -->
 
         <!--begin::Extra Scripts -->  
-        {% block javascripts %}{% endblock %}
+        {% block scripts %}{% endblock %}
         <!--end::Extra Scripts -->
     </body>
 </html>