diff --git a/app/assets/images/admin/file_types/1358029801_css.png b/app/assets/images/admin/file_types/1358029801_css.png
new file mode 100644
index 0000000..42b4528
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029801_css.png differ
diff --git a/app/assets/images/admin/file_types/1358029807_docx.png b/app/assets/images/admin/file_types/1358029807_docx.png
new file mode 100644
index 0000000..7aa40bc
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029807_docx.png differ
diff --git a/app/assets/images/admin/file_types/1358029820_psd.png b/app/assets/images/admin/file_types/1358029820_psd.png
new file mode 100644
index 0000000..4cdf434
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029820_psd.png differ
diff --git a/app/assets/images/admin/file_types/1358029824_jpg.png b/app/assets/images/admin/file_types/1358029824_jpg.png
new file mode 100644
index 0000000..943858c
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029824_jpg.png differ
diff --git a/app/assets/images/admin/file_types/1358029827_generic.png b/app/assets/images/admin/file_types/1358029827_generic.png
new file mode 100644
index 0000000..b91b1be
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029827_generic.png differ
diff --git a/app/assets/images/admin/file_types/1358029830_doc.png b/app/assets/images/admin/file_types/1358029830_doc.png
new file mode 100644
index 0000000..983cc8a
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029830_doc.png differ
diff --git a/app/assets/images/admin/file_types/1358029834_aac.png b/app/assets/images/admin/file_types/1358029834_aac.png
new file mode 100644
index 0000000..4d32144
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029834_aac.png differ
diff --git a/app/assets/images/admin/file_types/1358029839_wmv.png b/app/assets/images/admin/file_types/1358029839_wmv.png
new file mode 100644
index 0000000..27d2d25
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029839_wmv.png differ
diff --git a/app/assets/images/admin/file_types/1358029845_raw.png b/app/assets/images/admin/file_types/1358029845_raw.png
new file mode 100644
index 0000000..5fd1b19
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029845_raw.png differ
diff --git a/app/assets/images/admin/file_types/1358029848_tar.png b/app/assets/images/admin/file_types/1358029848_tar.png
new file mode 100644
index 0000000..34f0d31
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029848_tar.png differ
diff --git a/app/assets/images/admin/file_types/1358029854_tiff.png b/app/assets/images/admin/file_types/1358029854_tiff.png
new file mode 100644
index 0000000..f5c07d1
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029854_tiff.png differ
diff --git a/app/assets/images/admin/file_types/1358029858_rtf.png b/app/assets/images/admin/file_types/1358029858_rtf.png
new file mode 100644
index 0000000..7fe2fe3
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029858_rtf.png differ
diff --git a/app/assets/images/admin/file_types/1358029860_rtf.png b/app/assets/images/admin/file_types/1358029860_rtf.png
new file mode 100644
index 0000000..7fe2fe3
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029860_rtf.png differ
diff --git a/app/assets/images/admin/file_types/1358029868_js.png b/app/assets/images/admin/file_types/1358029868_js.png
new file mode 100644
index 0000000..6fed77c
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029868_js.png differ
diff --git a/app/assets/images/admin/file_types/1358029872_gif.png b/app/assets/images/admin/file_types/1358029872_gif.png
new file mode 100644
index 0000000..c3940d2
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029872_gif.png differ
diff --git a/app/assets/images/admin/file_types/1358029874_aiff.png b/app/assets/images/admin/file_types/1358029874_aiff.png
new file mode 100644
index 0000000..721a436
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029874_aiff.png differ
diff --git a/app/assets/images/admin/file_types/1358029878_gzip.png b/app/assets/images/admin/file_types/1358029878_gzip.png
new file mode 100644
index 0000000..af4ece5
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029878_gzip.png differ
diff --git a/app/assets/images/admin/file_types/1358029881_ma.png b/app/assets/images/admin/file_types/1358029881_ma.png
new file mode 100644
index 0000000..fc4af76
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029881_ma.png differ
diff --git a/app/assets/images/admin/file_types/1358029885_mp.png b/app/assets/images/admin/file_types/1358029885_mp.png
new file mode 100644
index 0000000..122aa42
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029885_mp.png differ
diff --git a/app/assets/images/admin/file_types/1358029888_php.png b/app/assets/images/admin/file_types/1358029888_php.png
new file mode 100644
index 0000000..18b1e1d
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029888_php.png differ
diff --git a/app/assets/images/admin/file_types/1358029892_mpeg.png b/app/assets/images/admin/file_types/1358029892_mpeg.png
new file mode 100644
index 0000000..1e072fb
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029892_mpeg.png differ
diff --git a/app/assets/images/admin/file_types/1358029894_mov.png b/app/assets/images/admin/file_types/1358029894_mov.png
new file mode 100644
index 0000000..0d04088
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029894_mov.png differ
diff --git a/app/assets/images/admin/file_types/1358029899_html.png b/app/assets/images/admin/file_types/1358029899_html.png
new file mode 100644
index 0000000..6699269
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029899_html.png differ
diff --git a/app/assets/images/admin/file_types/1358029903_avi.png b/app/assets/images/admin/file_types/1358029903_avi.png
new file mode 100644
index 0000000..233252f
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029903_avi.png differ
diff --git a/app/assets/images/admin/file_types/1358029906_txt.png b/app/assets/images/admin/file_types/1358029906_txt.png
new file mode 100644
index 0000000..98058ea
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029906_txt.png differ
diff --git a/app/assets/images/admin/file_types/1358029912_wav.png b/app/assets/images/admin/file_types/1358029912_wav.png
new file mode 100644
index 0000000..07bd3b4
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029912_wav.png differ
diff --git a/app/assets/images/admin/file_types/1358029916_generic.png b/app/assets/images/admin/file_types/1358029916_generic.png
new file mode 100644
index 0000000..b91b1be
Binary files /dev/null and b/app/assets/images/admin/file_types/1358029916_generic.png differ
diff --git a/app/assets/images/admin/file_types/ACP_PDF.icns b/app/assets/images/admin/file_types/ACP_PDF.icns
new file mode 100644
index 0000000..26e0810
Binary files /dev/null and b/app/assets/images/admin/file_types/ACP_PDF.icns differ
diff --git a/app/assets/images/admin/file_types/ai.png b/app/assets/images/admin/file_types/ai.png
old mode 100755
new mode 100644
index 25428c7..eb16320
Binary files a/app/assets/images/admin/file_types/ai.png and b/app/assets/images/admin/file_types/ai.png differ
diff --git a/app/assets/images/admin/file_types/bmp.png b/app/assets/images/admin/file_types/bmp.png
old mode 100755
new mode 100644
index 98ef182..bb852d2
Binary files a/app/assets/images/admin/file_types/bmp.png and b/app/assets/images/admin/file_types/bmp.png differ
diff --git a/app/assets/images/admin/file_types/eps.png b/app/assets/images/admin/file_types/eps.png
old mode 100755
new mode 100644
index 41fc8dc..7cadd57
Binary files a/app/assets/images/admin/file_types/eps.png and b/app/assets/images/admin/file_types/eps.png differ
diff --git a/app/assets/images/admin/file_types/gif.png b/app/assets/images/admin/file_types/gif.png
old mode 100755
new mode 100644
index 8d47b3a..e71bd80
Binary files a/app/assets/images/admin/file_types/gif.png and b/app/assets/images/admin/file_types/gif.png differ
diff --git a/app/assets/images/admin/file_types/icns.png b/app/assets/images/admin/file_types/icns.png
new file mode 100644
index 0000000..d857fa5
Binary files /dev/null and b/app/assets/images/admin/file_types/icns.png differ
diff --git a/app/assets/images/admin/file_types/ico.png b/app/assets/images/admin/file_types/ico.png
new file mode 100644
index 0000000..73c23f0
Binary files /dev/null and b/app/assets/images/admin/file_types/ico.png differ
diff --git a/app/assets/images/admin/file_types/ics/ai.icns b/app/assets/images/admin/file_types/ics/ai.icns
new file mode 100644
index 0000000..7beb64c
Binary files /dev/null and b/app/assets/images/admin/file_types/ics/ai.icns differ
diff --git a/app/assets/images/admin/file_types/ics/ai.png b/app/assets/images/admin/file_types/ics/ai.png
new file mode 100644
index 0000000..eb16320
Binary files /dev/null and b/app/assets/images/admin/file_types/ics/ai.png differ
diff --git a/app/assets/images/admin/file_types/ics/bmp.icns b/app/assets/images/admin/file_types/ics/bmp.icns
new file mode 100644
index 0000000..d81d996
Binary files /dev/null and b/app/assets/images/admin/file_types/ics/bmp.icns differ
diff --git a/app/assets/images/admin/file_types/ics/bmp.png b/app/assets/images/admin/file_types/ics/bmp.png
new file mode 100644
index 0000000..bb852d2
Binary files /dev/null and b/app/assets/images/admin/file_types/ics/bmp.png differ
diff --git a/app/assets/images/admin/file_types/ics/eps.icns b/app/assets/images/admin/file_types/ics/eps.icns
new file mode 100644
index 0000000..438b4e2
Binary files /dev/null and b/app/assets/images/admin/file_types/ics/eps.icns differ
diff --git a/app/assets/images/admin/file_types/ics/eps.png b/app/assets/images/admin/file_types/ics/eps.png
new file mode 100644
index 0000000..7cadd57
Binary files /dev/null and b/app/assets/images/admin/file_types/ics/eps.png differ
diff --git a/app/assets/images/admin/file_types/ics/gif.icns b/app/assets/images/admin/file_types/ics/gif.icns
new file mode 100644
index 0000000..fb5b274
Binary files /dev/null and b/app/assets/images/admin/file_types/ics/gif.icns differ
diff --git a/app/assets/images/admin/file_types/ics/gif.png b/app/assets/images/admin/file_types/ics/gif.png
new file mode 100644
index 0000000..e71bd80
Binary files /dev/null and b/app/assets/images/admin/file_types/ics/gif.png differ
diff --git a/app/assets/images/admin/file_types/ics/icns.icns b/app/assets/images/admin/file_types/ics/icns.icns
new file mode 100644
index 0000000..a0d3984
Binary files /dev/null and b/app/assets/images/admin/file_types/ics/icns.icns differ
diff --git a/app/assets/images/admin/file_types/ics/icns.png b/app/assets/images/admin/file_types/ics/icns.png
new file mode 100644
index 0000000..d857fa5
Binary files /dev/null and b/app/assets/images/admin/file_types/ics/icns.png differ
diff --git a/app/assets/images/admin/file_types/ics/ico.icns b/app/assets/images/admin/file_types/ics/ico.icns
new file mode 100644
index 0000000..984eec6
Binary files /dev/null and b/app/assets/images/admin/file_types/ics/ico.icns differ
diff --git a/app/assets/images/admin/file_types/ics/ico.png b/app/assets/images/admin/file_types/ics/ico.png
new file mode 100644
index 0000000..73c23f0
Binary files /dev/null and b/app/assets/images/admin/file_types/ics/ico.png differ
diff --git a/app/assets/images/admin/file_types/ics/jpeg.icns b/app/assets/images/admin/file_types/ics/jpeg.icns
new file mode 100644
index 0000000..ac4080f
Binary files /dev/null and b/app/assets/images/admin/file_types/ics/jpeg.icns differ
diff --git a/app/assets/images/admin/file_types/ics/jpeg.png b/app/assets/images/admin/file_types/ics/jpeg.png
new file mode 100644
index 0000000..502b09e
Binary files /dev/null and b/app/assets/images/admin/file_types/ics/jpeg.png differ
diff --git a/app/assets/images/admin/file_types/ics/pdf.icns b/app/assets/images/admin/file_types/ics/pdf.icns
new file mode 100644
index 0000000..f580bb5
Binary files /dev/null and b/app/assets/images/admin/file_types/ics/pdf.icns differ
diff --git a/app/assets/images/admin/file_types/ics/pdf.png b/app/assets/images/admin/file_types/ics/pdf.png
new file mode 100644
index 0000000..3d1affe
Binary files /dev/null and b/app/assets/images/admin/file_types/ics/pdf.png differ
diff --git a/app/assets/images/admin/file_types/ics/png.icns b/app/assets/images/admin/file_types/ics/png.icns
new file mode 100644
index 0000000..47d2ce5
Binary files /dev/null and b/app/assets/images/admin/file_types/ics/png.icns differ
diff --git a/app/assets/images/admin/file_types/ics/png.png b/app/assets/images/admin/file_types/ics/png.png
new file mode 100644
index 0000000..ae5727f
Binary files /dev/null and b/app/assets/images/admin/file_types/ics/png.png differ
diff --git a/app/assets/images/admin/file_types/ics/tiff.icns b/app/assets/images/admin/file_types/ics/tiff.icns
new file mode 100644
index 0000000..65fdd1d
Binary files /dev/null and b/app/assets/images/admin/file_types/ics/tiff.icns differ
diff --git a/app/assets/images/admin/file_types/ics/tiff.png b/app/assets/images/admin/file_types/ics/tiff.png
new file mode 100644
index 0000000..536448e
Binary files /dev/null and b/app/assets/images/admin/file_types/ics/tiff.png differ
diff --git a/app/assets/images/admin/file_types/jpeg.png b/app/assets/images/admin/file_types/jpeg.png
new file mode 100644
index 0000000..502b09e
Binary files /dev/null and b/app/assets/images/admin/file_types/jpeg.png differ
diff --git a/app/assets/images/admin/file_types/jpg.png b/app/assets/images/admin/file_types/jpg.png
old mode 100755
new mode 100644
index f04374f..502b09e
Binary files a/app/assets/images/admin/file_types/jpg.png and b/app/assets/images/admin/file_types/jpg.png differ
diff --git a/app/assets/images/admin/file_types/m4v.png b/app/assets/images/admin/file_types/m4v.png
new file mode 100644
index 0000000..ede0b74
Binary files /dev/null and b/app/assets/images/admin/file_types/m4v.png differ
diff --git a/app/assets/images/admin/file_types/mpg.png b/app/assets/images/admin/file_types/mpg.png
old mode 100755
new mode 100644
index 64e72e7..b1582c6
Binary files a/app/assets/images/admin/file_types/mpg.png and b/app/assets/images/admin/file_types/mpg.png differ
diff --git a/app/assets/images/admin/file_types/pdf.png b/app/assets/images/admin/file_types/pdf.png
old mode 100755
new mode 100644
index 0f8a3e1..0030fa7
Binary files a/app/assets/images/admin/file_types/pdf.png and b/app/assets/images/admin/file_types/pdf.png differ
diff --git a/app/assets/images/admin/file_types/png.png b/app/assets/images/admin/file_types/png.png
old mode 100755
new mode 100644
index 0043d8b..ae5727f
Binary files a/app/assets/images/admin/file_types/png.png and b/app/assets/images/admin/file_types/png.png differ
diff --git a/app/assets/images/admin/file_types/psd.png b/app/assets/images/admin/file_types/psd.png
old mode 100755
new mode 100644
index c1fad7c..4cdf434
Binary files a/app/assets/images/admin/file_types/psd.png and b/app/assets/images/admin/file_types/psd.png differ
diff --git a/app/assets/images/admin/file_types/sql.png b/app/assets/images/admin/file_types/sql.png
old mode 100755
new mode 100644
index 0664ed5..e7efb9e
Binary files a/app/assets/images/admin/file_types/sql.png and b/app/assets/images/admin/file_types/sql.png differ
diff --git a/app/assets/images/admin/file_types/tar.gz.png b/app/assets/images/admin/file_types/tar.gz.png
new file mode 100644
index 0000000..d9deafa
Binary files /dev/null and b/app/assets/images/admin/file_types/tar.gz.png differ
diff --git a/app/assets/images/admin/file_types/tar.png b/app/assets/images/admin/file_types/tar.png
new file mode 100644
index 0000000..d9deafa
Binary files /dev/null and b/app/assets/images/admin/file_types/tar.png differ
diff --git a/app/assets/images/admin/file_types/tgz.png b/app/assets/images/admin/file_types/tgz.png
deleted file mode 100755
index d99d6d6..0000000
Binary files a/app/assets/images/admin/file_types/tgz.png and /dev/null differ
diff --git a/app/assets/images/admin/file_types/tiff.png b/app/assets/images/admin/file_types/tiff.png
old mode 100755
new mode 100644
index 8b90725..536448e
Binary files a/app/assets/images/admin/file_types/tiff.png and b/app/assets/images/admin/file_types/tiff.png differ
diff --git a/app/assets/images/admin/file_types/zip.png b/app/assets/images/admin/file_types/zip.png
old mode 100755
new mode 100644
index db988ad..d9deafa
Binary files a/app/assets/images/admin/file_types/zip.png and b/app/assets/images/admin/file_types/zip.png differ
diff --git a/app/assets/javascripts/note_files/note_files.js b/app/assets/javascripts/note_files/note_files.js
index 4659568..7ae5c37 100644
--- a/app/assets/javascripts/note_files/note_files.js
+++ b/app/assets/javascripts/note_files/note_files.js
@@ -44,8 +44,8 @@ function init_note_upload_fields(note_id){
 
 $(document).ready(function () {
 
-	$(".note .add_file").live("click",function(){
-		
+	$(".note .add_files").live("click",function(){
+		alert('test');
 		$(this).next('input').click();
 		return false;
 	});
diff --git a/app/assets/stylesheets/topics.css.scss b/app/assets/stylesheets/topics.css.scss
index 09a5eeb..16c2e52 100644
--- a/app/assets/stylesheets/topics.css.scss
+++ b/app/assets/stylesheets/topics.css.scss
@@ -109,15 +109,18 @@
 			@include border-radius(0px 0px 3px 0px);
 			@include box-shadow(0px 0px 2px rgba(0,0,0,0.3),-1px -1px 5px rgba(0,0,0,0.2) inset);
 			padding:10px;
-			min-height:1em;
+			padding-top:2px;
+			
+			min-height:75px;
 		
 			.note_file{
 				margin:8px 0px;
-				
-				.icon{
-				height:20px;
 				position:relative;
-				top:4px;
+				top:-4px;
+				.icon{
+				height:28px;
+				position:relative;
+				top:8px;
 				}
 			}
 		
@@ -136,23 +139,25 @@
 			}
 			.fileupload{
 				
-				.add_file{
-					background:black;
-					color:white;
-					padding:5px 10px;
-					position:absolute;
-					right:10px;
-					top:5px;
-				}
-				
-				.progress{
+			.upload{
 				position:absolute;
 				right:10px;
-				top:30px;
+				top:10px;
+				z-index:1000;
+				
+					.add_files{
+						background:black;
+						color:white;
+						padding:5px 10px;
+					
+					}
+				
+					.progress{
+						
 			
 				
+					}
 				}
-				
 				input[type=file]{
 					display:none;
 			
diff --git a/app/views/note_files/_form.html.haml b/app/views/note_files/_form.html.haml
index e7ee99e..9c79e37 100644
--- a/app/views/note_files/_form.html.haml
+++ b/app/views/note_files/_form.html.haml
@@ -1,13 +1,13 @@
 %form.fileupload{:action => note_files_path(:note_id => note.id), :enctype => "multipart/form-data", :method => "POST"}
 	
+	.upload
+		%button.add_files ajouter des fichiers
 	
-	%button.add_file ajouter des fichiers
-	
-	%input{:multiple => "", :name => "files[]", :type => "file", :style => "float:right;"}
+		%input{:multiple => "", :name => "files[]", :type => "file", :style => "float:right;"}
 
 	
-	.progress
-		.bar{:style => "height:1em;"}
+		.progress
+			.bar{:style => "height:1em;"}
 	
 
 .note_file_queue#note_file_queue
diff --git a/app/views/note_files/_note_file.html.haml b/app/views/note_files/_note_file.html.haml
index 4b593da..3ba68bd 100644
--- a/app/views/note_files/_note_file.html.haml
+++ b/app/views/note_files/_note_file.html.haml
@@ -1,6 +1,6 @@
 .note_file#note_file{:id => note_file.id}
 	-ext = File.extname(note_file.file.path)[1..-1]
-	=image_tag "admin/file_types/"+ext+".png", :class => "icon"
+	%div{:style => "display:inline-block;text-align:center;width:30px;"}=image_tag "admin/file_types/"+ext+".png", :class => "icon"
 	=l note_file.created_at, :format => :short
 	=note_file.name
 	=link_to "supprimer", note_file_path(note_file), :remote => true, :method => :delete, :confirm => "Voulez-vous vraiment supprimer ce fichier ?"