diff --git a/modules/editor/skins/default/editor.html b/modules/editor/skins/default/editor.html
index 4871d06a1..6cb66643e 100644
--- a/modules/editor/skins/default/editor.html
+++ b/modules/editor/skins/default/editor.html
@@ -58,6 +58,8 @@
                     <img src="./images/editor_btn_b.gif" width="23" height="63" title="{$lang->edit->help_bold}" alt="{$lang->edit->help_bold}" id="component_{$editor_sequence}_Bold" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
                     <img src="./images/editor_btn_i.gif" width="23" height="63" title="{$lang->edit->help_italic}" alt="{$lang->edit->help_italic}" id="component_{$editor_sequence}_Italic" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
                     <img src="./images/editor_btn_u.gif" width="23" height="63" title="{$lang->edit->help_underline}" alt="{$lang->edit->help_underline}" id="component_{$editor_sequence}_Underline" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
+                    <img src="./images/editor_btn_strikethrough.gif" width="23" height="63" title="{$lang->edit->help_underline}" alt="{$lang->edit->help_underline}" id="component_{$editor_sequence}_StrikeThrough" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
+                    <img src="./images/editor_btn_removeformat.gif" width="23" height="63" title="{$lang->edit->help_underline}" alt="{$lang->edit->help_underline}" id="component_{$editor_sequence}_RemoveFormat" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
                     <img src="./images/editor_btn_c.gif" width="23" height="63" title="{$lang->edit->help_fontcolor}" alt="{$lang->edit->help_fontcolor}" id="component_{$editor_sequence}_colorpicker_text" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
                     <img src="./images/editor_btn_bg.gif" width="23" height="63" title="{$lang->edit->help_fontbgcolor}" alt="{$lang->edit->help_fontbgcolor}" id="component_{$editor_sequence}_colorpicker_bg" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
                 </div>
@@ -65,20 +67,20 @@
 
             <div class="optionB">
                 <div class="buttonGroup">
-                    <img src="./images/editor_btn_al.gif" width="23" height="63" title="{$lang->edit->help_align_left}" alt="{$lang->edit->help_align_left}" id="component_{$editor_sequence}_justifyleft" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
-                    <img src="./images/editor_btn_ac.gif" width="23" height="63"  title="{$lang->edit->help_align_center}" alt="{$lang->edit->help_align_center}" id="component_{$editor_sequence}_justifycenter" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
-                    <img src="./images/editor_btn_ar.gif" width="23" height="63" title="{$lang->edit->help_align_right}" alt="{$lang->edit->help_align_right}"  id="component_{$editor_sequence}_justifyright"  onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
-                    <!--<img src="./images/editor_btn_aj.gif" width="23" height="63" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />-->
+                    <img src="./images/editor_btn_al.gif" width="23" height="63" title="{$lang->edit->help_align_left}" alt="{$lang->edit->help_align_left}" id="component_{$editor_sequence}_JustifyLeft" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
+                    <img src="./images/editor_btn_ac.gif" width="23" height="63"  title="{$lang->edit->help_align_center}" alt="{$lang->edit->help_align_center}" id="component_{$editor_sequence}_JustifyCenter" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
+                    <img src="./images/editor_btn_ar.gif" width="23" height="63" title="{$lang->edit->help_align_right}" alt="{$lang->edit->help_align_right}"  id="component_{$editor_sequence}_JustifyRight"  onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
+                    <img src="./images/editor_btn_aj.gif" width="23" height="63" title="" alt="" id="component_{$editor_sequence}_JustifyFull" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
                 </div>
 
                 <div class="buttonGroup">
-                    <img src="./images/editor_btn_od.gif" title="{$lang->edit->help_remove_indent}" alt="{$lang->edit->help_remove_indent}"  id="component_{$editor_sequence}_outdent" width="23" height="63" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
-                    <img src="./images/editor_btn_id.gif" width="23" height="63" title="{$lang->edit->help_add_indent}" alt="{$lang->edit->help_add_indent}" id="component_{$editor_sequence}_indent" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
+                    <img src="./images/editor_btn_od.gif" title="{$lang->edit->help_remove_indent}" alt="{$lang->edit->help_remove_indent}"  id="component_{$editor_sequence}_Outdent" width="23" height="63" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
+                    <img src="./images/editor_btn_id.gif" width="23" height="63" title="{$lang->edit->help_add_indent}" alt="{$lang->edit->help_add_indent}" id="component_{$editor_sequence}_Indent" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
                 </div>
 
                 <div class="buttonGroup">
-                    <img src="./images/editor_btn_ol.gif" title="{$lang->edit->help_list_number}" alt="{$lang->edit->help_list_number}" id="component_{$editor_sequence}_insertorderedlist" width="23" height="63" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
-                    <img src="./images/editor_btn_ul.gif" title="{$lang->edit->help_list_bullet}" alt="{$lang->edit->help_list_bullet}" id="component_{$editor_sequence}_insertunorderedlist"  width="23" height="63" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
+                    <img src="./images/editor_btn_ol.gif" title="{$lang->edit->help_list_number}" alt="{$lang->edit->help_list_number}" id="component_{$editor_sequence}_InsertOrderedList" width="23" height="63" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
+                    <img src="./images/editor_btn_ul.gif" title="{$lang->edit->help_list_bullet}" alt="{$lang->edit->help_list_bullet}" id="component_{$editor_sequence}_InsertUnorderedList"  width="23" height="63" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
                 </div>
 
                 <!--
diff --git a/modules/editor/skins/default/images/editor_btn_removeformat.gif b/modules/editor/skins/default/images/editor_btn_removeformat.gif
new file mode 100644
index 000000000..a53b49625
Binary files /dev/null and b/modules/editor/skins/default/images/editor_btn_removeformat.gif differ
diff --git a/modules/editor/skins/default/images/editor_btn_strikethrough.gif b/modules/editor/skins/default/images/editor_btn_strikethrough.gif
new file mode 100644
index 000000000..cdae068ea
Binary files /dev/null and b/modules/editor/skins/default/images/editor_btn_strikethrough.gif differ
diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js
index 787a9d2f3..e2a41518f 100755
--- a/modules/editor/tpl/js/editor.js
+++ b/modules/editor/tpl/js/editor.js
@@ -563,13 +563,19 @@ function editorEventCheck(evt) {
         case 'StrikeThrough' :
         case 'undo' :
         case 'redo' :
-        case 'justifyleft' :
-        case 'justifycenter' :
-        case 'justifyright' :
-        case 'indent' :
-        case 'outdent' :
-        case 'insertorderedlist' :
-        case 'insertunorderedlist' :
+        case 'JustifyLeft' :
+        case 'JustifyCenter' :
+        case 'JustifyRight' :
+        case 'JustifyFull' :
+        case 'Indent' :
+        case 'Outdent' :
+        case 'InsertOrderedList' :
+        case 'InsertUnorderedList' :
+		case 'SaveAs' :
+		case 'Copy' :
+		case 'Cut' :
+		case 'Paste' :
+        case 'RemoveFormat' :
                 editorDo(component_name, '', editor_sequence);
             break;