diff --git a/material/mkdocs_theme.yml b/material/mkdocs_theme.yml
index df133a1cf..c60c657bd 100644
--- a/material/mkdocs_theme.yml
+++ b/material/mkdocs_theme.yml
@@ -52,12 +52,6 @@ font:
 # icons that are part of the HTML can be configured and replaced
 icon:
 
-  # Shown if no logo is set
-  logo: material/library
-
-  # Repository icon
-  repo: fontawesome/brands/git-alt
-
 # Favicon to be rendered
 favicon: assets/images/favicon.png
 
diff --git a/material/partials/header.html b/material/partials/header.html
index 90438e8cf..984512b5a 100644
--- a/material/partials/header.html
+++ b/material/partials/header.html
@@ -7,7 +7,8 @@
       {% if config.theme.logo %}
         <img src="{{ config.theme.logo | url }}" alt="logo">
       {% else %}
-        {% include ".icons/" ~ config.theme.icon.logo ~ ".svg" %}
+        {% set icon = config.theme.icon.logo or "material/library" %}
+        {% include ".icons/" ~ icon ~ ".svg" %}
       {% endif %}
     </a>
     <label class="md-header-nav__button md-icon" for="__drawer">
diff --git a/material/partials/nav.html b/material/partials/nav.html
index 0735f58ea..d8bb62779 100644
--- a/material/partials/nav.html
+++ b/material/partials/nav.html
@@ -7,7 +7,8 @@
       {% if config.theme.logo %}
         <img src="{{ config.theme.logo | url }}" alt="logo">
       {% else %}
-        {% include ".icons/" ~ config.theme.icon.logo ~ ".svg" %}
+        {% set icon = config.theme.icon.logo or "material/library" %}
+        {% include ".icons/" ~ icon ~ ".svg" %}
       {% endif %}
     </a>
     {{ config.site_name }}
diff --git a/material/partials/source-link.html b/material/partials/source-link.html
index 0fa929f23..237efe74c 100644
--- a/material/partials/source-link.html
+++ b/material/partials/source-link.html
@@ -9,5 +9,6 @@
 {% set path = page.meta.path | default([""]) %}
 <a href="{{ [repo, path, page.meta.source] | join('/') }}" title="{{ page.meta.source }}" class="md-content__button md-icon">
   {{ lang.t("meta.source") }}
-  {% include ".icons/" ~ config.theme.icon.repo ~ ".svg" %}
+  {% set icon = config.theme.icon.repo or "fontawesome/brands/git-alt" %}
+  {% include ".icons/" ~ icon ~ ".svg" %}
 </a>
diff --git a/material/partials/source.html b/material/partials/source.html
index a65295a4c..095b49a20 100644
--- a/material/partials/source.html
+++ b/material/partials/source.html
@@ -4,7 +4,8 @@
 {% import "partials/language.html" as lang with context %}
 <a href="{{ config.repo_url }}" title="{{ lang.t('source.link.title') }}" class="md-source">
   <div class="md-source__icon md-icon">
-    {% include ".icons/" ~ config.theme.icon.repo ~ ".svg" %}
+    {% set icon = config.theme.icon.repo or "fontawesome/brands/git-alt" %}
+    {% include ".icons/" ~ icon ~ ".svg" %}
   </div>
   <div class="md-source__repository">
     {{ config.repo_name }}
diff --git a/mkdocs.yml b/mkdocs.yml
index ecad8d0c3..318207016 100755
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -57,8 +57,6 @@ theme:
     text: Roboto
     code: Roboto Mono
   icon:
-    logo: material/library
-    repo: fontawesome/brands/git-alt
   favicon: assets/favicon.png
   logo: assets/images/icon.svg
 
diff --git a/src/mkdocs_theme.yml b/src/mkdocs_theme.yml
index df133a1cf..c60c657bd 100644
--- a/src/mkdocs_theme.yml
+++ b/src/mkdocs_theme.yml
@@ -52,12 +52,6 @@ font:
 # icons that are part of the HTML can be configured and replaced
 icon:
 
-  # Shown if no logo is set
-  logo: material/library
-
-  # Repository icon
-  repo: fontawesome/brands/git-alt
-
 # Favicon to be rendered
 favicon: assets/images/favicon.png
 
diff --git a/src/partials/header.html b/src/partials/header.html
index 977bc1e6e..9792e60a6 100644
--- a/src/partials/header.html
+++ b/src/partials/header.html
@@ -36,7 +36,8 @@
       {% if config.theme.logo %}
         <img src="{{ config.theme.logo | url }}" alt="logo" />
       {% else %}
-        {% include ".icons/" ~ config.theme.icon.logo ~ ".svg" %}
+        {% set icon = config.theme.icon.logo or "material/library" %}
+        {% include ".icons/" ~ icon ~ ".svg" %}
       {% endif %}
     </a>
     <label
diff --git a/src/partials/nav.html b/src/partials/nav.html
index a9fed2342..808d9d571 100644
--- a/src/partials/nav.html
+++ b/src/partials/nav.html
@@ -34,7 +34,8 @@
       {% if config.theme.logo %}
         <img src="{{ config.theme.logo | url }}" alt="logo" />
       {% else %}
-        {% include ".icons/" ~ config.theme.icon.logo ~ ".svg" %}
+        {% set icon = config.theme.icon.logo or "material/library" %}
+        {% include ".icons/" ~ icon ~ ".svg" %}
       {% endif %}
     </a>
     {{ config.site_name }}
diff --git a/src/partials/source-link.html b/src/partials/source-link.html
index 9fbf51ad4..6e3d9638e 100644
--- a/src/partials/source-link.html
+++ b/src/partials/source-link.html
@@ -34,5 +34,6 @@
   class="md-content__button md-icon"
 >
   {{ lang.t("meta.source") }}
-  {% include ".icons/" ~ config.theme.icon.repo ~ ".svg" %}
+  {% set icon = config.theme.icon.repo or "fontawesome/brands/git-alt" %}
+  {% include ".icons/" ~ icon ~ ".svg" %}
 </a>
diff --git a/src/partials/source.html b/src/partials/source.html
index 6987c2695..89f3b740b 100644
--- a/src/partials/source.html
+++ b/src/partials/source.html
@@ -29,7 +29,8 @@
   class="md-source"
 >
   <div class="md-source__icon md-icon">
-    {% include ".icons/" ~ config.theme.icon.repo ~ ".svg" %}
+    {% set icon = config.theme.icon.repo or "fontawesome/brands/git-alt" %}
+    {% include ".icons/" ~ icon ~ ".svg" %}
   </div>
   <div class="md-source__repository">
     {{ config.repo_name }}