diff --git a/docs/_includes/icons/bootstrap.svg b/docs/_includes/icons/bootstrap.svg
index a82728be43..72df705f5c 100644
--- a/docs/_includes/icons/bootstrap.svg
+++ b/docs/_includes/icons/bootstrap.svg
@@ -1 +1 @@
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 612 612"><path fill="currentColor" d="M510 5c53.5.2 96.8 43.5 97 97v408c-.2 53.5-43.5 96.8-97 97H102c-53.5-.2-96.8-43.5-97-97V102c.2-53.5 43.5-96.8 97-97h408m0-5H102C45.9 0 0 45.9 0 102v408c0 56.1 45.9 102 102 102h408c56.1 0 102-45.9 102-102V102C612 45.9 566.1 0 510 0z"/><path fill="currentColor" d="M202.8 471.5V154.4H327c54.3 0 91 31.6 91 79.1 0 33-24.2 63.7-54.7 69.2v1.8c43.1 5.5 70.8 35.8 70.8 78 0 55.8-40 89-107.5 89H202.8zm39.5-180.4h63.3c46.8 0 72.3-18.7 72.3-53 0-31.4-21.5-48.8-60-48.8h-75.6v101.8zm78.2 145.5c47.7 0 72.7-19.3 72.7-56s-25.9-55.4-76.5-55.4h-74.5v111.4h78.3z"/></svg>
+<svg{% if include.class %} class="{{ include.class }}"{% endif %} xmlns="http://www.w3.org/2000/svg" viewBox="0 0 612 612"{% if include.width %} width="{{ include.width }}"{% endif %}{% if include.height %} height="{{ include.height }}"{% endif %}><path fill="currentColor" d="M510 5c53.5.2 96.8 43.5 97 97v408c-.2 53.5-43.5 96.8-97 97H102c-53.5-.2-96.8-43.5-97-97V102c.2-53.5 43.5-96.8 97-97h408m0-5H102C45.9 0 0 45.9 0 102v408c0 56.1 45.9 102 102 102h408c56.1 0 102-45.9 102-102V102C612 45.9 566.1 0 510 0z"/><path fill="currentColor" d="M202.8 471.5V154.4H327c54.3 0 91 31.6 91 79.1 0 33-24.2 63.7-54.7 69.2v1.8c43.1 5.5 70.8 35.8 70.8 78 0 55.8-40 89-107.5 89H202.8zm39.5-180.4h63.3c46.8 0 72.3-18.7 72.3-53 0-31.4-21.5-48.8-60-48.8h-75.6v101.8zm78.2 145.5c47.7 0 72.7-19.3 72.7-56s-25.9-55.4-76.5-55.4h-74.5v111.4h78.3z"/></svg>
diff --git a/docs/_includes/icons/github.svg b/docs/_includes/icons/github.svg
index e297b9190d..2fad27b0e8 100644
--- a/docs/_includes/icons/github.svg
+++ b/docs/_includes/icons/github.svg
@@ -1 +1 @@
-<svg class="navbar-nav-svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 499.36"><title>GitHub</title><path d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z" fill="currentColor" fill-rule="evenodd"/></svg>
\ No newline at end of file
+<svg{% if include.class %} class="{{ include.class }}"{% endif %} xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 499.36"{% if include.width %} width="{{ include.width }}"{% endif %}{% if include.height %} height="{{ include.height }}"{% endif %}><title>GitHub</title><path d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z" fill="currentColor" fill-rule="evenodd"/></svg>
diff --git a/docs/_includes/icons/slack.svg b/docs/_includes/icons/slack.svg
index d57a6a0152..45046aa9c2 100644
--- a/docs/_includes/icons/slack.svg
+++ b/docs/_includes/icons/slack.svg
@@ -1 +1 @@
-<svg class="navbar-nav-svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><title>Slack</title><path fill="currentColor" d="M210.787 234.832l68.31-22.883 22.1 65.977-68.309 22.882z"/><path d="M490.54 185.6C437.7 9.59 361.6-31.34 185.6 21.46S-31.3 150.4 21.46 326.4 150.4 543.3 326.4 490.54 543.34 361.6 490.54 185.6zM401.7 299.8l-33.15 11.05 11.46 34.38c4.5 13.92-2.87 29.06-16.78 33.56-2.87.82-6.14 1.64-9 1.23a27.32 27.32 0 0 1-24.56-18l-11.46-34.38-68.36 22.92 11.46 34.38c4.5 13.92-2.87 29.06-16.78 33.56-2.87.82-6.14 1.64-9 1.23a27.32 27.32 0 0 1-24.56-18l-11.46-34.43-33.15 11.05c-2.87.82-6.14 1.64-9 1.23a27.32 27.32 0 0 1-24.56-18c-4.5-13.92 2.87-29.06 16.78-33.56l33.12-11.03-22.1-65.9-33.15 11.05c-2.87.82-6.14 1.64-9 1.23a27.32 27.32 0 0 1-24.56-18c-4.48-13.93 2.89-29.07 16.81-33.58l33.15-11.05-11.46-34.38c-4.5-13.92 2.87-29.06 16.78-33.56s29.06 2.87 33.56 16.78l11.46 34.38 68.36-22.92-11.46-34.38c-4.5-13.92 2.87-29.06 16.78-33.56s29.06 2.87 33.56 16.78l11.47 34.42 33.15-11.05c13.92-4.5 29.06 2.87 33.56 16.78s-2.87 29.06-16.78 33.56L329.7 194.6l22.1 65.9 33.15-11.05c13.92-4.5 29.06 2.87 33.56 16.78s-2.88 29.07-16.81 33.57z" fill="currentColor"/></svg>
\ No newline at end of file
+<svg{% if include.class %} class="{{ include.class }}"{% endif %} xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"{% if include.width %} width="{{ include.width }}"{% endif %}{% if include.height %} height="{{ include.height }}"{% endif %}><title>Slack</title><path fill="currentColor" d="M210.787 234.832l68.31-22.883 22.1 65.977-68.309 22.882z"/><path d="M490.54 185.6C437.7 9.59 361.6-31.34 185.6 21.46S-31.3 150.4 21.46 326.4 150.4 543.3 326.4 490.54 543.34 361.6 490.54 185.6zM401.7 299.8l-33.15 11.05 11.46 34.38c4.5 13.92-2.87 29.06-16.78 33.56-2.87.82-6.14 1.64-9 1.23a27.32 27.32 0 0 1-24.56-18l-11.46-34.38-68.36 22.92 11.46 34.38c4.5 13.92-2.87 29.06-16.78 33.56-2.87.82-6.14 1.64-9 1.23a27.32 27.32 0 0 1-24.56-18l-11.46-34.43-33.15 11.05c-2.87.82-6.14 1.64-9 1.23a27.32 27.32 0 0 1-24.56-18c-4.5-13.92 2.87-29.06 16.78-33.56l33.12-11.03-22.1-65.9-33.15 11.05c-2.87.82-6.14 1.64-9 1.23a27.32 27.32 0 0 1-24.56-18c-4.48-13.93 2.89-29.07 16.81-33.58l33.15-11.05-11.46-34.38c-4.5-13.92 2.87-29.06 16.78-33.56s29.06 2.87 33.56 16.78l11.46 34.38 68.36-22.92-11.46-34.38c-4.5-13.92 2.87-29.06 16.78-33.56s29.06 2.87 33.56 16.78l11.47 34.42 33.15-11.05c13.92-4.5 29.06 2.87 33.56 16.78s-2.87 29.06-16.78 33.56L329.7 194.6l22.1 65.9 33.15-11.05c13.92-4.5 29.06 2.87 33.56 16.78s-2.88 29.07-16.81 33.57z" fill="currentColor"/></svg>
diff --git a/docs/_includes/icons/twitter.svg b/docs/_includes/icons/twitter.svg
index a317fd7666..332d9ac115 100644
--- a/docs/_includes/icons/twitter.svg
+++ b/docs/_includes/icons/twitter.svg
@@ -1 +1 @@
-<svg class="navbar-nav-svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 416.32"><title>Twitter</title><path d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92" fill="currentColor"/></svg>
\ No newline at end of file
+<svg{% if include.class %} class="{{ include.class }}"{% endif %} xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 416.32"{% if include.width %} width="{{ include.width }}"{% endif %}{% if include.height %} height="{{ include.height }}"{% endif %}><title>Twitter</title><path d="M160.83 416.32c193.2 0 298.92-160.22 298.92-298.92 0-4.51 0-9-.2-13.52A214 214 0 0 0 512 49.38a212.93 212.93 0 0 1-60.44 16.6 105.7 105.7 0 0 0 46.3-58.19 209 209 0 0 1-66.79 25.37 105.09 105.09 0 0 0-181.73 71.91 116.12 116.12 0 0 0 2.66 24c-87.28-4.3-164.73-46.3-216.56-109.82A105.48 105.48 0 0 0 68 159.6a106.27 106.27 0 0 1-47.53-13.11v1.43a105.28 105.28 0 0 0 84.21 103.06 105.67 105.67 0 0 1-47.33 1.84 105.06 105.06 0 0 0 98.14 72.94A210.72 210.72 0 0 1 25 370.84a202.17 202.17 0 0 1-25-1.43 298.85 298.85 0 0 0 160.83 46.92" fill="currentColor"/></svg>
diff --git a/docs/_includes/nav-home.html b/docs/_includes/nav-home.html
index 0e4e227057..d6f1b04061 100644
--- a/docs/_includes/nav-home.html
+++ b/docs/_includes/nav-home.html
@@ -1,6 +1,6 @@
 <header class="navbar navbar-inverse navbar-sticky-top navbar-expand-md bd-navbar">
   <a class="navbar-brand" href="{{ site.baseurl }}/">
-    <svg class="d-block" xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 612 612"><path fill="currentColor" d="M510 5c53.5.2 96.8 43.5 97 97v408c-.2 53.5-43.5 96.8-97 97H102c-53.5-.2-96.8-43.5-97-97V102c.2-53.5 43.5-96.8 97-97h408m0-5H102C45.9 0 0 45.9 0 102v408c0 56.1 45.9 102 102 102h408c56.1 0 102-45.9 102-102V102C612 45.9 566.1 0 510 0z"/><path fill="currentColor" d="M202.8 471.5V154.4H327c54.3 0 91 31.6 91 79.1 0 33-24.2 63.7-54.7 69.2v1.8c43.1 5.5 70.8 35.8 70.8 78 0 55.8-40 89-107.5 89H202.8zm39.5-180.4h63.3c46.8 0 72.3-18.7 72.3-53 0-31.4-21.5-48.8-60-48.8h-75.6v101.8zm78.2 145.5c47.7 0 72.7-19.3 72.7-56s-25.9-55.4-76.5-55.4h-74.5v111.4h78.3z"/></svg>
+    {% include icons/bootstrap.svg width="40" height="40" class="d-block" %}
   </a>
   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#bd-main-nav" aria-controls="bd-main-nav" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
@@ -45,17 +45,17 @@
 
       <li class="nav-item">
         <a class="nav-link p-2" href="{{ site.repo }}">
-          {% include icons/github.svg %}
+          {% include icons/github.svg class="navbar-nav-svg" %}
         </a>
       </li>
       <li class="nav-item">
         <a class="nav-link p-2" href="https://twitter.com/{{ site.twitter }}">
-          {% include icons/twitter.svg %}
+          {% include icons/twitter.svg class="navbar-nav-svg" %}
         </a>
       </li>
       <li class="nav-item">
         <a class="nav-link p-2" href="{{ site.slack }}">
-          {% include icons/slack.svg %}
+          {% include icons/slack.svg class="navbar-nav-svg" %}
         </a>
       </li>
     </ul>