diff --git a/apps/common/main/lib/template/AutoCorrectDialog.template b/apps/common/main/lib/template/AutoCorrectDialog.template
index 872521c14..6aa2fcc25 100644
--- a/apps/common/main/lib/template/AutoCorrectDialog.template
+++ b/apps/common/main/lib/template/AutoCorrectDialog.template
@@ -25,9 +25,9 @@
             </tr>
         <tr>
             <td style="padding-bottom: 8px;">
-                <button type="button" class="btn btn-text-default auto" id="auto-correct-btn-reset" style="min-width: 86px;"><%= scope.textResetAll %></button>
-                <button type="button" class="btn btn-text-default auto" id="auto-correct-btn-delete" style="min-width: 86px;float: right;"><%= scope.textDelete %></button>
-                <button type="button" class="btn btn-text-default auto" id="auto-correct-btn-edit" style="min-width: 86px;float: right;margin-right:5px;"><%= scope.textAdd %></button>
+                <button type="button" class="btn btn-text-default auto" id="auto-correct-btn-reset" style="min-width: 80px;"><%= scope.textResetAll %></button>
+                <button type="button" class="btn btn-text-default auto" id="auto-correct-btn-delete" style="min-width: 80px;float: right;"><%= scope.textDelete %></button>
+                <button type="button" class="btn btn-text-default auto" id="auto-correct-btn-edit" style="min-width: 80px;float: right;margin-right:5px;"><%= scope.textAdd %></button>
                 </td>
             </tr>
         </table>
diff --git a/apps/documenteditor/main/app/template/ChartSettings.template b/apps/documenteditor/main/app/template/ChartSettings.template
index b4d293b9a..41d89483b 100644
--- a/apps/documenteditor/main/app/template/ChartSettings.template
+++ b/apps/documenteditor/main/app/template/ChartSettings.template
@@ -54,7 +54,7 @@
     </tr>
     <tr>
         <td class="padding-small" colspan=2>
-            <button type="button" class="btn btn-text-default" id="chart-button-edit-data" style="width:115px;"><%= scope.textEditData %></button>
+            <button type="button" class="btn btn-text-default auto" id="chart-button-edit-data" style="min-width:115px;"><%= scope.textEditData %></button>
         </td>
     </tr>
     <tr>
diff --git a/apps/documenteditor/main/locale/be.json b/apps/documenteditor/main/locale/be.json
index 94974188a..1ecc6a28d 100644
--- a/apps/documenteditor/main/locale/be.json
+++ b/apps/documenteditor/main/locale/be.json
@@ -1130,7 +1130,7 @@
   "DE.Views.BookmarksDialog.textSort": "Парадкаваць па",
   "DE.Views.BookmarksDialog.textTitle": "Закладкі",
   "DE.Views.BookmarksDialog.txtInvalidName": "Назва закладкі можа змяшчаць літары, лічбы, знакі падкрэслівання і мусіць пачынацца з літары.",
-  "DE.Views.CaptionDialog.textAdd": "Дадаць адмеціну",
+  "DE.Views.CaptionDialog.textAdd": "Дадаць",
   "DE.Views.CaptionDialog.textAfter": "Пасля",
   "DE.Views.CaptionDialog.textBefore": "Перад",
   "DE.Views.CaptionDialog.textCaption": "Назва",
@@ -1138,7 +1138,7 @@
   "DE.Views.CaptionDialog.textChapterInc": "Уключыць нумар раздзела",
   "DE.Views.CaptionDialog.textColon": "двукроп’е",
   "DE.Views.CaptionDialog.textDash": "злучок",
-  "DE.Views.CaptionDialog.textDelete": "Выдаліць адмеціну",
+  "DE.Views.CaptionDialog.textDelete": "Выдаліць",
   "DE.Views.CaptionDialog.textEquation": "Раўнанне",
   "DE.Views.CaptionDialog.textExamples": "Прыклады: Табліца 2-A, Выява 1.IV",
   "DE.Views.CaptionDialog.textExclude": "Выключыць адмеціну з назвы",
diff --git a/apps/documenteditor/main/locale/bg.json b/apps/documenteditor/main/locale/bg.json
index a1c4220f7..34e1e03d9 100644
--- a/apps/documenteditor/main/locale/bg.json
+++ b/apps/documenteditor/main/locale/bg.json
@@ -1032,8 +1032,8 @@
   "DE.Views.BookmarksDialog.textSort": "Сортиране по",
   "DE.Views.BookmarksDialog.textTitle": "Отбелязани",
   "DE.Views.BookmarksDialog.txtInvalidName": "Името на отметката може да съдържа само букви, цифри и долни черти и трябва да започва с буквата",
-  "DE.Views.CaptionDialog.textAdd": "Добави етикет",
-  "DE.Views.CaptionDialog.textDelete": "Изтрий етикета",
+  "DE.Views.CaptionDialog.textAdd": "Добави",
+  "DE.Views.CaptionDialog.textDelete": "Изтрий",
   "DE.Views.CaptionDialog.textEquation": "Уравнение",
   "DE.Views.CellsAddDialog.textUp": "Над курсора",
   "DE.Views.ChartSettings.textAdvanced": "Показване на разширените настройки",
diff --git a/apps/documenteditor/main/locale/ca.json b/apps/documenteditor/main/locale/ca.json
index 09bfc7fc3..fd022bd1e 100644
--- a/apps/documenteditor/main/locale/ca.json
+++ b/apps/documenteditor/main/locale/ca.json
@@ -1130,7 +1130,7 @@
   "DE.Views.BookmarksDialog.textSort": "Ordenar per",
   "DE.Views.BookmarksDialog.textTitle": "Marcadors",
   "DE.Views.BookmarksDialog.txtInvalidName": "El nom del marcador només pot contenir lletres, dígits i guions baixos i hauria de començar per la lletra",
-  "DE.Views.CaptionDialog.textAdd": "Afegir etiqueta",
+  "DE.Views.CaptionDialog.textAdd": "Afegir",
   "DE.Views.CaptionDialog.textAfter": "Després",
   "DE.Views.CaptionDialog.textBefore": "Abans",
   "DE.Views.CaptionDialog.textCaption": "Subtítol",
@@ -1138,7 +1138,7 @@
   "DE.Views.CaptionDialog.textChapterInc": "Inclogui el número de capítol",
   "DE.Views.CaptionDialog.textColon": "Dos punts",
   "DE.Views.CaptionDialog.textDash": "guió",
-  "DE.Views.CaptionDialog.textDelete": "Suprimeix l'etiqueta",
+  "DE.Views.CaptionDialog.textDelete": "Suprimeix",
   "DE.Views.CaptionDialog.textEquation": "Equació",
   "DE.Views.CaptionDialog.textExamples": "Exemples: Taula 2-A, Imatge 1.IV",
   "DE.Views.CaptionDialog.textExclude": "Exclou l'etiqueta de la llegenda",
diff --git a/apps/documenteditor/main/locale/el.json b/apps/documenteditor/main/locale/el.json
index e73ab7bcb..fec25b5d9 100644
--- a/apps/documenteditor/main/locale/el.json
+++ b/apps/documenteditor/main/locale/el.json
@@ -1116,7 +1116,7 @@
   "DE.Views.BookmarksDialog.textSort": "Ταξινόμηση κατά",
   "DE.Views.BookmarksDialog.textTitle": "Σελιδοδείκτες",
   "DE.Views.BookmarksDialog.txtInvalidName": "Το όνομα του σελιδοδείκτη μπορεί να περιέχει μόνο γράμματα, ψηφία και κάτω παύλες και πρέπει να ξεκινά με γράμμα",
-  "DE.Views.CaptionDialog.textAdd": "Προσθήκη ετικέτας",
+  "DE.Views.CaptionDialog.textAdd": "Προσθήκη",
   "DE.Views.CaptionDialog.textAfter": "Μετά",
   "DE.Views.CaptionDialog.textBefore": "Πριν",
   "DE.Views.CaptionDialog.textCaption": "Λεζάντα",
@@ -1124,7 +1124,7 @@
   "DE.Views.CaptionDialog.textChapterInc": "Συμπερίληψη αριθμού κεφαλαίου",
   "DE.Views.CaptionDialog.textColon": "άνω κάτω τελεία",
   "DE.Views.CaptionDialog.textDash": "παύλα",
-  "DE.Views.CaptionDialog.textDelete": "Διαγραφή ετικέτας",
+  "DE.Views.CaptionDialog.textDelete": "Διαγραφή",
   "DE.Views.CaptionDialog.textEquation": "Εξίσωση",
   "DE.Views.CaptionDialog.textExamples": "Παραδείγματα: Πίνακας 2-A, Εικόνα 1.IV",
   "DE.Views.CaptionDialog.textExclude": "Εξαίρεση ετικέτας από τη λεζάντα",
@@ -1471,7 +1471,7 @@
   "DE.Views.DropcapSettingsAdvanced.textAtLeast": "Τουλάχιστον",
   "DE.Views.DropcapSettingsAdvanced.textAuto": "Αυτόματα",
   "DE.Views.DropcapSettingsAdvanced.textBackColor": "Χρώμα φόντου",
-  "DE.Views.DropcapSettingsAdvanced.textBorderColor": "Χρώμα περιγράμματος",
+  "DE.Views.DropcapSettingsAdvanced.textBorderColor": "Χρώμα",
   "DE.Views.DropcapSettingsAdvanced.textBorderDesc": "Κάντε κλικ στο διάγραμμα ή χρησιμοποιήστε τα κουμπιά για να επιλέξετε περιγράμματα",
   "DE.Views.DropcapSettingsAdvanced.textBorderWidth": "Μέγεθος περιγράμματος",
   "DE.Views.DropcapSettingsAdvanced.textBottom": "Κάτω",
@@ -2024,7 +2024,7 @@
   "DE.Views.ParagraphSettingsAdvanced.textAuto": "Πολλαπλό",
   "DE.Views.ParagraphSettingsAdvanced.textBackColor": "Χρώμα φόντου",
   "DE.Views.ParagraphSettingsAdvanced.textBodyText": "Βασικό κείμενο",
-  "DE.Views.ParagraphSettingsAdvanced.textBorderColor": "Χρώμα περιγράμματος",
+  "DE.Views.ParagraphSettingsAdvanced.textBorderColor": "Χρώμα",
   "DE.Views.ParagraphSettingsAdvanced.textBorderDesc": "Κάντε κλικ στο διάγραμμα ή χρησιμοποιήστε τα κουμπιά για να επιλέξετε περιγράμματα και να εφαρμόσετε την επιλεγμένη τεχνοτροπία σε αυτά",
   "DE.Views.ParagraphSettingsAdvanced.textBorderWidth": "Μέγεθος περιγράμματος",
   "DE.Views.ParagraphSettingsAdvanced.textBottom": "Κάτω",
@@ -2258,7 +2258,7 @@
   "DE.Views.TableSettingsAdvanced.textAutofit": "Αυτόματη αλλαγή μεγέθους για προσαρμογή περιεχομένου",
   "DE.Views.TableSettingsAdvanced.textBackColor": "Φόντο κελιού",
   "DE.Views.TableSettingsAdvanced.textBelow": "παρακάτω",
-  "DE.Views.TableSettingsAdvanced.textBorderColor": "Χρώμα περιγράμματος",
+  "DE.Views.TableSettingsAdvanced.textBorderColor": "Χρώμα",
   "DE.Views.TableSettingsAdvanced.textBorderDesc": "Κάντε κλικ στο διάγραμμα ή χρησιμοποιήστε τα κουμπιά για να επιλέξετε περιγράμματα και να εφαρμόσετε την επιλεγμένη τεχνοτροπία σε αυτά",
   "DE.Views.TableSettingsAdvanced.textBordersBackgroung": "Περιγράμματα & Φόντο",
   "DE.Views.TableSettingsAdvanced.textBorderWidth": "Μέγεθος περιγράμματος",
diff --git a/apps/documenteditor/main/locale/it.json b/apps/documenteditor/main/locale/it.json
index 8a732a00c..60298ecef 100644
--- a/apps/documenteditor/main/locale/it.json
+++ b/apps/documenteditor/main/locale/it.json
@@ -1127,7 +1127,7 @@
   "DE.Views.BookmarksDialog.textSort": "Ordina per",
   "DE.Views.BookmarksDialog.textTitle": "Segnalibri",
   "DE.Views.BookmarksDialog.txtInvalidName": "il nome del Segnalibro può contenere solo lettere, numeri e underscore, e dovrebbe iniziare con la lettera",
-  "DE.Views.CaptionDialog.textAdd": "Aggiungi etichetta",
+  "DE.Views.CaptionDialog.textAdd": "Aggiungi",
   "DE.Views.CaptionDialog.textAfter": "Dopo",
   "DE.Views.CaptionDialog.textBefore": "Prima",
   "DE.Views.CaptionDialog.textCaption": "Didascalia",
@@ -1135,7 +1135,7 @@
   "DE.Views.CaptionDialog.textChapterInc": "Includi il numero del capitolo",
   "DE.Views.CaptionDialog.textColon": "due punti",
   "DE.Views.CaptionDialog.textDash": "trattino",
-  "DE.Views.CaptionDialog.textDelete": "Elimina etichetta",
+  "DE.Views.CaptionDialog.textDelete": "Elimina",
   "DE.Views.CaptionDialog.textEquation": "Equazione",
   "DE.Views.CaptionDialog.textExamples": "Esempi: Tabella 2-A, Immagine 1.IV",
   "DE.Views.CaptionDialog.textExclude": "Escludere l'etichetta dalla didascalia",
diff --git a/apps/documenteditor/main/locale/pt.json b/apps/documenteditor/main/locale/pt.json
index f7ed28e33..4dd48150a 100644
--- a/apps/documenteditor/main/locale/pt.json
+++ b/apps/documenteditor/main/locale/pt.json
@@ -1140,7 +1140,7 @@
   "DE.Views.BookmarksDialog.textSort": "Ordenar por",
   "DE.Views.BookmarksDialog.textTitle": "Favoritos",
   "DE.Views.BookmarksDialog.txtInvalidName": "O nome do marcador só pode conter letras, dígitos e sublinhados, e deve começar com a letra",
-  "DE.Views.CaptionDialog.textAdd": "Adicionar etiqueta",
+  "DE.Views.CaptionDialog.textAdd": "Adicionar",
   "DE.Views.CaptionDialog.textAfter": "Depois",
   "DE.Views.CaptionDialog.textBefore": "Antes",
   "DE.Views.CaptionDialog.textCaption": "Legenda",
@@ -1148,7 +1148,7 @@
   "DE.Views.CaptionDialog.textChapterInc": "Inclui o número do capítulo",
   "DE.Views.CaptionDialog.textColon": "Dois pontos",
   "DE.Views.CaptionDialog.textDash": "traço",
-  "DE.Views.CaptionDialog.textDelete": "Excluir etiqueta",
+  "DE.Views.CaptionDialog.textDelete": "Excluir",
   "DE.Views.CaptionDialog.textEquation": "Equação",
   "DE.Views.CaptionDialog.textExamples": "Exemplos: Tabela 2-A, Imagem 1.IV",
   "DE.Views.CaptionDialog.textExclude": "Excluir rótulo da legenda",
diff --git a/apps/documenteditor/main/locale/ro.json b/apps/documenteditor/main/locale/ro.json
index 60942d795..ebb701027 100644
--- a/apps/documenteditor/main/locale/ro.json
+++ b/apps/documenteditor/main/locale/ro.json
@@ -1140,7 +1140,7 @@
   "DE.Views.BookmarksDialog.textSort": "Sortare după",
   "DE.Views.BookmarksDialog.textTitle": "Marcaje",
   "DE.Views.BookmarksDialog.txtInvalidName": "Titlul marcajului poate conține numai litere, numere și sublinieri și trebuie să înceapă cu o litera",
-  "DE.Views.CaptionDialog.textAdd": "Adăugare eticheta",
+  "DE.Views.CaptionDialog.textAdd": "Adăugare",
   "DE.Views.CaptionDialog.textAfter": "După",
   "DE.Views.CaptionDialog.textBefore": "Înainte",
   "DE.Views.CaptionDialog.textCaption": "Legenda",
@@ -1148,7 +1148,7 @@
   "DE.Views.CaptionDialog.textChapterInc": "Includere număr de capitol",
   "DE.Views.CaptionDialog.textColon": "două puncte",
   "DE.Views.CaptionDialog.textDash": "linia de pauză",
-  "DE.Views.CaptionDialog.textDelete": "Eliminare eticheta",
+  "DE.Views.CaptionDialog.textDelete": "Eliminare",
   "DE.Views.CaptionDialog.textEquation": "Ecuație",
   "DE.Views.CaptionDialog.textExamples": "Exemple: Tabel 2-A, Imaginea 1.IV",
   "DE.Views.CaptionDialog.textExclude": "Excludere etichetă din legendă",
diff --git a/apps/presentationeditor/main/app/template/ChartSettings.template b/apps/presentationeditor/main/app/template/ChartSettings.template
index 7ca88a41a..0d84fa8e8 100644
--- a/apps/presentationeditor/main/app/template/ChartSettings.template
+++ b/apps/presentationeditor/main/app/template/ChartSettings.template
@@ -46,7 +46,7 @@
     </tr>
     <tr>
         <td class="padding-small">
-            <button type="button" class="btn btn-text-default" id="chart-button-edit-data" style="width:115px;"><%= scope.textEditData %></button>
+            <button type="button" class="btn btn-text-default auto" id="chart-button-edit-data" style="min-width:115px;"><%= scope.textEditData %></button>
         </td>
     </tr>
     <tr>
diff --git a/apps/presentationeditor/main/app/template/SlideSettings.template b/apps/presentationeditor/main/app/template/SlideSettings.template
index 267fe7abf..7f75de968 100644
--- a/apps/presentationeditor/main/app/template/SlideSettings.template
+++ b/apps/presentationeditor/main/app/template/SlideSettings.template
@@ -120,12 +120,16 @@
         </td>
     </tr>
     <tr>
-        <td class="padding-large">
-            <div style="display: inline-block;">
-                <label class="input-label"><%= scope.strDuration %></label>
-                <div id="slide-spin-duration" style="display: inline-block; vertical-align: middle;"></div>
+        <td class="padding-small">
+            <div>
+                <label class="input-label" style="margin-top:4px;"><%= scope.strDuration %></label>
+                <div id="slide-spin-duration" style="display: inline-block; float:right;"></div>
             </div>
-            <button type="button" class="btn btn-text-default" id="slide-button-preview" style="width:70px;display: inline-block; float:right;"><%= scope.textPreview %></button>
+        </td>
+    </tr>
+    <tr>
+        <td class="padding-large">
+            <button type="button" class="btn btn-text-default" id="slide-button-preview" style="width:100%;"><%= scope.textPreview %></button>
         </td>
     </tr>
     <tr>
@@ -136,7 +140,7 @@
     <tr>
         <td class="padding-large">
             <div>
-                <div id="slide-checkbox-delay" style="display: inline-block; width: 100px; margin-top:2px;"></div>
+                <div id="slide-checkbox-delay" style="display: inline-block; width: 100px; margin-top:4px;"></div>
                 <div id="slide-spin-delay" style="display: inline-block; float:right;"></div>
             </div>
         </td>
diff --git a/apps/presentationeditor/main/app/view/SlideSettings.js b/apps/presentationeditor/main/app/view/SlideSettings.js
index f09266959..96a94f2a0 100644
--- a/apps/presentationeditor/main/app/view/SlideSettings.js
+++ b/apps/presentationeditor/main/app/view/SlideSettings.js
@@ -210,7 +210,7 @@ define([
             this.numDuration = new Common.UI.MetricSpinner({
                 el: $('#slide-spin-duration'),
                 step: 1,
-                width: 65,
+                width: 70,
                 value: '',
                 defaultUnit : this.textSec,
                 maxValue: 300,