diff --git a/_src/adapter/adapter.js b/_src/adapter/adapter.js
index f249ac1b..0209ab45 100644
--- a/_src/adapter/adapter.js
+++ b/_src/adapter/adapter.js
@@ -201,11 +201,7 @@
                                 $.eduiseparator && btns.push($.eduiseparator());
                         }else{
                             var ui = _cacheUI[name];
-                            if(name=="fullscreen"){
-                                ui&&btns.unshift(ui);
-                            }else{
-                                ui && btns.push(ui);
-                            }
+                            ui && btns.push(ui);
                         }
 
                     });
diff --git a/_src/adapter/dialog.js b/_src/adapter/dialog.js
index b3538c2c..e99c906d 100644
--- a/_src/adapter/dialog.js
+++ b/_src/adapter/dialog.js
@@ -1,4 +1,4 @@
-UM.registerUI('link image video map formula',function(name){
+UM.registerUI('link image video',function(name){
 
     var me = this, currentRange, $dialog,
         opt = {
diff --git a/_src/adapter/imagescale.js b/_src/adapter/imagescale.js
index a3879edc..05c09075 100644
--- a/_src/adapter/imagescale.js
+++ b/_src/adapter/imagescale.js
@@ -1,76 +1,76 @@
-UM.registerUI('imagescale',function () {
-    var me = this,
-        $imagescale;
+// UM.registerUI('imagescale',function () {
+//     var me = this,
+//         $imagescale;
 
-    me.setOpt('imageScaleEnabled', true);
+//     me.setOpt('imageScaleEnabled', true);
 
-    if (browser.webkit && me.getOpt('imageScaleEnabled')) {
+//     if (browser.webkit && me.getOpt('imageScaleEnabled')) {
 
-        me.addListener('click', function (type, e) {
-            var range = me.selection.getRange(),
-                img = range.getClosedNode(),
-                target = e.target;
+//         me.addListener('click', function (type, e) {
+//             var range = me.selection.getRange(),
+//                 img = range.getClosedNode(),
+//                 target = e.target;
 
-            /* 点击第一个图片的后面,八个角不消失 fix:3652 */
-            if (img && img.tagName == 'IMG' && target == img) {
+//             /* 点击第一个图片的后面,八个角不消失 fix:3652 */
+//             if (img && img.tagName == 'IMG' && target == img) {
 
-                if (!$imagescale) {
-                    $imagescale = $.eduiscale({'$wrap':me.$container}).css('zIndex', me.options.zIndex);
-                    me.$container.append($imagescale);
+//                 if (!$imagescale) {
+//                     $imagescale = $.eduiscale({'$wrap':me.$container}).css('zIndex', me.options.zIndex);
+//                     me.$container.append($imagescale);
 
-                    var _keyDownHandler = function () {
-                        $imagescale.edui().hide();
-                    }, _mouseDownHandler = function (e) {
-                        var ele = e.target || e.srcElement;
-                        if (ele && ele.className.indexOf('edui-scale') == -1) {
-                            _keyDownHandler(e);
-                        }
-                    }, timer;
+//                     var _keyDownHandler = function () {
+//                         $imagescale.edui().hide();
+//                     }, _mouseDownHandler = function (e) {
+//                         var ele = e.target || e.srcElement;
+//                         if (ele && ele.className.indexOf('edui-scale') == -1) {
+//                             _keyDownHandler(e);
+//                         }
+//                     }, timer;
 
-                    $imagescale.edui()
-                        .on('aftershow', function () {
-                            $(document).bind('keydown', _keyDownHandler);
-                            $(document).bind('mousedown', _mouseDownHandler);
-                            me.selection.getNative().removeAllRanges();
-                        })
-                        .on('afterhide', function () {
-                            $(document).unbind('keydown', _keyDownHandler);
-                            $(document).unbind('mousedown', _mouseDownHandler);
-                            var target = $imagescale.edui().getScaleTarget();
-                            if (target.parentNode) {
-                                me.selection.getRange().selectNode(target).select();
-                            }
-                        })
-                        .on('mousedown', function (e) {
-                            me.selection.getNative().removeAllRanges();
-                            var ele = e.target || e.srcElement;
-                            if (ele && ele.className.indexOf('edui-scale-hand') == -1) {
-                                timer = setTimeout(function() {
-                                    $imagescale.edui().hide();
-                                }, 200);
-                            }
-                        })
-                        .on('mouseup', function (e) {
-                            var ele = e.target || e.srcElement;
-                            if (ele && ele.className.indexOf('edui-scale-hand') == -1) {
-                                clearTimeout(timer);
-                            }
-                        });
-                }
-                $imagescale.edui().show($(img));
+//                     $imagescale.edui()
+//                         .on('aftershow', function () {
+//                             $(document).bind('keydown', _keyDownHandler);
+//                             $(document).bind('mousedown', _mouseDownHandler);
+//                             me.selection.getNative().removeAllRanges();
+//                         })
+//                         .on('afterhide', function () {
+//                             $(document).unbind('keydown', _keyDownHandler);
+//                             $(document).unbind('mousedown', _mouseDownHandler);
+//                             var target = $imagescale.edui().getScaleTarget();
+//                             if (target.parentNode) {
+//                                 me.selection.getRange().selectNode(target).select();
+//                             }
+//                         })
+//                         .on('mousedown', function (e) {
+//                             me.selection.getNative().removeAllRanges();
+//                             var ele = e.target || e.srcElement;
+//                             if (ele && ele.className.indexOf('edui-scale-hand') == -1) {
+//                                 timer = setTimeout(function() {
+//                                     $imagescale.edui().hide();
+//                                 }, 200);
+//                             }
+//                         })
+//                         .on('mouseup', function (e) {
+//                             var ele = e.target || e.srcElement;
+//                             if (ele && ele.className.indexOf('edui-scale-hand') == -1) {
+//                                 clearTimeout(timer);
+//                             }
+//                         });
+//                 }
+//                 $imagescale.edui().show($(img));
 
-            } else {
-                if ($imagescale && $imagescale.css('display') != 'none') $imagescale.edui().hide();
+//             } else {
+//                 if ($imagescale && $imagescale.css('display') != 'none') $imagescale.edui().hide();
 
-            }
-        });
+//             }
+//         });
 
-        me.addListener('click', function (type, e) {
-            if (e.target.tagName == 'IMG') {
-                var range = new dom.Range(me.document, me.body);
-                range.selectNode(e.target).select();
-            }
-        });
+//         me.addListener('click', function (type, e) {
+//             if (e.target.tagName == 'IMG') {
+//                 var range = new dom.Range(me.document, me.body);
+//                 range.selectNode(e.target).select();
+//             }
+//         });
 
-    }
-});
\ No newline at end of file
+//     }
+// });
\ No newline at end of file
diff --git a/_src/adapter/popup.js b/_src/adapter/popup.js
index 7ccc542f..6fa3d173 100644
--- a/_src/adapter/popup.js
+++ b/_src/adapter/popup.js
@@ -1,49 +1,49 @@
-UM.registerUI( 'emotion formula', function( name ){
-    var me = this,
-        url  = me.options.UMEDITOR_HOME_URL + 'dialogs/' +name+ '/'+name+'.js';
+// UM.registerUI( 'emotion formula', function( name ){
+//     var me = this,
+//         url  = me.options.UMEDITOR_HOME_URL + 'dialogs/' +name+ '/'+name+'.js';
 
-    var $btn = $.eduibutton({
-        icon: name,
-        title: this.getLang('labelMap')[name] || ''
-    });
+//     var $btn = $.eduibutton({
+//         icon: name,
+//         title: this.getLang('labelMap')[name] || ''
+//     });
 
-    //加载模版数据
-    utils.loadFile(document,{
-        src: url,
-        tag: "script",
-        type: "text/javascript",
-        defer: "defer"
-    },function(){
-        var opt = {
-            url : url
-        };
-        //调整数据
-        var data = UM.getWidgetData(name);
+//     //加载模版数据
+//     utils.loadFile(document,{
+//         src: url,
+//         tag: "script",
+//         type: "text/javascript",
+//         defer: "defer"
+//     },function(){
+//         var opt = {
+//             url : url
+//         };
+//         //调整数据
+//         var data = UM.getWidgetData(name);
 
-        data.width && (opt.width = data.width);
-        data.height && (opt.height = data.height);
+//         data.width && (opt.width = data.width);
+//         data.height && (opt.height = data.height);
 
-        $.eduipopup(opt).css('zIndex',me.options.zIndex + 1)
-            .addClass('edui-popup-' + name)
-            .edui()
-            .on('beforeshow',function(){
-                var $root = this.root();
-                if(!$root.parent().length){
-                    me.$container.find('.edui-dialog-container').append($root);
-                }
-                UM.setWidgetBody(name,$root,me);
-                UM.setTopEditor(me);
-            }).attachTo($btn,{
-                offsetTop:-5,
-                offsetLeft:10,
-                caretLeft:11,
-                caretTop:-8
-            });
-        me.addListener('selectionchange', function () {
-            var state = this.queryCommandState(name);
-            $btn.edui().disabled(state == -1).active(state == 1);
-        });
-    });
-    return $btn;
+//         $.eduipopup(opt).css('zIndex',me.options.zIndex + 1)
+//             .addClass('edui-popup-' + name)
+//             .edui()
+//             .on('beforeshow',function(){
+//                 var $root = this.root();
+//                 if(!$root.parent().length){
+//                     me.$container.find('.edui-dialog-container').append($root);
+//                 }
+//                 UM.setWidgetBody(name,$root,me);
+//                 UM.setTopEditor(me);
+//             }).attachTo($btn,{
+//                 offsetTop:-5,
+//                 offsetLeft:10,
+//                 caretLeft:11,
+//                 caretTop:-8
+//             });
+//         me.addListener('selectionchange', function () {
+//             var state = this.queryCommandState(name);
+//             $btn.edui().disabled(state == -1).active(state == 1);
+//         });
+//     });
+//     return $btn;
 
-} );
\ No newline at end of file
+// } );
\ No newline at end of file
diff --git a/_src/plugins/formula.js b/_src/plugins/formula.js
index b2af5354..9b21ff69 100755
--- a/_src/plugins/formula.js
+++ b/_src/plugins/formula.js
@@ -1,81 +1,81 @@
-/**
- * 公式插件
- */
-UM.plugins['formula'] = function () {
-    var me = this;
+// /**
+//  * 公式插件
+//  */
+// UM.plugins['formula'] = function () {
+//     var me = this;
 
-    function getActiveIframe() {
-        return me.$body.find('iframe.edui-formula-active')[0] || null;
-    }
+//     function getActiveIframe() {
+//         return me.$body.find('iframe.edui-formula-active')[0] || null;
+//     }
 
-    function blurActiveIframe(){
-        var iframe = getActiveIframe();
-        iframe && iframe.contentWindow.formula.blur();
-    }
+//     function blurActiveIframe(){
+//         var iframe = getActiveIframe();
+//         iframe && iframe.contentWindow.formula.blur();
+//     }
 
-    me.addInputRule(function (root) {
-        $.each(root.getNodesByTagName('span'), function (i, node) {
-            if (node.hasClass('mathquill-embedded-latex')) {
-                var firstChild, latex = '';
-                while(firstChild = node.firstChild()){
-                    latex += firstChild.data;
-                    node.removeChild(firstChild);
-                }
-                node.tagName = 'iframe';
-                node.setAttr({
-                    'frameborder': '0',
-                    'src': me.getOpt('UMEDITOR_HOME_URL') + 'dialogs/formula/formula.html',
-                    'data-latex': utils.unhtml(latex)
-                });
-            }
-        });
-    });
-    me.addOutputRule(function (root) {
-        $.each(root.getNodesByTagName('iframe'), function (i, node) {
-            if (node.hasClass('mathquill-embedded-latex')) {
-                node.tagName = 'span';
-                node.appendChild(UM.uNode.createText(node.getAttr('data-latex')));
-                node.setAttr({
-                    'frameborder': '',
-                    'src': '',
-                    'data-latex': ''
-                });
-            }
-        });
-    });
-    me.addListener('click', function(){
-        blurActiveIframe();
-    });
-    me.addListener('afterexeccommand', function(type, cmd){
-        if(cmd != 'formula') {
-            blurActiveIframe();
-        }
-    });
+//     me.addInputRule(function (root) {
+//         $.each(root.getNodesByTagName('span'), function (i, node) {
+//             if (node.hasClass('mathquill-embedded-latex')) {
+//                 var firstChild, latex = '';
+//                 while(firstChild = node.firstChild()){
+//                     latex += firstChild.data;
+//                     node.removeChild(firstChild);
+//                 }
+//                 node.tagName = 'iframe';
+//                 node.setAttr({
+//                     'frameborder': '0',
+//                     'src': me.getOpt('UMEDITOR_HOME_URL') + 'dialogs/formula/formula.html',
+//                     'data-latex': utils.unhtml(latex)
+//                 });
+//             }
+//         });
+//     });
+//     me.addOutputRule(function (root) {
+//         $.each(root.getNodesByTagName('iframe'), function (i, node) {
+//             if (node.hasClass('mathquill-embedded-latex')) {
+//                 node.tagName = 'span';
+//                 node.appendChild(UM.uNode.createText(node.getAttr('data-latex')));
+//                 node.setAttr({
+//                     'frameborder': '',
+//                     'src': '',
+//                     'data-latex': ''
+//                 });
+//             }
+//         });
+//     });
+//     me.addListener('click', function(){
+//         blurActiveIframe();
+//     });
+//     me.addListener('afterexeccommand', function(type, cmd){
+//         if(cmd != 'formula') {
+//             blurActiveIframe();
+//         }
+//     });
 
-    me.commands['formula'] = {
-        execCommand: function (cmd, latex) {
-            var iframe = getActiveIframe();
-            if (iframe) {
-                iframe.contentWindow.formula.insertLatex(latex);
-            } else {
-                me.execCommand('inserthtml', '<span class="mathquill-embedded-latex">' + latex + '</span>');
-                browser.ie && browser.ie9below && setTimeout(function(){
-                    var rng = me.selection.getRange(),
-                        startContainer = rng.startContainer;
-                    if(startContainer.nodeType == 1 && !startContainer.childNodes[rng.startOffset]){
-                        rng.insertNode(me.document.createTextNode(' '));
-                        rng.setCursor()
-                    }
-                },100)
-            }
-        },
-        queryCommandState: function (cmd) {
-            return 0;
-        },
-        queryCommandValue: function (cmd) {
-            var iframe = getActiveIframe();
-            return iframe && iframe.contentWindow.formula.getLatex();
-        }
-    }
+//     me.commands['formula'] = {
+//         execCommand: function (cmd, latex) {
+//             var iframe = getActiveIframe();
+//             if (iframe) {
+//                 iframe.contentWindow.formula.insertLatex(latex);
+//             } else {
+//                 me.execCommand('inserthtml', '<span class="mathquill-embedded-latex">' + latex + '</span>');
+//                 browser.ie && browser.ie9below && setTimeout(function(){
+//                     var rng = me.selection.getRange(),
+//                         startContainer = rng.startContainer;
+//                     if(startContainer.nodeType == 1 && !startContainer.childNodes[rng.startOffset]){
+//                         rng.insertNode(me.document.createTextNode(' '));
+//                         rng.setCursor()
+//                     }
+//                 },100)
+//             }
+//         },
+//         queryCommandState: function (cmd) {
+//             return 0;
+//         },
+//         queryCommandValue: function (cmd) {
+//             var iframe = getActiveIframe();
+//             return iframe && iframe.contentWindow.formula.getLatex();
+//         }
+//     }
 
-};
+// };
diff --git a/_src/plugins/image.js b/_src/plugins/image.js
index 5b53ca0b..33c91b98 100755
--- a/_src/plugins/image.js
+++ b/_src/plugins/image.js
@@ -19,7 +19,8 @@ UM.commands['insertimage'] = {
         var html = [], str = '', ci;
         ci = opt[0];
         if (opt.length == 1) {
-            str = '<img src="' + ci.src + '" ' + (ci._src ? ' _src="' + ci._src + '" ' : '') +
+            str = '<img src="' + (ci.src.indexOf('http://pubimg.xingren.com/') === 0 ? ci.src + '/800' : ci.src) + '" ' +
+                (ci._src ? ' _src="' + ci._src + '" ' : '') +
                 (ci.width ? 'width="' + ci.width + '" ' : '') +
                 (ci.height ? ' height="' + ci.height + '" ' : '') +
                 (ci['floatStyle'] == 'left' || ci['floatStyle'] == 'right' ? ' style="float:' + ci['floatStyle'] + ';"' : '') +
diff --git a/_src/plugins/link.js b/_src/plugins/link.js
index e935352e..610f0263 100755
--- a/_src/plugins/link.js
+++ b/_src/plugins/link.js
@@ -58,7 +58,8 @@ UM.plugins['link'] = function(){
     this.addOutputRule(function(root){
         $.each(root.getNodesByTagName('a'),function(i,a){
             var _href = utils.html(a.getAttr('_href'));
-            if(!/^(ftp|https?|\/|file)/.test(_href)){
+
+            if (_href.indexOf('://') === -1) {
                 _href = 'http://' + _href;
             }
             a.setAttr('href', _href);
diff --git a/_src/plugins/video.js b/_src/plugins/video.js
index 96d7d146..9d8cc52c 100755
--- a/_src/plugins/video.js
+++ b/_src/plugins/video.js
@@ -5,8 +5,7 @@
 ///commandsTitle  插入视频
 ///commandsDialog  dialogs\video
 UM.plugins['video'] = function (){
-    var me =this,
-        div;
+    var me =this;
 
     /**
      * 创建插入视频字符窜
@@ -17,44 +16,17 @@ UM.plugins['video'] = function (){
      * @param toEmbed 是否以flash代替显示
      * @param addParagraph  是否需要添加P 标签
      */
-    function creatInsertStr(url,width,height,id,align,toEmbed){
-        return  !toEmbed ?
+    function creatInsertStr(url, toEmbed){
+        var src = me.options.UMEDITOR_HOME_URL + 'themes/default/images/spacer.gif';
 
-                '<img ' + (id ? 'id="' + id+'"' : '') + ' width="'+ width +'" height="' + height + '" _url="'+url+'" class="edui-faked-video"'  +
-                ' src="' + me.options.UMEDITOR_HOME_URL+'themes/default/images/spacer.gif" style="background:url('+me.options.UMEDITOR_HOME_URL+'themes/default/images/videologo.gif) no-repeat center center; border:1px solid gray;'+(align ? 'float:' + align + ';': '')+'" />'
-
-                :
-                '<embed type="application/x-shockwave-flash" class="edui-faked-video" pluginspage="http://www.macromedia.com/go/getflashplayer"' +
-                ' src="' + url + '" width="' + width  + '" height="' + height  + '"'  + (align ? ' style="float:' + align + '"': '') +
-                ' wmode="transparent" play="true" loop="false" menu="false" allowscriptaccess="never" allowfullscreen="true" >';
-    }
-
-    function switchImgAndEmbed(root,img2embed){
-        utils.each(root.getNodesByTagName(img2embed ? 'img' : 'embed'),function(node){
-            if(node.getAttr('class') == 'edui-faked-video'){
-
-                var html = creatInsertStr( img2embed ? node.getAttr('_url') : node.getAttr('src'),node.getAttr('width'),node.getAttr('height'),null,node.getStyle('float') || '',img2embed);
-                node.parentNode.replaceChild(UM.uNode.createElement(html),node)
-            }
-        })
+        if (url) {
+            return '<img class="edui-faked-video" width=500 height=373 _url="' + url + '" src=' + src + ' />';
+        }
     }
 
-    me.addOutputRule(function(root){
-        switchImgAndEmbed(root,true)
-    });
-    me.addInputRule(function(root){
-        switchImgAndEmbed(root)
-    });
-
     me.commands["insertvideo"] = {
-        execCommand: function (cmd, videoObjs){
-            videoObjs = utils.isArray(videoObjs)?videoObjs:[videoObjs];
-            var html = [],id = 'tmpVedio';
-            for(var i=0,vi,len = videoObjs.length;i<len;i++){
-                 vi = videoObjs[i];
-                 html.push(creatInsertStr( vi.url, vi.width || 420,  vi.height || 280, id + i,vi.align,false));
-            }
-            me.execCommand("inserthtml",html.join(""),true);
+        execCommand: function (cmd, url){
+            me.execCommand("inserthtml",creatInsertStr(url),true);
 
         },
         queryCommandState : function(){
diff --git a/_src/ui/scale.js b/_src/ui/scale.js
index 9dbda4c9..5c03b488 100644
--- a/_src/ui/scale.js
+++ b/_src/ui/scale.js
@@ -1,165 +1,165 @@
 //scale 类
-UM.ui.define('scale', {
-    tpl: '<div class="edui-scale" unselectable="on">' +
-        '<span class="edui-scale-hand0"></span>' +
-        '<span class="edui-scale-hand1"></span>' +
-        '<span class="edui-scale-hand2"></span>' +
-        '<span class="edui-scale-hand3"></span>' +
-        '<span class="edui-scale-hand4"></span>' +
-        '<span class="edui-scale-hand5"></span>' +
-        '<span class="edui-scale-hand6"></span>' +
-        '<span class="edui-scale-hand7"></span>' +
-        '</div>',
-    defaultOpt: {
-        $doc: $(document),
-        $wrap: $(document)
-    },
-    init: function (options) {
-        if(options.$doc) this.defaultOpt.$doc = options.$doc;
-        if(options.$wrap) this.defaultOpt.$wrap = options.$wrap;
-        this.root($($.parseTmpl(this.tpl, options)));
-        this.initStyle();
-        this.startPos = this.prePos = {x: 0, y: 0};
-        this.dragId = -1;
-        return this;
-    },
-    initStyle: function () {
-        utils.cssRule('edui-style-scale', '.edui-scale{display:none;position:absolute;border:1px solid #38B2CE;cursor:hand;}' +
-            '.edui-scale span{position:absolute;left:0;top:0;width:7px;height:7px;overflow:hidden;font-size:0px;display:block;background-color:#3C9DD0;}'
-            + '.edui-scale .edui-scale-hand0{cursor:nw-resize;top:0;margin-top:-4px;left:0;margin-left:-4px;}'
-            + '.edui-scale .edui-scale-hand1{cursor:n-resize;top:0;margin-top:-4px;left:50%;margin-left:-4px;}'
-            + '.edui-scale .edui-scale-hand2{cursor:ne-resize;top:0;margin-top:-4px;left:100%;margin-left:-3px;}'
-            + '.edui-scale .edui-scale-hand3{cursor:w-resize;top:50%;margin-top:-4px;left:0;margin-left:-4px;}'
-            + '.edui-scale .edui-scale-hand4{cursor:e-resize;top:50%;margin-top:-4px;left:100%;margin-left:-3px;}'
-            + '.edui-scale .edui-scale-hand5{cursor:sw-resize;top:100%;margin-top:-3px;left:0;margin-left:-4px;}'
-            + '.edui-scale .edui-scale-hand6{cursor:s-resize;top:100%;margin-top:-3px;left:50%;margin-left:-4px;}'
-            + '.edui-scale .edui-scale-hand7{cursor:se-resize;top:100%;margin-top:-3px;left:100%;margin-left:-3px;}');
-    },
-    _eventHandler: function (e) {
-        var me = this,
-            $doc = me.defaultOpt.$doc;
-        switch (e.type) {
-            case 'mousedown':
-                var hand = e.target || e.srcElement, hand;
-                if (hand.className.indexOf('edui-scale-hand') != -1) {
-                    me.dragId = hand.className.slice(-1);
-                    me.startPos.x = me.prePos.x = e.clientX;
-                    me.startPos.y = me.prePos.y = e.clientY;
-                    $doc.bind('mousemove', $.proxy(me._eventHandler, me));
-                }
-                break;
-            case 'mousemove':
-                if (me.dragId != -1) {
-                    me.updateContainerStyle(me.dragId, {x: e.clientX - me.prePos.x, y: e.clientY - me.prePos.y});
-                    me.prePos.x = e.clientX;
-                    me.prePos.y = e.clientY;
-                    me.updateTargetElement();
-                }
-                break;
-            case 'mouseup':
-                if (me.dragId != -1) {
-                    me.dragId = -1;
-                    me.updateTargetElement();
-                    var $target = me.data('$scaleTarget');
-                    if ($target.parent()) me.attachTo(me.data('$scaleTarget'));
-                }
-                $doc.unbind('mousemove', $.proxy(me._eventHandler, me));
-                break;
-            default:
-                break;
-        }
-    },
-    updateTargetElement: function () {
-        var me = this,
-            $root = me.root(),
-            $target = me.data('$scaleTarget');
-        $target.css({width: $root.width(), height: $root.height()});
-        me.attachTo($target);
-    },
-    updateContainerStyle: function (dir, offset) {
-        var me = this,
-            $dom = me.root(),
-            tmp,
-            rect = [
-                //[left, top, width, height]
-                [0, 0, -1, -1],
-                [0, 0, 0, -1],
-                [0, 0, 1, -1],
-                [0, 0, -1, 0],
-                [0, 0, 1, 0],
-                [0, 0, -1, 1],
-                [0, 0, 0, 1],
-                [0, 0, 1, 1]
-            ];
+// UM.ui.define('scale', {
+//     tpl: '<div class="edui-scale" unselectable="on">' +
+//         '<span class="edui-scale-hand0"></span>' +
+//         '<span class="edui-scale-hand1"></span>' +
+//         '<span class="edui-scale-hand2"></span>' +
+//         '<span class="edui-scale-hand3"></span>' +
+//         '<span class="edui-scale-hand4"></span>' +
+//         '<span class="edui-scale-hand5"></span>' +
+//         '<span class="edui-scale-hand6"></span>' +
+//         '<span class="edui-scale-hand7"></span>' +
+//         '</div>',
+//     defaultOpt: {
+//         $doc: $(document),
+//         $wrap: $(document)
+//     },
+//     init: function (options) {
+//         if(options.$doc) this.defaultOpt.$doc = options.$doc;
+//         if(options.$wrap) this.defaultOpt.$wrap = options.$wrap;
+//         this.root($($.parseTmpl(this.tpl, options)));
+//         this.initStyle();
+//         this.startPos = this.prePos = {x: 0, y: 0};
+//         this.dragId = -1;
+//         return this;
+//     },
+//     initStyle: function () {
+//         utils.cssRule('edui-style-scale', '.edui-scale{display:none;position:absolute;border:1px solid #38B2CE;cursor:hand;}' +
+//             '.edui-scale span{position:absolute;left:0;top:0;width:7px;height:7px;overflow:hidden;font-size:0px;display:block;background-color:#3C9DD0;}'
+//             + '.edui-scale .edui-scale-hand0{cursor:nw-resize;top:0;margin-top:-4px;left:0;margin-left:-4px;}'
+//             + '.edui-scale .edui-scale-hand1{cursor:n-resize;top:0;margin-top:-4px;left:50%;margin-left:-4px;}'
+//             + '.edui-scale .edui-scale-hand2{cursor:ne-resize;top:0;margin-top:-4px;left:100%;margin-left:-3px;}'
+//             + '.edui-scale .edui-scale-hand3{cursor:w-resize;top:50%;margin-top:-4px;left:0;margin-left:-4px;}'
+//             + '.edui-scale .edui-scale-hand4{cursor:e-resize;top:50%;margin-top:-4px;left:100%;margin-left:-3px;}'
+//             + '.edui-scale .edui-scale-hand5{cursor:sw-resize;top:100%;margin-top:-3px;left:0;margin-left:-4px;}'
+//             + '.edui-scale .edui-scale-hand6{cursor:s-resize;top:100%;margin-top:-3px;left:50%;margin-left:-4px;}'
+//             + '.edui-scale .edui-scale-hand7{cursor:se-resize;top:100%;margin-top:-3px;left:100%;margin-left:-3px;}');
+//     },
+//     _eventHandler: function (e) {
+//         var me = this,
+//             $doc = me.defaultOpt.$doc;
+//         switch (e.type) {
+//             case 'mousedown':
+//                 var hand = e.target || e.srcElement, hand;
+//                 if (hand.className.indexOf('edui-scale-hand') != -1) {
+//                     me.dragId = hand.className.slice(-1);
+//                     me.startPos.x = me.prePos.x = e.clientX;
+//                     me.startPos.y = me.prePos.y = e.clientY;
+//                     $doc.bind('mousemove', $.proxy(me._eventHandler, me));
+//                 }
+//                 break;
+//             case 'mousemove':
+//                 if (me.dragId != -1) {
+//                     me.updateContainerStyle(me.dragId, {x: e.clientX - me.prePos.x, y: e.clientY - me.prePos.y});
+//                     me.prePos.x = e.clientX;
+//                     me.prePos.y = e.clientY;
+//                     me.updateTargetElement();
+//                 }
+//                 break;
+//             case 'mouseup':
+//                 if (me.dragId != -1) {
+//                     me.dragId = -1;
+//                     me.updateTargetElement();
+//                     var $target = me.data('$scaleTarget');
+//                     if ($target.parent()) me.attachTo(me.data('$scaleTarget'));
+//                 }
+//                 $doc.unbind('mousemove', $.proxy(me._eventHandler, me));
+//                 break;
+//             default:
+//                 break;
+//         }
+//     },
+//     updateTargetElement: function () {
+//         var me = this,
+//             $root = me.root(),
+//             $target = me.data('$scaleTarget');
+//         $target.css({width: $root.width(), height: $root.height()});
+//         me.attachTo($target);
+//     },
+//     updateContainerStyle: function (dir, offset) {
+//         var me = this,
+//             $dom = me.root(),
+//             tmp,
+//             rect = [
+//                 //[left, top, width, height]
+//                 [0, 0, -1, -1],
+//                 [0, 0, 0, -1],
+//                 [0, 0, 1, -1],
+//                 [0, 0, -1, 0],
+//                 [0, 0, 1, 0],
+//                 [0, 0, -1, 1],
+//                 [0, 0, 0, 1],
+//                 [0, 0, 1, 1]
+//             ];
 
-        if (rect[dir][0] != 0) {
-            tmp = parseInt($dom.offset().left) + offset.x;
-            $dom.css('left', me._validScaledProp('left', tmp));
-        }
-        if (rect[dir][1] != 0) {
-            tmp = parseInt($dom.offset().top) + offset.y;
-            $dom.css('top', me._validScaledProp('top', tmp));
-        }
-        if (rect[dir][2] != 0) {
-            tmp = $dom.width() + rect[dir][2] * offset.x;
-            $dom.css('width', me._validScaledProp('width', tmp));
-        }
-        if (rect[dir][3] != 0) {
-            tmp = $dom.height() + rect[dir][3] * offset.y;
-            $dom.css('height', me._validScaledProp('height', tmp));
-        }
-    },
-    _validScaledProp: function (prop, value) {
-        var $ele = this.root(),
-            $wrap = this.defaultOpt.$doc,
-            calc = function(val, a, b){
-                return (val + a) > b ? b - a : value;
-            };
+//         if (rect[dir][0] != 0) {
+//             tmp = parseInt($dom.offset().left) + offset.x;
+//             $dom.css('left', me._validScaledProp('left', tmp));
+//         }
+//         if (rect[dir][1] != 0) {
+//             tmp = parseInt($dom.offset().top) + offset.y;
+//             $dom.css('top', me._validScaledProp('top', tmp));
+//         }
+//         if (rect[dir][2] != 0) {
+//             tmp = $dom.width() + rect[dir][2] * offset.x;
+//             $dom.css('width', me._validScaledProp('width', tmp));
+//         }
+//         if (rect[dir][3] != 0) {
+//             tmp = $dom.height() + rect[dir][3] * offset.y;
+//             $dom.css('height', me._validScaledProp('height', tmp));
+//         }
+//     },
+//     _validScaledProp: function (prop, value) {
+//         var $ele = this.root(),
+//             $wrap = this.defaultOpt.$doc,
+//             calc = function(val, a, b){
+//                 return (val + a) > b ? b - a : value;
+//             };
 
-        value = isNaN(value) ? 0 : value;
-        switch (prop) {
-            case 'left':
-                return value < 0 ? 0 : calc(value, $ele.width(), $wrap.width());
-            case 'top':
-                return value < 0 ? 0 : calc(value, $ele.height(),$wrap.height());
-            case 'width':
-                return value <= 0 ? 1 : calc(value, $ele.offset().left, $wrap.width());
-            case 'height':
-                return value <= 0 ? 1 : calc(value, $ele.offset().top, $wrap.height());
-        }
-    },
-    show: function ($obj) {
-        var me = this;
-        if ($obj) me.attachTo($obj);
-        me.root().bind('mousedown', $.proxy(me._eventHandler, me));
-        me.defaultOpt.$doc.bind('mouseup', $.proxy(me._eventHandler, me));
-        me.root().show();
-        me.trigger("aftershow");
-    },
-    hide: function () {
-        var me = this;
-        me.root().unbind('mousedown', $.proxy(me._eventHandler, me));
-        me.defaultOpt.$doc.unbind('mouseup', $.proxy(me._eventHandler, me));
-        me.root().hide();
-        me.trigger('afterhide')
-    },
-    attachTo: function ($obj) {
-        var me = this,
-            imgPos = $obj.offset(),
-            $root = me.root(),
-            $wrap = me.defaultOpt.$wrap,
-            posObj = $wrap.offset();
+//         value = isNaN(value) ? 0 : value;
+//         switch (prop) {
+//             case 'left':
+//                 return value < 0 ? 0 : calc(value, $ele.width(), $wrap.width());
+//             case 'top':
+//                 return value < 0 ? 0 : calc(value, $ele.height(),$wrap.height());
+//             case 'width':
+//                 return value <= 0 ? 1 : calc(value, $ele.offset().left, $wrap.width());
+//             case 'height':
+//                 return value <= 0 ? 1 : calc(value, $ele.offset().top, $wrap.height());
+//         }
+//     },
+//     show: function ($obj) {
+//         var me = this;
+//         if ($obj) me.attachTo($obj);
+//         me.root().bind('mousedown', $.proxy(me._eventHandler, me));
+//         me.defaultOpt.$doc.bind('mouseup', $.proxy(me._eventHandler, me));
+//         me.root().show();
+//         me.trigger("aftershow");
+//     },
+//     hide: function () {
+//         var me = this;
+//         me.root().unbind('mousedown', $.proxy(me._eventHandler, me));
+//         me.defaultOpt.$doc.unbind('mouseup', $.proxy(me._eventHandler, me));
+//         me.root().hide();
+//         me.trigger('afterhide')
+//     },
+//     attachTo: function ($obj) {
+//         var me = this,
+//             imgPos = $obj.offset(),
+//             $root = me.root(),
+//             $wrap = me.defaultOpt.$wrap,
+//             posObj = $wrap.offset();
 
-        me.data('$scaleTarget', $obj);
-        me.root().css({
-            position: 'absolute',
-            width: $obj.width(),
-            height: $obj.height(),
-            left: imgPos.left - posObj.left - parseInt($wrap.css('border-left-width')) - parseInt($root.css('border-left-width')),
-            top: imgPos.top - posObj.top - parseInt($wrap.css('border-top-width')) - parseInt($root.css('border-top-width'))
-        });
-    },
-    getScaleTarget: function () {
-        return this.data('$scaleTarget')[0];
-    }
-});
\ No newline at end of file
+//         me.data('$scaleTarget', $obj);
+//         me.root().css({
+//             position: 'absolute',
+//             width: $obj.width(),
+//             height: $obj.height(),
+//             left: imgPos.left - posObj.left - parseInt($wrap.css('border-left-width')) - parseInt($root.css('border-left-width')),
+//             top: imgPos.top - posObj.top - parseInt($wrap.css('border-top-width')) - parseInt($root.css('border-top-width'))
+//         });
+//     },
+//     getScaleTarget: function () {
+//         return this.data('$scaleTarget')[0];
+//     }
+// });
\ No newline at end of file
diff --git a/dialogs/video/video.js b/dialogs/video/video.js
index 64a47eca..6f049031 100644
--- a/dialogs/video/video.js
+++ b/dialogs/video/video.js
@@ -2,6 +2,7 @@
 (function(){
     var domUtils = UM.dom.domUtils;
     var widgetName = 'video';
+    var _swfUrl;
 
     UM.registerWidget( widgetName,{
 
@@ -15,19 +16,6 @@
             "<div id=\"eduiVideoPanel\" class=\"edui-video-panel\">" +
             "<table><tr><td><label for=\"eduiVideoUrl\" class=\"edui-video-url\"><%=lang_video_url%></label></td><td><input id=\"eduiVideoUrl\" type=\"text\"></td></tr></table>" +
             "<div id=\"eduiVideoPreview\"></div>" +
-            "<div id=\"eduiVideoInfo\">" +
-            "<fieldset>" +
-            "<legend><%=lang_video_size%></legend>" +
-            "<table>" +
-            "<tr><td><label for=\"eduiVideoWidth\"><%=lang_videoW%></label></td><td><input class=\"edui-video-txt\" id=\"eduiVideoWidth\" type=\"text\"/></td></tr>" +
-            "<tr><td><label for=\"eduiVideoHeight\"><%=lang_videoH%></label></td><td><input class=\"edui-video-txt\" id=\"eduiVideoHeight\" type=\"text\"/></td></tr>" +
-            "</table>" +
-            "</fieldset>" +
-            "<fieldset>" +
-            "<legend><%=lang_alignment%></legend>" +
-            "<div id=\"eduiVideoFloat\"></div>" +
-            "</fieldset>" +
-            "</div>" +
             "</div>" +
             "</div>" +
             "</div>" +
@@ -49,15 +37,24 @@
         initEvent:function(){
 
             var me = this,
-                url = $("#eduiVideoUrl", me.$widget)[0];
+                url = $("#eduiVideoUrl", me.$widget)[0],
+                timer;
+
+            function createPreview(url) {
+                clearTimeout(timer);
+
+                timer = setTimeout(function() {
+                    me.createPreviewVideo(url);
+                }, 200);
+            }
 
             if( 'oninput' in url ) {
                 url.oninput = function(){
-                    me.createPreviewVideo( this.value );
+                    createPreview(this.value);
                 };
             } else {
                 url.onpropertychange = function () {
-                    me.createPreviewVideo( this.value );
+                    createPreview( this.value );
                 }
             }
 
@@ -68,17 +65,11 @@
                 img = me.editor.selection.getRange().getClosedNode(),
                 url;
 
-            me.createAlignButton( ["eduiVideoFloat"] );
-
             //编辑视频时初始化相关信息
             if(img && img.className == "edui-faked-video"){
                 $("#eduiVideoUrl", me.$widget)[0].value = url = img.getAttribute("_url");
-                $("#eduiVideoWidth", me.$widget)[0].value = img.width;
-                $("#eduiVideoHeight", me.$widget)[0].value = img.height;
-                var align = domUtils.getComputedStyle(img,"float"),
-                    parentAlign = domUtils.getComputedStyle(img.parentNode,"text-align");
-                me.updateAlignButton(parentAlign==="center"?"center":align);
             }
+
             me.createPreviewVideo(url);
 
         },
@@ -91,18 +82,17 @@
 
             var me = this,
                 lang = me.lang,
-                conUrl = me.convert_url(url);
+                $preview = $("#eduiVideoPreview", me.$widget);
 
-            if(!me.endWith(conUrl,[".swf",".flv",".wmv"])){
-                $("#eduiVideoPreview", me.$widget).html( lang.urlError );
-                return;
-            }
-            $("#eduiVideoPreview", me.$widget)[0].innerHTML = '<embed type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer"' +
-                ' src="' + url + '"' +
-                ' width="' + 420  + '"' +
-                ' height="' + 280  + '"' +
-                ' wmode="transparent" play="true" loop="false" menu="false" allowscriptaccess="never" allowfullscreen="true" ></embed>';
+            $preview.html(lang.loading);
+
+            me.convertUrl(url, function(data) {
+                _swfUrl = data.swf_url;
 
+                $preview[0].innerHTML = '<embed src=' + _swfUrl + ' allowFullScreen=true quality=high width=500 height=375 align=middle allowScriptAccess=always type="application/x-shockwave-flash"></embed>';
+            }, function() {
+                $preview.html(lang.urlError);
+            });
         },
         /**
          * 将单个视频信息插入编辑器中
@@ -110,159 +100,41 @@
         insertSingle: function(){
 
             var me = this,
-                width = $("#eduiVideoWidth", me.$widget)[0],
-                height = $("#eduiVideoHeight", me.$widget)[0],
-                url=$('#eduiVideoUrl', me.$widget)[0].value,
-                align = this.findFocus("eduiVideoFloat","name");
+                url=$('#eduiVideoUrl', me.$widget)[0].value;
 
             if(!url) return false;
-            if ( !me.checkNum( [width, height] ) ) return false;
-            this.editor.execCommand('insertvideo', {
-                url: me.convert_url(url),
-                width: width.value,
-                height: height.value,
-                align: align
-            });
-
-        },
-        /**
-         * URL转换
-         */
-        convert_url: function(url){
-            if ( !url ) return '';
-            var matches = url.match(/youtu.be\/(\w+)$/) ||
-                    url.match(/youtube\.com\/watch\?v=(\w+)/) ||
-                    url.match(/youtube.com\/v\/(\w+)/),
-                youku = url.match(/youku\.com\/v_show\/id_(\w+)/),
-                youkuPlay = /player\.youku\.com/ig.test(url);
 
-            if(youkuPlay){
-                url = url.replace(/\?f=.*/, "");
-            } else if (matches){
-                url = "https://www.youtube.com/v/" + matches[1] + "?version=3&feature=player_embedded";
-            }else if(youku){
-                url = "http://player.youku.com/player.php/sid/"+youku[1]+"/v.swf"
+            if (_swfUrl) {
+                me.editor.execCommand('insertvideo', _swfUrl);
             } else {
-                url = url.replace(/http:\/\/www\.tudou\.com\/programs\/view\/([\w\-]+)\/?/i, "http://www.tudou.com/v/$1")
-                    .replace(/http:\/\/www\.youtube\.com\/watch\?v=([\w\-]+)/i, "http://www.youtube.com/v/$1")
-                    .replace(/http:\/\/v\.youku\.com\/v_show\/id_([\w\-=]+)\.html/i, "http://player.youku.com/player.php/sid/$1")
-                    .replace(/http:\/\/www\.56\.com\/u\d+\/v_([\w\-]+)\.html/i, "http://player.56.com/v_$1.swf")
-                    .replace(/http:\/\/www.56.com\/w\d+\/play_album\-aid\-\d+_vid\-([^.]+)\.html/i, "http://player.56.com/v_$1.swf")
-                    .replace(/http:\/\/v\.ku6\.com\/.+\/([^.]+)\.html/i, "http://player.ku6.com/refer/$1/v.swf")
-                    .replace(/\?f=.*/, "");
-            }
-            return url;
-        },
-        /**
-         * 检测传入的所有input框中输入的长宽是否是正数
-         */
-        checkNum: function checkNum( nodes ) {
-
-            var me = this;
-
-            for ( var i = 0, ci; ci = nodes[i++]; ) {
-                var value = ci.value;
-                if ( !me.isNumber( value ) && value) {
-                    alert( me.lang.numError );
-                    ci.value = "";
-                    ci.focus();
-                    return false;
-                }
-            }
-            return true;
-        },
-        /**
-         * 数字判断
-         * @param value
-         */
-        isNumber: function( value ) {
-            return /(0|^[1-9]\d*$)/.test( value );
-        },
-        updateAlignButton: function( align ) {
-            var aligns = $( "#eduiVideoFloat", this.$widget )[0].children;
-
-            for ( var i = 0, ci; ci = aligns[i++]; ) {
-                if ( ci.getAttribute( "name" ) == align ) {
-                    if ( ci.className !="edui-video-focus" ) {
-                        ci.className = "edui-video-focus";
-                    }
-                } else {
-                    if ( ci.className =="edui-video-focus" ) {
-                        ci.className = "";
-                    }
-                }
-            }
-
-        },
-        /**
-         * 创建图片浮动选择按钮
-         * @param ids
-         */
-        createAlignButton: function( ids ) {
-            var lang = this.lang,
-                vidoe_home = UMEDITOR_CONFIG.UMEDITOR_HOME_URL + 'dialogs/video/';
-
-            for ( var i = 0, ci; ci = ids[i++]; ) {
-                var floatContainer = $( "#" + ci, this.$widget ) [0],
-                    nameMaps = {"none":lang['default'], "left":lang.floatLeft, "right":lang.floatRight};
-                for ( var j in nameMaps ) {
-                    var div = document.createElement( "div" );
-                    div.setAttribute( "name", j );
-                    if ( j == "none" ) div.className="edui-video-focus";
-                    div.style.cssText = "background:url("+ vidoe_home +"images/" + j + "_focus.jpg);";
-                    div.setAttribute( "title", nameMaps[j] );
-                    floatContainer.appendChild( div );
-                }
-                this.switchSelect( ci );
-            }
-        },
-        /**
-         * 选择切换
-         */
-        switchSelect: function( selectParentId ) {
-            var selects = $( "#" + selectParentId, this.$widget )[0].children;
-            for ( var i = 0, ci; ci = selects[i++]; ) {
-               $(ci).on("click", function () {
-                    for ( var j = 0, cj; cj = selects[j++]; ) {
-                        cj.className = "";
-                        cj.removeAttribute && cj.removeAttribute( "class" );
+                me.convertUrl(url, function(data) {
+                    if (data.swf_url) {
+                        me.editor.execCommand('insertvideo', data.swf_url);
+                    } else {
+                        console.error('Insert video error:', url);
                     }
-                    this.className = "edui-video-focus";
-                } )
+                }, function() {
+                    console.error('Insert video error:', url);
+                });
             }
         },
         /**
-         * 找到id下具有focus类的节点并返回该节点下的某个属性
-         * @param id
-         * @param returnProperty
+         * URL转换
          */
-        findFocus: function( id, returnProperty ) {
-            var tabs = $( "#" + id , this.$widget)[0].children,
-                property;
-            for ( var i = 0, ci; ci = tabs[i++]; ) {
-                if ( ci.className=="edui-video-focus" ) {
-                    property = ci.getAttribute( returnProperty );
-                    break;
-                }
+        convertUrl: function(url, success, fail) {
+            if (!url) {
+                fail();
+                return;
             }
-            return property;
-        },
-        /**
-         * 末尾字符检测
-         */
-        endWith: function(str,endStrArr){
-            for(var i=0,len = endStrArr.length;i<len;i++){
-                var tmp = endStrArr[i];
-                if(str.length - tmp.length<0) return false;
 
-                if(str.substring(str.length-tmp.length)==tmp){
-                    return true;
+            $.get('/web/article/video/extract', { videoUrl: url, type: 0 }, function(res) {
+                if (res.success && res.result.data) {
+                    success(res.result.data);
+                } else {
+                    fail();
                 }
-            }
-            return false;
+            })
         },
-        width:610,
-        height:498,
         buttons: {
             ok: {
                 exec: function( editor, $w ){
diff --git a/themes/default/_css/button.css b/themes/default/_css/button.css
index 7c8171fa..92c1d405 100755
--- a/themes/default/_css/button.css
+++ b/themes/default/_css/button.css
@@ -18,7 +18,6 @@
     padding:0;
     background-repeat: no-repeat;
     background-image: url(../images/icons.png);
-    background-image: url(../images/icons.gif) \9;
 }
 
 /*状态反射*/
diff --git a/themes/default/_css/buttonicon.css b/themes/default/_css/buttonicon.css
index 064cf8e7..6c592317 100755
--- a/themes/default/_css/buttonicon.css
+++ b/themes/default/_css/buttonicon.css
@@ -1,129 +1,27 @@
-.edui-btn-toolbar .edui-btn .edui-icon-source {
-    background-position:-260px -0px;
-}
-.edui-btn-toolbar .edui-btn .edui-icon-undo {
-    background-position: -160px 0;
-}
-.edui-btn-toolbar .edui-btn .edui-icon-redo {
-    background-position: -100px 0;
-}
-.edui-btn-toolbar  .edui-btn .edui-icon-bold{
-    background-position: 0 0;
-}
-.edui-btn-toolbar  .edui-btn .edui-icon-italic {
-    background-position: -60px 0;
-}
-.edui-btn-toolbar  .edui-btn .edui-icon-underline  {
-    background-position: -140px 0
-}
-.edui-btn-toolbar .edui-btn .edui-icon-strikethrough {
-    background-position: -120px 0;
-}
-
-.edui-btn-toolbar .edui-btn .edui-icon-superscript {
-    background-position: -620px 0;
-}
-.edui-btn-toolbar .edui-btn .edui-icon-subscript {
-    background-position:  -600px 0;
-}
-.edui-btn-toolbar .edui-btn .edui-icon-font, .edui-btn-toolbar .edui-btn .edui-icon-forecolor {
-    background-position: -720px 0;
-}
-
-.edui-btn-toolbar .edui-btn .edui-icon-backcolor {
-    background-position: -760px 0;
-}
-
-.edui-btn-toolbar .edui-btn .edui-icon-insertorderedlist {
-    background-position: -80px 0;
-}
-.edui-btn-toolbar .edui-btn .edui-icon-insertunorderedlist {
-    background-position:   -20px 0;
-}
-.edui-btn-toolbar .edui-btn .edui-icon-selectall {
-    background-position: -400px -20px;
-}
-.edui-btn-toolbar .edui-btn .edui-icon-cleardoc {
-    background-position: -520px 0;
-}
-.edui-btn-toolbar .edui-btn .edui-icon-paragraph {
-    background-position: -140px 0;
-}
-
-.edui-btn-toolbar .edui-btn .edui-icon-fontfamily {
-    background-position: -140px 0;
-}
-
-.edui-btn-toolbar .edui-btn .edui-icon-fontsize {
-    background-position: -140px 0;
-}
-
-.edui-btn-toolbar .edui-btn .edui-icon-justifyleft {
-    background-position: -460px 0;
-}
-
-.edui-btn-toolbar .edui-btn .edui-icon-justifycenter {
-    background-position: -420px 0;
-}
-
-.edui-btn-toolbar .edui-btn .edui-icon-justifyright {
-    background-position:-480px 0;
-}
-
-.edui-btn-toolbar .edui-btn .edui-icon-justifyjustify {
-    background-position: -440px 0;
-}
-
-.edui-btn-toolbar .edui-btn .edui-icon-link {
-    background-position: -500px 0;
-}
-
-.edui-btn-toolbar .edui-btn .edui-icon-unlink {
-    background-position: -640px 0;
-}
-
-.edui-btn-toolbar .edui-btn .edui-icon-image {
-    background-position: -380px 0;
-}
-
-.edui-btn-toolbar .edui-btn .edui-icon-emotion {
-    background-position: -60px -20px;
-}
-.edui-btn-toolbar .edui-btn .edui-icon-video {
-    background-position: -320px -20px;
-}
-
-.edui-btn-toolbar .edui-btn .edui-icon-map {
-    background-position:  -40px -40px;
-}
-
-.edui-btn-toolbar .edui-btn .edui-icon-gmap {
-    background-position:  -260px -40px;
-}
-.edui-btn-toolbar .edui-btn .edui-icon-horizontal {
-    background-position: -360px 0;
-}
-
-.edui-btn-toolbar .edui-btn .edui-icon-print {
-    background-position: -440px -20px;
-}
-.edui-btn-toolbar .edui-btn .edui-icon-preview {
-    background-position: -420px -20px;
-}
-
-.edui-btn-toolbar .edui-btn-fullscreen{
-    float:right;
-}
-.edui-btn-toolbar .edui-btn .edui-icon-fullscreen {
-    background-position: -100px -20px;
-}
-
-.edui-btn-toolbar .edui-btn .edui-icon-removeformat {
-    background-position: -580px 0;
-}
-.edui-btn-toolbar .edui-btn .edui-icon-drafts {
-    background-position: -560px 0;
-}
-.edui-btn-toolbar .edui-btn .edui-icon-formula {
-    background-position: -80px -20px;
-}
\ No newline at end of file
+.edui-icon-bold.edui-icon { background-position: 0 -168px }
+.edui-icon-italic.edui-icon { background-position: 0 -198px }
+.edui-icon-underline.edui-icon { background-position: -2px -228px }
+/*.edui-icon-blockquote.edui-icon { background-position: 0 -258px }*/
+.edui-icon-forecolor.edui-icon { background-position: 0 -288px }
+.edui-icon-backcolor.edui-icon { background-position: 0 -318px }
+.edui-icon-justifyleft.edui-icon { background-position: 0 -348px }
+.edui-icon-justifycenter.edui-icon { background-position: 0 -378px }
+.edui-icon-justifyright.edui-icon { background-position: 0 -408px }
+.edui-icon-insertorderedlist.edui-icon { background-position: 0 -438px }
+.edui-icon-insertunorderedlist.edui-icon { background-position: 0 -468px }
+.edui-icon-lineheight.edui-icon { background-position: 0 -498px }
+.edui-icon-rowspacingbottom.edui-icon { background-position: 0 -528px }
+.edui-icon-rowspacingtop.edui-icon { background-position: 0 -558px }
+.edui-icon-horizontal.edui-icon { background-position: 0 -588px }
+.edui-icon-link.edui-icon { background-position: 0 -618px }
+.edui-icon-video.edui-icon { background-position: 0 -678px }
+.edui-icon-image.edui-icon { background-position: 0 -648px }
+.edui-icon-removeformat.edui-icon { background-position: 0 -708px }
+.edui-icon-unlink.edui-icon { background-position: 0 -738px }
+/*.edui-icon-imagenone.edui-icon { background-position: 0 -768px }
+.edui-icon-imageleft.edui-icon { background-position: 0 -798px }
+.edui-icon-imageright.edui-icon { background-position: 0 -828px }
+.edui-icon-imagecenter.edui-icon { background-position: 0 -858px }*/
+.edui-icon-fullscreen.edui-icon { background-position: -2px -2px; }
+.edui-btn-fullscreen.edui-active .edui-icon-fullscreen { background-position: -2px -38px }
+.edui-btn-fullscreen { float: right; }
diff --git a/themes/default/_css/combobox.css b/themes/default/_css/combobox.css
index 0863fb18..e950d522 100644
--- a/themes/default/_css/combobox.css
+++ b/themes/default/_css/combobox.css
@@ -8,8 +8,6 @@
     position: relative;
     display: inline-block;
     vertical-align: top;
-    *display: inline ;
-    *zoom:1;
     width:60px;
     height:20px;
     line-height: 20px;
@@ -23,24 +21,16 @@
     position: relative;
     display: inline-block ;
     vertical-align: top;
-    *display: inline ;
-    *zoom:1;
     height:20px;
     margin: 0;
     padding:0 3px;
 }
 .edui-combobox .edui-caret{
-    position: relative;
     display: inline-block ;
     vertical-align: top;
-    *display: inline ;
-    *zoom:1;
     height:20px;
     width: 12px;
-    margin: 0;
-    padding: 0;
-    background: url(../images/icons.png) -741px 0;
-    _background: url(../images/icons.gif) -741px 0;
+    background: url(../images/arrow.png) 50% 50% no-repeat;
 }
 .edui-btn-toolbar .edui-combobox.edui-disabled{
     opacity: 0.2;
diff --git a/themes/default/_css/editor.css b/themes/default/_css/editor.css
index 68777f31..a17301e7 100755
--- a/themes/default/_css/editor.css
+++ b/themes/default/_css/editor.css
@@ -46,4 +46,10 @@
     vertical-align: middle;
     width: 0px;
     height: 0px;
-}
\ No newline at end of file
+}
+
+.edui-faked-video {
+    background: url(../images/videologo.gif) 50% 50% no-repeat;
+    border: 1px solid #eee;
+    float: none;
+}
diff --git a/themes/default/_css/separator.css b/themes/default/_css/separator.css
index bc9444dc..21e1e818 100755
--- a/themes/default/_css/separator.css
+++ b/themes/default/_css/separator.css
@@ -1,13 +1,8 @@
 .edui-toolbar .edui-separator{
-    width: 2px;
+    display: inline-block;
+    width: 1px;
     height: 20px;
-    padding: 1px 2px;
-    background: url(../images/icons.png) -179px 1px;
-    background: url(../images/icons.gif) -179px 1px \9;
-    display: inline-block ;
+    background-color: #e7e7eb;
+    margin: 1px 3px;
     vertical-align: top;
-    *display: inline ;
-    *zoom:1;
-    border:none;
-
 }
\ No newline at end of file
diff --git a/themes/default/_css/splitbutton.css b/themes/default/_css/splitbutton.css
index 9a2db04c..21794273 100755
--- a/themes/default/_css/splitbutton.css
+++ b/themes/default/_css/splitbutton.css
@@ -10,15 +10,11 @@
     margin: 0;
 }
 .edui-splitbutton .edui-caret{
-    position: relative;
     display: inline-block ;
     vertical-align: top;
-    *display: inline ;
-    *zoom:1;
-    width: 8px;
-    height: 20px;
-    background: url(../images/icons.png) -741px 0;
-    _background: url(../images/icons.gif) -741px 0;
+    height:20px;
+    width: 12px;
+    background: url(../images/arrow.png) 50% 50% no-repeat;
 }
 
 .edui-btn-toolbar .edui-splitbutton,
diff --git a/themes/default/_css/tab.css b/themes/default/_css/tab.css
index 25362978..6cfaff7f 100644
--- a/themes/default/_css/tab.css
+++ b/themes/default/_css/tab.css
@@ -28,7 +28,7 @@
     border: 1px solid #ddd;
     border-bottom-color: transparent;
     background-color: #fff;
-    padding:8px 12px;
+    padding:5px 12px;
     color: #555555;
     cursor: default;
 }
diff --git a/themes/default/images/arrow.png b/themes/default/images/arrow.png
new file mode 100755
index 00000000..80999de3
Binary files /dev/null and b/themes/default/images/arrow.png differ
diff --git a/themes/default/images/icons.png b/themes/default/images/icons.png
index de9a1bb2..7ab39602 100755
Binary files a/themes/default/images/icons.png and b/themes/default/images/icons.png differ