diff --git a/_layouts/default.html b/_layouts/default.html
index bfe40f1..e9b6d6d 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -2,5 +2,26 @@
 layout: no-section
 ---
 <div class="section">
+    <div class="center">
+        {% comment %}
+            Only set an icon if one is available for the page.
+        {% endcomment %}
+
+        {% if page.icon %}
+            <h1><i class="mdi mdi-{{ page.icon }}"></i> {{ page.title }}</h1>
+        {% else %}
+            <h1>{{ page.title }}</h1>
+        {% endif %}
+
+        {% comment %}
+            We'd rather not provide an empty tag for the description
+            wherever possible.
+        {% endcomment %}
+        {% if page.description %}
+        <p>{{ page.description }}</p>
+        {% endif %}
+    </div>
+    <h1 class="center"></h1>
+
     {{ content }}
 </div>
diff --git a/donators.html b/donators.html
index d6f4bce..e2afdbd 100644
--- a/donators.html
+++ b/donators.html
@@ -1,9 +1,9 @@
 ---
 title: Donators
+icon: account-multiple
+description: We thank all of our donators. They ensure that WiiLink will thrive for years to come!
 ---
 
-<h1 class="center"><i class="mdi mdi-account-multiple"></i> Donators</h1>
-<p class="center">We thank all of our donators. They ensure that WiiLink will thrive for years to come!</p>
 <table>
     <tr>
         <th style="text-align:center">Thank you!</th>
diff --git a/faq.md b/faq.md
index 731b00f..caefb45 100644
--- a/faq.md
+++ b/faq.md
@@ -1,5 +1,6 @@
 ---
 title: FAQ
+icon: help-circle
 ---
 
 <!-- Special styling to permit readability. -->
@@ -21,8 +22,6 @@ body {
 }
 </style>
 
-<h1 class="center"><i class="mdi mdi-help-circle"></i> FAQ</h1>
-
 {% include table-of-contents.html %}
 
 <div class="title-pair">
diff --git a/news.html b/news.html
index 8f342fc..267eafa 100644
--- a/news.html
+++ b/news.html
@@ -1,8 +1,8 @@
 ---
 title: News
+icon: newspaper-variant
 ---
 
-<h1 class="center"><i class="mdi mdi-newspaper-variant"></i> News</h1>
 <!-- Example layout of a news post
 <div>
     <h1>Date (MM DD, YY)</h1>
diff --git a/services.html b/services.html
index 110963c..8b3492f 100644
--- a/services.html
+++ b/services.html
@@ -1,9 +1,9 @@
 ---
 title: Services
+icon: cogs
+description: These are the services that we (either now or in the future) maintain and their current state in development.
 ---
 
-<h1 class="center"><i class="mdi mdi-cogs"></i> Services</h1>
-<p class="center">These are the services that we (either now or in the future) maintain and their current state in development.</p>
 
 <!-- TESTING TABLE
 <table>