diff --git a/modules/editor/skins/xpresseditor/css/default.css b/modules/editor/skins/xpresseditor/css/default.css
index 65123bb22..8bca6b1d9 100644
--- a/modules/editor/skins/xpresseditor/css/default.css
+++ b/modules/editor/skins/xpresseditor/css/default.css
@@ -18,7 +18,7 @@
 .xpress-editor li{list-style:none;}
 
 /* Layout Selector */
-.xpress-editor{ position:relative; background:#fff;}
+.xpress-editor{ position:relative; background:transparent;}
 .xpress-editor #smart_content{ position:relative; clear:both; margin:0 0 10px 0; border:1px solid #c2c2c2; *zoom:1;}
 .xpress-editor #smart_footer{ position:relative; text-align:center; padding:10px 0;}
 
@@ -63,6 +63,7 @@
 .xpress-editor .tool ul.extra3 li{ margin-right:4px;}
 .xpress-editor .tool li{ position:relative; float:left;}
 .xpress-editor .tool li button{ width:21px; height:21px; background:url(../img/btn_set.gif) no-repeat 0 0; vertical-align:top;}
+.xpress-editor.black .tool li button{ width:21px; height:21px; background:url(../img/btn_set.black.gif) no-repeat 0 0; vertical-align:top;}
 .xpress-editor .tool li button span{ position:absolute; top:0; left:0; width:0; height:0; overflow:hidden; visibility:hidden;}
 
 .xpress-editor .tool li.extensions span.exButton,
@@ -70,7 +71,7 @@
 .xpress-editor .tool li.extensions span.exButton{ margin-right:18px;}
 .xpress-editor .tool li.extensions span.exButton button{ left:18px; height:21px; background-position:right top; padding:0 4px 0 0; font:11px/21px Tahoma, Sans-serif; text-align:left;}
 .xpress-editor.black .tool li.extensions span.exButton,
-.xpress-editor.black .tool li.extensions span.exButton button{ background-image:url(../img/btn_extension.black.gif); }
+.xpress-editor.black .tool li.extensions span.exButton button{ color:#fff; background-image:url(../img/btn_extension.black.gif); }
 
 .xpress-editor .tool li.html span,
 .xpress-editor .tool li.html span button,
@@ -79,7 +80,7 @@
 .xpress-editor.black .tool li.html span,
 .xpress-editor.black .tool li.html span button,
 .xpress-editor.black .tool li.preview span,
-.xpress-editor.black .tool li.preview span button{ background-image:url(../img/btn_set_blank.black.gif); }
+.xpress-editor.black .tool li.preview span button{ color:#fff;background-image:url(../img/btn_set_blank.black.gif); }
 
 .xpress-editor .tool li.html span,
 .xpress-editor .tool li.preview span{ margin-right:2px; background-position:left top;}
@@ -403,5 +404,4 @@
 /* Auto Save */
 .xpress-editor .autosave_message { display:none; background: #f6ffdb; padding:6px 10px; margin:0; line-height:1;}
 .xpress-editor.black .autosave_message { display:none; background:#222; padding:6px 10px; margin:0; line-height:1; color:#fff; }
-
-.xpress-editor .input_syntax.black { background:transparent; color:#fff; }
\ No newline at end of file
+.xpress-editor .input_syntax.black { background:transparent; color:#fff; }
diff --git a/modules/editor/skins/xpresseditor/editor.html b/modules/editor/skins/xpresseditor/editor.html
index 3893198ca..e427ffd86 100644
--- a/modules/editor/skins/xpresseditor/editor.html
+++ b/modules/editor/skins/xpresseditor/editor.html
@@ -32,9 +32,8 @@
 	<input type="hidden" name="_saved_doc_content" value="{htmlspecialchars($saved_doc->content)}" />
 	<input type="hidden" name="_saved_doc_message" value="{$lang->msg_load_saved_doc}" />
 	<!--@end-->
-	
 	<!-- 에디터 -->
-	<div class="xpress-editor">
+	<div class="xpress-editor {$colorset}">
 	    <div id="smart_content"> <a href="#xe_iframe" class="skip">&raquo; {$lang->edit->jumptoedit}</a>
 	
 	    <!-- 편집 컴포넌트 -->
@@ -444,7 +443,7 @@
 	                <div class="layer extension2 xpress_xeditor_extension_layer" id="editorExtension_{$editor_sequence}">
 	                    <ul id="editor_component_{$editor_sequence}" class="editorComponent">
 	                        <!--@foreach($component_list as $component_name => $component)-->
-	                            <li><a href="#" onclick="return false;" id="component_{$editor_sequence}_{$component_name}">{$component->title}</a></li>
+	                            <li><!--@if($component->component_icon)--><img src="../../components/{$component_name}/component_icon.gif" alt="" width="13" height="12"/> <!--@end--><a href="#" onclick="return false;" id="component_{$editor_sequence}_{$component_name}">{$component->title}</a></li>
 	                        <!--@end-->
 	                    </ul>
 	                </div>
@@ -515,7 +514,7 @@
 	<script type="text/javascript">//<![CDATA[
 	    var editor_path = "{$editor_path}";
 	    var auto_saved_msg = "{$lang->msg_auto_saved}";
-	    var oEditor = editorStart_xe("{$editor_sequence}", "{$editor_primary_key_name}", "{$editor_content_key_name}", "{$editor_height}");
+	    var oEditor = editorStart_xe("{$editor_sequence}", "{$editor_primary_key_name}", "{$editor_content_key_name}", "{$editor_height}", "{$colorset}");
 	//]]></script>
 
-<!--@end-->
\ No newline at end of file
+<!--@end-->
diff --git a/modules/editor/skins/xpresseditor/img/btn_set.black.gif b/modules/editor/skins/xpresseditor/img/btn_set.black.gif
index 8b2eb91c9..0940eca96 100755
Binary files a/modules/editor/skins/xpresseditor/img/btn_set.black.gif and b/modules/editor/skins/xpresseditor/img/btn_set.black.gif differ
diff --git a/modules/editor/skins/xpresseditor/js/xe_interface.js b/modules/editor/skins/xpresseditor/js/xe_interface.js
index 37ac20d84..d1101e957 100644
--- a/modules/editor/skins/xpresseditor/js/xe_interface.js
+++ b/modules/editor/skins/xpresseditor/js/xe_interface.js
@@ -227,4 +227,4 @@ xe.XE_Preview = jQuery.Class({
     $ON_EVENT_PREVIEW : function() {
         // TODO : 버튼이 눌렸을 때의 동작 정의
     }
-});
\ No newline at end of file
+});