diff --git a/main/group/group.php b/main/group/group.php
index fc8c3c6ef2..c3e7fc2d61 100644
--- a/main/group/group.php
+++ b/main/group/group.php
@@ -186,18 +186,18 @@ if (api_is_allowed_to_edit())
 	}
 	// Show admin-panel
 	echo '<ul>';
-	echo '<li><a href="group_creation.php">'.get_lang("NewGroupCreate").'</a></li>';
+	echo '<li><a href="group_creation.php"><img src="../img/group_add_big.gif" align="absbottom">&nbsp;'.get_lang("NewGroupCreate").'</a></li>';
 	if (get_setting('allow_group_categories') == 'true')
 	{
 		echo '<li><a href="group_category.php?action=add_category">'.get_lang("AddCategory").'</a></li>';
 	}
 	else
 	{
-		echo '<li><a href="group_category.php?id=2">'.get_lang('PropModify').'</a></li>';
+		echo '<li><a href="group_category.php?id=2"><img src="../img/edit_group.gif" align="absbottom">&nbsp;'.get_lang('PropModify').'</a></li>';
 	}
 	if( Database::count_rows(Database::get_course_table(TABLE_GROUP)) > 0)
 	{
-		echo '<li><a href="group_overview.php">'.get_lang('GroupOverview').'</a></li>';
+		echo '<li><a href="group_overview.php"><img src="../img/group_view.gif" align="absbottom">&nbsp;'.get_lang('GroupOverview').'</a></li>';
 	}
 	echo '</ul>';
 }
@@ -320,7 +320,7 @@ foreach ($group_cats as $index => $category)
 				$edit_actions = '<a href="group_edit.php?gidReq='.$this_group['id'].'"  title="'.get_lang('Edit').'"><img src="../img/edit.gif" alt="'.get_lang("Edit").'"/></a>&nbsp;';
 				$edit_actions .= '<a href="'.$_SERVER['PHP_SELF'].'?category='.$category['id'].'&amp;action=delete_one&amp;id='.$this_group['id'].'" onclick="javascript:if(!confirm('."'".addslashes(htmlentities(get_lang("ConfirmYourChoice")))."'".')) return false;" title="'.get_lang('Delete').'"><img src="../img/delete.gif" alt="'.get_lang("Delete").'"/></a>&nbsp;';
 				$edit_actions .= '<a href="'.$_SERVER['PHP_SELF'].'?category='.$category['id'].'&amp;action=empty_one&amp;id='.$this_group['id'].'" onclick="javascript:if(!confirm('."'".addslashes(htmlentities(get_lang("ConfirmYourChoice")))."'".')) return false;" title="'.get_lang('EmptyGroup').'"><img src="../img/group_delete.gif" alt="'.get_lang("EmptyGroup").'"/></a>&nbsp;';
-				$edit_actions .= '<a href="'.$_SERVER['PHP_SELF'].'?category='.$category['id'].'&amp;action=fill_one&amp;id='.$this_group['id'].'" onclick="javascript:if(!confirm('."'".addslashes(htmlentities(get_lang("ConfirmYourChoice")))."'".')) return false;" title="'.get_lang('FillGroup').'"><img src="../img/group_add.gif" alt="'.get_lang("FillGroup").'"/></a>';
+				$edit_actions .= '<a href="'.$_SERVER['PHP_SELF'].'?category='.$category['id'].'&amp;action=fill_one&amp;id='.$this_group['id'].'" onclick="javascript:if(!confirm('."'".addslashes(htmlentities(get_lang("ConfirmYourChoice")))."'".')) return false;" title="'.get_lang('FillGroup').'"><img src="../img/add_user.gif" alt="'.get_lang("FillGroup").'"/></a>';
 				$row[] = $edit_actions;
 			}
 			$totalRegistered = $totalRegistered + $this_group[nbMember];
diff --git a/main/img/add_user.gif b/main/img/add_user.gif
new file mode 100644
index 0000000000..b3b5344e9d
Binary files /dev/null and b/main/img/add_user.gif differ
diff --git a/main/img/add_user_big.gif b/main/img/add_user_big.gif
new file mode 100644
index 0000000000..d84e886caf
Binary files /dev/null and b/main/img/add_user_big.gif differ
diff --git a/main/img/edit_group.gif b/main/img/edit_group.gif
new file mode 100644
index 0000000000..290c24e272
Binary files /dev/null and b/main/img/edit_group.gif differ
diff --git a/main/img/group_add_big.gif b/main/img/group_add_big.gif
new file mode 100644
index 0000000000..71fb6ef9ff
Binary files /dev/null and b/main/img/group_add_big.gif differ
diff --git a/main/img/group_view.gif b/main/img/group_view.gif
new file mode 100644
index 0000000000..349cdeb363
Binary files /dev/null and b/main/img/group_view.gif differ
diff --git a/main/user/user.php b/main/user/user.php
index 20cb26ffb1..0aaca2f7e1 100644
--- a/main/user/user.php
+++ b/main/user/user.php
@@ -292,10 +292,10 @@ Display::display_introduction_section(TOOL_USER, $is_allowed);
  if( api_is_allowed_to_edit())
 {
 	echo "<div align=\"right\">";
-	echo '<a href="user.php?action=export&type=csv">'.get_lang('ExportAsCSV').'</a> | ';
-	echo '<a href="user.php?action=export&type=xls">'.get_lang('ExportAsXLS').'</a> | ';
-	echo "<a href=\"subscribe_user.php\">".get_lang("SubscribeUserToCourse")."</a> | ";
-	echo "<a href=\"../group/group.php?".api_get_cidreq()."\">".get_lang("GroupUserManagement")."</a>";
+	echo '<a href="user.php?action=export&type=csv"><img align="absbottom" src="../img/file_xls.gif">&nbsp;'.get_lang('ExportAsCSV').'</a> | ';
+	echo '<a href="user.php?action=export&type=xls"><img align="absbottom" src="../img/file_xls.gif">&nbsp;'.get_lang('ExportAsXLS').'</a> | ';
+	echo "<a href=\"subscribe_user.php\"><img align='absbottom' src='../img/add_user_big.gif'>&nbsp;".get_lang("SubscribeUserToCourse")."</a> | ";
+	echo "<a href=\"../group/group.php?".api_get_cidreq()."\"><img align='absbottom' src='../img/edit_group.gif'>&nbsp;".get_lang("GroupUserManagement")."</a>";
 	if(api_get_setting('use_session_mode')=='false')
 	{
 		echo ' | <a href="class.php">'.get_lang('Classes').'</a>';
@@ -437,12 +437,18 @@ function get_user_data($from, $number_of_items, $column, $direction)
 			$columns[] = "'".get_lang('CourseManager')."'";
 		}
 		$columns[] = 'u.user_id';
+		/*$sql = "SELECT  ".implode(',',$columns)."
+               FROM ".Database::get_main_table(TABLE_MAIN_USER)." `u`, ".Database::get_main_table(TABLE_MAIN_SESSION_COURSE)." c
+               WHERE `u`.`user_id`= c.`id_coach`
+               AND c.`course_code`='".$_SESSION['_course']['id']."'
+				AND c.id_session='".$_SESSION['id_session']."'";*/
+		
 		$sql = "SELECT  ".implode(',',$columns)."
                FROM ".Database::get_main_table(TABLE_MAIN_USER)." `u`, ".Database::get_main_table(TABLE_MAIN_SESSION_COURSE)." c
                WHERE `u`.`user_id`= c.`id_coach`
                AND c.`course_code`='".$_SESSION['_course']['id']."'
-				AND c.id_session='".$_SESSION['id_session']."'";
-
+				";
+		
 		$res = api_sql_query($sql, __FILE__, __LINE__);
 		$users = array ();
 		while ($user = mysql_fetch_row($res))
@@ -466,12 +472,18 @@ function get_user_data($from, $number_of_items, $column, $direction)
 			$columns[] = "''";
 		}
 		$columns[] = 'u.user_id';
+		/*$sql = "SELECT  ".implode(',',$columns)."
+				FROM ".Database::get_main_table(TABLE_MAIN_USER)." `u`, ".Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER)." c
+               WHERE `u`.`user_id`= c.`id_user`
+               AND c.`course_code`='".$_SESSION['_course']['id']."'
+				AND c.id_session='".$_SESSION['id_session']."'";*/
+		
 		$sql = "SELECT  ".implode(',',$columns)."
 				FROM ".Database::get_main_table(TABLE_MAIN_USER)." `u`, ".Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER)." c
                WHERE `u`.`user_id`= c.`id_user`
                AND c.`course_code`='".$_SESSION['_course']['id']."'
-				AND c.id_session='".$_SESSION['id_session']."'";
-
+				";
+		
 		$res = api_sql_query($sql, __FILE__, __LINE__);
 
 		while ($user = mysql_fetch_row($res))
@@ -485,12 +497,14 @@ function get_user_data($from, $number_of_items, $column, $direction)
 	                    LEFT JOIN ".Database::get_course_table(TABLE_GROUP)." sg
 	                    ON ug.group_id = sg.id
 	                    WHERE ug.user_id IN ('".implode("','", $user_ids)."')";
+
 	    $res = api_sql_query($sql,__FILE__,__LINE__);
 	    while($group = mysql_fetch_object($res))
 	    {
 	    	$users[''.$group->user_id][5] .= $group->name.'<br />';
 	    }
 	}
+
 	return $users;
 }
 /**
@@ -503,15 +517,15 @@ function modify_filter($user_id)
 	global $origin,$_user,$is_allowed_to_track;
 
 	// info
-	$result = '<a href="userInfo.php?origin='.$origin.'&amp;uInfo='.$user_id.'"><img border="0" alt="'.get_lang('Info').'" src="../img/info_small.gif" /></a>';
+	$result = '<a href="userInfo.php?origin='.$origin.'&amp;uInfo='.$user_id.'"><img border="0" alt="'.get_lang('Info').'" src="../img/info_small.gif" /></a>&nbsp;';
 	if(api_is_allowed_to_edit())
 	{
 		if($is_allowed_to_track)
 		{
-			$result .= '<a href="../tracking/userLog.php?'.api_get_cidreq().'&amp;origin='.$origin.'&amp;uInfo='.$user_id.'"><img border="0" alt="'.get_lang('Tracking').'" src="../img/statistics.gif" /></a>';
+			$result .= '<a href="../tracking/userLog.php?'.api_get_cidreq().'&amp;origin='.$origin.'&amp;uInfo='.$user_id.'"><img border="0" alt="'.get_lang('Tracking').'" src="../img/statistics.gif" /></a>&nbsp;';
 		}
 		// edit
-		$result .= '<a href="userInfo.php?origin='.$origin.'&amp;editMainUserInfo='.$user_id.'"><img border="0" alt="'.get_lang('Edit').'" src="../img/edit.gif" /></a>';
+		$result .= '<a href="userInfo.php?origin='.$origin.'&amp;editMainUserInfo='.$user_id.'"><img border="0" alt="'.get_lang('Edit').'" src="../img/edit.gif" /></a>&nbsp;';
 		// unregister
 		 if( $user_id != $_user['user_id'])
 		{