diff --git a/IPython/html/static/style/ipython.less b/IPython/html/static/style/ipython.less
index a6fa987..d34a7be 100644
--- a/IPython/html/static/style/ipython.less
+++ b/IPython/html/static/style/ipython.less
@@ -14,4 +14,7 @@
 // notebook
 @import "../notebook/less/style_noapp.less";
 
+// Font-Awesome
+@import "../components/font-awesome/less/font-awesome.less";
+@FontAwesomePath:    "../components/font-awesome/font";
 
diff --git a/IPython/html/static/style/ipython.min.css b/IPython/html/static/style/ipython.min.css
index 4623293..65e51bc 100644
--- a/IPython/html/static/style/ipython.min.css
+++ b/IPython/html/static/style/ipython.min.css
@@ -52,6 +52,8 @@ input.nbname_input,input.engine_num_input{padding-top:3px;padding-bottom:3px;hei
 input.engine_num_input{width:60px}
 .highlight_text{color:#00f}
 #project_name>.breadcrumb{padding:0;margin-bottom:0;background-color:transparent;font-weight:bold}
+.folder_icon:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f07c"}
+.notebook_icon:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f0f6"}
 .ansibold{font-weight:bold}
 .ansiblack{color:#000}
 .ansired{color:#8b0000}
@@ -85,7 +87,7 @@ div.input_area>div.highlight>pre{margin:0;border:0;padding:0;background-color:tr
 @-moz-document url-prefix(){.CodeMirror-scroll{overflow-x:hidden}}.CodeMirror-lines{padding:.4em}
 .CodeMirror-linenumber{padding:0 8px 0 4px}
 .CodeMirror-gutters{border-bottom-left-radius:4px;border-top-left-radius:4px}
-.CodeMirror pre{padding:0;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}
+.CodeMirror pre{padding:0;border:0;border-radius:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}
 pre code{display:block;padding:.5em}
 .highlight-base,pre code,pre .subst,pre .tag .title,pre .lisp .title,pre .clojure .built_in,pre .nginx .title{color:#000}
 .highlight-string,pre .string,pre .constant,pre .parent,pre .tag .value,pre .rules .value,pre .rules .value .number,pre .preprocessor,pre .ruby .symbol,pre .ruby .symbol .string,pre .aggregate,pre .template_tag,pre .django .variable,pre .smalltalk .class,pre .addition,pre .flow,pre .stream,pre .bash .variable,pre .apache .tag,pre .apache .cbracket,pre .tex .command,pre .tex .special,pre .erlang_repl .function_or_atom,pre .markdown .header{color:#ba2121}
diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css
index 749fb5f..03e7f96 100644
--- a/IPython/html/static/style/style.min.css
+++ b/IPython/html/static/style/style.min.css
@@ -1329,6 +1329,8 @@ input.nbname_input,input.engine_num_input{padding-top:3px;padding-bottom:3px;hei
 input.engine_num_input{width:60px}
 .highlight_text{color:#00f}
 #project_name>.breadcrumb{padding:0;margin-bottom:0;background-color:transparent;font-weight:bold}
+.folder_icon:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f07c"}
+.notebook_icon:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f0f6"}
 .ansibold{font-weight:bold}
 .ansiblack{color:#000}
 .ansired{color:#8b0000}
diff --git a/IPython/html/static/tree/js/notebooklist.js b/IPython/html/static/tree/js/notebooklist.js
index 2f472de..7eef320 100644
--- a/IPython/html/static/tree/js/notebooklist.js
+++ b/IPython/html/static/tree/js/notebooklist.js
@@ -204,7 +204,7 @@ var IPython = (function (IPython) {
         item.data('name', name);
         item.data('path', path);
         item.find(".item_name").text(name);
-        item.find(".item_icon").addClass('icon-folder-open');
+        item.find(".item_icon").addClass('folder_icon');
         item.find("a.item_link")
             .attr('href',
                 utils.url_join_encode(
@@ -221,7 +221,7 @@ var IPython = (function (IPython) {
         item.data('nbname', nbname);
         item.data('path', path);
         item.find(".item_name").text(nbname);
-        item.find(".item_icon").addClass('icon-book');
+        item.find(".item_icon").addClass('notebook_icon');
         item.find("a.item_link")
             .attr('href',
                 utils.url_join_encode(
@@ -236,7 +236,7 @@ var IPython = (function (IPython) {
 
     NotebookList.prototype.add_name_input = function (nbname, item) {
         item.data('nbname', nbname);
-        item.find(".item_icon").addClass('icon-book');
+        item.find(".item_icon").addClass('notebook_icon');
         item.find(".item_name").empty().append(
             $('<input/>')
             .addClass("nbname_input")
diff --git a/IPython/html/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less
index 0e758b5..101dabe 100644
--- a/IPython/html/static/tree/less/tree.less
+++ b/IPython/html/static/tree/less/tree.less
@@ -127,4 +127,10 @@ input.engine_num_input {
    
 }
 
+.folder_icon:before {
+    .icon(@folder-open)
+}
 
+.notebook_icon:before {
+    .icon(@file-text-alt)
+}