diff --git a/_config.yml b/_config.yml
index 58b69adf0..fc182f581 100644
--- a/_config.yml
+++ b/_config.yml
@@ -28,8 +28,6 @@ font_awesome:
     url:          https://github.com/FortAwesome/Font-Awesome
     project:      Font-Awesome
     org:          FortAwesome
-  icon_count:     302
-  new_icon_count: 54
 
 bootstrap:
   version:        2.3.1
diff --git a/build/_includes/icons.html b/build/_includes/icons.html
index bea4eefc0..8963c9bed 100644
--- a/build/_includes/icons.html
+++ b/build/_includes/icons.html
@@ -1,6 +1,6 @@
 {% capture stripe_ad_content %}
 <p class="lead">
-  You asked, Font Awesome delivers with {{ site.font_awesome.new_icon_count }} shiny new icons in version {{ site.font_awesome.version }}.
+  You asked, Font Awesome delivers with {{ icons | version:site.font_awesome.version | size }} shiny new icons in version {{ site.font_awesome.version }}.
   Want to request new icons? <a href="{{ page.relative_path }}community/#requesting-new-icons">Here's how</a>.
   <!--The ever-expanding list of Font Awesome {{ site.font_awesome.version }} icons.-->
   Need vectors or want to use on the desktop? Check the <a href="{{ page.relative_path }}cheatsheet/">cheatsheet</a>.
@@ -10,6 +10,7 @@
 
 {% include icons/new.html %}
 {% include icons/web-application.html %}
+{% include icons/currency.html %}
 {% include icons/text-editor.html %}
 {% include icons/directional.html %}
 {% include icons/video-player.html %}
diff --git a/build/_includes/icons/currency.html b/build/_includes/icons/currency.html
new file mode 100644
index 000000000..a043bcc24
--- /dev/null
+++ b/build/_includes/icons/currency.html
@@ -0,0 +1,15 @@
+<section id="currency">
+  <h2 class="page-header">Currency Icons</h2>
+
+  <div class="row the-icons">
+    {% for icon in icons %}
+      {% if icon.categories contains "Currency Icons" %}
+        <div class="span3"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="icon-{{ icon.id }}"></i> icon-{{ icon.id }}</a></div>
+        {% for alias in icon.aliases %}
+          <div class="span3"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="icon-{{ alias }}"></i> icon-{{ alias }} <span class="muted">(alias)</span></a></div>
+        {% endfor %}
+      {% endif %}
+    {% endfor %}
+  </div>
+
+</section>
diff --git a/build/_includes/icons/new.html b/build/_includes/icons/new.html
index c00f93b20..e9cd2e019 100644
--- a/build/_includes/icons/new.html
+++ b/build/_includes/icons/new.html
@@ -2,7 +2,7 @@
   <h2 class="page-header">New Icons in {{ site.font_awesome.version }}</h2>
   {% if page.navbar_active != "icons" %}
     <div class="margin-botom-large">
-      You asked, Font Awesome delivers with {{ site.font_awesome.new_icon_count }} shiny new icons in version {{ site.font_awesome.version }}.
+      You asked, Font Awesome delivers with {{ icons | version:site.font_awesome.version | size }} shiny new icons in version {{ site.font_awesome.version }}.
       Want to request new icons? <a href="{{ page.relative_path }}community/#requesting-new-icons">Here's how</a>.
     </div>
   {% endif %}
diff --git a/build/_includes/navbar.html b/build/_includes/navbar.html
index aad0e47c0..c7b8777d8 100644
--- a/build/_includes/navbar.html
+++ b/build/_includes/navbar.html
@@ -15,6 +15,7 @@
           <li class="divider"></li>
           <li><a href="{{ page.relative_path }}icons/#new"><i class="icon-shield icon-fixed-width"></i>&nbsp; New Icons in {{ site.font_awesome.version }}</a></li>
           <li><a href="{{ page.relative_path }}icons/#web-application"><i class="icon-camera-retro icon-fixed-width"></i>&nbsp; Web Application Icons</a></li>
+          <li><a href="{{ page.relative_path }}icons/#currency"><i class="icon-gbp icon-fixed-width"></i>&nbsp; Currency Icons</a></li>
           <li><a href="{{ page.relative_path }}icons/#text-editor"><i class="icon-file-alt icon-fixed-width"></i>&nbsp; Text Editor Icons</a></li>
           <li><a href="{{ page.relative_path }}icons/#directional"><i class="icon-hand-right icon-fixed-width"></i>&nbsp; Directional Icons</a></li>
           <li><a href="{{ page.relative_path }}icons/#video-player"><i class="icon-play-sign icon-fixed-width"></i>&nbsp; Video Player Icons</a></li>
diff --git a/build/_includes/why.html b/build/_includes/why.html
index 6ef74f414..700c63322 100644
--- a/build/_includes/why.html
+++ b/build/_includes/why.html
@@ -1,7 +1,7 @@
 <div id="why">
   <div class="row">
     <div class="span4">
-      <h4><i class="icon-flag"></i> One Font, {{ site.font_awesome.icon_count }} Icons</h4>
+      <h4><i class="icon-flag"></i> One Font, {{ icons | size }} Icons</h4>
       In a single collection, Font Awesome is a pictographic language of web-related actions.
     </div>
     <div class="span4">
diff --git a/build/assets/font-awesome/font/FontAwesome.otf b/build/assets/font-awesome/font/FontAwesome.otf
index a33d8c115..aa622aa55 100644
Binary files a/build/assets/font-awesome/font/FontAwesome.otf and b/build/assets/font-awesome/font/FontAwesome.otf differ
diff --git a/build/icons.html b/build/icons.html
index 45ea86d58..a4885557e 100644
--- a/build/icons.html
+++ b/build/icons.html
@@ -5,7 +5,7 @@ navbar_active: icons
 relative_path: ../
 ---
 {% capture jumbotron_h1 %}<i class="icon-flag icon-large"></i>&nbsp; The Icons{% endcapture %}
-{% capture jumbotron_p %}The complete set of {{ site.font_awesome.icon_count }} icons in Font Awesome {{ site.font_awesome.version }}{% endcapture %}
+{% capture jumbotron_p %}The complete set of {{ icons | size }} icons in Font Awesome {{ site.font_awesome.version }}{% endcapture %}
 
 {% include jumbotron.html %}
 {% include stripe-social.html %}
diff --git a/build/icons.yml b/build/icons.yml
index 357859022..3f0695c5d 100755
--- a/build/icons.yml
+++ b/build/icons.yml
@@ -2187,14 +2187,14 @@ icons:
     aliases:
       - euro
     categories:
-      - Web Application Icons
+      - Currency Icons
 
   - name:       GBP
     id:         gbp
     unicode:    f154
     created:    3.2.0
     categories:
-      - Web Application Icons
+      - Currency Icons
 
   - name:       US Dollar
     id:         usd
@@ -2203,7 +2203,7 @@ icons:
     aliases:
       - dollar
     categories:
-      - Web Application Icons
+      - Currency Icons
 
   - name:       Indian Rupee (INR)
     id:         inr
@@ -2212,7 +2212,7 @@ icons:
     aliases:
       - rupee
     categories:
-      - Web Application Icons
+      - Currency Icons
 
   - name:       Japanese Yen (JPY)
     id:         jpy
@@ -2221,7 +2221,7 @@ icons:
     aliases:
       - yen
     categories:
-      - Web Application Icons
+      - Currency Icons
 
   - name:       Renminbi (CNY)
     id:         cny
@@ -2230,7 +2230,7 @@ icons:
     aliases:
       - renminbi
     categories:
-      - Web Application Icons
+      - Currency Icons
 
   - name:       Korean Won (KRW)
     id:         krw
@@ -2239,4 +2239,4 @@ icons:
     aliases:
       - won
     categories:
-      - Web Application Icons
+      - Currency Icons