diff --git a/themes/gohugoioTheme/layouts/404.html b/themes/gohugoioTheme/layouts/404.html
index 156db1452..9b0866d18 100644
--- a/themes/gohugoioTheme/layouts/404.html
+++ b/themes/gohugoioTheme/layouts/404.html
@@ -2,7 +2,7 @@
 <main class="cf pa5 pa4-l f4 tc center measure-wide lh-copy gray">
   <h1 class="f3 f2-ns">The page you're looking for doesn't exist. Perhaps you'd like to gopher something else? Sorry.</h1>
   <div class="h6">
-    {{ partial "svg/gopher-hero.svg" . }}
+    <img src="/images/gopher-hero.svg" alt="" class="h5">
   </div>
 
   {{ .Content }}
diff --git a/themes/gohugoioTheme/layouts/partials/hero.html b/themes/gohugoioTheme/layouts/partials/hero.html
index 18710141b..9e7240433 100644
--- a/themes/gohugoioTheme/layouts/partials/hero.html
+++ b/themes/gohugoioTheme/layouts/partials/hero.html
@@ -1,7 +1,7 @@
 <header class="bg-primary-color-dark ph4 tc" role="banner">
   <section class="center pb4 pb5-l ph4-l pt3 pt5-ns w-90 w-60-l">
     <div class="center w-100 w-50-ns">
-      {{ partial "svg/hugo-logo-wide.svg" . }}
+        <img src="/images/hugo-logo-wide.svg" alt="Hugo Logo">
     </div>
     {{ with .Site.Params.description }}
       <h2 class="f3 f1-l fw4 white-90 m0 lh-title pt2 pb3 pv0-ns">
diff --git a/themes/gohugoioTheme/layouts/partials/home-page-sections/installation.html b/themes/gohugoioTheme/layouts/partials/home-page-sections/installation.html
index 23729abcf..4bea1a54a 100644
--- a/themes/gohugoioTheme/layouts/partials/home-page-sections/installation.html
+++ b/themes/gohugoioTheme/layouts/partials/home-page-sections/installation.html
@@ -12,7 +12,7 @@
     <!-- RIGHT -->
     <div class="w-100 w-50-ns tc">
       <div class="h4">
-        {{ partial "svg/gopher-hero.svg" . }}
+        <img src="/images/gopher-hero.svg" alt="Hugo Gopher" class="h4">
       </div>
       <p class="f6 mid-gray m0 p0 pt3">Mac OS</p>
       <div class="code f6 bg-black light-green lh-copy pv3 ph3 br2 w-100 w-50-ns center mb2 tl">
diff --git a/themes/gohugoioTheme/layouts/partials/site-footer.html b/themes/gohugoioTheme/layouts/partials/site-footer.html
index 9ae1d2156..ec932d887 100644
--- a/themes/gohugoioTheme/layouts/partials/site-footer.html
+++ b/themes/gohugoioTheme/layouts/partials/site-footer.html
@@ -7,7 +7,7 @@
           </div>
 
           <div class="center w4">
-            {{ partialCached "svg/hugo-logo-wide.svg" . }}
+            <img src="/images/hugo-logo-wide.svg" alt="Hugo Logo">
           </div>
 
           <ul class="center f6 list ma0 mv3 pa0 tc">
diff --git a/themes/gohugoioTheme/layouts/partials/site-nav.html b/themes/gohugoioTheme/layouts/partials/site-nav.html
index eabf0ea7c..222b29f3b 100644
--- a/themes/gohugoioTheme/layouts/partials/site-nav.html
+++ b/themes/gohugoioTheme/layouts/partials/site-nav.html
@@ -17,7 +17,9 @@
               {{/* using ".Post" from the menu system to determine if we should show an icon for external links */}}
             {{ $post_status := printf "%s" .Post }}
             {{ if eq $post_status "external" }}
-              {{ partial "svg/link-ext.svg" (dict "size" "10") }}
+              <span class="pl1">
+                {{ partial "svg/link-ext.svg" (dict "size" "10") }}
+              </span>
             {{ end }}
           </a>
         </li>
diff --git a/themes/gohugoioTheme/layouts/partials/svg/gopher-hero.svg b/themes/gohugoioTheme/static/images/gopher-hero.svg
similarity index 100%
rename from themes/gohugoioTheme/layouts/partials/svg/gopher-hero.svg
rename to themes/gohugoioTheme/static/images/gopher-hero.svg
diff --git a/themes/gohugoioTheme/layouts/partials/svg/hugo-logo-wide.svg b/themes/gohugoioTheme/static/images/hugo-logo-wide.svg
similarity index 100%
rename from themes/gohugoioTheme/layouts/partials/svg/hugo-logo-wide.svg
rename to themes/gohugoioTheme/static/images/hugo-logo-wide.svg