diff --git a/mod/assignment/mod.html b/mod/assignment/mod.html
index 2bc1ff30b9b..fcab3f18d39 100644
--- a/mod/assignment/mod.html
+++ b/mod/assignment/mod.html
@@ -66,5 +66,6 @@
 <input type="hidden" name=instance   value="<? p($form->instance) ?>">
 <input type="hidden" name=mode       value="<? p($form->mode) ?>">
 <input type="submit" value="<? print_string("savechanges") ?>">
+<input type="submit" name=cancel value="<? print_string("cancel") ?>">
 </CENTER>
 </FORM>
diff --git a/mod/assignment/submissions.php b/mod/assignment/submissions.php
index cb780c151fd..7da71fa52d3 100644
--- a/mod/assignment/submissions.php
+++ b/mod/assignment/submissions.php
@@ -33,7 +33,7 @@
     print_header("$course->shortname: $assignment->name", "$course->fullname",
                  "$navigation <A HREF=index.php?id=$course->id>$strassignments</A> -> 
                   <A HREF=\"view.php?a=$assignment->id\">$assignment->name</A> -> $strsubmissions", 
-                  "", "", true, update_module_icon($cm->id, $course->id));
+                  "", "", true);
 
     // Some easy ways to reference submissions
     if ($submissions = assignment_get_all_submissions($assignment)) {
diff --git a/mod/assignment/view.php b/mod/assignment/view.php
index f2431d92abc..32b22cbc539 100644
--- a/mod/assignment/view.php
+++ b/mod/assignment/view.php
@@ -44,7 +44,7 @@
 
     print_header("$course->shortname: $assignment->name", "$course->fullname",
                  "$navigation <A HREF=index.php?id=$course->id>$strassignments</A> -> $assignment->name", 
-                  "", "", true, update_module_icon($cm->id, $course->id));
+                  "", "", true, update_module_button($cm->id, $course->id, $strassignment));
 
     if (isteacher($course->id)) {
         if ($submissions = assignment_get_all_submissions($assignment)) {
diff --git a/mod/choice/mod.html b/mod/choice/mod.html
index bf8a1b4d201..fb6db2a84ff 100644
--- a/mod/choice/mod.html
+++ b/mod/choice/mod.html
@@ -73,5 +73,6 @@
 <input type="hidden" name=instance   value="<? p($form->instance) ?>">
 <input type="hidden" name=mode       value="<? p($form->mode) ?>">
 <input type="submit" value="<? print_string("savechanges") ?>">
+<input type="submit" name=cancel value="<? print_string("cancel") ?>">
 </CENTER>
 </FORM>
diff --git a/mod/choice/view.php b/mod/choice/view.php
index db0e96043c9..e1d842e408c 100644
--- a/mod/choice/view.php
+++ b/mod/choice/view.php
@@ -59,7 +59,7 @@
     }
     print_header("$course->shortname: $choice->name", "$course->fullname",
                  "$navigation <A HREF=index.php?id=$course->id>$strchoices</A> -> $choice->name", "", "", true,
-                  update_module_icon($cm->id, $course->id));
+                  update_module_button($cm->id, $course->id, $strchoice));
 
     if (isteacher($course->id)) {
         if ( $allanswers = get_records("choice_answers", "choice", $choice->id)) {
diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index 2aa2a876abe..109000a7da9 100644
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -54,19 +54,13 @@
 
     $navmiddle = "<A HREF=\"../forum/index.php?id=$course->id\">".get_string("forums", "forum")."</A> -> <A HREF=\"../forum/view.php?f=$forum->id\">$forum->name</A>";
 
-    if ($cm->id) {
-        $updatebutton = update_module_icon($cm->id, $course->id);
-    } else {
-        $updatebutton = "";
-    }
-
     if ($course->category) {
         print_header("$course->shortname: $discussion->name", "$course->fullname",
                  "<A HREF=../../course/view.php?id=$course->id>$course->shortname</A> ->
-                  $navmiddle -> $navtail", "", "", true, $updatebutton);
+                  $navmiddle -> $navtail", "", "", true);
     } else {
         print_header("$course->shortname: $discussion->name", "$course->fullname",
-                 "$navmiddle -> $navtail", "", "", true, $updatebutton);
+                 "$navmiddle -> $navtail", "", "", true);
     }
 
     forum_print_discussion($course, $forum, $discussion, $post, $displaymode);
diff --git a/mod/forum/mod.html b/mod/forum/mod.html
index d206ee08b0b..0016350d50d 100644
--- a/mod/forum/mod.html
+++ b/mod/forum/mod.html
@@ -64,5 +64,6 @@
 <input type="hidden" name=instance   value="<? p($form->instance) ?>">
 <input type="hidden" name=mode       value="<? p($form->mode) ?>">
 <input type="submit" value="<? print_string("savechanges") ?>">
+<input type="submit" name=cancel value="<? print_string("cancel") ?>">
 </CENTER>
 </FORM>
diff --git a/mod/forum/view.php b/mod/forum/view.php
index 587169fec85..befd2d4be37 100644
--- a/mod/forum/view.php
+++ b/mod/forum/view.php
@@ -8,6 +8,9 @@
     optional_variable($mode);    // Display mode (for single forum)
 
 
+    $strforums = get_string("modulenameplural", "forum");
+    $strforum = get_string("modulename", "forum");
+
     if ($id) {
         if (! $cm = get_record("course_modules", "id", $id)) {
             error("Course Module ID was incorrect");
@@ -18,7 +21,7 @@
         if (! $forum = get_record("forum", "id", $cm->instance)) {
             error("Forum ID was incorrect");
         }
-        $buttontext = update_module_icon($cm->id, $course->id);
+        $buttontext = update_module_button($cm->id, $course->id, $strforum);
 
     } else if ($f) {
         if (! $forum = get_record("forum", "id", $f)) {
@@ -28,7 +31,7 @@
             error("Forum is misconfigured - don't know what course it's from");
         }
         if ($cm = get_coursemodule_from_instance("forum", $forum->id, $course->id)) {
-            $buttontext = update_module_icon($cm->id, $course->id);
+            $buttontext = update_module_button($cm->id, $course->id, $strforum);
         } else {
             $buttontext = "";
         }
@@ -37,7 +40,6 @@
         error("Must specify a course module or a forum ID");
     }
 
-    $strforums = get_string("modulenameplural", "forum");
 
     if ($course->category) {
         require_login($course->id);
diff --git a/mod/journal/mod.html b/mod/journal/mod.html
index 72f0688ef7a..c624401cd55 100644
--- a/mod/journal/mod.html
+++ b/mod/journal/mod.html
@@ -44,5 +44,6 @@
 <input type="hidden" name=instance   value="<? p($form->instance) ?>">
 <input type="hidden" name=mode       value="<? p($form->mode) ?>">
 <input type="submit" value="<? print_string("savechanges") ?>">
-</CENTER>
+<input type="submit" name=cancel value="<? print_string("cancel") ?>">
 </FORM>
+</CENTER>
diff --git a/mod/journal/view.php b/mod/journal/view.php
index 6f2eb229309..b4839eb9179 100644
--- a/mod/journal/view.php
+++ b/mod/journal/view.php
@@ -34,7 +34,7 @@
 
     print_header("$course->shortname: $journal->name", "$course->fullname",
                  "$navigation <A HREF=index.php?id=$course->id>$strjournals</A> -> $journal->name", "", "", true,
-                  update_module_icon($cm->id, $course->id));
+                  update_module_button($cm->id, $course->id, $strjournal));
 
     if (isteacher($course->id)) {
         if ($allentries = get_records("journal_entries", "journal", $journal->id)) {
diff --git a/mod/quiz/view.php b/mod/quiz/view.php
index 19189554545..eca66b1692a 100644
--- a/mod/quiz/view.php
+++ b/mod/quiz/view.php
@@ -51,7 +51,7 @@
 
     print_header("$course->shortname: $quiz->name", "$course->fullname",
                  "$navigation <A HREF=index.php?id=$course->id>$strquizzes</A> -> $quiz->name", 
-                 "", "", true, update_module_icon($cm->id, $course->id));
+                 "", "", true, update_module_button($cm->id, $course->id, $strquiz));
 
     if (isteacher($course->id)) {
         if ($allanswers = get_records("quiz_grades", "quiz", $quiz->id)) {
diff --git a/mod/survey/mod.html b/mod/survey/mod.html
index 78dd2856d27..c5b6a301533 100644
--- a/mod/survey/mod.html
+++ b/mod/survey/mod.html
@@ -32,5 +32,6 @@
 <input type="hidden" name=instance   value="<? p($form->instance) ?>">
 <input type="hidden" name=mode       value="<? p($form->mode) ?>">
 <input type="submit" value="<? print_string("savechanges") ?>">
+<input type="submit" name=cancel value="<? print_string("cancel") ?>">
 </CENTER>
 </FORM>
diff --git a/mod/survey/view.php b/mod/survey/view.php
index 6e2f79e7806..16a9aed5add 100644
--- a/mod/survey/view.php
+++ b/mod/survey/view.php
@@ -24,10 +24,11 @@
     }
 
     $strsurveys = get_string("modulenameplural", "survey");
+    $strsurvey = get_string("modulename", "survey");
 
     print_header("$course->shortname: $survey->name", "$course->fullname",
                  "$navigation <A HREF=index.php?id=$course->id>$strsurveys</A> -> $survey->name", "", "", true,
-                  update_module_icon($cm->id, $course->id));
+                  update_module_button($cm->id, $course->id, $strsurvey));
 
     if (isteacher($course->id)) {
         $numusers = survey_count_responses($survey->id);