diff --git a/docfx.json b/docfx.json
index b7a22e622..2035c3917 100644
--- a/docfx.json
+++ b/docfx.json
@@ -28,6 +28,10 @@
     }
   ],
   "build": {
+    "template": [
+        "default",
+        "template"
+    ],
     "content": [
       {
         "files": [ "**/*.yml" ],
@@ -61,14 +65,16 @@
     "resource": [
       {
         "files": [ "img/**", "CNAME" ]
+      },
+      {
+        "files": [ "**" ],
+        "src": "favicons"
       }
     ],
     "xrefService": [ "https://xref.docs.microsoft.com/query?uid={uid}" ],
     "globalMetadata": {
       "_appTitle": "Npgsql Documentation",
       "_appFooter": "© Copyright 2022 The Npgsql Development Team",
-      "_appLogoPath": "img/logo.svg",
-      "_appFaviconPath": "img/favicon.ico",
       "_enableSearch": true,
       "_gitContribute": {
         "branch": "main"
diff --git a/favicons/android-chrome-192x192.png b/favicons/android-chrome-192x192.png
new file mode 100644
index 000000000..7860dbf70
Binary files /dev/null and b/favicons/android-chrome-192x192.png differ
diff --git a/favicons/android-chrome-512x512.png b/favicons/android-chrome-512x512.png
new file mode 100644
index 000000000..4420efb3c
Binary files /dev/null and b/favicons/android-chrome-512x512.png differ
diff --git a/favicons/apple-touch-icon.png b/favicons/apple-touch-icon.png
new file mode 100644
index 000000000..fd9338585
Binary files /dev/null and b/favicons/apple-touch-icon.png differ
diff --git a/favicons/browserconfig.xml b/favicons/browserconfig.xml
new file mode 100644
index 000000000..4b6c707ac
--- /dev/null
+++ b/favicons/browserconfig.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square70x70logo src="/mstile-70x70.png"/>
+            <square150x150logo src="/mstile-150x150.png"/>
+            <square310x310logo src="/mstile-310x310.png"/>
+            <TileColor>#2b5797</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
diff --git a/favicons/favicon-16x16.png b/favicons/favicon-16x16.png
new file mode 100644
index 000000000..99d0c2685
Binary files /dev/null and b/favicons/favicon-16x16.png differ
diff --git a/favicons/favicon-32x32.png b/favicons/favicon-32x32.png
new file mode 100644
index 000000000..6b42e32e5
Binary files /dev/null and b/favicons/favicon-32x32.png differ
diff --git a/favicons/favicon.ico b/favicons/favicon.ico
new file mode 100644
index 000000000..443a68ac3
Binary files /dev/null and b/favicons/favicon.ico differ
diff --git a/favicons/mstile-144x144.png b/favicons/mstile-144x144.png
new file mode 100644
index 000000000..07c36c885
Binary files /dev/null and b/favicons/mstile-144x144.png differ
diff --git a/favicons/mstile-150x150.png b/favicons/mstile-150x150.png
new file mode 100644
index 000000000..16bf4b902
Binary files /dev/null and b/favicons/mstile-150x150.png differ
diff --git a/favicons/mstile-310x150.png b/favicons/mstile-310x150.png
new file mode 100644
index 000000000..6cca66025
Binary files /dev/null and b/favicons/mstile-310x150.png differ
diff --git a/favicons/mstile-310x310.png b/favicons/mstile-310x310.png
new file mode 100644
index 000000000..71ca32edf
Binary files /dev/null and b/favicons/mstile-310x310.png differ
diff --git a/favicons/mstile-70x70.png b/favicons/mstile-70x70.png
new file mode 100644
index 000000000..ba6879886
Binary files /dev/null and b/favicons/mstile-70x70.png differ
diff --git a/favicons/safari-pinned-tab.svg b/favicons/safari-pinned-tab.svg
new file mode 100644
index 000000000..a3cacf665
--- /dev/null
+++ b/favicons/safari-pinned-tab.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="594.000000pt" height="594.000000pt" viewBox="0 0 594.000000 594.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.14, written by Peter Selinger 2001-2017
+</metadata>
+<g transform="translate(0.000000,594.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M4058 5936 c-1 -2 -32 -7 -68 -10 -36 -4 -90 -11 -120 -16 -30 -5
+-71 -12 -90 -15 -19 -3 -71 -15 -115 -26 -85 -22 -149 -27 -230 -16 -234 30
+-567 26 -677 -9 -9 -2 -25 -6 -35 -8 -68 -14 -214 -68 -298 -112 l-59 -32 -53
+19 c-29 10 -53 15 -53 12 0 -3 -7 1 -17 8 -9 8 -18 13 -20 12 -1 -2 -4 -3 -5
+-2 -2 0 -10 2 -18 4 -8 2 -51 13 -95 24 -95 23 -228 51 -270 57 -28 3 -73 10
+-136 20 -22 3 -236 16 -264 16 -23 -1 -193 -12 -235 -16 -85 -8 -267 -52 -335
+-81 -94 -40 -155 -70 -193 -96 -24 -16 -46 -29 -49 -29 -29 0 -224 -196 -282
+-283 -22 -34 -44 -67 -48 -72 -5 -6 -25 -46 -45 -90 -81 -173 -128 -363 -142
+-568 -2 -32 -7 -61 -10 -64 -3 -4 -1 -12 5 -19 5 -7 6 -14 2 -17 -12 -8 -3
+-308 11 -387 3 -14 10 -54 16 -90 5 -36 13 -78 16 -95 3 -16 7 -39 9 -50 21
+-139 95 -464 155 -690 23 -82 42 -157 45 -165 14 -56 60 -204 95 -305 22 -66
+42 -127 44 -135 6 -20 74 -199 86 -225 5 -11 25 -58 45 -105 57 -133 178 -357
+220 -407 5 -6 21 -28 35 -48 28 -39 131 -149 170 -180 182 -143 392 -167 587
+-67 29 15 53 30 53 35 0 4 5 7 11 7 6 0 17 7 25 15 13 13 20 10 56 -25 43 -40
+186 -120 216 -120 10 0 23 -5 30 -12 7 -7 12 -9 12 -6 0 4 15 2 33 -3 122 -36
+339 -42 477 -15 47 9 109 26 139 37 29 11 55 18 57 17 1 -2 5 -67 7 -144 2
+-78 7 -146 11 -152 3 -6 2 -13 -4 -17 -6 -4 -8 -10 -5 -14 2 -5 7 -48 10 -97
+3 -49 8 -109 11 -133 3 -24 7 -62 10 -85 7 -74 15 -120 31 -181 8 -33 16 -64
+18 -70 1 -5 5 -17 8 -25 3 -8 15 -44 28 -80 70 -207 167 -341 307 -423 52 -30
+155 -69 192 -72 9 0 20 -4 25 -7 19 -12 251 0 330 16 313 66 498 172 644 369
+43 59 131 226 131 250 0 8 3 17 7 21 4 3 8 12 9 19 1 7 9 31 18 55 8 23 15 44
+16 47 0 3 0 6 1 8 3 11 37 170 43 202 3 15 8 49 12 74 3 25 8 57 10 71 9 59
+22 236 29 384 2 55 7 111 10 125 l5 26 123 0 c110 0 186 6 272 20 65 11 80 14
+80 15 0 1 11 3 25 6 14 2 41 10 60 16 19 7 40 12 45 13 16 0 106 37 145 58 19
+10 53 29 75 40 22 12 42 24 45 27 3 3 31 22 62 42 85 56 193 169 225 236 35
+73 42 169 18 242 -20 61 -88 133 -148 160 -54 24 -197 45 -197 30 0 -3 -10 -5
+-22 -6 -36 -1 -141 -18 -178 -29 -8 -2 -52 -7 -97 -11 -79 -6 -95 -1 -74 21
+31 33 275 507 296 575 1 3 13 31 28 64 15 32 27 60 27 61 0 2 10 25 22 52 24
+55 22 49 33 88 4 17 11 35 15 40 12 16 109 306 141 423 41 146 40 144 46 172
+2 14 7 32 10 40 3 8 7 22 8 30 1 8 5 26 8 40 13 54 16 70 23 117 5 26 9 50 9
+53 3 9 16 95 21 130 10 81 17 202 17 305 0 97 -3 136 -17 235 -11 71 -70 230
+-88 238 -5 2 -8 9 -8 16 0 7 -10 24 -23 38 -12 13 -33 38 -45 54 -54 69 -196
+205 -266 254 -12 8 -27 20 -34 27 -43 41 -260 160 -377 205 -60 23 -228 74
+-276 83 -19 3 -43 8 -54 10 -11 2 -40 7 -65 10 -25 4 -56 9 -70 12 -27 5 -436
+14 -442 9z"/>
+</g>
+</svg>
diff --git a/favicons/site.webmanifest b/favicons/site.webmanifest
new file mode 100644
index 000000000..7594d95cb
--- /dev/null
+++ b/favicons/site.webmanifest
@@ -0,0 +1,19 @@
+{
+    "name": "Npgsql Documentation",
+    "short_name": " Npgsql docs",
+    "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"
+}
diff --git a/img/favicon.ico b/img/favicon.ico
deleted file mode 100644
index cc0376628..000000000
Binary files a/img/favicon.ico and /dev/null differ
diff --git a/img/logo.svg b/template/logo.svg
similarity index 100%
rename from img/logo.svg
rename to template/logo.svg
diff --git a/template/partials/head.tmpl.partial b/template/partials/head.tmpl.partial
new file mode 100644
index 000000000..8d7671a81
--- /dev/null
+++ b/template/partials/head.tmpl.partial
@@ -0,0 +1,25 @@
+{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
+
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <title>{{#title}}{{title}}{{/title}}{{^title}}{{>partials/title}}{{/title}} {{#_appTitle}}| {{_appTitle}} {{/_appTitle}}</title>
+  <meta name="viewport" content="width=device-width">
+  <meta name="title" content="{{#title}}{{title}}{{/title}}{{^title}}{{>partials/title}}{{/title}} {{#_appTitle}}| {{_appTitle}} {{/_appTitle}}">
+  {{#_description}}<meta name="description" content="{{_description}}">{{/_description}}
+  <link rel="apple-touch-icon" sizes="180x180" href="{{_rel}}apple-touch-icon.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="{{_rel}}favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="{{_rel}}favicon-16x16.png">
+  <link rel="manifest" href="{{_rel}}site.webmanifest">
+  <link rel="mask-icon" href="{{_rel}}safari-pinned-tab.svg" color="#5bbad5">
+  <meta name="msapplication-TileColor" content="#2b5797">
+  <meta name="theme-color" content="#ffffff">
+  <link rel="stylesheet" href="{{_rel}}styles/docfx.vendor.css">
+  <link rel="stylesheet" href="{{_rel}}styles/docfx.css">
+  <link rel="stylesheet" href="{{_rel}}styles/main.css">
+  <meta property="docfx:navrel" content="{{_navRel}}">
+  <meta property="docfx:tocrel" content="{{_tocRel}}">
+  {{#_noindex}}<meta name="searchOption" content="noindex">{{/_noindex}}
+  {{#_enableSearch}}<meta property="docfx:rel" content="{{_rel}}">{{/_enableSearch}}
+  {{#_enableNewTab}}<meta property="docfx:newtab" content="true">{{/_enableNewTab}}
+</head>