diff --git a/src/cheatsheet.html b/src/cheatsheet.html
index cc5f8ab8a..dfd6d13c3 100644
--- a/src/cheatsheet.html
+++ b/src/cheatsheet.html
@@ -20,11 +20,14 @@ relative_path: ../
   <h2 class="page-header">Every Font Awesome {{ site.fontawesome.version }} Icon, CSS Class, &amp; Unicode</h2>
 
   <div class="row">
-    {% assign sorted_icons = icons | sort_by:'class' %}{% for icon in sorted_icons %}
+    {% assign sorted_icons = icons | expand_aliases | sort_by:'class' %}
+
+    {% for icon in sorted_icons %}
     <div class="col-md-4 col-sm-6 col-lg-3">
       <i class="fa fa-fw">&#x{{ icon.unicode }}</i>
-      fa-{{ icon.id }}
-      <span class="muted">(&amp;#x{{ icon.unicode }};)</span>
+      fa-{{ icon.class }}
+      {% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}
+      <span class="muted">[&amp;#x{{ icon.unicode }};]</span>
     </div>
     {% endfor %}
   </div>