diff --git a/media/css/seahub.css b/media/css/seahub.css
index facf1c7acc..018645343b 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -59,7 +59,7 @@ table {
     margin:8px 0 20px;
 }
 td, th {
-    padding:4px 3px;
+    padding:5px 3px;
     word-wrap:break-word;
 }
 th { text-align:left; border-top:1px solid #f8f8f8; }
diff --git a/media/img/file-icon-24.png b/media/img/file/file-icon-24.png
similarity index 100%
rename from media/img/file-icon-24.png
rename to media/img/file/file-icon-24.png
diff --git a/media/img/file/ms-excel.png b/media/img/file/ms-excel.png
new file mode 100644
index 0000000000..fd23d2a341
Binary files /dev/null and b/media/img/file/ms-excel.png differ
diff --git a/media/img/file/ms-ppt.png b/media/img/file/ms-ppt.png
new file mode 100644
index 0000000000..d983489fc8
Binary files /dev/null and b/media/img/file/ms-ppt.png differ
diff --git a/media/img/file/ms-word.png b/media/img/file/ms-word.png
new file mode 100644
index 0000000000..226e46e6a3
Binary files /dev/null and b/media/img/file/ms-word.png differ
diff --git a/media/img/music-icon-24.png b/media/img/file/music-icon-24.png
similarity index 100%
rename from media/img/music-icon-24.png
rename to media/img/file/music-icon-24.png
diff --git a/media/img/file/odf.png b/media/img/file/odf.png
new file mode 100644
index 0000000000..393ab9404e
Binary files /dev/null and b/media/img/file/odf.png differ
diff --git a/media/img/file/pdf.png b/media/img/file/pdf.png
new file mode 100644
index 0000000000..2110a92648
Binary files /dev/null and b/media/img/file/pdf.png differ
diff --git a/media/img/pic-icon-24.png b/media/img/file/pic-icon-24.png
similarity index 100%
rename from media/img/pic-icon-24.png
rename to media/img/file/pic-icon-24.png
diff --git a/media/img/file/txt.png b/media/img/file/txt.png
new file mode 100644
index 0000000000..b4c8d96e08
Binary files /dev/null and b/media/img/file/txt.png differ
diff --git a/settings.py b/settings.py
index 47619b4903..6eda4e7e13 100644
--- a/settings.py
+++ b/settings.py
@@ -124,13 +124,16 @@ ACCOUNT_ACTIVATION_DAYS = 7
 # Icons will show in repo page.
 FILEEXT_ICON_MAP = {
     # pdf file
-    'pdf' : 'pdf-icon-24.png',
+    'pdf' : 'pdf.png',
     # document file
-    'doc' : 'word-icon-24.png',
-    'docx' : 'word-icon-24.png',
-    # ppt file
-    'ppt' : 'ppt-icon-24.png',
-    'pptx' : 'ppt-icon-24.png',
+    'doc' : 'ms-word.png',
+    'docx' : 'ms-word.png',
+    'ppt' : 'ms-ppt.png',
+    'pptx' : 'ms-ppt.png',
+    'xls' : 'ms-excel.png',
+    'xlsx' : 'ms-excel.png',
+    'txt' : 'txt.png',
+    'odf' : 'odf.png',
     # music file
     'mp3' : 'music-icon-24.png',
     # picture file
diff --git a/templates/repo.html b/templates/repo.html
index 46c30de988..5ba8b7d356 100644
--- a/templates/repo.html
+++ b/templates/repo.html
@@ -151,7 +151,7 @@
 
             {% for dirent in file_list %}
             <tr>
-              <td class="icon-container"><img src="{{ MEDIA_URL }}img/{{ dirent.obj_name|file_icon_filter }}" alt="文件" /></td>
+              <td class="icon-container"><img src="{{ MEDIA_URL }}img/file/{{ dirent.obj_name|file_icon_filter }}" alt="文件" /></td>
               {% if view_history %}
               <td><a class="op" href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/files/?obj_id={{ dirent.props.obj_id }}&commit_id={{ current_commit.id }}&p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}">{{ dirent.props.obj_name }}</a></td>              
               {% else %}