diff --git a/app/helpers/dmsf_helper.rb b/app/helpers/dmsf_helper.rb
index 1932bbb0..bd111d16 100644
--- a/app/helpers/dmsf_helper.rb
+++ b/app/helpers/dmsf_helper.rb
@@ -41,4 +41,14 @@ module DmsfHelper
     just_filename.gsub(/[^\w\.\-]/,'_') 
   end
   
+  def self.filetype_css(filename)
+    extension = File.extname(filename)
+    extension = extension[1, extension.length-1]
+    if File.exists?("#{File.dirname(__FILE__)}/../../assets/images/filetypes/#{extension}.png")
+      return "filetype-#{extension}";
+    else
+      return Redmine::MimeType.css_class_of(filename)
+    end
+  end
+  
 end
diff --git a/app/views/dmsf/index.html.erb b/app/views/dmsf/index.html.erb
index c55a8d46..458abb89 100644
--- a/app/views/dmsf/index.html.erb
+++ b/app/views/dmsf/index.html.erb
@@ -93,7 +93,7 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
 			<td class="title">
 				<%= link_to(h(file.last_revision.display_title),
 		        	{:action => "download_file", :id => @project, :file_id => file},
-		        	:class => "icon icon-file #{Redmine::MimeType.css_class_of(file.name)}",
+		        	:class => "icon icon-file #{DmsfHelper.filetype_css(file.name)}",
 					:title => l(:title_title_version_version_download, :title => h(file.last_revision.title), :version => file.last_revision.version)) %>
 				<div class="filename"><%= h(file.display_name) %></div>
 			</td>
diff --git a/assets/images/filetypes/doc.png b/assets/images/filetypes/doc.png
new file mode 100644
index 00000000..8cca68cd
Binary files /dev/null and b/assets/images/filetypes/doc.png differ
diff --git a/assets/images/filetypes/docx.png b/assets/images/filetypes/docx.png
new file mode 100644
index 00000000..8cca68cd
Binary files /dev/null and b/assets/images/filetypes/docx.png differ
diff --git a/assets/images/filetypes/mpp.png b/assets/images/filetypes/mpp.png
new file mode 100644
index 00000000..91814977
Binary files /dev/null and b/assets/images/filetypes/mpp.png differ
diff --git a/assets/images/filetypes/odg.png b/assets/images/filetypes/odg.png
new file mode 100644
index 00000000..9c2df410
Binary files /dev/null and b/assets/images/filetypes/odg.png differ
diff --git a/assets/images/filetypes/odp.png b/assets/images/filetypes/odp.png
new file mode 100644
index 00000000..234ab9f7
Binary files /dev/null and b/assets/images/filetypes/odp.png differ
diff --git a/assets/images/filetypes/ods.png b/assets/images/filetypes/ods.png
new file mode 100644
index 00000000..c385a9db
Binary files /dev/null and b/assets/images/filetypes/ods.png differ
diff --git a/assets/images/filetypes/odt.png b/assets/images/filetypes/odt.png
new file mode 100644
index 00000000..db375748
Binary files /dev/null and b/assets/images/filetypes/odt.png differ
diff --git a/assets/images/filetypes/ppt.png b/assets/images/filetypes/ppt.png
new file mode 100644
index 00000000..06f3a26c
Binary files /dev/null and b/assets/images/filetypes/ppt.png differ
diff --git a/assets/images/filetypes/pptx.png b/assets/images/filetypes/pptx.png
new file mode 100644
index 00000000..06f3a26c
Binary files /dev/null and b/assets/images/filetypes/pptx.png differ
diff --git a/assets/images/filetypes/vsd.png b/assets/images/filetypes/vsd.png
new file mode 100644
index 00000000..9af5be18
Binary files /dev/null and b/assets/images/filetypes/vsd.png differ
diff --git a/assets/images/filetypes/vsdx.png b/assets/images/filetypes/vsdx.png
new file mode 100644
index 00000000..9af5be18
Binary files /dev/null and b/assets/images/filetypes/vsdx.png differ
diff --git a/assets/images/filetypes/xls.png b/assets/images/filetypes/xls.png
new file mode 100644
index 00000000..0f227dc1
Binary files /dev/null and b/assets/images/filetypes/xls.png differ
diff --git a/assets/images/filetypes/xlsx.png b/assets/images/filetypes/xlsx.png
new file mode 100644
index 00000000..0f227dc1
Binary files /dev/null and b/assets/images/filetypes/xlsx.png differ
diff --git a/assets/stylesheets/dmsf.css b/assets/stylesheets/dmsf.css
index f65fb222..fa519da8 100644
--- a/assets/stylesheets/dmsf.css
+++ b/assets/stylesheets/dmsf.css
@@ -1,3 +1,4 @@
+/* DMSF entries list */
 table.entries tbody td, table.entries tbody tr:hover td {
 	border: solid 1px #D7D7D7;
 }
@@ -24,14 +25,40 @@ table.entries th.check {
 	text-align: left;
 }
 
-#sidebar h3 {
-	border: none;
+.icon-file.filetype-doc, .icon-file.filetype-docx {
+	background-image: url(../images/filetypes/doc.png);
 }
 
-button {
-	vertical-align: middle;
-	margin-top: 1px;
-	margin-bottom: 1px;
+.icon-file.filetype-xls, .icon-file.filetype-xlsx {
+	background-image: url(../images/filetypes/xls.png);
+}
+
+.icon-file.filetype-ppt, .icon-file.filetype-pptx {
+	background-image: url(../images/filetypes/ppt.png);
+}
+
+.icon-file.filetype-vsd, .icon-file.filetype-vsdx {
+	background-image: url(../images/filetypes/vsd.png);
+}
+
+.icon-file.filetype-mpp {
+	background-image: url(../images/filetypes/mpp.png);
+}
+
+.icon-file.filetype-odt {
+	background-image: url(../images/filetypes/odt.png);
+}
+
+.icon-file.filetype-ods {
+	background-image: url(../images/filetypes/ods.png);
+}
+
+.icon-file.filetype-odp {
+	background-image: url(../images/filetypes/odp.png);
+}
+
+.icon-file.filetype-odg {
+	background-image: url(../images/filetypes/odg.png);
 }
 
 form.dmfs_entries {
@@ -47,6 +74,10 @@ form.dmfs_entries div.controls input, form.dmfs_entries div.controls button {
 	font-size: 0.9em;
 }
 
+input[type="checkbox"] {
+	margin: 1px;
+}
+
 div.filename {
 	padding: 0 10px 0 10px; float: right; font-size: 0.8em;
 	white-space: nowrap;
@@ -78,6 +109,8 @@ td.version img {
 	vertical-align:text-top;
 }
 
+/* DMSF entries list icons */
+
 div.right_icon_box {
 	float: right;
 	white-space: nowrap; 
@@ -88,6 +121,7 @@ div.right_icon_box img.detail_icon {
 	padding-top: 2px;
 }
 
+/* DMSF entries upload control */
 
 .dmsf_upload textarea {
 	width: 90%;
@@ -101,38 +135,6 @@ div.right_icon_box img.detail_icon {
 	padding: 4px 4px 4px 30px;
 }
 
-.dmsf_detail legend {
-	font-weight: bold;
-}
-
-.dmsf_detail .warning {
-	padding: 4px 4px 4px 30px;
-}
-
-.dmsf_detail div.data {
-	margin-left: 110px;
-}
-
-.dmsf_detail label {
-	font-weight: bold;
-	width: 100px;
-	float: left;
-	text-align: right;
-	padding-right: 10px;
-}
-
-p.no-ident {
-	margin-bottom: 0;
-	margin-top: 0;
-}
-
-fieldset {
-	padding-top: 4px;
-	padding-right: 8px;
-	padding-bottom: 8px;
-	padding-left: 8px;
-}
-
 #uploader div.flash {
 	border: none;
 }
@@ -153,10 +155,6 @@ div.upload_select input, div.upload_select select {
 	font-size: 0.9em;
 }
 
-input[type="checkbox"] {
-	margin: 1px;
-}
-
 .plupload_scroll {
 	max-height: 1000px;
 	min-height: 175px;
@@ -166,3 +164,25 @@ input[type="checkbox"] {
 	bottom: 0px;
 }
 
+/* DMSF detail/commit page */
+
+.dmsf_detail .warning {
+	padding: 4px 4px 4px 30px;
+}
+
+.dmsf_detail div.data {
+	margin-left: 110px;
+}
+
+.dmsf_detail label {
+	font-weight: bold;
+	width: 100px;
+	float: left;
+	text-align: right;
+	padding-right: 10px;
+}
+
+p.no-ident {
+	margin-bottom: 0;
+	margin-top: 0;
+}