From e81c374dde802d1e0c85e408be464579ef9f3a64 Mon Sep 17 00:00:00 2001
From: Alexey Koshelev <aleksei.koshelev@onlyoffice.com>
Date: Mon, 25 Mar 2024 13:53:05 +0300
Subject: [PATCH 1/3] [DE] Move tabs contents. Bug 36439

---
 apps/documenteditor/main/app/template/Toolbar.template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/apps/documenteditor/main/app/template/Toolbar.template b/apps/documenteditor/main/app/template/Toolbar.template
index 0bacc61708..5292a0ceec 100644
--- a/apps/documenteditor/main/app/template/Toolbar.template
+++ b/apps/documenteditor/main/app/template/Toolbar.template
@@ -99,9 +99,9 @@
                 <div class="separator long"></div>
                 <div class="group">
                     <span class="btn-slot text x-huge" id="slot-btn-insimage"></span>
-                    <span class="btn-slot text x-huge" id="slot-btn-inschart"></span>
                     <span class="btn-slot text x-huge" id="slot-btn-insshape"></span>
                     <span class="btn-slot text x-huge" id="slot-btn-inssmartart"></span>
+                    <span class="btn-slot text x-huge" id="slot-btn-inschart"></span>
                 </div>
                 <div class="separator long"></div>
                 <div class="group">
@@ -111,12 +111,13 @@
                 <div class="separator long"></div>
                 <div class="group">
                     <span class="btn-slot text x-huge" id="slot-btn-editheader"></span>
-                    <span class="btn-slot text x-huge" id="slot-btn-datetime"></span>
                 </div>
                 <div class="separator long"></div>
                 <div class="group">
                     <span class="btn-slot text x-huge" id="slot-btn-instext"></span>
                     <span class="btn-slot text x-huge" id="slot-btn-instextart"></span>
+                    <span class="btn-slot text x-huge" id="slot-btn-dropcap"></span>
+                    <span class="btn-slot text x-huge" id="slot-btn-datetime"></span>
                 </div>
                 <div class="separator long"></div>
                 <div class="group">
@@ -124,10 +125,6 @@
                     <span class="btn-slot text x-huge" id="slot-btn-inssymbol"></span>
                 </div>
                 <div class="separator long"></div>
-                <div class="group">
-                    <span class="btn-slot text x-huge" id="slot-btn-dropcap"></span>
-                </div>
-                <div class="separator long"></div>
                 <div class="group">
                     <span class="btn-slot text x-huge" id="slot-btn-controls"></span>
                 </div>

From 9b06507eef0b300ad069a84397aea3d427865b6b Mon Sep 17 00:00:00 2001
From: Alexey Koshelev <aleksei.koshelev@onlyoffice.com>
Date: Mon, 25 Mar 2024 14:05:55 +0300
Subject: [PATCH 2/3] [SSE] Move tabs contents. Bug 36439

---
 .../main/app/template/Toolbar.template               | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/template/Toolbar.template b/apps/spreadsheeteditor/main/app/template/Toolbar.template
index 1b30cfdb91..526bc94e33 100644
--- a/apps/spreadsheeteditor/main/app/template/Toolbar.template
+++ b/apps/spreadsheeteditor/main/app/template/Toolbar.template
@@ -145,8 +145,6 @@
                 <div class="group">
                     <span class="btn-slot text x-huge" id="slot-btn-insimage"></span>
                     <span class="btn-slot text x-huge" id="slot-btn-insshape"></span>
-                    <span class="btn-slot text x-huge" id="slot-btn-instext"></span>
-                    <span class="btn-slot text x-huge" id="slot-btn-instextart"></span>
                     <span class="btn-slot text x-huge" id="slot-btn-inssmartart"></span>
                 </div>
                 <div class="separator long"></div>
@@ -162,16 +160,18 @@
                 </div>
                 <div class="separator long"></div>
                 <div class="group">
-                    <span class="btn-slot text x-huge slot-editheader"></span>
+                    <span class="btn-slot text x-huge" id="slot-btn-insslicer"></span>
                 </div>
                 <div class="separator long"></div>
                 <div class="group">
-                    <span class="btn-slot text x-huge" id="slot-btn-insequation"></span>
-                    <span class="btn-slot text x-huge" id="slot-btn-inssymbol"></span>
+                    <span class="btn-slot text x-huge" id="slot-btn-instext"></span>
+                    <span class="btn-slot text x-huge" id="slot-btn-instextart"></span>
+                    <span class="btn-slot text x-huge slot-editheader"></span>
                 </div>
                 <div class="separator long"></div>
                 <div class="group">
-                    <span class="btn-slot text x-huge" id="slot-btn-insslicer"></span>
+                    <span class="btn-slot text x-huge" id="slot-btn-insequation"></span>
+                    <span class="btn-slot text x-huge" id="slot-btn-inssymbol"></span>
                 </div>
             </section>
             <section class="panel" data-tab="layout">

From da58b40b86c604936e90faf12ab9259db10a7a66 Mon Sep 17 00:00:00 2001
From: Alexey Koshelev <aleksei.koshelev@onlyoffice.com>
Date: Mon, 25 Mar 2024 14:45:02 +0300
Subject: [PATCH 3/3] [PE] Move tabs contents. Bug 36439

---
 .../main/app/template/Toolbar.template                 | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/presentationeditor/main/app/template/Toolbar.template b/apps/presentationeditor/main/app/template/Toolbar.template
index 627899f211..d622189e8e 100644
--- a/apps/presentationeditor/main/app/template/Toolbar.template
+++ b/apps/presentationeditor/main/app/template/Toolbar.template
@@ -130,14 +130,14 @@
                 </div>
                 <div class="separator long"></div>
                 <div class="group">
-                    <span class="btn-slot text x-huge slot-instext"></span>
-                    <span class="btn-slot text x-huge" id="slot-btn-instextart"></span>
                     <span class="btn-slot text x-huge slot-insertimg"></span>
-                    <span class="btn-slot text x-huge" id="slot-btn-insertchart"></span>
-                    <span class="btn-slot text x-huge" id="slot-btn-inssmartart"></span>
                 </div>
                 <div class="separator long invisible"></div>
                 <div class="group small" id="slot-combo-insertshape"></div>
+                <div class="group small">
+                    <span class="btn-slot text x-huge" id="slot-btn-inssmartart"></span>
+                    <span class="btn-slot text x-huge" id="slot-btn-insertchart"></span>
+                </div>
                 <div class="separator long"></div>
                 <div class="group">
                     <span class="btn-slot text x-huge slot-comment"></span>
@@ -145,6 +145,8 @@
                 </div>
                 <div class="separator long"></div>
                 <div class="group">
+                    <span class="btn-slot text x-huge slot-instext"></span>
+                    <span class="btn-slot text x-huge" id="slot-btn-instextart"></span>
                     <span class="btn-slot text x-huge" id="slot-btn-editheader"></span>
                     <span class="btn-slot text x-huge" id="slot-btn-datetime"></span>
                     <span class="btn-slot text x-huge" id="slot-btn-slidenum"></span>