diff --git a/static/assets/favicons/docs.ico b/assets/favicons/docs.ico
similarity index 100%
rename from static/assets/favicons/docs.ico
rename to assets/favicons/docs.ico
diff --git a/static/assets/favicons/docs@2x.ico b/assets/favicons/docs@2x.ico
similarity index 100%
rename from static/assets/favicons/docs@2x.ico
rename to assets/favicons/docs@2x.ico
diff --git a/layouts/_default/engine-api-baseof.html b/layouts/_default/engine-api-baseof.html
index 802d04e19d65..c9888202e399 100644
--- a/layouts/_default/engine-api-baseof.html
+++ b/layouts/_default/engine-api-baseof.html
@@ -9,11 +9,7 @@
         content="Reference documentation and Swagger (OpenAPI) specification for the {{ .File.BaseFileName }} version of the API served by Docker Engine." />
     <meta charset="utf-8" />
     <!-- favicon -->
-    <meta name="msapplication-TileImage" content="{{ site.BaseURL }}/assets/favicons/docs@2x.ico" />
-    <meta property="og:image" content="{{ site.BaseURL }}/assets/favicons/docs@2x.ico" />
-    <link rel="apple-touch-icon" type="image/x-icon" href="{{ site.BaseURL }}/assets/favicons/docs@2x.ico"
-        sizes="129x128" />
-    <link rel="icon" type="image/x-icon" href="{{ site.BaseURL }}/assets/favicons/docs@2x.ico" sizes="129x128" />
+    {{ partialCached "favicon.html" "favicon" }}
     <!-- make the latest API version the canonical page as that's what we want users to be using mostly -->
     <link rel="canonical" href="{{ site.BaseURL }}/engine/api/v{{ site.Params.latest_engine_api_version }}/" />
     <style>
diff --git a/layouts/_default/hub-api-baseof.html b/layouts/_default/hub-api-baseof.html
index d47c1c67cda8..bee7269ea6c5 100644
--- a/layouts/_default/hub-api-baseof.html
+++ b/layouts/_default/hub-api-baseof.html
@@ -9,11 +9,7 @@
     content="Reference documentation and Swagger (OpenAPI) specification for the {{ .File.BaseFileName }} API served by Docker Hub." />
   <meta charset="utf-8" />
   <!-- favicon -->
-  <meta name="msapplication-TileImage" content="{{ site.BaseURL }}/assets/favicons/docs@2x.ico" />
-  <meta property="og:image" content="{{ site.BaseURL }}/assets/favicons/docs@2x.ico" />
-  <link rel="apple-touch-icon" type="image/x-icon" href="{{ site.BaseURL }}/assets/favicons/docs@2x.ico"
-    sizes="129x128" />
-  <link rel="icon" type="image/x-icon" href="{{ site.BaseURL }}/assets/favicons/docs@2x.ico" sizes="129x128" />
+  {{ partialCached "favicon.html" "favicon" }}
   <!-- make the latest API version the canonical page as that's what we want users to be using mostly -->
   <link rel="canonical" href="{{ site.BaseURL }}/docker-hub/api/latest/" />
   <style>
diff --git a/layouts/partials/favicon.html b/layouts/partials/favicon.html
new file mode 100644
index 000000000000..0893cdc33f23
--- /dev/null
+++ b/layouts/partials/favicon.html
@@ -0,0 +1,17 @@
+{{- $favicon := resources.Get "favicons/docs@2x.ico" }}
+<link
+  rel="icon"
+  type="image/x-icon"
+  href="{{ $favicon.Permalink }}"
+  sizes="129x128"
+/>
+<link
+  rel="apple-touch-icon"
+  type="image/x-icon"
+  href="{{ $favicon.Permalink }}"
+  sizes="129x128"
+/>
+<meta
+  name="msapplication-TileImage"
+  content="{{ $favicon.Permalink }}"
+/>
diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
index 48f318a7701a..64fe5b8371ec 100644
--- a/layouts/partials/meta.html
+++ b/layouts/partials/meta.html
@@ -18,22 +18,7 @@
 <link rel="canonical" href="{{ .Permalink }}" />
 
 <!-- favicon -->
-<link
-  rel="icon"
-  type="image/x-icon"
-  href="{{ site.BaseURL }}/assets/favicons/docs@2x.ico"
-  sizes="129x128"
-/>
-<link
-  rel="apple-touch-icon"
-  type="image/x-icon"
-  href="{{ site.BaseURL }}/assets/favicons/docs@2x.ico"
-  sizes="129x128"
-/>
-<meta
-  name="msapplication-TileImage"
-  content="{{ site.BaseURL }}/assets/favicons/docs@2x.ico"
-/>
+{{ partialCached "favicon.html" "favicon" }}
 <meta name="theme-color" content="#2496ed" />
 
 <!-- SEO -->
diff --git a/static/assets/favicons/favicon.ico b/static/assets/favicons/favicon.ico
deleted file mode 100644
index 523925f7bd7c..000000000000
Binary files a/static/assets/favicons/favicon.ico and /dev/null differ