diff --git a/apps/documenteditor/main/app/view/TableOfContentsSettings.js b/apps/documenteditor/main/app/view/TableOfContentsSettings.js
index 2d3167c3f9..e3684197ca 100644
--- a/apps/documenteditor/main/app/view/TableOfContentsSettings.js
+++ b/apps/documenteditor/main/app/view/TableOfContentsSettings.js
@@ -49,7 +49,7 @@ define([
     DE.Views.TableOfContentsSettings = Common.Views.AdvancedSettingsWindow.extend(_.extend({
         options: {
             contentWidth: 500,
-            height: 445
+            height: 430
         },
 
         initialize : function(options) {
@@ -66,8 +66,8 @@ define([
                                         '<td class="padding-small">',
                                         '<div id="tableofcontents-chb-pages"></div>',
                                         '</td>',
-                                        '<td rowspan="6" class="padding-small" style="vertical-align: top;">',
-                                        '<div style="border: 1px solid #cbcbcb;width: 230px; height: 197px; float: right;">',
+                                        '<td rowspan="5" class="padding-small" style="vertical-align: top;">',
+                                        '<div style="border: 1px solid #cbcbcb;width: 230px; height: 172px; float: right;">',
                                             '<div id="tableofcontents-img" style="width: 100%; height: 100%;"></div>',
                                         '</div>',
                                         '</td>',
@@ -83,14 +83,9 @@ define([
                                             '<div id="tableofcontents-combo-leader" class="input-group-nr" style="display: inline-block; width:95px; margin-left: 10px;"></div>',
                                         '</td>',
                                     '</tr>',
-                                    '<tr>',
-                                        '<td class="padding-small">',
-                                            '<div id="tableofcontents-chb-links"></div>',
-                                        '</td>',
-                                    '</tr>',
                                     '<tr>',
                                         '<td class="padding-large">',
-                                            '<div id="tableofcontents-chb-underline"></div>',
+                                            '<div id="tableofcontents-chb-links"></div>',
                                         '</td>',
                                     '</tr>',
                                     '<tr>',
@@ -102,7 +97,7 @@ define([
                                     '</tr>',
                                     '<tr>',
                                         '<td class="padding-small" style="vertical-align: top;">',
-                                            '<div id="tableofcontents-from-levels">',
+                                            '<div id="tableofcontents-from-levels" style="width:220px;">',
                                                 '<label class="input-label">' + me.textLevels + '</label>',
                                                 '<div id="tableofcontents-spin-levels" style="display: inline-block; width:95px; margin-left: 10px;"></div>',
                                             '</div>',
@@ -183,17 +178,8 @@ define([
                 labelText: this.strLinks
             });
             this.chLinks.on('change', _.bind(function(field, newValue, oldValue, eOpts){
-                this.chUnderline.setDisabled(field.getValue()!=='checked');
-                if (this._changedProps) {
-                }
             }, this));
 
-            this.chUnderline = new Common.UI.CheckBox({
-                el: $('#tableofcontents-chb-underline'),
-                labelText: this.strUnderline,
-                disabled: true
-            });
-
             this.radioLevels = new Common.UI.RadioBox({
                 el: $('#tableofcontents-radio-levels'),
                 labelText: this.textRadioLevels,
@@ -359,7 +345,6 @@ define([
         strShowPages: 'Show page numbers',
         strAlign: 'Right align page numbers',
         strLinks: 'Format Table of Contents as links',
-        strUnderline: 'Underline links',
         textNone: 'None',
         textRadioLevels: 'Outline levels',
         textRadioStyles: 'Selected styles',
diff --git a/apps/documenteditor/main/resources/img/toolbar/contents.png b/apps/documenteditor/main/resources/img/toolbar/contents.png
index e9acee2a38..83210bd7a2 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/contents.png and b/apps/documenteditor/main/resources/img/toolbar/contents.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/contents@2x.png b/apps/documenteditor/main/resources/img/toolbar/contents@2x.png
index b622082dcf..e1946694c9 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/contents@2x.png and b/apps/documenteditor/main/resources/img/toolbar/contents@2x.png differ