diff --git a/modules/editor/lang/en.php b/modules/editor/lang/en.php
index 922619eaa..12d32fbdd 100644
--- a/modules/editor/lang/en.php
+++ b/modules/editor/lang/en.php
@@ -69,11 +69,14 @@ $lang->edit['fontlist']['arial'] = 'Arial, Helvetica, sans-serif';
 $lang->edit['fontlist']['tahoma'] = 'Tahoma, Geneva, sans-serif';
 $lang->edit['fontlist']['verdana'] = 'Verdana, Geneva, sans-serif';
 $lang->edit['fontlist']['sans-serif'] = 'Sans-serif';
-$lang->edit['fontlist']['georgia'] = 'Georgia, \'Times New Roman\', Times, serif';
-$lang->edit['fontlist']['palatinoLinotype'] = '\'Palatino Linotype\', \'Book Antiqua\', Palatino, serif';
-$lang->edit['fontlist']['timesNewRoman'] = '\'Times New Roman\', Times, serif';
+$lang->edit['fontlist']['georgia'] = 'Georgia, Times New Roman, Times, serif';
+$lang->edit['fontlist']['palatinoLinotype'] = 'Palatino Linotype, Book Antiqua, Palatino, serif';
+$lang->edit['fontlist']['timesNewRoman'] = 'Times New Roman, Times, serif';
 $lang->edit['fontlist']['serif'] = 'Serif';
-$lang->edit['fontlist']['courierNew'] = '\'Courier New\', Courier, monospace';
+$lang->edit['fontlist']['consolas'] = 'Consolas, monospace';
+$lang->edit['fontlist']['courierNew'] = 'Courier New, Courier, monospace';
+$lang->edit['fontlist']['lucidaConsole'] = 'Lucida Console, Monaco, monospace';
+$lang->edit['fontlist']['monospace'] = 'Monospace';
 $lang->edit['header'] = 'Style';
 $lang->edit['header_list']['h1'] = 'Header 1';
 $lang->edit['header_list']['h2'] = 'Header 2';
diff --git a/modules/editor/lang/ja.php b/modules/editor/lang/ja.php
index f4ae0102e..0f9b0f163 100644
--- a/modules/editor/lang/ja.php
+++ b/modules/editor/lang/ja.php
@@ -56,9 +56,9 @@ $lang->about_enable_autosave = '書き込みの際に自動保存機能をオン
 $lang->edit['fontname'] = 'フォント';
 $lang->edit['fontsize'] = 'フォントサイズ';
 $lang->edit['use_paragraph'] = '段落機能';
-$lang->edit['fontlist']['meiryo'] = '\'メイリオ\', \'Meiryo\', Arial, Helvetica, sans-serif';
-$lang->edit['fontlist']['hiragino'] = '\'ヒラギノ角ゴ Pro\', \'Hiragino Kaku Gothic Pro\', Arial, Helvetica, sans-serif';
-$lang->edit['fontlist']['ms_pgothic'] = '\'ＭＳ Ｐゴシック\', \'MS PGothic\', Arial, Helvetica, sans-serif';
+$lang->edit['fontlist']['meiryo'] = 'メイリオ, Meiryo, Arial, Helvetica, sans-serif';
+$lang->edit['fontlist']['hiragino'] = 'ヒラギノ角ゴ Pro, Hiragino Kaku Gothic Pro, Arial, Helvetica, sans-serif';
+$lang->edit['fontlist']['ms_pgothic'] = 'ＭＳ Ｐゴシック, MS PGothic, Arial, Helvetica, sans-serif';
 $lang->edit['header'] = '書式';
 $lang->edit['header_list']['h1'] = '見出し１';
 $lang->edit['header_list']['h2'] = '見出し２';
diff --git a/modules/editor/lang/ko.php b/modules/editor/lang/ko.php
index a2ebfc471..4d3aeb1a4 100644
--- a/modules/editor/lang/ko.php
+++ b/modules/editor/lang/ko.php
@@ -69,20 +69,21 @@ $lang->edit['use_paragraph'] = '문단기능';
 $lang->edit['fontlist']['arial'] = 'Arial, Helvetica, sans-serif';
 $lang->edit['fontlist']['tahoma'] = 'Tahoma, Geneva, sans-serif';
 $lang->edit['fontlist']['verdana'] = 'Verdana, Geneva, sans-serif';
-$lang->edit['fontlist']['sans-serif'] = 'Sans-serif';
-$lang->edit['fontlist']['georgia'] = 'Georgia, \'Times New Roman\', Times, serif';
-$lang->edit['fontlist']['palatinoLinotype'] = '\'Palatino Linotype\', \'Book Antiqua\', Palatino, serif';
-$lang->edit['fontlist']['timesNewRoman'] = '\'Times New Roman\', Times, serif';
-$lang->edit['fontlist']['serif'] = 'Serif';
-$lang->edit['fontlist']['courierNew'] = '\'Courier New\', Courier, monospace';
-$lang->edit['fontlist']['lucidaConsole'] = '\'Lucida Console\', Monaco, monospace';
-$lang->edit['fontlist']['monospace'] = 'Monospace';
-$lang->edit['fontlist']['batang'] = 'Batang, serif';
-$lang->edit['fontlist']['dotum'] = 'Dotum, sans-serif';
-$lang->edit['fontlist']['gulim'] = 'Gulim, sans-serif';
-$lang->edit['fontlist']['gungsuh'] = 'Gungsuh, serif';
-$lang->edit['fontlist']['malgunGothic'] = '\'Malgun Gothic\', sans-serif';
-$lang->edit['fontlist']['nanumGothic'] = 'NanumGothic, sans-serif';
+$lang->edit['fontlist']['sans-serif'] = 'sans-serif';
+$lang->edit['fontlist']['georgia'] = 'Georgia, Times New Roman, Times, serif';
+$lang->edit['fontlist']['palatinoLinotype'] = 'Palatino Linotype, Book Antiqua, Palatino, serif';
+$lang->edit['fontlist']['timesNewRoman'] = 'Times New Roman, Times, serif';
+$lang->edit['fontlist']['serif'] = 'serif';
+$lang->edit['fontlist']['consolas'] = 'Consolas, monospace';
+$lang->edit['fontlist']['courierNew'] = 'Courier New, Courier, monospace';
+$lang->edit['fontlist']['lucidaConsole'] = 'Lucida Console, Monaco, monospace';
+$lang->edit['fontlist']['monospace'] = 'monospace';
+$lang->edit['fontlist']['gulim'] = '굴림, Gulim, sans-serif';
+$lang->edit['fontlist']['gungsuh'] = '궁서, Gungsuh, serif';
+$lang->edit['fontlist']['dotum'] = '돋움, Dotum, sans-serif';
+$lang->edit['fontlist']['batang'] = '바탕, Batang, serif';
+$lang->edit['fontlist']['malgunGothic'] = '맑은 고딕, Malgun Gothic, Meiryo, Microsoft YaHei, Segoe UI, sans-serif';
+$lang->edit['fontlist']['nanumGothic'] = '나눔고딕, NanumGothic, Malgun Gothic, sans-serif';
 $lang->edit['header'] = '형식';
 $lang->edit['header_list']['h1'] = '제목 1';
 $lang->edit['header_list']['h2'] = '제목 2';
diff --git a/modules/editor/skins/xpresseditor/css/default.css b/modules/editor/skins/xpresseditor/css/default.css
index a5d75a0eb..d118ed5dd 100644
--- a/modules/editor/skins/xpresseditor/css/default.css
+++ b/modules/editor/skins/xpresseditor/css/default.css
@@ -80,7 +80,7 @@
 .xpress-editor .tool li.html span button,
 .xpress-editor .tool li.preview span button{left:2px;height:21px;background-position:right top;font:11px/21px Tahoma, Sans-serif;padding:0 4px;*overflow:visible;*line-height:20px}
 .xpress-editor .tool ul.type li{float:none;display:inline;*top:1px}
-.xpress-editor .tool ul.type li select{height:21px;width:64px;white-space:nowrap;min-width:64px;padding:0}
+.xpress-editor .tool ul.type li select{height:21px;width:64px;white-space:nowrap;min-width:64px;padding:0;font-size:12px}
 .xpress-editor .tool ul.type li option{white-space:nowrap}
 .xpress-editor.black .tool ul.type li select{color:#fff;background-color:#000}
 /* Content > Tool > Button Default */
@@ -345,4 +345,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 e1f749bf4..3baf416bc 100644
--- a/modules/editor/skins/xpresseditor/editor.html
+++ b/modules/editor/skins/xpresseditor/editor.html
@@ -60,7 +60,8 @@
                     <select class="xpress_xeditor_ui_fontName_select" disabled="disabled">
                         <option value="">{$lang->edit->fontname}</option>
                         <!--@foreach($lang->edit->fontlist as $key=>$obj)-->
-                        <option value="{htmlspecialchars($obj, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}" style="font-family:{$obj}">{$obj}</option>
+                        {@ $fontname_simplified = trim(array_first(explode(',', $obj)), "'\" ")}
+                        <option value="{htmlspecialchars($obj, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}" style="font-family:{$obj}">{$fontname_simplified}</option>
                         <!--@end-->
                     </select>
                 </li>
diff --git a/modules/editor/tpl/admin_index.html b/modules/editor/tpl/admin_index.html
index 1fc73cd62..4054dea72 100644
--- a/modules/editor/tpl/admin_index.html
+++ b/modules/editor/tpl/admin_index.html
@@ -103,8 +103,9 @@
 				<label style="font-family:''" class="fontSelector">
 					<input type="radio" name="content_font" id="font_noFont" value="" checked="checked"|cond="!$editor_config->content_font && $editor_config->font_defined != 'Y'" /> none (inherit)
 				</label>
-				<label style="font-family:{$detail}" class="fontSelector" loop="$lang->edit->fontlist=>$name,$detail">
-					<input type="radio" name="content_font" id="font_{$name}" value="{$detail}" checked="checked"|cond="$editor_config->content_font == $detail && $editor_config->font_defined != 'Y'" /> {$detail}
+				<label style="display:inline-block;margin-right:16px;font-family:{$detail}" class="fontSelector" loop="$lang->edit->fontlist=>$name,$detail">
+					{@ $fontname_simplified = trim(array_first(explode(',', $detail)), "'\" ")}
+					<input type="radio" name="content_font" id="font_{$name}" value="{$detail}" checked="checked"|cond="$editor_config->content_font == $detail && $editor_config->font_defined != 'Y'" /> {$fontname_simplified}
 				</label>
 				<label>
 					<input type="radio" class="fontSelector" name="font_defined" id="font_defined" value="Y" checked="checked"|cond="$editor_config->font_defined== 'Y'" /> {$lang->by_you} :