diff --git a/course/lib.php b/course/lib.php
index b160b19cab3..18576c86307 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -1679,9 +1679,10 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
                         echo html_writer::end_tag('div');
                         echo html_writer::end_tag('form');
                     } else {
-                        // In auto mode, or when editing, the icon is just an image
-                        echo "<span class='autocompletion'>";
-                        echo "<img src='$imgsrc' alt='$imgalt' title='$imgalt' /></span>";
+                        // In auto mode, or when editing, the icon is just an image.
+                        echo html_writer::tag('span', html_writer::empty_tag('img', array(
+                                'src' => $imgsrc, 'alt' => $imgalt, 'title' => $imgalt)),
+                                array('class' => 'autocompletion'));
                     }
                 }
             }