diff --git a/docs/_includes/admonition.html b/docs/_includes/admonition.html
index ffd2a3627b4..65c8dbf71a2 100644
--- a/docs/_includes/admonition.html
+++ b/docs/_includes/admonition.html
@@ -1,4 +1,8 @@
-<!-- Original by Adam Douglas (https://www.adamsdesk.com/posts/admonitions-jekyll/), reused with modifications. -->
+{% if false %}
+<!-- These comments are wrapped in an if block to prevent these comments from being rendered on GitHub Pages. -->
+<!-- Solution below adapted from Adam Douglas (https://www.adamsdesk.com/posts/admonitions-jekyll/), reused with modifications. -->
+{% endif %}
+
 {% if include.type.size > 0 and include.title.size > 0 %}
     {% assign types = "note, abstract, info, tip, success, question, warning, failure, danger, bug, example, quote" | split: ", " %}
     {% if types contains include.type and include.body.size > 0 %}
diff --git a/docs/_sass/admonition.scss b/docs/_sass/admonition.scss
index f98da4f6358..ed6c2ba4efc 100644
--- a/docs/_sass/admonition.scss
+++ b/docs/_sass/admonition.scss
@@ -65,8 +65,9 @@ $admonitions:
         }
     }
     .admonition.#{$name} .admonition-title::before {
-        -webkit-mask: url("/assets/img/icons/#{$icon}") no-repeat 50% 50%;
-        mask: url("/assets/img/icons/#{$icon}") no-repeat 50% 50%;
+        // Adapted from: https://stackoverflow.com/a/39156436
+        -webkit-mask: url($baseurl + "/assets/img/icons/#{$icon}") no-repeat 50% 50%;
+        mask: url($baseurl + "/assets/img/icons/#{$icon}") no-repeat 50% 50%;
         @if $icon-color {
             background-color: #{$icon-color};
         }
diff --git a/docs/assets/css/style.scss b/docs/assets/css/style.scss
index a337d9b8ec9..2531665ca45 100644
--- a/docs/assets/css/style.scss
+++ b/docs/assets/css/style.scss
@@ -2,6 +2,9 @@
 # Only the main Sass file needs front matter (the dashes are enough)
 ---
 
+// Adapted from: https://stackoverflow.com/a/39156436
+$baseurl: "{% if site.baseurl != '/' %}{{ site.baseurl }}{% endif %}";
+
 @import
   "minima/skins/{{ site.minima.skin | default: 'classic' }}",
   "minima/initialize",