diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js
index 7a733b0c3..b3efc39b1 100644
--- a/apps/common/main/lib/controller/Plugins.js
+++ b/apps/common/main/lib/controller/Plugins.js
@@ -167,8 +167,9 @@ define([
             return this;
         },
 
-        setMode: function(mode) {
+        setMode: function(mode, api) {
             this.appOptions = mode;
+            this.api = api;
             this.customPluginsComplete = !this.appOptions.canBrandingExt;
             if (this.appOptions.canBrandingExt)
                 this.getAppCustomPlugins(this.configPlugins);
@@ -514,7 +515,7 @@ define([
             var pluginStore = this.getApplication().getCollection('Common.Collections.Plugins'),
                 isEdit = me.appOptions.isEdit,
                 editor = me.editor,
-                apiVersion = me.api.GetVersion();
+                apiVersion = me.api ? me.api.GetVersion() : undefined;
             if ( pluginsdata instanceof Array ) {
                 var arr = [], arrUI = [],
                     lang = me.appOptions.lang.split(/[\-_]/)[0];
diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js
index a9227d93b..c96aaeb42 100644
--- a/apps/common/main/lib/controller/ReviewChanges.js
+++ b/apps/common/main/lib/controller/ReviewChanges.js
@@ -132,7 +132,7 @@ define([
                     this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this));
                     this.api.asc_registerCallback('asc_onParticipantsChanged',     _.bind(this.onAuthParticipantsChanged, this));
                 }
-                if (this.appConfig.canReview && !this.appConfig.isReviewOnly)
+                if (this.appConfig.canReview)
                     this.api.asc_registerCallback('asc_onOnTrackRevisionsChange', _.bind(this.onApiTrackRevisionsChange, this));
                 this.api.asc_registerCallback('asc_onAcceptChangesBeforeCompare',_.bind(this.onAcceptChangesBeforeCompare, this));
                 this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onCoAuthoringDisconnect, this));
@@ -562,6 +562,7 @@ define([
                 this.view.turnChanges(true);
             } else
             if ( this.appConfig.canReview ) {
+                state = (state=='off') ? false : state; // support of prev. version (on/off)
                 if (!!global) {
                     this.api.asc_SetLocalTrackRevisions(null);
                     this.api.asc_SetGlobalTrackRevisions(!!state);
diff --git a/apps/common/main/lib/view/Comments.js b/apps/common/main/lib/view/Comments.js
index bc5bc47f1..166ab0583 100644
--- a/apps/common/main/lib/view/Comments.js
+++ b/apps/common/main/lib/view/Comments.js
@@ -272,16 +272,8 @@ define([
 
                     me.fireEvent('comment:resolve', [commentId]);
 
-                    readdresolves();
-                } else if (btn.hasClass('btn-resolve-check', false)) {
-                    var tip = btn.data('bs.tooltip');
-                    if (tip) tip.dontShow = true;
-
-                    me.fireEvent('comment:resolve', [commentId]);
-
                     readdresolves();
                 } else if (!btn.hasClass('msg-reply') &&
-                    !btn.hasClass('btn-resolve-check') &&
                     !btn.hasClass('btn-resolve')) {
                     var isTextSelected = false;
                     if (btn.hasClass('user-message')) {
@@ -377,12 +369,12 @@ define([
                     }
 
                     var arr = [],
-                        btns = $(view.el).find('.btn-resolve');
+                        btns = $(view.el).find('.btn-resolve:not(.comment-resolved)');
                     btns.tooltip({title: me.textResolve, placement: 'cursor'});
                     btns.each(function(idx, item){
                         arr.push($(item).data('bs.tooltip').tip());
                     });
-                    btns = $(view.el).find('.btn-resolve-check');
+                    btns = $(view.el).find('.comment-resolved');
                     btns.tooltip({title: me.textOpenAgain, placement: 'cursor'});
                     btns.each(function(idx, item){
                         arr.push($(item).data('bs.tooltip').tip());
diff --git a/apps/common/main/lib/view/ReviewPopover.js b/apps/common/main/lib/view/ReviewPopover.js
index 723632817..6eda90bda 100644
--- a/apps/common/main/lib/view/ReviewPopover.js
+++ b/apps/common/main/lib/view/ReviewPopover.js
@@ -258,12 +258,12 @@ define([
                         }
 
                         var arr = [],
-                            btns = $(view.el).find('.btn-resolve');
+                            btns = $(view.el).find('.btn-resolve:not(.comment-resolved)');
                         btns.tooltip({title: me.textResolve, placement: 'cursor'});
                         btns.each(function (idx, item) {
                             arr.push($(item).data('bs.tooltip').tip());
                         });
-                        btns = $(view.el).find('.btn-resolve-check');
+                        btns = $(view.el).find('.comment-resolved');
                         btns.tooltip({title: me.textOpenAgain, placement: 'cursor'});
                         btns.each(function (idx, item) {
                             arr.push($(item).data('bs.tooltip').tip());
@@ -451,14 +451,7 @@ define([
 
                                 readdresolves();
 
-                            } else if (btn.hasClass('btn-resolve', false)) {
-                                var tip = btn.data('bs.tooltip');
-                                if (tip) tip.dontShow = true;
-
-                                me.fireEvent('comment:resolve', [commentId]);
-
-                                readdresolves();
-                            } else if (btn.hasClass('btn-resolve-check', false)) {
+                            } else if (btn.hasClass('btn-resolve')) {
                                 var tip = btn.data('bs.tooltip');
                                 if (tip) tip.dontShow = true;
 
diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index e7d706b03..44d97a700 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -1340,7 +1340,7 @@ define([
 
                 this.appOptions.canRename && appHeader.setCanRename(true);
                 this.appOptions.canBrandingExt = params.asc_getCanBranding() && (typeof this.editorConfig.customization == 'object' || this.editorConfig.plugins);
-                this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions);
+                this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions, this.api);
 
                 if (this.appOptions.canComments)
                     Common.NotificationCenter.on('comments:cleardummy', _.bind(this.onClearDummyComment, this));