diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js
index 3d9e3a31e..99d10656c 100644
--- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js
+++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js
@@ -51,7 +51,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
     DE.Views.ControlSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
         options: {
             contentWidth: 310,
-            height: 412,
+            height: 392,
             toggleGroup: 'control-adv-settings-group',
             storageName: 'de-control-settings-adv-category'
         },
@@ -344,6 +344,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
                 //for list controls
                 this.btnsCategory[2].setVisible(type == Asc.c_oAscContentControlSpecificType.ComboBox || type == Asc.c_oAscContentControlSpecificType.DropDownList);
                 if (type == Asc.c_oAscContentControlSpecificType.ComboBox || type == Asc.c_oAscContentControlSpecificType.DropDownList) {
+                    this.btnsCategory[2].setCaption(type == Asc.c_oAscContentControlSpecificType.ComboBox ? this.textCombobox : this.textDropDown);
                     var specProps = (type == Asc.c_oAscContentControlSpecificType.ComboBox) ? props.get_ComboBoxPr() : props.get_DropDownListPr();
                     if (specProps) {
                         var count = specProps.get_ItemsCount();
@@ -648,9 +649,10 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
         textUp: 'Up',
         textDown: 'Down',
         textCombobox: 'Combo box',
+        textDropDown: 'Drop-down list',
         textDisplayName: 'Display name',
         textValue: 'Value',
-        textDate: 'Date Format',
+        textDate: 'Date format',
         textLang: 'Language',
         textFormat: 'Display the date like this',
         textCheckbox: 'Check box',
diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js
index cffc823cb..a60980b14 100644
--- a/apps/documenteditor/main/app/view/Toolbar.js
+++ b/apps/documenteditor/main/app/view/Toolbar.js
@@ -638,43 +638,43 @@ define([
                             items: [
                                 {
                                     caption: this.textPlainControl,
-                                    iconCls: 'mnu-control-plain',
+                                    // iconCls: 'mnu-control-plain',
                                     value: 'plain'
                                 },
                                 {
                                     caption: this.textRichControl,
-                                    iconCls: 'mnu-control-rich',
+                                    // iconCls: 'mnu-control-rich',
                                     value: 'rich'
                                 },
                                 {
                                     caption: this.textPictureControl,
-                                    iconCls: 'mnu-control-rich',
+                                    // iconCls: 'mnu-control-rich',
                                     value: 'picture'
                                 },
                                 {
                                     caption: this.textComboboxControl,
-                                    iconCls: 'mnu-control-rich',
+                                    // iconCls: 'mnu-control-rich',
                                     value: 'combobox'
                                 },
                                 {
                                     caption: this.textDropdownControl,
-                                    iconCls: 'mnu-control-rich',
+                                    // iconCls: 'mnu-control-rich',
                                     value: 'dropdown'
                                 },
                                 {
                                     caption: this.textDateControl,
-                                    iconCls: 'mnu-control-rich',
+                                    // iconCls: 'mnu-control-rich',
                                     value: 'date'
                                 },
                                 {
                                     caption: this.textCheckboxControl,
-                                    iconCls: 'mnu-control-rich',
+                                    // iconCls: 'mnu-control-rich',
                                     value: 'checkbox'
                                 },
                                 {caption: '--'},
                                 {
                                     caption: this.textRemoveControl,
-                                    iconCls: 'mnu-control-remove',
+                                    // iconCls: 'mnu-control-remove',
                                     value: 'remove'
                                 },
                                 {caption: '--'},
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index b9a16dd19..b749848be 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -1088,6 +1088,22 @@
   "DE.Views.ControlSettingsDialog.textTitle": "Content Control Settings",
   "DE.Views.ControlSettingsDialog.txtLockDelete": "Content control cannot be deleted",
   "DE.Views.ControlSettingsDialog.txtLockEdit": "Contents cannot be edited",
+  "DE.Views.ControlSettingsDialog.strGeneral": "General",
+  "DE.Views.ControlSettingsDialog.textAdd": "Add",
+  "DE.Views.ControlSettingsDialog.textChange": "Edit",
+  "DE.Views.ControlSettingsDialog.textDelete": "Delete",
+  "DE.Views.ControlSettingsDialog.textUp": "Up",
+  "DE.Views.ControlSettingsDialog.textDown": "Down",
+  "DE.Views.ControlSettingsDialog.textCombobox": "Combo box",
+  "DE.Views.ControlSettingsDialog.textDropDown": "Drop-down list",
+  "DE.Views.ControlSettingsDialog.textDisplayName": "Display name",
+  "DE.Views.ControlSettingsDialog.textValue": "Value",
+  "DE.Views.ControlSettingsDialog.textDate": "Date format",
+  "DE.Views.ControlSettingsDialog.textLang": "Language",
+  "DE.Views.ControlSettingsDialog.textFormat": "Display the date like this",
+  "DE.Views.ControlSettingsDialog.textCheckbox": "Check box",
+  "DE.Views.ControlSettingsDialog.textChecked": "Checked symbol",
+  "DE.Views.ControlSettingsDialog.textUnchecked": "Unchecked symbol",
   "DE.Views.CustomColumnsDialog.textColumns": "Number of columns",
   "DE.Views.CustomColumnsDialog.textSeparator": "Column divider",
   "DE.Views.CustomColumnsDialog.textSpacing": "Spacing between columns",
@@ -2247,6 +2263,11 @@
   "DE.Views.Toolbar.txtScheme9": "Foundry",
   "DE.Views.Toolbar.capBtnInsSymbol": "Symbol",
   "DE.Views.Toolbar.tipInsertSymbol": "Insert symbol",
+  "DE.Views.Toolbar.textPictureControl": "Picture",
+  "DE.Views.Toolbar.textComboboxControl": "Combo box",
+  "DE.Views.Toolbar.textCheckboxControl": "Check box",
+  "DE.Views.Toolbar.textDropdownControl": "Drop-down list",
+  "DE.Views.Toolbar.textDateControl": "Date",
   "DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
   "DE.Views.WatermarkSettingsDialog.textBold": "Bold",
   "DE.Views.WatermarkSettingsDialog.textColor": "Text color",