diff --git a/main/document/document.inc.php b/main/document/document.inc.php
index 0f23066934..5876508eef 100755
--- a/main/document/document.inc.php
+++ b/main/document/document.inc.php
@@ -214,9 +214,9 @@ function build_document_icon_tag($type, $path) {
 		$icon = choose_image($basename);
 	} else {
 		if ($basename == 'shared_folder') {
-			$icon = 'user_folders.gif';
+			$icon = 'folder_users.gif';
 			if ($is_allowed_to_edit) {
-				$basename = get_lang('HelpSharedFolder');
+				$basename = get_lang('HelpUsersFolder');
 			} else {
 				$basename = get_lang('UserFolders');
 			}
@@ -226,7 +226,7 @@ function build_document_icon_tag($type, $path) {
 			} else {
 				$basename = get_lang('UserFolders').' ('.api_get_session_name($current_session_id).')';
 			}
-			$icon = 'user_folders.gif';
+			$icon = 'folder_users.gif';
 		}elseif(strstr($basename, 'sf_user_')) {
 			$userinfo = Database::get_user_info_from_id(substr($basename, 8));
 			$image_path = UserManager::get_user_picture_path_by_id(substr($basename, 8), 'web', false, true);
@@ -240,10 +240,33 @@ function build_document_icon_tag($type, $path) {
 			$basename = get_lang('UserFolder').' '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']);
 
 		} else {
-			if (($basename =='audio' || $basename =='flash' || $basename =='images' || $basename =='video') && api_is_allowed_to_edit()) {
+			$icon = 'folder_document.gif';
+			if (($basename =='audio' || $basename =='flash' || $basename =='images' || $basename =='video' || $basename =='gallery') && api_is_allowed_to_edit()) {
+				if($basename=='audio'){
+					$icon = 'folder_audio.gif';
+				}
+				elseif($basename =='flash'){
+					$icon = 'folder_flash.gif';
+				}
+				elseif($basename =='images'){
+					$icon = 'folder_images.gif';
+				}
+				elseif($basename =='video'){
+					$icon = 'folder_video.gif';
+				}
+				elseif($basename =='gallery'){
+					$icon = 'folder_gallery.gif';
+				}	
 				$basename = get_lang('HelpDefaultDirDocuments');
 			}
-			$icon = 'folder_document.gif';
+			elseif($basename =='chat_files' && api_is_allowed_to_edit()){
+				$icon = 'folder_chat.gif';
+				$basename = get_lang('HelpFolderChat');
+			}
+			elseif($basename =='certificates' && api_is_allowed_to_edit()){
+				$icon = 'folder_certificates.gif';
+				$basename = get_lang('HelpFolderCertificates');
+			}
 		}
 	}
 
diff --git a/main/document/document.php b/main/document/document.php
index 57d3cf5466..4f26530f07 100755
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -903,7 +903,7 @@ if ($is_allowed_to_edit || $group_member_with_upload_rights || is_my_shared_fold
 					<?php Display::display_icon('draw_new.png', get_lang('Draw')); echo get_lang('Draw'); ?></a>&nbsp;
 			<?php	
 			}else{
-				Display::display_icon('draw_new.png', get_lang('BrowserDontSupportsSVG')); echo get_lang('Draw').'&nbsp;';
+				Display::display_icon('draw_new_na.png', get_lang('BrowserDontSupportsSVG')); echo get_lang('Draw').'&nbsp;';
 			}
 		}
 	}
diff --git a/main/group/group.php b/main/group/group.php
index 217647a041..0f92e58465 100755
--- a/main/group/group.php
+++ b/main/group/group.php
@@ -189,7 +189,7 @@ foreach ($group_cats as $index => $category) {
 	$in_category = false;
 	if (api_get_setting('allow_group_categories') == 'true') {
 		if (isset ($_GET['show_all']) || (isset ($_GET['category']) && $_GET['category'] == $category['id'])) {
-			echo '<img src="../img/group_category.gif" alt=""/>';
+			echo '<img src="../img/folder_group_category.gif" alt=""/>';
 			echo '<a href="group.php?'.api_get_cidreq().'&origin='.Security::remove_XSS($_GET['origin']).'">'.$category['title'].'</a>';
 			$in_category = true;
 		} else {
diff --git a/main/img/draw_new_na.png b/main/img/draw_new_na.png
new file mode 100644
index 0000000000..01921046a7
Binary files /dev/null and b/main/img/draw_new_na.png differ
diff --git a/main/img/flash.gif b/main/img/flash.gif
index 5079c85909..f81fd1d6d0 100755
Binary files a/main/img/flash.gif and b/main/img/flash.gif differ
diff --git a/main/img/folder_audio.gif b/main/img/folder_audio.gif
new file mode 100644
index 0000000000..3a1ffd76b7
Binary files /dev/null and b/main/img/folder_audio.gif differ
diff --git a/main/img/folder_certificates.gif b/main/img/folder_certificates.gif
new file mode 100644
index 0000000000..9fe2f80366
Binary files /dev/null and b/main/img/folder_certificates.gif differ
diff --git a/main/img/folder_chat.gif b/main/img/folder_chat.gif
new file mode 100644
index 0000000000..64f877e58e
Binary files /dev/null and b/main/img/folder_chat.gif differ
diff --git a/main/img/folder_flash.gif b/main/img/folder_flash.gif
new file mode 100644
index 0000000000..b441c2dfc3
Binary files /dev/null and b/main/img/folder_flash.gif differ
diff --git a/main/img/folder_gallery.gif b/main/img/folder_gallery.gif
new file mode 100644
index 0000000000..1617801a1f
Binary files /dev/null and b/main/img/folder_gallery.gif differ
diff --git a/main/img/folder_group_category.gif b/main/img/folder_group_category.gif
new file mode 100644
index 0000000000..c2823840de
Binary files /dev/null and b/main/img/folder_group_category.gif differ
diff --git a/main/img/folder_images.gif b/main/img/folder_images.gif
new file mode 100644
index 0000000000..944cce3c42
Binary files /dev/null and b/main/img/folder_images.gif differ
diff --git a/main/img/folder_images_svg.gif b/main/img/folder_images_svg.gif
new file mode 100644
index 0000000000..f7eeda963e
Binary files /dev/null and b/main/img/folder_images_svg.gif differ
diff --git a/main/img/folder_links.gif b/main/img/folder_links.gif
new file mode 100644
index 0000000000..1809046ad4
Binary files /dev/null and b/main/img/folder_links.gif differ
diff --git a/main/img/folder_quizzes.gif b/main/img/folder_quizzes.gif
new file mode 100644
index 0000000000..931f6355bd
Binary files /dev/null and b/main/img/folder_quizzes.gif differ
diff --git a/main/img/folder_users.gif b/main/img/folder_users.gif
new file mode 100644
index 0000000000..f4b95edbc4
Binary files /dev/null and b/main/img/folder_users.gif differ
diff --git a/main/img/folder_video.gif b/main/img/folder_video.gif
new file mode 100644
index 0000000000..02af432f18
Binary files /dev/null and b/main/img/folder_video.gif differ
diff --git a/main/img/folder_works.gif b/main/img/folder_works.gif
new file mode 100644
index 0000000000..75abbbd344
Binary files /dev/null and b/main/img/folder_works.gif differ
diff --git a/main/img/group_category.gif b/main/img/group_category.gif
deleted file mode 100644
index a871087326..0000000000
Binary files a/main/img/group_category.gif and /dev/null differ
diff --git a/main/img/user_folders.gif b/main/img/user_folders.gif
deleted file mode 100644
index 143fae61d7..0000000000
Binary files a/main/img/user_folders.gif and /dev/null differ