diff --git a/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/attributes.png b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/attributes.png
new file mode 100644
index 00000000000..f5137eeeee8
Binary files /dev/null and b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/attributes.png differ
diff --git a/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/attributes.svg b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/attributes.svg
new file mode 100644
index 00000000000..18c892ea00b
--- /dev/null
+++ b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/attributes.svg
@@ -0,0 +1,14 @@
+
+
+
+]>
+
diff --git a/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/cancel.png b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/cancel.png
index 607dc55971e..adeb35dc0ca 100644
Binary files a/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/cancel.png and b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/cancel.png differ
diff --git a/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/cancel.svg b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/cancel.svg
index 271743b4b06..cf88a6bbf01 100644
--- a/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/cancel.svg
+++ b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/cancel.svg
@@ -6,12 +6,10 @@
diff --git a/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_color_picker.png b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_color_picker.png
new file mode 100644
index 00000000000..8582e313a93
Binary files /dev/null and b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_color_picker.png differ
diff --git a/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_color_picker.svg b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_color_picker.svg
new file mode 100644
index 00000000000..4502db8fe28
--- /dev/null
+++ b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_color_picker.svg
@@ -0,0 +1,16 @@
+
+
+
+]>
+
diff --git a/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_highlight_picker.png b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_highlight_picker.png
new file mode 100644
index 00000000000..b56921d1453
Binary files /dev/null and b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_highlight_picker.png differ
diff --git a/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_highlight_picker.svg b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_highlight_picker.svg
new file mode 100644
index 00000000000..e31399880ff
--- /dev/null
+++ b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_highlight_picker.svg
@@ -0,0 +1,14 @@
+
+
+
+]>
+
diff --git a/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/ui.css b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/ui.css
index 92b417f49ee..96c6b8b71b2 100644
--- a/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/ui.css
+++ b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/ui.css
@@ -257,9 +257,10 @@
.moodleSkin span.mce_visualblocks {background:url(img/visual_blocks.png) center center no-repeat;}
.moodleSkin span.mce_backward {background:url(img/backward.png) center center no-repeat;}
.moodleSkin span.mce_forward {background:url(img/forward.png) center center no-repeat;}
+.moodleSkin span.mce_attribs {background:url(img/attributes.png) center center no-repeat;}
-.moodleSkin span.mce_forecolorpicker {background:url(img/text_color.png) center center no-repeat;}
-.moodleSkin span.mce_backcolorpicker {background:url(img/text_highlight.png) center center no-repeat;}
+.moodleSkin span.mce_forecolorpicker {background:url(img/text_color_picker.png) center center no-repeat;}
+.moodleSkin span.mce_backcolorpicker {background:url(img/text_highlight_picker.png) center center no-repeat;}
.moodleSkin .mce_forecolor span.mceAction {background:url(img/text_color.png) center center no-repeat;}
.moodleSkin .mce_backcolor span.mceAction {background:url(img/text_highlight.png) center center no-repeat;}