diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
index 63c40e2516ef7..f30f5c1b5f58f 100644
--- a/lib/deprecatedlib.php
+++ b/lib/deprecatedlib.php
@@ -3543,3 +3543,18 @@ function print_heading_with_help($text, $helppage, $module='moodle', $icon=false
         echo $output;
     }
 }
+
+/**
+ * Returns a turn edit on/off button for course in a self contained form.
+ * Used to be an icon, but it's now a simple form button
+ *
+ * @deprecated since Moodle 2.0
+ *
+ * @global object
+ * @global object
+ * @param int $courseid The course  to update by id as found in 'course' table
+ * @return string
+ */
+function update_mymoodle_icon() {
+    throw new coding_exception('update_mymoodle_icon() has been completely deprecated.');
+}
diff --git a/lib/weblib.php b/lib/weblib.php
index 42e0776b67d95..6b970717ed50f 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -2764,33 +2764,6 @@ function switchroles_form($courseid) {
 }
 
 
-/**
- * Returns a turn edit on/off button for course in a self contained form.
- * Used to be an icon, but it's now a simple form button
- *
- * @global object
- * @global object
- * @param int $courseid The course  to update by id as found in 'course' table
- * @return string
- */
-function update_mymoodle_icon() {
-
-    global $CFG, $USER;
-
-    if (!empty($USER->editing)) {
-        $string = get_string('updatemymoodleoff');
-        $edit = '0';
-    } else {
-        $string = get_string('updatemymoodleon');
-        $edit = '1';
-    }
-
-    return "<form $CFG->frametarget method=\"get\" action=\"$CFG->wwwroot/my/index.php\">".
-           "<div>".
-           "<input type=\"hidden\" name=\"edit\" value=\"$edit\" />".
-           "<input type=\"submit\" value=\"$string\" /></div></form>";
-}
-
 /**
  * Returns a turn edit on/off button for tag in a self contained form.
  *
diff --git a/my/index.php b/my/index.php
index 57f1a022af842..1523c6ea3da0f 100644
--- a/my/index.php
+++ b/my/index.php
@@ -28,7 +28,19 @@
         $USER->editing = $edit;
     }
 
-    $button = update_mymoodle_icon($USER->id);
+    if (!empty($USER->editing)) {
+        $string = get_string('updatemymoodleoff');
+        $edit = '0';
+    } else {
+        $string = get_string('updatemymoodleon');
+        $edit = '1';
+    }
+
+    $form = new html_form();
+    $form->url = new moodle_url("$CFG->wwwroot/my/index.php", array('edit' => $edit));
+    $form->button->text = $string;
+    $button = $OUTPUT->button($form);
+
     $header = $SITE->shortname . ': ' . $strmymoodle;
     $navigation = build_navigation($strmymoodle);
     $loggedinas = user_login_string();