Index: lams_central/web/css/defaultHTML.css
===================================================================
diff -u -r59bfecd711928c0ac9acfb15c64156bfa38bf216 -r87d2aff057c029ce4ac4d5ccc350d162b929fa6a
--- lams_central/web/css/defaultHTML.css	(.../defaultHTML.css)	(revision 59bfecd711928c0ac9acfb15c64156bfa38bf216)
+++ lams_central/web/css/defaultHTML.css	(.../defaultHTML.css)	(revision 87d2aff057c029ce4ac4d5ccc350d162b929fa6a)
@@ -910,7 +910,7 @@
 
 ********************************************** */
 
-.left-buttons {float:left; padding-left:20px;}
+.left-buttons {float:left; padding-left:10px;}
 
 .right-buttons {float:right; padding-right:20px; padding-top:5px;}
 
Index: lams_central/web/groupHeader.jsp
===================================================================
diff -u -r13912543234d7fdec6cb7dec5ab9ba803c07ff19 -r87d2aff057c029ce4ac4d5ccc350d162b929fa6a
--- lams_central/web/groupHeader.jsp	(.../groupHeader.jsp)	(revision 13912543234d7fdec6cb7dec5ab9ba803c07ff19)
+++ lams_central/web/groupHeader.jsp	(.../groupHeader.jsp)	(revision 87d2aff057c029ce4ac4d5ccc350d162b929fa6a)
@@ -5,7 +5,7 @@
 
 <div class="row">
 	<div class="left-buttons">
-		<h2><a class="j-group-header"><c:out value="${orgBean.name}" /></a>
+		<h2><span class="j-group-icon" style="vertical-align:middle;"></span>&nbsp;<a class="j-group-header"><c:out value="${orgBean.name}" /></a>
 			<c:if test="${not empty orgBean.archivedDate}"><small>(<fmt:message key="label.archived"/> <lams:Date value="${orgBean.archivedDate}"/>)</small></c:if>
 		</h2>
 	</div>
Index: lams_central/web/includes/javascript/groupDisplay.js
===================================================================
diff -u -r57b9712b142d692defce65ecab9cd7dc3f1aef19 -r87d2aff057c029ce4ac4d5ccc350d162b929fa6a
--- lams_central/web/includes/javascript/groupDisplay.js	(.../groupDisplay.js)	(revision 57b9712b142d692defce65ecab9cd7dc3f1aef19)
+++ lams_central/web/includes/javascript/groupDisplay.js	(.../groupDisplay.js)	(revision 87d2aff057c029ce4ac4d5ccc350d162b929fa6a)
@@ -8,6 +8,11 @@
 							orgId: jQuery(element).attr("id")
 						},
 						function() {
+							if (display == 'header') {
+								jQuery("span.j-group-icon", element).html("<img src='images/tree_closed.gif'/>");
+							} else if (display == 'group') {
+								jQuery("span.j-group-icon", element).html("<img src='images/tree_open.gif'/>");
+							}
 							toggleGroupContents(element, stateId);
 							registerToolTip(element);
 							jQuery(element).css("display", "block");
@@ -16,13 +21,15 @@
 				}
 			
 				function toggleGroupContents(element, stateId) {
-					jQuery("a.j-group-header", element).click(function() {
-						var row = jQuery(this).parent("h2").parent("div.left-buttons").parent("div.row");
+					jQuery("a.j-group-header, span.j-group-icon", element).click(function() {
+						var row = jQuery("div.row", element);
 						var orgId = jQuery(row).parent("div.course-bg").attr("id");
 						var course = jQuery(row).next("div.j-course-contents");
+						var groupIcon = jQuery("span.j-group-icon", element);
 						if (jQuery(course).html() == null) {
 							loadGroupContents(orgId, stateId);
 							saveCollapsed(orgId, "false");
+							jQuery(groupIcon).html("<img src='images/tree_open.gif'/>");
 						} else {
 							var display = course.css("display");
 							if (jQuery.browser.msie && jQuery.browser.version == '6.0') {
@@ -32,8 +39,10 @@
 							}
 							if (display == "none") {
 								saveCollapsed(orgId, "false");
+								jQuery(groupIcon).html("<img src='images/tree_open.gif'/>");
 							} else if (display == "block") {
 								saveCollapsed(orgId, "true");
+								jQuery(groupIcon).html("<img src='images/tree_closed.gif'/>");
 							}
 						}
 						makeAllUnsortable();