diff --git a/modules/editor/skins/default/css/black.css b/modules/editor/skins/default/css/black.css
index b85b6db92..944470156 100644
--- a/modules/editor/skins/default/css/black.css
+++ b/modules/editor/skins/default/css/black.css
@@ -5,7 +5,7 @@
 
 /* Editor Type Selector */
 .editorTypeSelector a,
-.editorTypeSelector a span{ background-image:url(../../../common/tpl/images/buttonBlack.gif); color:#fff;}
+.editorTypeSelector a span{ background-image:url(../images/buttonBlack.gif); color:#fff;}
 
 /* Editor Container */
 .xeEditor{ border-color:#666;}
diff --git a/modules/editor/skins/default/css/white.css b/modules/editor/skins/default/css/white.css
index 162e7f069..fe66dd795 100644
--- a/modules/editor/skins/default/css/white.css
+++ b/modules/editor/skins/default/css/white.css
@@ -5,7 +5,7 @@
 
 /* Editor Type Selector */
 .editorTypeSelector a,
-.editorTypeSelector a span{ background-image:url(../../../common/tpl/images/buttonWhite.gif); color:#000;}
+.editorTypeSelector a span{ background-image:url(../images/buttonWhite.gif); color:#000;}
 
 /* Editor Container */
 .xeEditor{ border-color:#ddd;}
diff --git a/modules/editor/skins/default/editor.html b/modules/editor/skins/default/editor.html
index 33dbf4b33..52705b081 100644
--- a/modules/editor/skins/default/editor.html
+++ b/modules/editor/skins/default/editor.html
@@ -141,7 +141,7 @@
                     <button type="button" class="exButton" title="{$lang->edit->extension}" onclick="showEditorExtension(event,{$editor_sequence})"><span>{$lang->edit->extension}</span></button>
                     <ul id="editor_component_{$editor_sequence}">
                         <!--@foreach($component_list as $component_name => $component)-->
-                            <!--@if(!in_array($component_name,array('colorpicker_bg','colorpicker_text','emoticon','image_gallery','image_link','multimedia_link','quotation','table_maker','url_link')))-->
+                            <!--@if(!in_array($component_name,array('colorpicker_bg','colorpicker_text','emoticon','image_link','multimedia_link','quotation','table_maker','url_link')))-->
                                 <li><button type="button" id="component_{$editor_sequence}_{$component_name}"><span><img src="../../components/{$component_name}/component_icon.gif" alt="" /> {$component->title}</span></button></li>
                             <!--@end-->
                         <!--@end-->
diff --git a/modules/editor/skins/default/images/buttonBlack.gif b/modules/editor/skins/default/images/buttonBlack.gif
new file mode 100644
index 000000000..8873a99e5
Binary files /dev/null and b/modules/editor/skins/default/images/buttonBlack.gif differ
diff --git a/modules/editor/skins/default/images/buttonWhite.gif b/modules/editor/skins/default/images/buttonWhite.gif
new file mode 100644
index 000000000..4d5e40cef
Binary files /dev/null and b/modules/editor/skins/default/images/buttonWhite.gif differ