Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
===================================================================
diff -u -r9f625d1d3925aab8738ae9e64b736cd40a47b015 -rf4a2fe4d33e9e1302ac33016fc6f4a45b629c37e
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(.../DisplayGroupAction.java)	(revision 9f625d1d3925aab8738ae9e64b736cd40a47b015)
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(.../DisplayGroupAction.java)	(revision f4a2fe4d33e9e1302ac33016fc6f4a45b629c37e)
@@ -128,21 +128,21 @@
 		List<IndexLinkBean> links = new ArrayList<IndexLinkBean>();
 		if(isSysAdmin && stateId.equals(OrganisationState.ACTIVE)){
 			if (orgBean.getType().equals(OrganisationType.COURSE_TYPE)) {
-				links.add(new IndexLinkBean("index.classman", "javascript:openOrgManagement(" + org.getOrganisationId()+")", "manage-group-button"));
+				links.add(new IndexLinkBean("index.classman", "javascript:openOrgManagement(" + org.getOrganisationId()+")", "manage-group-button", null));
 			}
 		}
 		if ((contains(roles, Role.ROLE_GROUP_ADMIN) || contains(roles, Role.ROLE_GROUP_MANAGER) || contains(roles,Role.ROLE_MONITOR))
 				&& stateId.equals(OrganisationState.ACTIVE)) {
 			if (orgBean.getType().equals(OrganisationType.COURSE_TYPE)) {
 				if((!isSysAdmin)&&(contains(roles, Role.ROLE_GROUP_ADMIN) || contains(roles, Role.ROLE_GROUP_MANAGER))){
-					links.add(new IndexLinkBean("index.classman", "javascript:openOrgManagement(" + org.getOrganisationId()+")", "manage-group-button"));
+					links.add(new IndexLinkBean("index.classman", "javascript:openOrgManagement(" + org.getOrganisationId()+")", "manage-group-button", null));
 				}
 				if(contains(roles, Role.ROLE_GROUP_MANAGER) || contains(roles,Role.ROLE_MONITOR))
-					links.add(new IndexLinkBean("index.addlesson", "javascript:openAddLesson(" + org.getOrganisationId()+",'')", "add-lesson-button"));
-					links.add(new IndexLinkBean("index.searchlesson", "javascript:openSearchLesson(" + org.getOrganisationId()+",'')", "search-lesson-button")); 
+					links.add(new IndexLinkBean("index.addlesson", "javascript:openAddLesson(" + org.getOrganisationId()+",'')", "add-lesson-button", null));
+					links.add(new IndexLinkBean("index.searchlesson", "javascript:openSearchLesson(" + org.getOrganisationId()+",'')", "search-lesson-button", "index.searchlesson.tooltip")); 
 			}else{//CLASS_TYPE
 				if(contains(roles, Role.ROLE_GROUP_MANAGER) || contains(roles,Role.ROLE_MONITOR))
-					links.add(new IndexLinkBean("index.addlesson","javascript:openAddLesson("+org.getParentOrganisation().getOrganisationId()+","+org.getOrganisationId()+")", "add-lesson-button"));
+					links.add(new IndexLinkBean("index.addlesson","javascript:openAddLesson("+org.getParentOrganisation().getOrganisationId()+","+org.getOrganisationId()+")", "add-lesson-button", null));
 			}
 		}
 		orgBean.setLinks(links);
Index: lams_central/web/groupHeader.jsp
===================================================================
diff -u -red0c3f0f0de6b533ac71988b123270633846208d -rf4a2fe4d33e9e1302ac33016fc6f4a45b629c37e
--- lams_central/web/groupHeader.jsp	(.../groupHeader.jsp)	(revision ed0c3f0f0de6b533ac71988b123270633846208d)
+++ lams_central/web/groupHeader.jsp	(.../groupHeader.jsp)	(revision f4a2fe4d33e9e1302ac33016fc6f4a45b629c37e)
@@ -10,8 +10,15 @@
 		</h2>
 	</div>
 	<c:forEach var="link" items="${orgBean.links}">
+		<c:set var="tooltip" value="" />
+		<c:if test="${link.tooltip ne null}">
+			<c:set var="tooltip">
+				<fmt:message key="${link.tooltip}" />
+			</c:set>
+		</c:if>
+		
 		<div class="mycourses-right-buttons">
-			<a class="<c:out value='${link.style}'/>" href="<c:out value='${link.url}'/>"> 
+			<a class="<c:out value='${link.style}'/>" href="<c:out value='${link.url}'/>" title="${tooltip}"> 
 				<fmt:message key="${link.name}" /> 
 			</a>
 		</div>	
Index: lams_common/src/java/org/lamsfoundation/lams/index/IndexLinkBean.java
===================================================================
diff -u -re76fd654d97033acef2c7bbe4c0def48e37f79f3 -rf4a2fe4d33e9e1302ac33016fc6f4a45b629c37e
--- lams_common/src/java/org/lamsfoundation/lams/index/IndexLinkBean.java	(.../IndexLinkBean.java)	(revision e76fd654d97033acef2c7bbe4c0def48e37f79f3)
+++ lams_common/src/java/org/lamsfoundation/lams/index/IndexLinkBean.java	(.../IndexLinkBean.java)	(revision f4a2fe4d33e9e1302ac33016fc6f4a45b629c37e)
@@ -38,12 +38,14 @@
 	private String name;
 	private String url;
 	private String style;
+	private String tooltip;
 	
-	public IndexLinkBean(String name, String url, String style) {
+	public IndexLinkBean(String name, String url, String style, String tooltip) {
 		super();
 		this.name = name;
 		this.url = url;
 		this.style = style;
+		this.tooltip = tooltip;
 	}
 	
 	public IndexLinkBean(String name, String url) {
@@ -82,5 +84,13 @@
 	public void setStyle(String style) {
 		this.style = style;
 	}
+	
+	public String getTooltip() {
+	    return tooltip;
+	}
 
+	public void setTooltip(String tooltip) {
+	    this.tooltip = tooltip;
+	}
+
 }