diff --git a/modules/editor/components/cc_license/tpl/popup.html b/modules/editor/components/cc_license/tpl/popup.html
index 62cfba4aa..1850232bf 100755
--- a/modules/editor/components/cc_license/tpl/popup.html
+++ b/modules/editor/components/cc_license/tpl/popup.html
@@ -11,21 +11,21 @@
         <col width="120" />
         <col />
         <tr>
-            <th scope="row">{$lang->ccl_use_mark}</th>
+            <th scope="row"><div>{$lang->ccl_use_mark}</div></th>
             <td>
                 <select name="ccl_use_mark"><option value="Y" selected="selected">{$lang->use}</option><option value="N">{$lang->notuse}</option></select>
                 <p>{$lang->about_ccl_use_mark}</p>
             </td>
         </tr>
         <tr>
-            <th scope="row">{$lang->ccl_allow_commercial}</th>
+            <th scope="row"><div>{$lang->ccl_allow_commercial}</div></th>
             <td>
                 <select name="ccl_allow_commercial"><option value="Y">{$lang->ccl_allow}</option><option value="N" selected="selected">{$lang->ccl_disallow}</option></select>
                 <p>{$lang->about_ccl_allow_commercial}</p>
             </td>
         </tr>
         <tr>
-            <th scope="row">{$lang->ccl_allow_modification}</th>
+            <th scope="row"><div>{$lang->ccl_allow_modification}</div></th>
             <td>
                 <select name="ccl_allow_modification"><option value="Y">{$lang->ccl_allow}</option><option value="N">{$lang->ccl_disallow}</option><option value="SA" selected="selected">{$lang->ccl_sa}</option></select>
                 <p>{$lang->about_ccl_allow_modification}</p>
diff --git a/modules/editor/components/colorpicker_bg/tpl/popup.html b/modules/editor/components/colorpicker_bg/tpl/popup.html
index f3fc0cf78..d8f267862 100644
--- a/modules/editor/components/colorpicker_bg/tpl/popup.html
+++ b/modules/editor/components/colorpicker_bg/tpl/popup.html
@@ -9,8 +9,7 @@
     <form action="./" method="get" onsubmit="return applyColor()">
         <ul>
             <li><img src="blank.gif" alt="blank" class="preview_color" id="preview_color" /></li>
-            <li>#</li>
-            <li><input type="text" id="color_input" size="6" maxlength="6" class="popup_input" value="FFFFFF"  onkeyup="manual_select_color(this)"/></li>
+            <li>#<input type="text" id="color_input" size="6" maxlength="6" class="popup_input" value="FFFFFF"  onkeyup="manual_select_color(this)"/></li>
             <li><input type="submit" value="{$lang->cmd_select}" class="popup_submit"/></li>
         </ul>
     </form>
diff --git a/modules/editor/components/colorpicker_text/tpl/popup.html b/modules/editor/components/colorpicker_text/tpl/popup.html
index 90e05ea38..1a8dbe3d5 100644
--- a/modules/editor/components/colorpicker_text/tpl/popup.html
+++ b/modules/editor/components/colorpicker_text/tpl/popup.html
@@ -9,8 +9,7 @@
     <form action="./" method="get" onsubmit="return applyColor()">
         <ul>
             <li><img src="blank.gif" alt="blank" class="preview_color" id="preview_color" /></li>
-            <li>#</li>
-            <li><input type="text" id="color_input" size="6" maxlength="6" class="popup_input" value="000000"  onkeyup="manual_select_color(this)"/></li>
+            <li>#<input type="text" id="color_input" size="6" maxlength="6" class="popup_input" value="000000"  onkeyup="manual_select_color(this)"/></li>
             <li><input type="submit" value="{$lang->cmd_select}" class="popup_submit"/></li>
         </ul>
     </form>
diff --git a/modules/editor/components/image_gallery/tpl/popup.html b/modules/editor/components/image_gallery/tpl/popup.html
index aa95d8e0a..c23c121d3 100644
--- a/modules/editor/components/image_gallery/tpl/popup.html
+++ b/modules/editor/components/image_gallery/tpl/popup.html
@@ -15,11 +15,11 @@
         <col width="120" />
         <col />
         <tr>
-            <th scope="row">{$lang->width}</th>
+            <th scope="row"><div>{$lang->width}</div></th>
             <td><input type="text" class="inputTypeText" size="3" id="width" value="400" />px</td>
         </tr>
         <tr>
-            <th scope="row">{$lang->gallery_style}</th>
+            <th scope="row"><div>{$lang->gallery_style}</div></th>
             <td>
                 <select id="gallery_style">
                     <option value="slide">{$lang->gallery_slide_style}</option>
@@ -28,7 +28,7 @@
             </td>
         </tr>
         <tr>
-            <th scope="row">{$lang->gallery_slide_align}</th>
+            <th scope="row"><div>{$lang->gallery_slide_align}</div></th>
             <td>
                 <select id="gallery_align">
                     <option value="center">{$lang->gallery_slide_center}</option>
@@ -38,11 +38,11 @@
             </td>
         </tr>
         <tr>
-            <th scope="row">{$lang->gallery_border_thickness}</th>
+            <th scope="row"><div>{$lang->gallery_border_thickness}</div></th>
             <td><input type="text" class="inputTypeText" size="1" id="border_thickness" value="0" />px</td>
         </tr>
         <tr>
-            <th scope="row">{$lang->gallery_border_color}</th>
+            <th scope="row"><div>{$lang->gallery_border_color}</div></th>
             <td>
                 <div class="editor_color_box">
                     <script type="text/javascript">
@@ -56,7 +56,7 @@
             </td>
         </tr>
         <tr>
-            <th scope="row">{$lang->gallery_bg_color}</th>
+            <th scope="row"><div>{$lang->gallery_bg_color}</div></th>
             <td>
                 <div class="editor_color_box">
                     <script type="text/javascript">
@@ -70,7 +70,7 @@
             </td>
         </tr>
         <tr>
-            <th scope="row">{$lang->image_list}</th>
+            <th scope="row"><div>{$lang->image_list}</div></th>
             <td>
                 <select id="image_list" size="6" multiple="true" class="image_list">
                 </select>
diff --git a/modules/editor/components/image_link/tpl/popup.html b/modules/editor/components/image_link/tpl/popup.html
index dd0022099..6890d935c 100644
--- a/modules/editor/components/image_link/tpl/popup.html
+++ b/modules/editor/components/image_link/tpl/popup.html
@@ -14,11 +14,11 @@
         <col />
 
         <tr>
-            <th scope="row">{$lang->image_url}</th>
+            <th scope="row"><div>{$lang->image_url}</div></th>
             <td><input type="text" id="image_url" value="{url_decode($manual_url)}" onblur="getImageScale();" class="inputTypeText w400" /></td>
         </tr>
         <tr>
-            <th scope="row">{$lang->image_scale}</th>
+            <th scope="row"><div>{$lang->image_scale}</div></th>
             <td>
                 <ul>
                     <li><input type="text" id="width" value="0" size="4" class="inputTypeText" onblur="setScale('width');return false;" />px </li>
@@ -28,19 +28,19 @@
             </td>
         </tr>
         <tr>
-            <th scope="row">URL</th>
+            <th scope="row"><div>URL</div></th>
             <td><input type="text" id="link_url" value="" class="inputTypeText w400"/></td>
         </tr>
         <tr>
-            <th scope="row">{$lang->urllink_open_window}</th>
+            <th scope="row"><div>{$lang->urllink_open_window}</div></th>
             <td><input type="checkbox" id="open_window" value="Y" /> {$lang->about_url_link_open_window}</td>
         </tr>
         <tr>
-            <th scope="row">{$lang->image_alt}</th>
+            <th scope="row"><div>{$lang->image_alt}</div></th>
             <td><input type="text" id="image_alt" value="" class="inputTypeText w400"/></td>
         </tr>
         <tr>
-            <th scope="row">{$lang->image_align}</th>
+            <th scope="row"><div>{$lang->image_align}</div></th>
             <td>
                 <div class="image_align">
                     <input type="radio" name="align" value="" id="align_normal" checked="checked"/>
@@ -76,7 +76,7 @@
             </td>
         </tr>
         <tr>
-            <th scope="row">{$lang->image_border}</th>
+            <th scope="row"><div>{$lang->image_border}</div></th>
             <td><input type="text" id="image_border" value="0" size="2" class="inputTypeText" />px</td>
         </tr>
         </table>
diff --git a/modules/editor/components/multimedia_link/tpl/popup.html b/modules/editor/components/multimedia_link/tpl/popup.html
index fc5fdcfcc..8a8f2f803 100644
--- a/modules/editor/components/multimedia_link/tpl/popup.html
+++ b/modules/editor/components/multimedia_link/tpl/popup.html
@@ -12,23 +12,23 @@
         <col width="150" />
         <col />
         <tr>
-            <th scope="row">{$lang->multimedia_url}</th>
+            <th scope="row"><div>{$lang->multimedia_url}</div></th>
             <td><input type="text" class="inputTypeText w400" id="multimedia_url" value="{$manual_url}" /></td>
         </tr>
         <tr>
-            <th scope="row">{$lang->multimedia_caption}</th>
+            <th scope="row"><div>{$lang->multimedia_caption}</div></th>
             <td><input type="text" class="inputTypeText w400" id="multimedia_caption" value="" /></td>
         </tr>
         <tr>
-            <th scope="row">{$lang->multimedia_width}</th>
+            <th scope="row"><div>{$lang->multimedia_width}</div></th>
             <td><input type="text" class="inputTypeText" size="3" id="multimedia_width" value="400" />px</td>
         </tr>
         <tr>
-            <th scope="row">{$lang->multimedia_height}</th>
+            <th scope="row"><div>{$lang->multimedia_height}</div></th>
             <td><input type="text" class="inputTypeText" size="3" id="multimedia_height" value="400" />px</td>
         </tr>
         <tr>
-            <th scope="row">{$lang->multimedia_auto_start}</th>
+            <th scope="row"><div>{$lang->multimedia_auto_start}</div></th>
             <td><input type="checkbox" id="multimedia_auto_start" value="Y" /></td>
         </tr>
         </table>
diff --git a/modules/editor/components/naver_map/tpl/popup.html b/modules/editor/components/naver_map/tpl/popup.html
index 63b3bd131..bd7458d5f 100644
--- a/modules/editor/components/naver_map/tpl/popup.html
+++ b/modules/editor/components/naver_map/tpl/popup.html
@@ -35,11 +35,11 @@
 
             <table cellspacing="0" class="tableType5 gap1">
             <tr>
-                <th scope="row">{$lang->map_width}</th>
+                <th scope="row"><div>{$lang->map_width}</div></th>
                 <td><input type="text" class="inputTypeText" size="3" id="map_width" value="400" />px</td>
             </tr>
             <tr>
-                <th scope="row">{$lang->map_height}</th>
+                <th scope="row"><div>{$lang->map_height}</div></th>
                 <td><input type="text" class="inputTypeText" size="3" id="map_height" value="300" />px</td>
             </table>
         </td>
diff --git a/modules/editor/components/poll_maker/tpl/popup.html b/modules/editor/components/poll_maker/tpl/popup.html
index bad06d72c..6247db4d0 100644
--- a/modules/editor/components/poll_maker/tpl/popup.html
+++ b/modules/editor/components/poll_maker/tpl/popup.html
@@ -43,7 +43,7 @@
         <col width="100" />
         <col />
         <tr>
-            <th scope="row">{$lang->poll_stop_date}</th>
+            <th scope="row"><div>{$lang->poll_stop_date}</div></th>
             <td>
                 <div class="display_date" id="display_date">{date("Y-m-d",time()+60*60*24*30)}</div>
                 <script type="text/javascript">
@@ -52,7 +52,7 @@
             </td>
         </tr>
         <tr>
-            <th scope="row">{$lang->skin}</th>
+            <th scope="row"><div>{$lang->skin}</div></th>
             <td>
                 <select name="skin">
                     <!--@foreach($skin_list as $skin=>$skin_info)-->
@@ -70,17 +70,17 @@
             <col width="100" />
             <col />
             <tr>
-                <th scope="row">{$lang->poll_title}</th>
+                <th scope="row"><div>{$lang->poll_title}</div></th>
                 <td><input type="text" name="title_tidx" class="inputTypeText w400" /></td>
             </tr>
 
             <tr>
-                <th scope="row">{$lang->poll_item} 1</th>
+                <th scope="row"><div>{$lang->poll_item} 1</div></th>
                 <td><input type="text" name="item_tidx_1" class="inputTypeText w400" /></td>
             </tr>
 
             <tr>
-                <th scope="row">{$lang->poll_item} 2</th>
+                <th scope="row"><div>{$lang->poll_item} 2</div></th>
                 <td><input type="text" name="item_tidx_2" class="inputTypeText w400" /></td>
             </tr>
             </table>
diff --git a/modules/editor/components/quotation/tpl/popup.html b/modules/editor/components/quotation/tpl/popup.html
index 19150f52f..cf1bc5d92 100644
--- a/modules/editor/components/quotation/tpl/popup.html
+++ b/modules/editor/components/quotation/tpl/popup.html
@@ -16,7 +16,7 @@
         <col />
         <col />
         <tr>
-            <th scope="row">{$lang->quotation_use_folder}</th>
+            <th scope="row"><div>{$lang->quotation_use_folder}</div></th>
             <td colspan="5">
                 <input type="checkbox" id="quotation_use" value="Y" onclick="toggle_folder(this)" />
 
@@ -25,19 +25,19 @@
                     <col width="150" />
                     <col />
                     <tr>
-                        <th scope="row">{$lang->quotation_opener}</th>
+                        <th scope="row"><div>{$lang->quotation_opener}</div></th>
                         <td><input type="text" class="inputTypeText" id="quotation_opener" value="{$lang->quotation_cmd_opener}" /></td>
                     </tr>
                     <tr>
-                        <th scope="row">{$lang->quotation_closer}</th>
+                        <th scope="row"><div>{$lang->quotation_closer}</div></th>
                         <td><input type="text" class="inputTypeText" id="quotation_closer" value="{$lang->quotation_cmd_closer}" /></td>
                     </tr>
                     <tr>
-                        <th scope="row">{$lang->folder_text_bold}</th>
+                        <th scope="row"><div>{$lang->folder_text_bold}</div></th>
                         <td><input type="checkbox" name="bold" value="Y" id="quotation_bold" /> <label for="quotation_bold">{$lang->about_folder_text_bold}</label></td>
                     </tr>
                     <tr>
-                        <th scope="row">{$lang->folder_text_color}</th>
+                        <th scope="row"><div>{$lang->folder_text_color}</div></th>
                         <td>
                             <div class="editor_link_type" >
                                 <input type="radio" name="color" value="blue" id="quotation_color_blue" />
@@ -62,15 +62,15 @@
             </td>
         </tr>
         <tr>
-            <th scope="row">{$lang->quotation_padding}</th>
+            <th scope="row"><div>{$lang->quotation_padding}</div></th>
             <td><input type="text" class="inputTypeText" size="2" id="quotation_padding" value="5" />px</td>
-            <th scope="row">{$lang->quotation_margin}</th>
+            <th scope="row"><div>{$lang->quotation_margin}</div></th>
             <td><input type="text" class="inputTypeText" size="2" id="quotation_margin" value="5" />px</td>
-            <th scope="row">{$lang->quotation_border_thickness}</th>
+            <th scope="row"><div>{$lang->quotation_border_thickness}</div></th>
             <td><input type="text" class="inputTypeText" size="1" id="border_thickness" value="1" />px</td>
         </tr>
         <tr>
-            <th scope="row">{$lang->quotation_border_style}</th>
+            <th scope="row"><div>{$lang->quotation_border_style}</div></th>
             <td colspan="5">
                 <div class="border_type">
                     <input type="radio" name="border_style" value="" id="border_style_none" />
@@ -110,7 +110,7 @@
             </td>
         </tr>
         <tr>
-            <th scope="row">{$lang->quotation_border_color}</th>
+            <th scope="row"><div>{$lang->quotation_border_color}</div></th>
             <td colspan="5">
                 <div class="editor_color_box">
                     <script type="text/javascript">
@@ -126,7 +126,7 @@
             </td>
         </tr>
         <tr>
-            <th scope="row">{$lang->quotation_bg_color}</th>
+            <th scope="row"><div>{$lang->quotation_bg_color}</div></th>
             <td colspan="5">
                 <div class="editor_color_box">
                     <script type="text/javascript">
diff --git a/modules/editor/components/table_maker/tpl/popup.html b/modules/editor/components/table_maker/tpl/popup.html
index 81838ffa6..720905d62 100644
--- a/modules/editor/components/table_maker/tpl/popup.html
+++ b/modules/editor/components/table_maker/tpl/popup.html
@@ -24,9 +24,9 @@
                 <col width="25%" />
                 <col width="25%" />
                 <tr>
-                    <th scope="row">{$lang->table_cols_count}</th>
+                    <th scope="row"><div>{$lang->table_cols_count}</div></th>
                     <td><input type="text" class="inputTypeText" size="2" id="cols_count" value="2" /></td>
-                    <th scope="row">{$lang->table_rows_count}</th>
+                    <th scope="row"><div>{$lang->table_rows_count}</div></th>
                     <td><input type="text" class="inputTypeText" size="2" id="rows_count" value="1" /></td>
                 </tr>
                 </table>
@@ -36,7 +36,7 @@
             <col width="25%" />
             <col />
             <tr>
-                <th scope="row">{$lang->table_width}</th>
+                <th scope="row"><div>{$lang->table_width}</div></th>
                 <td>
                     <input type="text" class="inputTypeText" size="3" id="width" value="100" />
                     <input type="radio" name="width_unit" id="width_unit_percent" checked="checked" /><label for="width_unit_percent">%</label>
@@ -53,15 +53,15 @@
         <col width="25%" />
         <col width="25%" />
         <tr>
-            <th scope="row">{$lang->table_cellspacing}</th>
+            <th scope="row"><div>{$lang->table_cellspacing}</div></th>
             <td><input type="text" class="inputTypeText" size="2" id="cellspacing" value="0" />px</td>
-            <th scope="row">{$lang->table_cellpadding}</th>
+            <th scope="row"><div>{$lang->table_cellpadding}</div></th>
             <td><input type="text" class="inputTypeText" size="2" id="cellpadding" value="1" />px</td>
         </tr>
         <tr>
-            <th scope="row">{$lang->table_border}</th>
+            <th scope="row"><div>{$lang->table_border}</div></th>
             <td><input type="text" class="inputTypeText" size="2" id="border" value="1" />px</td>
-            <th scope="row">{$lang->table_inner_border}</th>
+            <th scope="row"><div>{$lang->table_inner_border}</div></th>
             <td><input type="text" class="inputTypeText" size="2" id="inner_border" value="0" />px</td>
         </tr>
         </table>
@@ -73,13 +73,13 @@
             <col width="25%" />
             <col width="25%" />
             <tr>
-                <th scope="row">{$lang->cell_width}</th>
+                <th scope="row"><div>{$lang->cell_width}</div></th>
                 <td>
                     <input type="text" class="inputTypeText" size="3" id="cell_width" value="0" />
                     <input type="radio" name="cell_width_unit" id="cell_width_unit_percent" checked="checked" /><label for="cell_width_unit_percent">%</label>
                     <input type="radio" name="cell_width_unit" id="cell_width_unit_pixel" /><label for="cell_width_unit_pixel">px</label>
                 </td>
-                <th scope="row">{$lang->cell_height}</th>
+                <th scope="row"><div>{$lang->cell_height}</div></th>
                 <td><input type="text" class="inputTypeText" size="3" id="cell_height" value="0" />px</td>
             </tr>
             </table>
@@ -90,7 +90,7 @@
             <col width="25%" />
             <col />
             <tr>
-                <th scope="row">{$lang->table_border_color}</th>
+                <th scope="row"><div>{$lang->table_border_color}</div></th>
                 <td>
                     <div class="editor_color_box">
                         <script type="text/javascript">
@@ -112,7 +112,7 @@
             <col width="25%" />
             <col />
             <tr>
-                <th scope="row">{$lang->table_bg_color}</th>
+                <th scope="row"><div>{$lang->table_bg_color}</div></th>
                 <td>
                     <div class="editor_color_box">
                         <script type="text/javascript">
diff --git a/modules/editor/components/url_link/tpl/popup.html b/modules/editor/components/url_link/tpl/popup.html
index 27c14aa53..777dacfbb 100644
--- a/modules/editor/components/url_link/tpl/popup.html
+++ b/modules/editor/components/url_link/tpl/popup.html
@@ -14,23 +14,23 @@
         <col />
 
         <tr>
-            <th scope="row">{$lang->urllink_title}</th>
+            <th scope="row"><div>{$lang->urllink_title}</div></th>
             <td><input type="text" name="text" class="inputTypeText w400" /></td>
         </tr>
         <tr>
-            <th scope="row">{$lang->urllink_url}</th>
+            <th scope="row"><div>{$lang->urllink_url}</div></th>
             <td><input type="text" name="url" class="inputTypeText w400" value="{$manual_url}"/></td>
         </tr>
         <tr>
-            <th scope="row">{$lang->urllink_open_window}</th>
+            <th scope="row"><div>{$lang->urllink_open_window}</div></th>
             <td><input type="checkbox" name="open_window" value="Y" id="editor_open_window" /> <label for="editor_open_window">{$lang->about_url_link_open_window}</label></td>
         </tr>
         <tr>
-            <th scope="row">{$lang->urllink_bold}</th>
+            <th scope="row"><div>{$lang->urllink_bold}</div></th>
             <td><input type="checkbox" name="bold" value="Y" id="editor_bold" /> <label for="editor_bold">{$lang->about_url_link_bold}</label></td>
         </tr>
         <tr>
-            <th scope="row">{$lang->urllink_color}</th>
+            <th scope="row"><div>{$lang->urllink_color}</div></th>
             <td>
                 <div class="link_color">
                     <input type="radio" name="color" value="none" id="color_none" />