diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 0c640e9723..af6b5a4074 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -8,9 +8,9 @@
     {{ partial "head/meta" . }}
     <title>
       {{- if eq .Kind "home" -}}
-        {{ .Site.Title }}
+        TrueNAS Documentation Hub
       {{- else -}}
-        {{ printf "%s | %s" (partial "utils/title" .) .Site.Title }}
+        {{ printf "%s %s | TrueNAS Documentation Hub" (partial "utils/title" .) .Site.Title }}
       {{- end -}}
     </title>
 
diff --git a/layouts/partials/head/custom.html b/layouts/partials/head/custom.html
index 64f9bbf59d..ecdb61d2e4 100644
--- a/layouts/partials/head/custom.html
+++ b/layouts/partials/head/custom.html
@@ -13,7 +13,8 @@
     })(window,document,'script','dataLayer','GTM-P87FM6K');</script>
 
 <!-- Favicon -->
-<link rel="icon" href="{{ "favicon/TN-favicon-32x32.png" | relURL }}" type="image/x-icon">
+<link rel="icon" href="{{ "favicon/TN-favicon-16x16.png" | relURL }}" type="image/png">
+<link rel="icon" href="{{ "favicon/TN-favicon-32x32.png" | relURL }}" type="image/png">
 
 <!-- Add Font Awesome and Material Design -->
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
diff --git a/layouts/partials/head/favicons.html b/layouts/partials/head/favicons.html
new file mode 100644
index 0000000000..a3d5aa21a4
--- /dev/null
+++ b/layouts/partials/head/favicons.html
@@ -0,0 +1,3 @@
+<link rel="icon" type="image/svg+xml" href="{{ "favicon/tn-favicon.svg" | relURL }}" />
+<link rel="icon" type="image/png" sizes="32x32" href="{{ "favicon/TN-favicon-32x32.png" | relURL }}" />
+<link rel="icon" type="image/png" sizes="16x16" href="{{ "favicon/TN-favicon-16x16.png" | relURL }}" />
\ No newline at end of file
diff --git a/static/favicon/TN-favicon-16x16.png b/static/favicon/TN-favicon-16x16.png
new file mode 100644
index 0000000000..8278fb82a9
Binary files /dev/null and b/static/favicon/TN-favicon-16x16.png differ
diff --git a/static/favicon/tn-favicon.svg b/static/favicon/tn-favicon.svg
new file mode 100644
index 0000000000..e798e97273
--- /dev/null
+++ b/static/favicon/tn-favicon.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1_Image" data-name="Layer 1 Image" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 408.65">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #aeadae;
+      }
+
+      .cls-1, .cls-2, .cls-3 {
+        stroke-width: 0px;
+      }
+
+      .cls-2 {
+        fill: #31beec;
+      }
+
+      .cls-3 {
+        fill: #0095d5;
+      }
+    </style>
+  </defs>
+  <polygon class="cls-2" points="21.39 123.4 233.4 0 233.4 111.12 116.78 179.41 21.39 123.4"/>
+  <polyline class="cls-3" points="278.16 0 278.16 110.87 395.8 179.41 489.92 124.42 279.44 0"/>
+  <polygon class="cls-2" points="278.16 298.84 278.16 408.65 512 272.76 512 162.65 278.16 298.84"/>
+  <polygon class="cls-3" points="233.4 298.88 233.4 408.65 0 272.41 0 162.65 233.4 298.88"/>
+  <polygon class="cls-1" points="161.08 205.35 256.43 148.88 350.68 205.35 256.43 259.87 161.08 205.35"/>
+</svg>
\ No newline at end of file