diff --git a/src/_includes/cheatsheet.html b/src/_includes/cheatsheet.html
index 81e508c45..ea6698ed3 100644
--- a/src/_includes/cheatsheet.html
+++ b/src/_includes/cheatsheet.html
@@ -10,9 +10,9 @@
 
 <div class="row">
 {% for icon in icons %}
-  <div class="span4">
-    <i class="icon-fixed-width">&#x{{ icon.unicode }}</i>
-    icon-{{ icon.id }}
+  <div class="col-md-4 col-sm-6 col-lg-3">
+    <i class="fa-icon fa-icon-fixed-width">&#x{{ icon.unicode }}</i>
+    fa-icon-{{ icon.id }}
     <span class="muted">(&amp;#x{{ icon.unicode }};)</span>
   </div>
 {% endfor %}
diff --git a/src/cheatsheet.html b/src/cheatsheet.html
index 7a843b971..c42ac8f54 100644
--- a/src/cheatsheet.html
+++ b/src/cheatsheet.html
@@ -3,7 +3,7 @@ layout: base
 title: Font Awesome Cheatsheet
 relative_path: ../
 ---
-{% capture jumbotron_h1 %}<i class="icon-list-ul icon-large"></i>&nbsp; Cheatsheet{% endcapture %}
+{% capture jumbotron_h1 %}<i class="fa-icon fa-icon-list-ul fa-icon-large"></i>&nbsp; Cheatsheet{% endcapture %}
 {% capture jumbotron_p %}The complete Font Awesome {{ site.fontawesome.version }} icon reference{% endcapture %}
 
 {% include jumbotron.html %}