diff --git a/course/lib.php b/course/lib.php
index 8bcd7a358b1..af2fc1caa9e 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -2258,12 +2258,12 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=-
     if ($mod->groupmode !== false) {
         if ($mod->groupmode == SEPARATEGROUPS) {
             $grouptitle = $str->groupsseparate;
-            $groupclass = 'editing_groupseparate';
+            $groupclass = 'editing_groupsseparate';
             $groupimage = $CFG->pixpath.'/t/groups.gif';
             $grouplink  = $path.'/mod.php?id='.$mod->id.'&groupmode=0&sesskey='.$sesskey;
         } else if ($mod->groupmode == VISIBLEGROUPS) {
             $grouptitle = $str->groupsvisible;
-            $groupclass = 'editing_groupvisible';
+            $groupclass = 'editing_groupsvisible';
             $groupimage = $CFG->pixpath.'/t/groupv.gif';
             $grouplink  = $path.'/mod.php?id='.$mod->id.'&groupmode=1&sesskey='.$sesskey;
         } else {
diff --git a/lib/ajax/section_classes.js b/lib/ajax/section_classes.js
index 0990c007c18..c4483f5f701 100755
--- a/lib/ajax/section_classes.js
+++ b/lib/ajax/section_classes.js
@@ -760,6 +760,23 @@ resource_class.prototype.toggle_groupmode = function() {
     if (this.groupmode > 2) {
         this.groupmode = 0;
 	}
+    
+    var newtitle = this.groupButton.getElementsByTagName('img')[0].title;
+
+    switch (this.groupmode) {
+        case 0:
+            newtitle = main.portal.strings['groupsnone']+' ('+main.portal.strings['clicktochange']+')';
+            break;
+        case 1:
+            newtitle = main.portal.strings['groupsseparate']+' ('+main.portal.strings['clicktochange']+')';
+            break;
+        case 2:
+            newtitle = main.portal.strings['groupsvisible']+' ('+main.portal.strings['clicktochange']+')';
+            break;
+    }
+    
+    this.groupButton.getElementsByTagName('img')[0].title = newtitle;         
+
     this.groupButton.getElementsByTagName('img')[0].src = main.portal.strings['pixpath']+this.groupImages[this.groupmode];
     main.connect('POST', 'class=resource&field=groupmode', null, 'value='+this.groupmode+'&id='+this.id);
 }