diff --git a/media/img/file/excel.png b/media/img/file/excel.png
new file mode 100644
index 0000000000..af742f54e3
Binary files /dev/null and b/media/img/file/excel.png differ
diff --git a/media/img/file/file-icon-24.png b/media/img/file/file-icon-24.png
deleted file mode 100644
index ce0ac01973..0000000000
Binary files a/media/img/file/file-icon-24.png and /dev/null differ
diff --git a/media/img/file/file.png b/media/img/file/file.png
new file mode 100644
index 0000000000..ea586d6417
Binary files /dev/null and b/media/img/file/file.png differ
diff --git a/media/img/file/ms-excel.png b/media/img/file/ms-excel.png
deleted file mode 100644
index fd23d2a341..0000000000
Binary files a/media/img/file/ms-excel.png and /dev/null differ
diff --git a/media/img/file/ms-ppt.png b/media/img/file/ms-ppt.png
deleted file mode 100644
index d983489fc8..0000000000
Binary files a/media/img/file/ms-ppt.png and /dev/null differ
diff --git a/media/img/file/ms-word.png b/media/img/file/ms-word.png
deleted file mode 100644
index 226e46e6a3..0000000000
Binary files a/media/img/file/ms-word.png and /dev/null differ
diff --git a/media/img/file/music-icon-24.png b/media/img/file/music-icon-24.png
deleted file mode 100644
index 4ea42b7af1..0000000000
Binary files a/media/img/file/music-icon-24.png and /dev/null differ
diff --git a/media/img/file/music.png b/media/img/file/music.png
new file mode 100644
index 0000000000..0d8b82f1ae
Binary files /dev/null and b/media/img/file/music.png differ
diff --git a/media/img/file/odf.png b/media/img/file/odf.png
deleted file mode 100644
index 393ab9404e..0000000000
Binary files a/media/img/file/odf.png and /dev/null differ
diff --git a/media/img/file/pdf.png b/media/img/file/pdf.png
index 2110a92648..b70ff13172 100644
Binary files a/media/img/file/pdf.png and b/media/img/file/pdf.png differ
diff --git a/media/img/file/pic-icon-24.png b/media/img/file/pic-icon-24.png
deleted file mode 100644
index 6371ea36f7..0000000000
Binary files a/media/img/file/pic-icon-24.png and /dev/null differ
diff --git a/media/img/file/pic.png b/media/img/file/pic.png
new file mode 100644
index 0000000000..619f19ca24
Binary files /dev/null and b/media/img/file/pic.png differ
diff --git a/media/img/file/ppt.png b/media/img/file/ppt.png
new file mode 100644
index 0000000000..290853d346
Binary files /dev/null and b/media/img/file/ppt.png differ
diff --git a/media/img/file/txt.png b/media/img/file/txt.png
index b4c8d96e08..3a529f8207 100644
Binary files a/media/img/file/txt.png and b/media/img/file/txt.png differ
diff --git a/media/img/file/word.png b/media/img/file/word.png
new file mode 100644
index 0000000000..d068b4b8ad
Binary files /dev/null and b/media/img/file/word.png differ
diff --git a/media/img/file/x_office_document-24.png b/media/img/file/x_office_document-24.png
deleted file mode 100644
index a76198d270..0000000000
Binary files a/media/img/file/x_office_document-24.png and /dev/null differ
diff --git a/media/img/file/x_office_presentation-24.png b/media/img/file/x_office_presentation-24.png
deleted file mode 100644
index dd974238ed..0000000000
Binary files a/media/img/file/x_office_presentation-24.png and /dev/null differ
diff --git a/media/img/file/x_office_spreadsheet-24.png b/media/img/file/x_office_spreadsheet-24.png
deleted file mode 100644
index 0a695b0e89..0000000000
Binary files a/media/img/file/x_office_spreadsheet-24.png and /dev/null differ
diff --git a/media/img/folder-icon-24.png b/media/img/folder-icon-24.png
index b179e5d5e3..747cdc54f2 100644
Binary files a/media/img/folder-icon-24.png and b/media/img/folder-icon-24.png differ
diff --git a/seahub/base/templatetags/seahub_tags.py b/seahub/base/templatetags/seahub_tags.py
index 5ae6fe27c6..f2429c3cb7 100644
--- a/seahub/base/templatetags/seahub_tags.py
+++ b/seahub/base/templatetags/seahub_tags.py
@@ -44,30 +44,30 @@ FILEEXT_ICON_MAP = {
     # pdf file
     'pdf' : 'pdf.png',
     # document file
-    'doc' : 'ms-word.png',
-    'docx' : 'ms-word.png',
-    'ppt' : 'ms-ppt.png',
-    'pptx' : 'ms-ppt.png',
-    'xls' : 'ms-excel.png',
-    'xlsx' : 'ms-excel.png',
+    'doc' : 'word.png',
+    'docx' : 'word.png',
+    'ppt' : 'ppt.png',
+    'pptx' : 'ppt.png',
+    'xls' : 'excel.png',
+    'xlsx' : 'excel.png',
     'txt' : 'txt.png',
-    'odt' : 'x_office_document-24.png',
-    'fodt' : 'x_office_document-24.png',
-    'ods' : 'x_office_spreadsheet-24.png',
-    'fods' : 'x_office_spreadsheet-24.png',
-    'odp' : 'x_office_presentation-24.png',
-    'fodp' : 'x_office_presentation-24.png',
+    'odt' : 'word.png',
+    'fodt' : 'word.png',
+    'ods' : 'excel.png',
+    'fods' : 'excel.png',
+    'odp' : 'ppt.png',
+    'fodp' : 'ppt.png',
     # music file
-    'mp3' : 'music-icon-24.png',
+    'mp3' : 'music.png',
     # picture file
-    'jpg' : 'pic-icon-24.png',
-    'jpeg' : 'pic-icon-24.png',
-    'png' : 'pic-icon-24.png',
-    'svg' : 'pic-icon-24.png',
-    'gif' : 'pic-icon-24.png',
-    'bmp' : 'pic-icon-24.png',
+    'jpg' : 'pic.png',
+    'jpeg' : 'pic.png',
+    'png' : 'pic.png',
+    'svg' : 'pic.png',
+    'gif' : 'pic.png',
+    'bmp' : 'pic.png',
     # normal file and unkown file
-    'default' : 'file-icon-24.png',
+    'default' : 'file.png',
 }
 @register.filter(name='file_icon_filter')
 def file_icon_filter(value):
diff --git a/seahub/templates/repo.html b/seahub/templates/repo.html
index 5c5054b2c5..89f74ab2ce 100644
--- a/seahub/templates/repo.html
+++ b/seahub/templates/repo.html
@@ -754,8 +754,15 @@ function encAndSubmitFile(file, fd, submit_url) {
 // js on repo file list
 var no_file_op_popup = true;
 
+function setPathWidth() {
+    $('.path').width($('.repo-file-list-topbar').width() - $('.repo-op').width() - 10);
+}
+setPathWidth();
+
 function dirOP() {
 
+setPathWidth();
+
 $('.path .dir-link').click(dirlinkClick);
 
 $('.lsch').click(function() {