diff --git a/docs/assets/css/site.css b/docs/assets/css/site.css
index 7bd8e6ca3..81bcf30eb 100644
--- a/docs/assets/css/site.css
+++ b/docs/assets/css/site.css
@@ -4711,7 +4711,7 @@ a.badge:hover {
 @font-face {
   font-family: 'FontAwesome';
   src: url('../font/fontawesome-webfont.eot');
-  src: url('../font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), url('../font/fontawesome-webfont.woff') format('woff'), url('../font/fontawesome-webfont.ttf') format('truetype'), url('../font/fontawesome-webfont.svg#FontAwesome') format('svg');
+  src: url('../font/FontAwesome.otf') format('opentype');
   font-weight: normal;
   font-style: normal;
 }
@@ -5399,9 +5399,54 @@ ul.icons li .icon-large:before {
 .icon-paste:before {
   content: "\f0ea";
 }
+.icon-lightbulb:before {
+  content: "\f0eb";
+}
+.icon-exchange:before {
+  content: "\f0ec";
+}
+.icon-cloud-download:before {
+  content: "\f0ed";
+}
+.icon-cloud-upload:before {
+  content: "\f0ee";
+}
 .icon-user-md:before {
   content: "\f200";
 }
+.icon-stethescope:before {
+  content: "\f201";
+}
+.icon-briefcase:before {
+  content: "\f202";
+}
+.icon-bell-alt:before {
+  content: "\f203";
+}
+.icon-coffee:before {
+  content: "\f204";
+}
+.icon-food:before {
+  content: "\f205";
+}
+.icon-file-alt:before {
+  content: "\f206";
+}
+.icon-building:before {
+  content: "\f207";
+}
+.icon-hospital:before {
+  content: "\f208";
+}
+.icon-ambulance:before {
+  content: "\f209";
+}
+.icon-medkit:before {
+  content: "\f210";
+}
+.icon-fighter-jet:before {
+  content: "\f211";
+}
 .navbar .brand {
   color: #ffffff;
   font-family: museo-slab, "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -5456,15 +5501,15 @@ h6 {
   color: #ffffff;
 }
 .hero-unit h1 {
-  font-size: 70px;
+  font-size: 75px;
   letter-spacing: -2px;
   line-height: 1.2;
 }
 .hero-unit p {
-  margin-top: 10px;
-  margin-bottom: 15px;
-  font-size: 28px;
-  line-height: 34px;
+  margin-top: 15px;
+  margin-bottom: 20px;
+  font-size: 40px;
+  line-height: 1.2;
 }
 .hero-unit ul {
   margin-left: 50px;
diff --git a/docs/assets/font/FontAwesome.otf b/docs/assets/font/FontAwesome.otf
new file mode 100644
index 000000000..e2c2066bc
Binary files /dev/null and b/docs/assets/font/FontAwesome.otf differ
diff --git a/docs/assets/less/font-awesome.less b/docs/assets/less/font-awesome.less
index 6ee21c8b1..de4be5a22 100644
--- a/docs/assets/less/font-awesome.less
+++ b/docs/assets/less/font-awesome.less
@@ -25,10 +25,14 @@
 @font-face {
   font-family: 'FontAwesome';
   src: url('../font/fontawesome-webfont.eot');
-  src: url('../font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),
-    url('../font/fontawesome-webfont.woff') format('woff'),
-    url('../font/fontawesome-webfont.ttf') format('truetype'),
-    url('../font/fontawesome-webfont.svg#FontAwesome') format('svg');
+//  src: url('../font/fontawesome-webfont.eot');
+//  src: url('../font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),
+//    url('../font/fontawesome-webfont.woff') format('woff'),
+//    url('../font/fontawesome-webfont.ttf') format('truetype'),
+//    url('../font/fontawesome-webfont.svg#FontAwesome') format('svg');
+
+  src: url('../font/FontAwesome.otf') format('opentype');
+
   font-weight: normal;
   font-style: normal;
 }
@@ -323,5 +327,24 @@ ul.icons {
 .icon-sitemap:before              { content: "\f0e8"; }
 .icon-umbrella:before             { content: "\f0e9"; }
 .icon-paste:before                { content: "\f0ea"; }
+.icon-lightbulb:before            { content: "\f0eb"; }
+.icon-exchange:before             { content: "\f0ec"; }
+.icon-cloud-download:before       { content: "\f0ed"; }
+.icon-cloud-upload:before         { content: "\f0ee"; }
 
 .icon-user-md:before              { content: "\f200"; }
+.icon-stethescope:before          { content: "\f201"; }
+.icon-briefcase:before            { content: "\f202"; }
+.icon-bell-alt:before             { content: "\f203"; }
+.icon-coffee:before               { content: "\f204"; }
+.icon-food:before                 { content: "\f205"; }
+.icon-file-alt:before             { content: "\f206"; }
+.icon-building:before             { content: "\f207"; }
+.icon-hospital:before             { content: "\f208"; }
+.icon-ambulance:before            { content: "\f209"; }
+.icon-medkit:before               { content: "\f210"; }
+.icon-fighter-jet:before          { content: "\f211"; }
+//.icon-user-md:before              { content: "\f212"; }
+//.icon-user-md:before              { content: "\f213"; }
+//.icon-user-md:before              { content: "\f214"; }
+//.icon-user-md:before              { content: "\f215"; }
diff --git a/docs/assets/less/site.less b/docs/assets/less/site.less
index 64c9a4be5..3821e5317 100644
--- a/docs/assets/less/site.less
+++ b/docs/assets/less/site.less
@@ -67,15 +67,15 @@ h1, h2, h3, h4, h5, h6 { font-family: @serifFontFamily; }
   background-color: @red;
   &, h1 { color: @white; }
   h1 {
-    font-size: 70px;
+    font-size: 75px;
     letter-spacing: -2px;
     line-height: 1.2;
   }
   p {
-    margin-top: 10px;
-    margin-bottom: 15px;
-    font-size: 28px;
-    line-height: 34px;
+    margin-top: 15px;
+    margin-bottom: 20px;
+    font-size: 40px;
+    line-height: 1.2;
   }
   text-shadow: 2px 2px 2px @grayDark;
   ul {
diff --git a/docs/index.html b/docs/index.html
index 4180fa889..70a8127b2 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -101,7 +101,7 @@
   </div>
   <div class="hero-content">
     <h1>Font Awesome</h1>
-    <p>The iconic font designed for use with Twitter Bootstrap</p>
+    <p>The iconic font designed for<br>use with Twitter Bootstrap</p>
     <div class="actions">
       <a class="btn btn-primary btn-large" href="https://github.com/FortAwesome/Font-Awesome/zipball/master"
           onClick="_gaq.push(['_trackEvent', 'Outbound Link', 'Download on GitHub']);">
@@ -176,7 +176,7 @@
 </section>
 
 <section id="whats-new">
-  <h1>What's new in Font Awesome v3.0</h1>
+  <h1>What's new in Font Awesome 3.0</h1>
   <div class="row">
     <div class="span4">
       <h4>LGPL Compliant</h4>
@@ -196,97 +196,24 @@
 
 <section id="new-icons" class="row">
   <div class="span12">
-    <h1>New Icons in 2.0</h1>
+    <h1>New Icons in 3.0</h1>
     <p>You asked, Font Awesome delivers with 70 shiny new icons in version 2.0. This giant set of new icons was requested on the Font Awesome GitHub project and includes icon parity with Bootstrap 2.0.3.</p>
   </div>
 
   <div class="span3">
     <ul class="the-icons">
-      <li><i class="icon-beaker"></i> icon-beaker</li>
-      <li><i class="icon-bell"></i> icon-bell</li>
-      <li><i class="icon-bolt"></i> icon-bolt</li>
-      <li><i class="icon-bookmark-empty"></i> icon-bookmark-empty</li>
-      <li><i class="icon-briefcase"></i> icon-briefcase</li>
-      <li><i class="icon-bullhorn"></i> icon-bullhorn</li>
-      <li><i class="icon-caret-down"></i> icon-caret-down</li>
-      <li><i class="icon-caret-left"></i> icon-caret-left</li>
-      <li><i class="icon-caret-right"></i> icon-caret-right</li>
-      <li><i class="icon-caret-up"></i> icon-caret-up</li>
-      <li><i class="icon-certificate"></i> icon-certificate</li>
-      <li><i class="icon-check-empty"></i> icon-check-empty</li>
-      <li><i class="icon-circle-arrow-down"></i> icon-circle-arrow-down</li>
-      <li><i class="icon-circle-arrow-left"></i> icon-circle-arrow-left</li>
-      <li><i class="icon-circle-arrow-right"></i> icon-circle-arrow-right</li>
-      <li><i class="icon-circle-arrow-up"></i> icon-circle-arrow-up</li>
-      <li><i class="icon-cloud"></i> icon-cloud</li>
-      <li><i class="icon-columns"></i> icon-columns</li>
-    </ul>
-  </div>
-
-  <div class="span3">
-    <ul class="the-icons">
-      <li><i class="icon-comment-alt"></i> icon-comment-alt</li>
-      <li><i class="icon-comments-alt"></i> icon-comments-alt</li>
-      <li><i class="icon-copy"></i> icon-copy</li>
-      <li><i class="icon-credit-card"></i> icon-credit-card</li>
-      <li><i class="icon-cut"></i> icon-cut</li>
-      <li><i class="icon-dashboard"></i> icon-dashboard</li>
-      <li><i class="icon-envelope-alt"></i> icon-envelope-alt</li>
-      <li><i class="icon-facebook"></i> icon-facebook</li>
-      <li><i class="icon-filter"></i> icon-filter</li>
-      <li><i class="icon-fullscreen"></i> icon-fullscreen</li>
-      <li><i class="icon-github"></i> icon-github</li>
-      <li><i class="icon-globe"></i> icon-globe</li>
-      <li><i class="icon-google-plus-sign"></i> icon-google-plus-sign</li>
-      <li><i class="icon-google-plus"></i> icon-google-plus</li>
-      <li><i class="icon-group"></i> icon-group</li>
-      <li><i class="icon-hand-down"></i> icon-hand-down</li>
-      <li><i class="icon-hand-left"></i> icon-hand-left</li>
-      <li><i class="icon-hand-right"></i> icon-hand-right</li>
-    </ul>
-  </div>
-
-  <div class="span3">
-    <ul class="the-icons">
-      <li><i class="icon-hand-up"></i> icon-hand-up</li>
-      <li><i class="icon-hdd"></i> icon-hdd</li>
-      <li><i class="icon-legal"></i> icon-legal</li>
-      <li><i class="icon-link"></i> icon-link</li>
-      <li><i class="icon-linkedin"></i> icon-linkedin</li>
-      <li><i class="icon-list-ol"></i> icon-list-ol</li>
-      <li><i class="icon-list-ul"></i> icon-list-ul</li>
-      <li><i class="icon-magic"></i> icon-magic</li>
-      <li><i class="icon-money"></i> icon-money</li>
-      <li><i class="icon-paper-clip"></i> icon-paper-clip</li>
-      <li><i class="icon-paste"></i> icon-paste</li>
-      <li><i class="icon-phone-sign"></i> icon-phone-sign</li>
-      <li><i class="icon-phone"></i> icon-phone</li>
-      <li><i class="icon-pinterest-sign"></i> icon-pinterest-sign</li>
-      <li><i class="icon-pinterest"></i> icon-pinterest</li>
-      <li><i class="icon-reorder"></i> icon-reorder</li>
-      <li><i class="icon-rss"></i> icon-rss</li>
-    </ul>
-  </div>
-
-  <div class="span3">
-    <ul class="the-icons">
-      <li><i class="icon-save"></i> icon-save</li>
-      <li><i class="icon-sign-blank"></i> icon-sign-blank</li>
-      <li><i class="icon-sitemap"></i> icon-sitemap</li>
-      <li><i class="icon-sort-down"></i> icon-sort-down</li>
-      <li><i class="icon-sort-up"></i> icon-sort-up</li>
-      <li><i class="icon-sort"></i> icon-sort</li>
-      <li><i class="icon-strikethrough"></i> icon-strikethrough</li>
-      <li><i class="icon-table"></i> icon-table</li>
-      <li><i class="icon-tasks"></i> icon-tasks</li>
-      <li><i class="icon-truck"></i> icon-truck</li>
-      <li><i class="icon-twitter"></i> icon-twitter</li>
-      <li><i class="icon-umbrella"></i> icon-umbrella</li>
-      <li><i class="icon-underline"></i> icon-underline</li>
-      <li><i class="icon-undo"></i> icon-undo</li>
-      <li><i class="icon-unlock"></i> icon-unlock</li>
       <li><i class="icon-user-md"></i> icon-user-md</li>
-      <li><i class="icon-wrench"></i> icon-wrench</li>
+      <li><i class="icon-stethescope"></i> icon-stethescope</li>
+      <li><i class="icon-briefcase"></i> icon-briefcase</li>
+      <li><i class="icon-bell-alt"></i> icon-bell-alt</li>
+      <li><i class="icon-coffee"></i> icon-coffee</li>
+      <li><i class="icon-food"></i> icon-food</li>
+      <li><i class="icon-file-alt"></i> icon-file-alt</li>
+      <li><i class="icon-building"></i> icon-building</li>
+      <li><i class="icon-hospital"></i> icon-hospital</li>
+      <li><i class="icon-ambulance"></i> icon-ambulance</li>
+      <li><i class="icon-medkit"></i> icon-medkit</li>
+      <li><i class="icon-fighter-jet"></i> icon-figher-jet</li>
     </ul>
   </div>
 </section>
diff --git a/docs/test.html b/docs/test.html
new file mode 100644
index 000000000..e69de29bb