diff --git a/apps/spreadsheeteditor/main/app/controller/CellEditor.js b/apps/spreadsheeteditor/main/app/controller/CellEditor.js
index 085c417e0..8a9beecf1 100644
--- a/apps/spreadsheeteditor/main/app/controller/CellEditor.js
+++ b/apps/spreadsheeteditor/main/app/controller/CellEditor.js
@@ -190,11 +190,15 @@ define([
         onLayoutResize: function(o, r) {
             if (r == 'cell:edit') {
                 if (Math.floor(this.editor.$el.height()) > 19) {
-                    if (!this.editor.$btnexpand.hasClass('btn-collapse'))
+                    if (!this.editor.$btnexpand.hasClass('btn-collapse')) {
+                        this.editor.$el.addClass('expanded');
                         this.editor.$btnexpand['addClass']('btn-collapse');
+                    }
+
                     o && Common.localStorage.setItem('sse-celleditor-height', this.editor.$el.height());
                     o && Common.localStorage.setBool('sse-celleditor-expand', true);
                 } else {
+                    this.editor.$el.removeClass('expanded');
                     this.editor.$btnexpand['removeClass']('btn-collapse');
                     o && Common.localStorage.setBool('sse-celleditor-expand', false);
                 }
@@ -232,10 +236,12 @@ define([
             if ( Math.floor(this.editor.$el.height()) > 19) {
                 this.editor.keep_height = this.editor.$el.height();
                 this.editor.$el.height(19);
+                this.editor.$el.removeClass('expanded');
                 this.editor.$btnexpand['removeClass']('btn-collapse');
                 Common.localStorage.setBool('sse-celleditor-expand', false);
             } else {
                 this.editor.$el.height(this.editor.keep_height);
+                this.editor.$el.addClass('expanded');
                 this.editor.$btnexpand['addClass']('btn-collapse');
                 Common.localStorage.setBool('sse-celleditor-expand', true);
             }
diff --git a/apps/spreadsheeteditor/main/resources/less/celleditor.less b/apps/spreadsheeteditor/main/resources/less/celleditor.less
index 1cf73a6e6..0ad230f18 100644
--- a/apps/spreadsheeteditor/main/resources/less/celleditor.less
+++ b/apps/spreadsheeteditor/main/resources/less/celleditor.less
@@ -4,14 +4,14 @@
     border-left: solid @scaled-one-px-value-ie @border-toolbar-ie;
     border-left: solid @scaled-one-px-value @border-toolbar;
     min-height: 20px;
-    background-color: @background-normal-ie;
-    background-color: @background-normal;
+    background-color: @background-toolbar-ie;
+    background-color: @background-toolbar;
 
     .ce-group-name {
         float: left;
         height: 20px;
-        border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie;
-        border-bottom: @scaled-one-px-value solid @border-toolbar;
+        //border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie;
+        //border-bottom: @scaled-one-px-value solid @border-toolbar;
         background-color: @background-toolbar-ie;
         background-color: @background-toolbar;
 
@@ -26,6 +26,8 @@
             border-right: @scaled-one-px-value solid @border-toolbar;
             transition: none;
             -webkit-transition: none;
+            box-shadow: 0 @scaled-one-px-value-ie 0 0 @border-toolbar-ie;
+            box-shadow: 0 @scaled-one-px-value 0 0 @border-toolbar;
 
             &[disabled] {
                 color: @border-preview-select-ie;
@@ -75,9 +77,19 @@
         }
     }
 
+    &:not(.expanded) {
+        #ce-func-label {
+            border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie;
+            border-bottom: @scaled-one-px-value solid @border-toolbar;
+        }
+    }
+
     .ce-group-expand {
         float: right;
-        height: 20px;
+        //height: 20px;
+        height: 100%;
+        background-color: @background-normal-ie;
+        background-color: @background-normal;
     }
 
     .ce-group-content {