diff --git a/main/img/default_courses_img/board.gif b/main/img/default_courses_img/board.gif
deleted file mode 100644
index 4fc2325c73..0000000000
Binary files a/main/img/default_courses_img/board.gif and /dev/null differ
diff --git a/main/img/default_courses_img/book.gif b/main/img/default_courses_img/book.gif
deleted file mode 100644
index 9983419213..0000000000
Binary files a/main/img/default_courses_img/book.gif and /dev/null differ
diff --git a/main/img/default_courses_img/book_highlight.gif b/main/img/default_courses_img/book_highlight.gif
deleted file mode 100644
index f845f983a8..0000000000
Binary files a/main/img/default_courses_img/book_highlight.gif and /dev/null differ
diff --git a/main/img/default_courses_img/bookcase.gif b/main/img/default_courses_img/bookcase.gif
deleted file mode 100644
index 7c85325654..0000000000
Binary files a/main/img/default_courses_img/bookcase.gif and /dev/null differ
diff --git a/main/img/default_courses_img/calendar.gif b/main/img/default_courses_img/calendar.gif
deleted file mode 100644
index b461cdaf01..0000000000
Binary files a/main/img/default_courses_img/calendar.gif and /dev/null differ
diff --git a/main/img/default_courses_img/computer.gif b/main/img/default_courses_img/computer.gif
deleted file mode 100644
index 1b3ecd61c9..0000000000
Binary files a/main/img/default_courses_img/computer.gif and /dev/null differ
diff --git a/main/img/default_courses_img/emot_happy.gif b/main/img/default_courses_img/emot_happy.gif
deleted file mode 100644
index 3b7c416530..0000000000
Binary files a/main/img/default_courses_img/emot_happy.gif and /dev/null differ
diff --git a/main/img/default_courses_img/emot_neutral.gif b/main/img/default_courses_img/emot_neutral.gif
deleted file mode 100644
index 237233669c..0000000000
Binary files a/main/img/default_courses_img/emot_neutral.gif and /dev/null differ
diff --git a/main/img/default_courses_img/emot_sad.gif b/main/img/default_courses_img/emot_sad.gif
deleted file mode 100644
index ce878f1ff3..0000000000
Binary files a/main/img/default_courses_img/emot_sad.gif and /dev/null differ
diff --git a/main/img/default_courses_img/emot_wink.gif b/main/img/default_courses_img/emot_wink.gif
deleted file mode 100644
index e7950d0c62..0000000000
Binary files a/main/img/default_courses_img/emot_wink.gif and /dev/null differ
diff --git a/main/img/default_courses_img/female.gif b/main/img/default_courses_img/female.gif
deleted file mode 100644
index 6d1cc3a7f5..0000000000
Binary files a/main/img/default_courses_img/female.gif and /dev/null differ
diff --git a/main/img/default_courses_img/floppy.gif b/main/img/default_courses_img/floppy.gif
deleted file mode 100644
index 57f4af6d04..0000000000
Binary files a/main/img/default_courses_img/floppy.gif and /dev/null differ
diff --git a/main/img/default_courses_img/geometry.gif b/main/img/default_courses_img/geometry.gif
deleted file mode 100644
index 6425eda989..0000000000
Binary files a/main/img/default_courses_img/geometry.gif and /dev/null differ
diff --git a/main/img/default_courses_img/group.gif b/main/img/default_courses_img/group.gif
deleted file mode 100644
index c7a53a26f0..0000000000
Binary files a/main/img/default_courses_img/group.gif and /dev/null differ
diff --git a/main/img/default_courses_img/hal.gif b/main/img/default_courses_img/hal.gif
deleted file mode 100644
index cd681c4174..0000000000
Binary files a/main/img/default_courses_img/hal.gif and /dev/null differ
diff --git a/main/img/default_courses_img/homework.gif b/main/img/default_courses_img/homework.gif
deleted file mode 100644
index 47ad36e640..0000000000
Binary files a/main/img/default_courses_img/homework.gif and /dev/null differ
diff --git a/main/img/default_courses_img/idea.gif b/main/img/default_courses_img/idea.gif
deleted file mode 100644
index ec88e6b8e3..0000000000
Binary files a/main/img/default_courses_img/idea.gif and /dev/null differ
diff --git a/main/img/default_courses_img/interaction.gif b/main/img/default_courses_img/interaction.gif
deleted file mode 100644
index ca13d8d31e..0000000000
Binary files a/main/img/default_courses_img/interaction.gif and /dev/null differ
diff --git a/main/img/default_courses_img/japanese.gif b/main/img/default_courses_img/japanese.gif
deleted file mode 100644
index 281ae11ac7..0000000000
Binary files a/main/img/default_courses_img/japanese.gif and /dev/null differ
diff --git a/main/img/default_courses_img/keyboard.gif b/main/img/default_courses_img/keyboard.gif
deleted file mode 100644
index 8b2e69a882..0000000000
Binary files a/main/img/default_courses_img/keyboard.gif and /dev/null differ
diff --git a/main/img/default_courses_img/linux.gif b/main/img/default_courses_img/linux.gif
deleted file mode 100644
index 3e0ac41ded..0000000000
Binary files a/main/img/default_courses_img/linux.gif and /dev/null differ
diff --git a/main/img/default_courses_img/male.gif b/main/img/default_courses_img/male.gif
deleted file mode 100644
index 2ac8a91b5d..0000000000
Binary files a/main/img/default_courses_img/male.gif and /dev/null differ
diff --git a/main/img/default_courses_img/maths.gif b/main/img/default_courses_img/maths.gif
deleted file mode 100644
index 3e17ffc2b4..0000000000
Binary files a/main/img/default_courses_img/maths.gif and /dev/null differ
diff --git a/main/img/default_courses_img/mechanism.gif b/main/img/default_courses_img/mechanism.gif
deleted file mode 100644
index 94f53f039b..0000000000
Binary files a/main/img/default_courses_img/mechanism.gif and /dev/null differ
diff --git a/main/img/default_courses_img/mouse.gif b/main/img/default_courses_img/mouse.gif
deleted file mode 100644
index cf8677887e..0000000000
Binary files a/main/img/default_courses_img/mouse.gif and /dev/null differ
diff --git a/main/img/default_courses_img/newspaper.gif b/main/img/default_courses_img/newspaper.gif
deleted file mode 100644
index d4ba0a985e..0000000000
Binary files a/main/img/default_courses_img/newspaper.gif and /dev/null differ
diff --git a/main/img/default_courses_img/note.gif b/main/img/default_courses_img/note.gif
deleted file mode 100644
index 4399dba7f5..0000000000
Binary files a/main/img/default_courses_img/note.gif and /dev/null differ
diff --git a/main/img/default_courses_img/planet.gif b/main/img/default_courses_img/planet.gif
deleted file mode 100644
index b6ac74b140..0000000000
Binary files a/main/img/default_courses_img/planet.gif and /dev/null differ
diff --git a/main/img/default_courses_img/presentation.gif b/main/img/default_courses_img/presentation.gif
deleted file mode 100644
index 5858267322..0000000000
Binary files a/main/img/default_courses_img/presentation.gif and /dev/null differ
diff --git a/main/img/default_courses_img/redlight.gif b/main/img/default_courses_img/redlight.gif
deleted file mode 100644
index b180fcdff0..0000000000
Binary files a/main/img/default_courses_img/redlight.gif and /dev/null differ
diff --git a/main/img/default_courses_img/science.gif b/main/img/default_courses_img/science.gif
deleted file mode 100644
index f532f7a5cb..0000000000
Binary files a/main/img/default_courses_img/science.gif and /dev/null differ
diff --git a/main/img/default_courses_img/search.gif b/main/img/default_courses_img/search.gif
deleted file mode 100644
index 4dabca0f03..0000000000
Binary files a/main/img/default_courses_img/search.gif and /dev/null differ
diff --git a/main/img/default_courses_img/speech.gif b/main/img/default_courses_img/speech.gif
deleted file mode 100644
index 3d228a22fc..0000000000
Binary files a/main/img/default_courses_img/speech.gif and /dev/null differ
diff --git a/main/img/default_courses_img/teacher.gif b/main/img/default_courses_img/teacher.gif
deleted file mode 100644
index c3f9d9941e..0000000000
Binary files a/main/img/default_courses_img/teacher.gif and /dev/null differ
diff --git a/main/img/default_courses_img/time.gif b/main/img/default_courses_img/time.gif
deleted file mode 100644
index 058dbfba38..0000000000
Binary files a/main/img/default_courses_img/time.gif and /dev/null differ
diff --git a/main/img/default_courses_img/tutorial.gif b/main/img/default_courses_img/tutorial.gif
deleted file mode 100644
index b49c241f40..0000000000
Binary files a/main/img/default_courses_img/tutorial.gif and /dev/null differ
diff --git a/main/img/default_courses_img/wallet.gif b/main/img/default_courses_img/wallet.gif
deleted file mode 100644
index b34288a160..0000000000
Binary files a/main/img/default_courses_img/wallet.gif and /dev/null differ
diff --git a/main/img/default_courses_img/wikipedia.gif b/main/img/default_courses_img/wikipedia.gif
deleted file mode 100644
index 48390ae014..0000000000
Binary files a/main/img/default_courses_img/wikipedia.gif and /dev/null differ
diff --git a/main/img/default_courses_img/work.gif b/main/img/default_courses_img/work.gif
deleted file mode 100644
index 288a573348..0000000000
Binary files a/main/img/default_courses_img/work.gif and /dev/null differ
diff --git a/main/img/default_courses_img/world.gif b/main/img/default_courses_img/world.gif
deleted file mode 100644
index 5edff1b5fc..0000000000
Binary files a/main/img/default_courses_img/world.gif and /dev/null differ
diff --git a/main/img/default_courses_img/write.gif b/main/img/default_courses_img/write.gif
deleted file mode 100644
index 1a77cfb81b..0000000000
Binary files a/main/img/default_courses_img/write.gif and /dev/null differ
diff --git a/main/inc/lib/add_course.lib.inc.php b/main/inc/lib/add_course.lib.inc.php
index 9ffa0f44a3..0b8d27586b 100644
--- a/main/inc/lib/add_course.lib.inc.php
+++ b/main/inc/lib/add_course.lib.inc.php
@@ -214,6 +214,7 @@ function prepare_course_repository($courseRepository, $courseId)
 	mkdir(api_get_path(SYS_COURSE_PATH).$courseRepository, 0777);
 	mkdir(api_get_path(SYS_COURSE_PATH).$courseRepository . "/document", 0777);
 	mkdir(api_get_path(SYS_COURSE_PATH).$courseRepository . "/document/images", 0777);
+		mkdir(api_get_path(SYS_COURSE_PATH).$courseRepository . "/document/images/default_course_img/", 0777);
 	mkdir(api_get_path(SYS_COURSE_PATH).$courseRepository . "/document/audio", 0777);
 	mkdir(api_get_path(SYS_COURSE_PATH).$courseRepository . "/document/flash", 0777);
 	mkdir(api_get_path(SYS_COURSE_PATH).$courseRepository . "/document/video", 0777);
@@ -1275,18 +1276,41 @@ function fill_course_repository($courseRepository)
 
 		fputs($fp, $enreg);
 	}
+	fclose($fp);
 	
 	$img_code_path = api_get_path(SYS_CODE_PATH)."img/default_courses_img/";
-	$course_documents_folder=$sys_course_path.$courseRepository.'/document/images/';
+	$course_documents_folder=$sys_course_path.$courseRepository.'/document/images/default_course_img/';
+	
+	mkdir($course_documents_folder,'0777');
 	
+	$dirs=array();
 	$handle = opendir($img_code_path);
 	
 	while (false !== ($file = readdir($handle))) {
-        copy($img_code_path.$file,$course_documents_folder.$file);
-        chmod($course_documents_folder.$file,"0777");
+		if(is_dir($img_code_path.$file) && $file!=".svn" && $file!="." && $file!=".."){
+			mkdir($course_documents_folder.$file,'0777');
+			$dirs[]=$file.'/';
+		}
+		elseif(is_file($img_code_path.$file) && $file!="." && $file!=".." && $file!=".svn"){
+	        copy($img_code_path.$file,$course_documents_folder.$file);
+	        chmod($course_documents_folder.$file,"0777");
+		}
    	}
-
-	fclose($fp);
+   	closedir($handle);
+   	
+   	foreach($dirs as $current_dir){
+   		$handle = opendir($img_code_path.$current_dir);
+   		
+		while (false !== ($file = readdir($handle))) {
+			if(is_file($img_code_path.$current_dir.$file) && $file!="." && $file!=".."){
+		        copy($img_code_path.$current_dir.$file,$course_documents_folder.$current_dir.$file);
+		        chmod($course_documents_folder.$current_dir.$file,"0777");
+			}
+	   	}
+	   	
+	   	closedir($handle);
+   	}
+   	
 	return 0;
 };
 
@@ -1479,7 +1503,11 @@ function fill_Db_course($courseDbName, $courseRepository, $language)
 		api_sql_query("INSERT INTO `".$TABLETOOLDOCUMENT . "`(path,title,filetype,size) VALUES ('/images','".get_lang('Images')."','folder','0')");
 		$example_doc_id = Database :: get_last_insert_id();
 		api_sql_query("INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('document',1,NOW(),NOW(),$example_doc_id,'DocumentAdded',1,0,NULL,0)");
-
+		
+		api_sql_query("INSERT INTO `".$TABLETOOLDOCUMENT . "`(path,title,filetype,size) VALUES ('/images/default_course_img','".get_lang('DefaultCourseImages')."','folder','0')");
+		$example_doc_id = Database :: get_last_insert_id();
+		api_sql_query("INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('document',1,NOW(),NOW(),$example_doc_id,'DocumentAdded',1,0,NULL,0)");
+		
 		api_sql_query("INSERT INTO `".$TABLETOOLDOCUMENT . "`(path,title,filetype,size) VALUES ('/audio','".get_lang('Audio')."','folder','0')");
 		$example_doc_id = Database :: get_last_insert_id();
 		api_sql_query("INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('document',1,NOW(),NOW(),$example_doc_id,'DocumentAdded',1,0,NULL,0)");
@@ -1495,18 +1523,55 @@ function fill_Db_course($courseDbName, $courseRepository, $language)
 		//FILL THE COURSE DOCUMENT WITH DEFAULT COURSE PICTURES
 		$img_code_path = api_get_path(SYS_CODE_PATH)."img/default_courses_img/";
 		$sys_course_path = api_get_path(SYS_COURSE_PATH);
-		
+	
+	   	
+	   	$img_code_path = api_get_path(SYS_CODE_PATH)."img/default_courses_img/";
+		$img_documents='/images/default_course_img/';
+	   	
+	   	$dirs=array();
 		$handle = opendir($img_code_path);
+		
 		while (false !== ($file = readdir($handle))) {
-			if($file!="." && $file!=".."){
+			$file=lang2db($file);
+			
+			if(is_dir($img_code_path.$file) && $file!=".svn" && $file!="." && $file!=".."){
+				
+				api_sql_query("INSERT INTO `".$TABLETOOLDOCUMENT . "`(path,title,filetype,size) VALUES ('$img_documents$file','$file','folder','0')");
+				$image_id = Database :: get_last_insert_id();
+				api_sql_query("INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('document',1,NOW(),NOW(),$image_id,'DocumentAdded',1,0,NULL,0)");
+				$dirs[]=$file.'/';
+				
+			}
+			
+			elseif(is_file($img_code_path.$file) && $file!="." && $file!=".." && $file!=".svn"){
 				$file_size=filesize($img_code_path.$file);
-				$file=lang2db($file);
-				api_sql_query("INSERT INTO `".$TABLETOOLDOCUMENT . "`(path,title,filetype,size) VALUES ('/images/','$file','file','$file_size')");
+		        api_sql_query("INSERT INTO `".$TABLETOOLDOCUMENT . "`(path,title,filetype,size) VALUES ('$img_documents$file','$file','file','$file_size')");
 				$image_id = Database :: get_last_insert_id();
 				api_sql_query("INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('document',1,NOW(),NOW(),$image_id,'DocumentAdded',1,0,NULL,0)");
+		        
 			}
 	   	}
-		
+	   	closedir($handle);
+	   	
+	   	$img_documents='/images/default_course_img/';
+	   	foreach($dirs as $current_dir){
+	   		
+	   		$handle = opendir($img_code_path.$current_dir);
+	   		
+			while (false !== ($file = readdir($handle))) {
+				if(is_file($img_code_path.$current_dir.$file) && $file!="." && $file!=".."){
+			        
+			        $file_size=filesize($img_code_path.$current_dir.$file);			        
+			        api_sql_query("INSERT INTO `".$TABLETOOLDOCUMENT . "`(path,title,filetype,size) VALUES ('$img_documents$current_dir$file','$langTitle','file','$file_size')");
+					$image_id = Database :: get_last_insert_id();
+					api_sql_query("INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('document',1,NOW(),NOW(),$image_id,'DocumentAdded',1,0,NULL,0)");
+			        
+				}
+		   	}
+		   	
+		   	closedir($handle);
+	   	}
+	   			
 		
 		/*
 		-----------------------------------------------------------