diff --git a/base/templatetags/seahub_tags.py b/base/templatetags/seahub_tags.py
index 7ffd66c10b..3f02d16e65 100644
--- a/base/templatetags/seahub_tags.py
+++ b/base/templatetags/seahub_tags.py
@@ -17,7 +17,7 @@ def tsstr_sec(value):
 def file_icon_filter(value):
     """Get file icon according to the file postfix"""
     if value.rfind('.') > 0:
-        file_ext = value.split('.')[-1]
+        file_ext = value.split('.')[-1].lower()
     else:
         file_ext = None
 
diff --git a/media/img/Files-Music-File-icon2-24.png b/media/img/Files-Music-File-icon2-24.png
deleted file mode 100644
index 528e818a47..0000000000
Binary files a/media/img/Files-Music-File-icon2-24.png and /dev/null differ
diff --git a/media/img/document-excel-icon-24.png b/media/img/document-excel-icon-24.png
deleted file mode 100644
index 865645c482..0000000000
Binary files a/media/img/document-excel-icon-24.png and /dev/null differ
diff --git a/media/img/document-pdf-icon-24.png b/media/img/document-pdf-icon-24.png
deleted file mode 100644
index a95b7777cb..0000000000
Binary files a/media/img/document-pdf-icon-24.png and /dev/null differ
diff --git a/media/img/document-powerpoint-icon-24.png b/media/img/document-powerpoint-icon-24.png
deleted file mode 100644
index 46471dba78..0000000000
Binary files a/media/img/document-powerpoint-icon-24.png and /dev/null differ
diff --git a/media/img/document-word-icon-24.png b/media/img/document-word-icon-24.png
deleted file mode 100644
index afb4e07bbd..0000000000
Binary files a/media/img/document-word-icon-24.png and /dev/null differ
diff --git a/media/img/excel-icon-24.png b/media/img/excel-icon-24.png
new file mode 100644
index 0000000000..5acb2ffcee
Binary files /dev/null and b/media/img/excel-icon-24.png differ
diff --git a/media/img/folder-icon-24.png b/media/img/folder-icon-24.png
new file mode 100644
index 0000000000..0462d4e0c8
Binary files /dev/null and b/media/img/folder-icon-24.png differ
diff --git a/media/img/File-Music-icon-24.png b/media/img/music-icon-24.png
similarity index 100%
rename from media/img/File-Music-icon-24.png
rename to media/img/music-icon-24.png
diff --git a/media/img/file-extension-pdf-icon-24.png b/media/img/pdf-icon-24.png
similarity index 100%
rename from media/img/file-extension-pdf-icon-24.png
rename to media/img/pdf-icon-24.png
diff --git a/media/img/File-Pictures-icon-24.png b/media/img/pic-icon-24.png
similarity index 100%
rename from media/img/File-Pictures-icon-24.png
rename to media/img/pic-icon-24.png
diff --git a/media/img/ppt-icon-24.png b/media/img/ppt-icon-24.png
new file mode 100644
index 0000000000..159358bdf5
Binary files /dev/null and b/media/img/ppt-icon-24.png differ
diff --git a/media/img/word-icon-24.png b/media/img/word-icon-24.png
new file mode 100644
index 0000000000..6df9aaaea5
Binary files /dev/null and b/media/img/word-icon-24.png differ
diff --git a/settings.py b/settings.py
index d6aa3668fe..cd0810812a 100644
--- a/settings.py
+++ b/settings.py
@@ -133,19 +133,20 @@ SEAFILE_VERSION = '0.9.2'
 # Icons will show in repo page.
 FILEEXT_ICON_MAP = {
     # pdf file
-    'pdf' : 'file-extension-pdf-icon-24.png',
+    'pdf' : 'pdf-icon-24.png',
     # document file
-    'doc' : 'document-word-icon-24.png',
-    'docx' : 'document-word-icon-24.png',
+    'doc' : 'word-icon-24.png',
+    'docx' : 'word-icon-24.png',
     # ppt file
-    'ppt' : 'document-powerpoint-icon-24.png',
-    'pptx' : 'document-powerpoint-icon-24.png',
+    'ppt' : 'ppt-icon-24.png',
+    'pptx' : 'ppt-icon-24.png',
     # music file
-    'mp3' : 'File-Music-icon-24.png',
+    'mp3' : 'music-icon-24.png',
     # picture file
-    'jpg' : 'File-Pictures-icon-24.png',
-    'jpeg' : 'File-Pictures-icon-24.png',
-    'png' : 'File-Pictures-icon-24.png',
+    'jpg' : 'pic-icon-24.png',
+    'jpeg' : 'pic-icon-24.png',
+    'png' : 'pic-icon-24.png',
+    'svg' : 'pic-icon-24.png',
     # normal file and unkown file
     'default' : 'File-icon-default-24.png',
 }
diff --git a/templates/repo.html b/templates/repo.html
index 74379fc93e..d49fd568f9 100644
--- a/templates/repo.html
+++ b/templates/repo.html
@@ -59,11 +59,11 @@
                 {% for dirent in dirs %}
                 <tr>
                     {% if dirent.is_dir %}
-                    <td><img src="{{ MEDIA_URL }}/img/favicon.png" /></td>
+                    <td><img src="{{ MEDIA_URL }}img/folder-icon-24.png" /></td>
                     <td><a href="{{ SITE_ROOT }}repo/{{ repo.id }}/?root_id={{ dirent.obj_id }}&p={{ path }}/{{ dirent.obj_name }}">{{ dirent.obj_name }}</a></td>
                     <td></td>
                     {% else %}
-                    <td><img src="{{ MEDIA_URL }}/img/{{ dirent.obj_name|file_icon_filter }}" /></td>
+                    <td><img src="{{ MEDIA_URL }}img/{{ dirent.obj_name|file_icon_filter }}" /></td>
                     <td>{{ dirent.props.obj_name }}</td>
                     <td>
                         <a class="op" href="{{ SITE_ROOT }}repo/view/{{ repo.props.id }}/{{ dirent.props.obj_id }}/?file_name={{ dirent.props.obj_name }}">查看</a>