diff --git a/material/partials/header.html b/material/partials/header.html
index f545e3fb9..e631fd5f1 100644
--- a/material/partials/header.html
+++ b/material/partials/header.html
@@ -3,7 +3,11 @@
     <div class="md-flex">
       <div class="md-flex__cell md-flex__cell--shrink">
         <a href="{{ nav.homepage.url }}" title="{{ config.site_name }}" class="md-icon md-header-nav__icon md-header-nav__icon--home">
-          layers
+          {% if config.extra.logo %}
+            <img src="{{ base_url }}/{{ config.extra.logo }}" width="24" height="24">
+          {% else %}
+            school
+          {% endif %}
         </a>
       </div>
       <div class="md-flex__cell md-flex__cell--shrink">
diff --git a/material/partials/source.html b/material/partials/source.html
index 46d2c6728..0e66638d9 100644
--- a/material/partials/source.html
+++ b/material/partials/source.html
@@ -11,7 +11,7 @@
 <a href="{{ config.repo_url }}" title="Go to repository" class="md-source" data-md-source="{{ repo_type }}">
   {% if repo_type %}
     <svg class="md-source__icon">
-      <use xlink:href="#{{ repo_type }}" x="12" y="12" width="24" height="24"></use>
+      <use href="#{{ repo_type }}" x="12" y="12" width="24" height="24"></use>
     </svg>
   {% endif %}
   <div class="md-source__repository">
diff --git a/src/partials/header.html b/src/partials/header.html
index 82e5f24ef..b874153cc 100644
--- a/src/partials/header.html
+++ b/src/partials/header.html
@@ -31,7 +31,12 @@
       <div class="md-flex__cell md-flex__cell--shrink">
         <a href="{{ nav.homepage.url }}" title="{{ config.site_name }}"
             class="md-icon md-header-nav__icon md-header-nav__icon--home">
-          layers
+          {% if config.extra.logo %}
+            <img src="{{ base_url }}/{{ config.extra.logo }}"
+                width="24" height="24" />
+          {% else %}
+            school
+          {% endif %}
         </a>
       </div>
 
diff --git a/src/partials/source.html b/src/partials/source.html
index c2194ba35..2eda48b98 100644
--- a/src/partials/source.html
+++ b/src/partials/source.html
@@ -40,7 +40,7 @@
     data-md-source="{{ repo_type }}">
   {% if repo_type %}
     <svg class="md-source__icon">
-      <use xlink:href="#{{ repo_type }}" x="12" y="12"
+      <use href="#{{ repo_type }}" x="12" y="12"
           width="24" height="24"></use>
     </svg>
   {% endif %}