diff --git a/lib/editor/tinymce/adminlib.php b/lib/editor/tinymce/adminlib.php
index b145f996743..2aa9caa49df 100644
--- a/lib/editor/tinymce/adminlib.php
+++ b/lib/editor/tinymce/adminlib.php
@@ -145,7 +145,7 @@ class tiynce_subplugins_settings extends admin_setting {
      * @return string
      */
     public function output_html($data, $query='') {
-        global $CFG, $OUTPUT;
+        global $CFG, $OUTPUT, $PAGE;
         require_once("$CFG->libdir/editorlib.php");
         require_once("$CFG->libdir/pluginlib.php");
         require_once(__DIR__.'/lib.php');
@@ -198,6 +198,13 @@ class tiynce_subplugins_settings extends admin_setting {
                 $displayname = html_writer::tag('span', $namestr, array('class'=>'dimmed_text'));
             }
 
+            if ($PAGE->theme->resolve_image_location('icon', 'tinymce_' . $name)) {
+                $icon = $OUTPUT->pix_icon('icon', '', 'tinymce_' . $name, array('class' => 'smallicon pluginicon'));
+            } else {
+                $icon = $OUTPUT->pix_icon('spacer', '', 'moodle', array('class' => 'smallicon pluginicon noicon'));
+            }
+            $displayname  = $icon . ' ' . $displayname;
+
             // Add available buttons.
             $buttons = implode(', ', $plugin->get_buttons());
             $buttons = html_writer::tag('span', $buttons, array('class'=>'tinymcebuttons'));
diff --git a/lib/editor/tinymce/plugins/dragmath/pix/icon.png b/lib/editor/tinymce/plugins/dragmath/pix/icon.png
new file mode 100644
index 00000000000..3fd55ee7361
Binary files /dev/null and b/lib/editor/tinymce/plugins/dragmath/pix/icon.png differ
diff --git a/lib/editor/tinymce/plugins/moodleemoticon/pix/icon.png b/lib/editor/tinymce/plugins/moodleemoticon/pix/icon.png
new file mode 100644
index 00000000000..6d6ffc69393
Binary files /dev/null and b/lib/editor/tinymce/plugins/moodleemoticon/pix/icon.png differ
diff --git a/lib/editor/tinymce/plugins/moodleimage/pix/icon.png b/lib/editor/tinymce/plugins/moodleimage/pix/icon.png
new file mode 100644
index 00000000000..60bc72349fb
Binary files /dev/null and b/lib/editor/tinymce/plugins/moodleimage/pix/icon.png differ
diff --git a/lib/editor/tinymce/plugins/moodlemedia/pix/icon.png b/lib/editor/tinymce/plugins/moodlemedia/pix/icon.png
new file mode 100644
index 00000000000..c7ebc40d3ea
Binary files /dev/null and b/lib/editor/tinymce/plugins/moodlemedia/pix/icon.png differ
diff --git a/lib/editor/tinymce/plugins/moodlenolink/pix/icon.png b/lib/editor/tinymce/plugins/moodlenolink/pix/icon.png
new file mode 100644
index 00000000000..3f21ab4b4ea
Binary files /dev/null and b/lib/editor/tinymce/plugins/moodlenolink/pix/icon.png differ
diff --git a/lib/editor/tinymce/plugins/spellchecker/pix/icon.png b/lib/editor/tinymce/plugins/spellchecker/pix/icon.png
new file mode 100644
index 00000000000..7124c6acb0d
Binary files /dev/null and b/lib/editor/tinymce/plugins/spellchecker/pix/icon.png differ