diff --git a/css/font-awesome.css b/css/font-awesome.css
index f901eec69..a82bdef3b 100644
--- a/css/font-awesome.css
+++ b/css/font-awesome.css
@@ -362,6 +362,8 @@
 .fa-video-camera:before {
   content: "\f03d";
 }
+.fa-photo:before,
+.fa-image:before,
 .fa-picture-o:before {
   content: "\f03e";
 }
@@ -1449,3 +1451,35 @@
 .fa-database:before {
   content: "\f1c0";
 }
+.fa-file-pdf-o:before {
+  content: "\f1c1";
+}
+.fa-file-word-o:before {
+  content: "\f1c2";
+}
+.fa-file-excel-o:before {
+  content: "\f1c3";
+}
+.fa-file-powerpoint-o:before {
+  content: "\f1c4";
+}
+.fa-file-photo-o:before,
+.fa-file-picture-o:before,
+.fa-file-image-o:before {
+  content: "\f1c5";
+}
+.fa-file-zip-o:before,
+.fa-file-archive-o:before {
+  content: "\f1c6";
+}
+.fa-file-sound-o:before,
+.fa-file-audio-o:before {
+  content: "\f1c7";
+}
+.fa-file-movie-o:before,
+.fa-file-video-o:before {
+  content: "\f1c8";
+}
+.fa-file-code-o:before {
+  content: "\f1c9";
+}
diff --git a/css/font-awesome.min.css b/css/font-awesome.min.css
index f901eec69..a82bdef3b 100644
--- a/css/font-awesome.min.css
+++ b/css/font-awesome.min.css
@@ -362,6 +362,8 @@
 .fa-video-camera:before {
   content: "\f03d";
 }
+.fa-photo:before,
+.fa-image:before,
 .fa-picture-o:before {
   content: "\f03e";
 }
@@ -1449,3 +1451,35 @@
 .fa-database:before {
   content: "\f1c0";
 }
+.fa-file-pdf-o:before {
+  content: "\f1c1";
+}
+.fa-file-word-o:before {
+  content: "\f1c2";
+}
+.fa-file-excel-o:before {
+  content: "\f1c3";
+}
+.fa-file-powerpoint-o:before {
+  content: "\f1c4";
+}
+.fa-file-photo-o:before,
+.fa-file-picture-o:before,
+.fa-file-image-o:before {
+  content: "\f1c5";
+}
+.fa-file-zip-o:before,
+.fa-file-archive-o:before {
+  content: "\f1c6";
+}
+.fa-file-sound-o:before,
+.fa-file-audio-o:before {
+  content: "\f1c7";
+}
+.fa-file-movie-o:before,
+.fa-file-video-o:before {
+  content: "\f1c8";
+}
+.fa-file-code-o:before {
+  content: "\f1c9";
+}
diff --git a/fonts/FontAwesome.otf b/fonts/FontAwesome.otf
index fbf3a661b..e0ef462c4 100644
Binary files a/fonts/FontAwesome.otf and b/fonts/FontAwesome.otf differ
diff --git a/less/icons.less b/less/icons.less
index 6e26da294..561246a24 100644
--- a/less/icons.less
+++ b/less/icons.less
@@ -63,6 +63,8 @@
 .@{fa-css-prefix}-outdent:before { content: @fa-var-outdent; }
 .@{fa-css-prefix}-indent:before { content: @fa-var-indent; }
 .@{fa-css-prefix}-video-camera:before { content: @fa-var-video-camera; }
+.@{fa-css-prefix}-photo:before,
+.@{fa-css-prefix}-image:before,
 .@{fa-css-prefix}-picture-o:before { content: @fa-var-picture-o; }
 .@{fa-css-prefix}-pencil:before { content: @fa-var-pencil; }
 .@{fa-css-prefix}-map-marker:before { content: @fa-var-map-marker; }
@@ -454,3 +456,17 @@
 .@{fa-css-prefix}-deviantart:before { content: @fa-var-deviantart; }
 .@{fa-css-prefix}-soundcloud:before { content: @fa-var-soundcloud; }
 .@{fa-css-prefix}-database:before { content: @fa-var-database; }
+.@{fa-css-prefix}-file-pdf-o:before { content: @fa-var-file-pdf-o; }
+.@{fa-css-prefix}-file-word-o:before { content: @fa-var-file-word-o; }
+.@{fa-css-prefix}-file-excel-o:before { content: @fa-var-file-excel-o; }
+.@{fa-css-prefix}-file-powerpoint-o:before { content: @fa-var-file-powerpoint-o; }
+.@{fa-css-prefix}-file-photo-o:before,
+.@{fa-css-prefix}-file-picture-o:before,
+.@{fa-css-prefix}-file-image-o:before { content: @fa-var-file-image-o; }
+.@{fa-css-prefix}-file-zip-o:before,
+.@{fa-css-prefix}-file-archive-o:before { content: @fa-var-file-archive-o; }
+.@{fa-css-prefix}-file-sound-o:before,
+.@{fa-css-prefix}-file-audio-o:before { content: @fa-var-file-audio-o; }
+.@{fa-css-prefix}-file-movie-o:before,
+.@{fa-css-prefix}-file-video-o:before { content: @fa-var-file-video-o; }
+.@{fa-css-prefix}-file-code-o:before { content: @fa-var-file-code-o; }
diff --git a/less/variables.less b/less/variables.less
index 020a86d25..2c3655d8b 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -159,9 +159,18 @@
 @fa-var-female: "\f182";
 @fa-var-fighter-jet: "\f0fb";
 @fa-var-file: "\f15b";
+@fa-var-file-archive-o: "\f1c6";
+@fa-var-file-audio-o: "\f1c7";
+@fa-var-file-code-o: "\f1c9";
+@fa-var-file-excel-o: "\f1c3";
+@fa-var-file-image-o: "\f1c5";
 @fa-var-file-o: "\f016";
+@fa-var-file-pdf-o: "\f1c1";
+@fa-var-file-powerpoint-o: "\f1c4";
 @fa-var-file-text: "\f15c";
 @fa-var-file-text-o: "\f0f6";
+@fa-var-file-video-o: "\f1c8";
+@fa-var-file-word-o: "\f1c2";
 @fa-var-files-o: "\f0c5";
 @fa-var-film: "\f008";
 @fa-var-filter: "\f0b0";
diff --git a/scss/_icons.scss b/scss/_icons.scss
index 5785d63b8..e87ef7641 100644
--- a/scss/_icons.scss
+++ b/scss/_icons.scss
@@ -164,9 +164,23 @@
 .#{$fa-css-prefix}-female:before { content: $fa-var-female; }
 .#{$fa-css-prefix}-fighter-jet:before { content: $fa-var-fighter-jet; }
 .#{$fa-css-prefix}-file:before { content: $fa-var-file; }
+.#{$fa-css-prefix}-file-zip-o:before,
+.#{$fa-css-prefix}-file-archive-o:before { content: $fa-var-file-archive-o; }
+.#{$fa-css-prefix}-file-sound-o:before,
+.#{$fa-css-prefix}-file-audio-o:before { content: $fa-var-file-audio-o; }
+.#{$fa-css-prefix}-file-code-o:before { content: $fa-var-file-code-o; }
+.#{$fa-css-prefix}-file-excel-o:before { content: $fa-var-file-excel-o; }
+.#{$fa-css-prefix}-file-photo-o:before,
+.#{$fa-css-prefix}-file-picture-o:before,
+.#{$fa-css-prefix}-file-image-o:before { content: $fa-var-file-image-o; }
 .#{$fa-css-prefix}-file-o:before { content: $fa-var-file-o; }
+.#{$fa-css-prefix}-file-pdf-o:before { content: $fa-var-file-pdf-o; }
+.#{$fa-css-prefix}-file-powerpoint-o:before { content: $fa-var-file-powerpoint-o; }
 .#{$fa-css-prefix}-file-text:before { content: $fa-var-file-text; }
 .#{$fa-css-prefix}-file-text-o:before { content: $fa-var-file-text-o; }
+.#{$fa-css-prefix}-file-movie-o:before,
+.#{$fa-css-prefix}-file-video-o:before { content: $fa-var-file-video-o; }
+.#{$fa-css-prefix}-file-word-o:before { content: $fa-var-file-word-o; }
 .#{$fa-css-prefix}-copy:before,
 .#{$fa-css-prefix}-files-o:before { content: $fa-var-files-o; }
 .#{$fa-css-prefix}-film:before { content: $fa-var-film; }
@@ -286,6 +300,8 @@
 .#{$fa-css-prefix}-pencil-square-o:before { content: $fa-var-pencil-square-o; }
 .#{$fa-css-prefix}-phone:before { content: $fa-var-phone; }
 .#{$fa-css-prefix}-phone-square:before { content: $fa-var-phone-square; }
+.#{$fa-css-prefix}-photo:before,
+.#{$fa-css-prefix}-image:before,
 .#{$fa-css-prefix}-picture-o:before { content: $fa-var-picture-o; }
 .#{$fa-css-prefix}-pied-piper-square:before,
 .#{$fa-css-prefix}-pied-piper:before { content: $fa-var-pied-piper; }
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 1e56bcab5..75228bace 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -159,9 +159,18 @@ $fa-var-fax: "\f1ac";
 $fa-var-female: "\f182";
 $fa-var-fighter-jet: "\f0fb";
 $fa-var-file: "\f15b";
+$fa-var-file-archive-o: "\f1c6";
+$fa-var-file-audio-o: "\f1c7";
+$fa-var-file-code-o: "\f1c9";
+$fa-var-file-excel-o: "\f1c3";
+$fa-var-file-image-o: "\f1c5";
 $fa-var-file-o: "\f016";
+$fa-var-file-pdf-o: "\f1c1";
+$fa-var-file-powerpoint-o: "\f1c4";
 $fa-var-file-text: "\f15c";
 $fa-var-file-text-o: "\f0f6";
+$fa-var-file-video-o: "\f1c8";
+$fa-var-file-word-o: "\f1c2";
 $fa-var-files-o: "\f0c5";
 $fa-var-film: "\f008";
 $fa-var-filter: "\f0b0";
diff --git a/src/_includes/icons/file-type.html b/src/_includes/icons/file-type.html
new file mode 100644
index 000000000..12d4e302a
--- /dev/null
+++ b/src/_includes/icons/file-type.html
@@ -0,0 +1,12 @@
+<section id="file-type">
+  <h2 class="page-header">File Type Icons</h2>
+
+  <div class="row fontawesome-icon-list">
+    {% assign icons_file_type = icons | expand_aliases | category:"File Type Icons" | sort_by:'class' %}
+
+    {% for icon in icons_file_type %}
+      <div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}"></i> fa-{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
+    {% endfor %}
+  </div>
+
+</section>
diff --git a/src/_includes/icons/new.html b/src/_includes/icons/new.html
index 595391693..e3b06f57e 100644
--- a/src/_includes/icons/new.html
+++ b/src/_includes/icons/new.html
@@ -8,7 +8,7 @@
   {% endif %}
 
   <div class="row fontawesome-icon-list">
-    {% assign icons_new = icons | expand_aliases | version:site.fontawesome.minor_version %}
+    {% assign icons_new = icons | expand_aliases | version:site.fontawesome.minor_version | sort_by:'class' %}
 
     {% for icon in icons_new %}
       <div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}"></i> fa-{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
diff --git a/src/_includes/navbar.html b/src/_includes/navbar.html
index ae5696f2f..31635edfc 100644
--- a/src/_includes/navbar.html
+++ b/src/_includes/navbar.html
@@ -26,8 +26,9 @@
           <ul class="dropdown-menu pull-right">
             <li><a href="{{ page.relative_path }}icons/"><i class="fa fa-flag fa-fw"></i>&nbsp; Icons</a></li>
             <li class="divider"></li>
-            <li><a href="{{ page.relative_path }}icons/#new"><i class="fa fa-rub fa-fw"></i>&nbsp; New Icons in {{ site.fontawesome.minor_version }}</a></li>
+            <li><a href="{{ page.relative_path }}icons/#new"><i class="fa fa-cube fa-fw"></i>&nbsp; New Icons in {{ site.fontawesome.minor_version }}</a></li>
             <li><a href="{{ page.relative_path }}icons/#web-application"><i class="fa fa-camera-retro fa-fw"></i>&nbsp; Web Application Icons</a></li>
+            <li><a href="{{ page.relative_path }}icons/#file-type"><i class="fa fa-file-image-o fa-fw"></i>&nbsp; File Type Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#form-control"><i class="fa fa-check-square fa-fw"></i>&nbsp; Form Control Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#currency"><i class="fa fa-won fa-fw"></i>&nbsp; Currency Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#text-editor"><i class="fa fa-file-text-o fa-fw"></i>&nbsp; Text Editor Icons</a></li>
diff --git a/src/assets/font-awesome/fonts/FontAwesome.otf b/src/assets/font-awesome/fonts/FontAwesome.otf
index fbf3a661b..e0ef462c4 100644
Binary files a/src/assets/font-awesome/fonts/FontAwesome.otf and b/src/assets/font-awesome/fonts/FontAwesome.otf differ
diff --git a/src/icons.html b/src/icons.html
index c3d216f16..0c13d18ca 100644
--- a/src/icons.html
+++ b/src/icons.html
@@ -23,6 +23,7 @@ relative_path: ../
 
   {% include icons/new.html %}
   {% include icons/web-application.html %}
+  {% include icons/file-type.html %}
   {% include icons/form-control.html %}
   {% include icons/currency.html %}
   {% include icons/text-editor.html %}
diff --git a/src/icons.yml b/src/icons.yml
index cd6cfe444..8351f2e19 100644
--- a/src/icons.yml
+++ b/src/icons.yml
@@ -155,6 +155,7 @@ icons:
     created:    1.0
     categories:
       - Text Editor Icons
+      - File Type Icons
 
   - name:       Clock Outlined
     id:         clock-o
@@ -425,6 +426,9 @@ icons:
     id:         picture-o
     unicode:    f03e
     created:    1.0
+    aliases:
+      - photo
+      - image
     categories:
       - Web Application Icons
 
@@ -1603,6 +1607,7 @@ icons:
     created:    3.0
     categories:
       - Text Editor Icons
+      - File Type Icons
 
   - name:       Building Outlined
     id:         building-o
@@ -2307,6 +2312,7 @@ icons:
     created:    3.2
     categories:
       - Text Editor Icons
+      - File Type Icons
 
   - name:       File Text
     id:         file-text
@@ -2314,6 +2320,7 @@ icons:
     created:    3.2
     categories:
       - Text Editor Icons
+      - File Type Icons
 
   - name:       Sort Alpha Ascending
     id:         sort-alpha-asc
@@ -2991,3 +2998,84 @@ icons:
     created:    4.1
     categories:
       - Web Application Icons
+
+  - name:       PDF File Outlined
+    id:         file-pdf-o
+    unicode:    f1c1
+    created:    4.1
+    categories:
+      - Web Application Icons
+      - File Type Icons
+
+  - name:       Word File Outlined
+    id:         file-word-o
+    unicode:    f1c2
+    created:    4.1
+    categories:
+      - Web Application Icons
+      - File Type Icons
+
+  - name:       Excel File Outlined
+    id:         file-excel-o
+    unicode:    f1c3
+    created:    4.1
+    categories:
+      - Web Application Icons
+      - File Type Icons
+
+  - name:       Powerpoint File Outlined
+    id:         file-powerpoint-o
+    unicode:    f1c4
+    created:    4.1
+    categories:
+      - Web Application Icons
+      - File Type Icons
+
+  - name:       Image File Outlined
+    id:         file-image-o
+    unicode:    f1c5
+    created:    4.1
+    aliases:
+      - file-photo-o
+      - file-picture-o
+    categories:
+      - Web Application Icons
+      - File Type Icons
+
+  - name:       Archive File Outlined
+    id:         file-archive-o
+    unicode:    f1c6
+    created:    4.1
+    aliases:
+      - file-zip-o
+    categories:
+      - Web Application Icons
+      - File Type Icons
+
+  - name:       Audio File Outlined
+    id:         file-audio-o
+    unicode:    f1c7
+    created:    4.1
+    aliases:
+      - file-sound-o
+    categories:
+      - Web Application Icons
+      - File Type Icons
+
+  - name:       Video File Outlined
+    id:         file-video-o
+    unicode:    f1c8
+    created:    4.1
+    aliases:
+      - file-movie-o
+    categories:
+      - Web Application Icons
+      - File Type Icons
+
+  - name:       Code File Outlined
+    id:         file-code-o
+    unicode:    f1c9
+    created:    4.1
+    categories:
+      - Web Application Icons
+      - File Type Icons