diff --git a/modules/editor/components/background_colorpicker/background_colorpicker.html b/modules/editor/components/background_colorpicker/background_colorpicker.html
new file mode 100644
index 000000000..392ec5928
--- /dev/null
+++ b/modules/editor/components/background_colorpicker/background_colorpicker.html
@@ -0,0 +1,20 @@
+<script type='text/javascript'>
+  var color_list = new Array('000000','993300','333300','003300','003366','000080','333399','333333','800000','FF6600','808000','008000','008080','0000FF','666699','808080','FF0000','FF9900','99CC00','339966','33CCCC','3366FF','800080','969696','FF00FF','FFCC00','FFFF00','00FF00','00FFFF','00CCFF','993366','c0c0c0','FF99CC','FFCC99','FFFF99','CCFFCC','CCFFFF','99CCFF','CC99FF','FFFFFF');
+
+  function setColor(color) {
+    var mode = "{$mode}";
+    opener.editorFocus(opener.editorPrevSrl);
+    if(mode == "ForeColor") {
+      opener.editorSetForeColor("#"+color);
+    } else {
+      opener.editorSetBackColor("#"+color);
+    }
+    opener.editorFocus(opener.editorPrevSrl);
+    self.close();
+  }
+
+  for(var i=0;i<color_list.length;i++) {
+    html += "<div style=\"float:left;background-color:#"+color_list[i]+"\"><img src=\"blank.gif\" class=\"color_icon\" onmouseover=\"this.className='color_icon_over'\" onmouseout=\"this.className='color_icon'\" onclick=\"setColor('"+color_list[i]+"')\" \/><\/div>";
+  }
+  document.write(html);
+</script>
diff --git a/modules/editor/tpl/images/font_bg_color.gif b/modules/editor/components/background_colorpicker/icon.gif
similarity index 100%
rename from modules/editor/tpl/images/font_bg_color.gif
rename to modules/editor/components/background_colorpicker/icon.gif
diff --git a/modules/editor/tpl/images/multimedia_icon.gif b/modules/editor/components/multimedialink/icon.gif
similarity index 100%
rename from modules/editor/tpl/images/multimedia_icon.gif
rename to modules/editor/components/multimedialink/icon.gif
diff --git a/modules/editor/tpl/images/font_color.gif b/modules/editor/components/text_colorpicker/icon.gif
similarity index 100%
rename from modules/editor/tpl/images/font_color.gif
rename to modules/editor/components/text_colorpicker/icon.gif