diff --git a/lib/editor/tinymce.js.php b/lib/editor/tinymce.js.php
index 1f6c48e27d6..a63feed85a3 100644
--- a/lib/editor/tinymce.js.php
+++ b/lib/editor/tinymce.js.php
@@ -197,10 +197,7 @@ echo <<<EOF
     });
     function toggleEditor(id) {
         var elm = document.getElementById(id);
-        if (tinyMCE.getInstanceById(id) == null)
-		    tinyMCE.execCommand('mceAddControl', false, id);
-	    else
-		    tinyMCE.execCommand('mceRemoveControl', false, id);
+        tinyMCE.execCommand('mceToggleEditor',false,elm);
     }
     function moodlefilemanager(field_name, url, type, win) {
         tinyMCE.activeEditor.windowManager.open({
diff --git a/lib/weblib.php b/lib/weblib.php
index 52620b1a306..fe5bdc611b7 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -4846,14 +4846,16 @@ function print_textarea($usehtmleditor, $rows, $cols, $width, $height, $name, $v
     $str .= '</textarea>'."\n";
 
     if ($usehtmleditor) {
+        $str_toggle = '<span class="helplink"><a href="javascript:toggleEditor(\''. $id .'\');"><img width="50" height="17" src="'. $CFG->httpswwwroot .'/lib/editor/tinymce/images/toggle.gif" alt="'. get_string('editortoggle') .'" title="'. get_string('editortoggle') .'" class="icontoggle" /></a></span>';
         // Show shortcuts button if HTML editor is in use, but only if JavaScript is enabled (MDL-9556)
-        $str .= '';
-        $str .= '<a href="javascript:toggleEditor(\''. $id .'\');"><img width="50" height="17" src="'. $CFG->httpswwwroot .'/lib/editor/tinymce/images/toggle.gif" alt="'. get_string('editortoggle') .'" title="'. get_string('editortoggle') .'" /></a>';
+        $str .= '<div class="textareaicons">';
         $str .= '<script type="text/javascript">
 //<![CDATA[
+document.write(\''.addslashes_js($str_toggle).'\');
 document.write(\''.addslashes_js(editorshortcutshelpbutton()).'\');
 //]]>
 </script>';
+        $str .= '</div>';
     }
 
     if ($return) {
diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 416fa34bf31..741f6180c31 100644
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -489,6 +489,13 @@ img.iconkbhelp {
   border:0px;
 }
 
+img.icontoggle {
+  width:50px;
+  height:17px;
+  border:0px;
+  vertical-align:middle;
+}
+
 /*Accessibility: text 'seen' by screen readers but not visual users. Fixed for RTL languages, example Farsi. */
 .accesshide {
   position:absolute;