diff --git a/lib/gollum/file_view.rb b/lib/gollum/file_view.rb
index 8b242a8f..0d2379b9 100644
--- a/lib/gollum/file_view.rb
+++ b/lib/gollum/file_view.rb
@@ -22,7 +22,7 @@ module Gollum
     def new_page page
       name = page.name
       url  = url_for_page page
-      %Q(  <li class="file"><a href="#{url}">#{name}</a></li>\n)
+      %Q(  <li class="file"><a href="#{url}"><span class="icon"></span>#{name}</a></li>\n)
     end
 
     def new_folder folder_path
@@ -89,7 +89,7 @@ module Gollum
         <li>
           <label>#{::File.dirname(page.path)}</label> <input type="checkbox" #{@checked} />
           <ol>
-            #{new_page page}
+          #{new_page page}
          </ol>
         </li>
         HTML
diff --git a/lib/gollum/frontend/public/gollum/css/_styles.css b/lib/gollum/frontend/public/gollum/css/_styles.css
index fdd1d2a3..c058fa2b 100644
--- a/lib/gollum/frontend/public/gollum/css/_styles.css
+++ b/lib/gollum/frontend/public/gollum/css/_styles.css
@@ -72,16 +72,23 @@ ol.tree
   }
     li.file a
     {
-      background: url(../images/fileview/document.png) 0 0 no-repeat;
       color: #fff;
-      padding-left: 21px;
       text-decoration: none;
-      display: block;
+      display: inline-block;
     }
-    li.file a[href *= '.pdf']  { background: url(../images/fileview/document.png) 0 0 no-repeat; }
-    li.file a[href *= '.html']  { background: url(../images/fileview/document.png) 0 0 no-repeat; }
-    li.file a[href $= '.css']  { background: url(../images/fileview/document.png) 0 0 no-repeat; }
-    li.file a[href $= '.js']    { background: url(../images/fileview/document.png) 0 0 no-repeat; }
+      li.file a span.icon
+      {
+        width: 14px;
+        height: 18px;
+        background: url(../images/fileview/document.png) 0 0 no-repeat;
+        display: inline-block;
+        margin-right: 7px;
+        vertical-align: text-top;
+      }
+      li.file a[href *= '.pdf'] span.icon { background: url(../images/fileview/document.png) 0 0 no-repeat; }
+      li.file a[href *= '.html'] span.icon { background: url(../images/fileview/document.png) 0 0 no-repeat; }
+      li.file a[href $= '.css'] span.icon { background: url(../images/fileview/document.png) 0 0 no-repeat; }
+      li.file a[href $= '.js']  span.icon { background: url(../images/fileview/document.png) 0 0 no-repeat; }
   li input
   {
     position: absolute;
diff --git a/test/file_view/1_file.txt b/test/file_view/1_file.txt
index 6f65a3a3..30d1ec1d 100644
--- a/test/file_view/1_file.txt
+++ b/test/file_view/1_file.txt
@@ -1,3 +1,3 @@
 <ol class="tree">
-  <li class="file"><a href="0">0</a></li>
-</ol>
\ No newline at end of file
+  <li class="file"><a href="0"><span class="icon"></span>0</a></li>
+</ol>
diff --git a/test/file_view/1_file_1_folder.txt b/test/file_view/1_file_1_folder.txt
index 9f803328..33a3e47b 100644
--- a/test/file_view/1_file_1_folder.txt
+++ b/test/file_view/1_file_1_folder.txt
@@ -2,7 +2,7 @@
         <li>
           <label>folder0</label> <input type="checkbox" checked />
           <ol>
-            <li class="file"><a href="folder0/0">0</a></li>
+            <li class="file"><a href="folder0/0"><span class="icon"></span>0</a></li>
          </ol>
         </li>
-</ol>
\ No newline at end of file
+</ol>
diff --git a/test/file_view/1_folder.txt b/test/file_view/1_folder.txt
index f960bee7..323443b3 100644
--- a/test/file_view/1_folder.txt
+++ b/test/file_view/1_folder.txt
@@ -2,7 +2,7 @@
         <li>
           <label>.</label> <input type="checkbox" checked />
           <ol>
-            <li class="file"><a href="folder0">folder0</a></li>
+            <li class="file"><a href="folder0"><span class="icon"></span>folder0</a></li>
          </ol>
         </li>
-</ol>
\ No newline at end of file
+</ol>
diff --git a/test/file_view/2_files_2_folders.txt b/test/file_view/2_files_2_folders.txt
index 05a8799a..1011235e 100644
--- a/test/file_view/2_files_2_folders.txt
+++ b/test/file_view/2_files_2_folders.txt
@@ -2,11 +2,11 @@
       <li>
         <label>folder0</label> <input type="checkbox" checked />
         <ol>
-  <li class="file"><a href="folder0/0">0</a></li>
+  <li class="file"><a href="folder0/0"><span class="icon"></span>0</a></li>
         </ol>
       </li>
       <li>
         <label>folder1</label> <input type="checkbox" checked />
         <ol>
-  <li class="file"><a href="folder1/1">1</a></li>
-</ol>
\ No newline at end of file
+  <li class="file"><a href="folder1/1"><span class="icon"></span>1</a></li>
+</ol>
diff --git a/test/file_view/2_files_2_folders_1_root.txt b/test/file_view/2_files_2_folders_1_root.txt
index f6e1e8f3..76b551f7 100644
--- a/test/file_view/2_files_2_folders_1_root.txt
+++ b/test/file_view/2_files_2_folders_1_root.txt
@@ -1,13 +1,13 @@
 <ol class="tree">
-  <li class="file"><a href="root">root</a></li>
+  <li class="file"><a href="root"><span class="icon"></span>root</a></li>
       <li>
         <label>folder0</label> <input type="checkbox" checked />
         <ol>
-  <li class="file"><a href="folder0/0">0</a></li>
+  <li class="file"><a href="folder0/0"><span class="icon"></span>0</a></li>
         </ol>
       </li>
       <li>
         <label>folder1</label> <input type="checkbox" checked />
         <ol>
-  <li class="file"><a href="folder1/1">1</a></li>
-</ol>
\ No newline at end of file
+  <li class="file"><a href="folder1/1"><span class="icon"></span>1</a></li>
+</ol>
diff --git a/test/file_view/nested_folders.txt b/test/file_view/nested_folders.txt
index 5094929d..39bf4ba6 100644
--- a/test/file_view/nested_folders.txt
+++ b/test/file_view/nested_folders.txt
@@ -8,13 +8,13 @@
       <li>
         <label>folder2</label> <input type="checkbox" checked />
         <ol>
-  <li class="file"><a href="folder0/folder1/folder2/0">0</a></li>
+  <li class="file"><a href="folder0/folder1/folder2/0"><span class="icon"></span>0</a></li>
         </ol>
       </li>
       <li>
         <label>folder3</label> <input type="checkbox" checked />
         <ol>
-  <li class="file"><a href="folder0/folder1/folder3/1">1</a></li>
+  <li class="file"><a href="folder0/folder1/folder3/1"><span class="icon"></span>1</a></li>
         </ol>
       </li>
         </ol>
@@ -24,5 +24,5 @@
       <li>
         <label>folder4</label> <input type="checkbox" checked />
         <ol>
-  <li class="file"><a href="folder4/2">2</a></li>
-</ol>
\ No newline at end of file
+  <li class="file"><a href="folder4/2"><span class="icon"></span>2</a></li>
+</ol>