diff --git a/lib/site_template/_includes/footer.html b/lib/site_template/_includes/footer.html
index 9fbc29e3..72239f1c 100644
--- a/lib/site_template/_includes/footer.html
+++ b/lib/site_template/_includes/footer.html
@@ -16,25 +16,13 @@
         <ul class="social-media-list">
           {% if site.github_username %}
           <li>
-            <a href="https://github.com/{{ site.github_username }}">
-              <span class="icon icon--github">
-                {% include icon-github.svg %}
-              </span>
-
-              <span class="username">{{ site.github_username }}</span>
-            </a>
+            {% include icon-github.html username=site.github_username %}
           </li>
           {% endif %}
 
           {% if site.twitter_username %}
           <li>
-            <a href="https://twitter.com/{{ site.twitter_username }}">
-              <span class="icon icon--twitter">
-                {% include icon-twitter.svg %}
-              </span>
-
-              <span class="username">{{ site.twitter_username }}</span>
-            </a>
+            {% include icon-twitter.html username=site.twitter_username %}
           </li>
           {% endif %}
         </ul>
diff --git a/lib/site_template/_includes/icon-github.html b/lib/site_template/_includes/icon-github.html
new file mode 100644
index 00000000..604b6d31
--- /dev/null
+++ b/lib/site_template/_includes/icon-github.html
@@ -0,0 +1,7 @@
+<a href="https://github.com/{{ include.username }}">
+  <span class="icon icon--github">
+    {% include icon-github.svg %}
+  </span>
+
+  <span class="username">{{ include.username }}</span>
+</a>
diff --git a/lib/site_template/_includes/icon-twitter.html b/lib/site_template/_includes/icon-twitter.html
new file mode 100644
index 00000000..25c242ec
--- /dev/null
+++ b/lib/site_template/_includes/icon-twitter.html
@@ -0,0 +1,7 @@
+<a href="https://twitter.com/{{ include.username }}">
+  <span class="icon icon--twitter">
+    {% include icon-twitter.svg %}
+  </span>
+
+  <span class="username">{{ include.username }}</span>
+</a>