diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html
index 6ffa87f453..9d255996e1 100644
--- a/apps/documenteditor/main/index.html
+++ b/apps/documenteditor/main/index.html
@@ -314,11 +314,15 @@
             visible = true;
 
         isForm && document.body.classList.add('pdf-form');
-        (compact || view || notoolbar) && document.querySelector('.brendpanel > :nth-child(2)').remove();
+        if (compact || view || notoolbar) {
+            let child = document.querySelector('.brendpanel > :nth-child(2)');
+            child && child.parentNode && child.parentNode.removeChild(child);
+        }
 
         if (compact || view) {
             if (notoolbar) {
-                document.querySelector('.brendpanel > :nth-child(1)').remove();
+                let child = document.querySelector('.brendpanel > :nth-child(1)');
+                child && child.parentNode && child.parentNode.removeChild(child);
                 visible = false;
             } else
                 document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
@@ -327,12 +331,14 @@
         }
 
         if (compact) {
-            document.querySelectorAll('.not-compact').forEach(function(item){
-                item.remove();
-            });
-            document.querySelectorAll('.compact').forEach(function(item){
-                item.style.display = 'inline-block';
-            });
+            var elements = document.querySelectorAll('.not-compact');
+            for (let i = 0; i < elements.length; i++) {
+                elements[i].parentNode.removeChild(elements[i]);
+            }
+            elements = document.querySelectorAll('.compact');
+            for (let i = 0; i < elements.length; i++) {
+                elements[i].style.display = 'inline-block';
+            }
             if (document.body.classList.contains('rtl'))
                 document.querySelector('.fat').style.right = '592px';
             else
diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy
index 3bf14cebbe..f104f6309e 100644
--- a/apps/documenteditor/main/index.html.deploy
+++ b/apps/documenteditor/main/index.html.deploy
@@ -277,11 +277,15 @@
             visible = true;
 
         isForm && document.body.classList.add('pdf-form');
-        (compact || view || notoolbar) && document.querySelector('.brendpanel > :nth-child(2)').remove();
+        if (compact || view || notoolbar) {
+            let child = document.querySelector('.brendpanel > :nth-child(2)');
+            child && child.parentNode && child.parentNode.removeChild(child);
+        }
 
         if (compact || view) {
             if (notoolbar) {
-                document.querySelector('.brendpanel > :nth-child(1)').remove();
+                let child = document.querySelector('.brendpanel > :nth-child(1)');
+                child && child.parentNode && child.parentNode.removeChild(child);
                 visible = false;
             } else
                 document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
@@ -290,12 +294,14 @@
         }
 
         if (compact) {
-            document.querySelectorAll('.not-compact').forEach(function(item){
-                item.remove();
-            });
-            document.querySelectorAll('.compact').forEach(function(item){
-                item.style.display = 'inline-block';
-            });
+            var elements = document.querySelectorAll('.not-compact');
+            for (let i = 0; i < elements.length; i++) {
+                elements[i].parentNode.removeChild(elements[i]);
+            }
+            elements = document.querySelectorAll('.compact');
+            for (let i = 0; i < elements.length; i++) {
+                elements[i].style.display = 'inline-block';
+            }
             if (document.body.classList.contains('rtl'))
                 document.querySelector('.fat').style.right = '592px';
             else
diff --git a/apps/pdfeditor/main/index.html b/apps/pdfeditor/main/index.html
index 656107b93d..6ccf162770 100644
--- a/apps/pdfeditor/main/index.html
+++ b/apps/pdfeditor/main/index.html
@@ -298,11 +298,15 @@
         view = params["mode"] == 'view',
         visible = true;
 
-    (compact || view || notoolbar) && document.querySelector('.brendpanel > :nth-child(2)').remove();
+    if (compact || view || notoolbar) {
+        let child = document.querySelector('.brendpanel > :nth-child(2)');
+        child && child.parentNode && child.parentNode.removeChild(child);
+    }
 
     if (compact || view) {
         if (notoolbar) {
-            document.querySelector('.brendpanel > :nth-child(1)').remove();
+            let child = document.querySelector('.brendpanel > :nth-child(1)');
+            child && child.parentNode && child.parentNode.removeChild(child);
             visible = false;
         } else
             document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
@@ -311,12 +315,14 @@
     }
 
     if (compact) {
-        document.querySelectorAll('.not-compact').forEach(function(item){
-            item.remove();
-        });
-        document.querySelectorAll('.compact').forEach(function(item){
-            item.style.display = 'inline-block';
-        });
+        var elements = document.querySelectorAll('.not-compact');
+        for (let i = 0; i < elements.length; i++) {
+            elements[i].parentNode.removeChild(elements[i]);
+        }
+        elements = document.querySelectorAll('.compact');
+        for (let i = 0; i < elements.length; i++) {
+            elements[i].style.display = 'inline-block';
+        }
     }
 
     visible && (document.querySelector('.brendpanel').style.display = 'block');
diff --git a/apps/pdfeditor/main/index.html.deploy b/apps/pdfeditor/main/index.html.deploy
index dee54784b7..70811d9632 100644
--- a/apps/pdfeditor/main/index.html.deploy
+++ b/apps/pdfeditor/main/index.html.deploy
@@ -262,11 +262,15 @@
             view = params["mode"] == 'view',
             visible = true;
 
-        (compact || view || notoolbar) && document.querySelector('.brendpanel > :nth-child(2)').remove();
+        if (compact || view || notoolbar) {
+            let child = document.querySelector('.brendpanel > :nth-child(2)');
+            child && child.parentNode && child.parentNode.removeChild(child);
+        }
 
         if (compact || view) {
             if (notoolbar) {
-                document.querySelector('.brendpanel > :nth-child(1)').remove();
+                let child = document.querySelector('.brendpanel > :nth-child(1)');
+                child && child.parentNode && child.parentNode.removeChild(child);
                 visible = false;
             } else
                 document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
@@ -275,12 +279,14 @@
         }
 
         if (compact) {
-            document.querySelectorAll('.not-compact').forEach(function(item){
-                item.remove();
-            });
-            document.querySelectorAll('.compact').forEach(function(item){
-                item.style.display = 'inline-block';
-            });
+            var elements = document.querySelectorAll('.not-compact');
+            for (let i = 0; i < elements.length; i++) {
+                elements[i].parentNode.removeChild(elements[i]);
+            }
+            elements = document.querySelectorAll('.compact');
+            for (let i = 0; i < elements.length; i++) {
+                elements[i].style.display = 'inline-block';
+            }
         }
 
         visible && (document.querySelector('.brendpanel').style.display = 'block');
diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html
index ddf2dcc0c4..2e2547fc7f 100644
--- a/apps/presentationeditor/main/index.html
+++ b/apps/presentationeditor/main/index.html
@@ -311,11 +311,15 @@
             view = params["mode"] == 'view',
             visible = true;
 
-        (compact || view || notoolbar) && document.querySelector('.brendpanel > :nth-child(2)').remove();
+        if (compact || view || notoolbar) {
+            let child = document.querySelector('.brendpanel > :nth-child(2)');
+            child && child.parentNode && child.parentNode.removeChild(child);
+        }
 
         if (compact || view) {
             if (notoolbar) {
-                document.querySelector('.brendpanel > :nth-child(1)').remove();
+                let child = document.querySelector('.brendpanel > :nth-child(1)');
+                child && child.parentNode && child.parentNode.removeChild(child);
                 visible = false;
             } else
                 document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
@@ -324,12 +328,14 @@
         }
 
         if (compact) {
-            document.querySelectorAll('.not-compact').forEach(function(item){
-                item.remove();
-            });
-            document.querySelectorAll('.compact').forEach(function(item){
-                item.style.display = 'inline-block';
-            });
+            var elements = document.querySelectorAll('.not-compact');
+            for (let i = 0; i < elements.length; i++) {
+                elements[i].parentNode.removeChild(elements[i]);
+            }
+            elements = document.querySelectorAll('.compact');
+            for (let i = 0; i < elements.length; i++) {
+                elements[i].style.display = 'inline-block';
+            }
             if (document.body.classList.contains('rtl'))
                 document.querySelector('.fat').style.right = '865px';
             else
diff --git a/apps/presentationeditor/main/index.html.deploy b/apps/presentationeditor/main/index.html.deploy
index 46fa96a28a..5936f45bf0 100644
--- a/apps/presentationeditor/main/index.html.deploy
+++ b/apps/presentationeditor/main/index.html.deploy
@@ -304,11 +304,15 @@
             view = params["mode"] == 'view',
             visible = true;
 
-        (compact || view || notoolbar) && document.querySelector('.brendpanel > :nth-child(2)').remove();
+        if (compact || view || notoolbar) {
+            let child = document.querySelector('.brendpanel > :nth-child(2)');
+            child && child.parentNode && child.parentNode.removeChild(child);
+        }
 
         if (compact || view) {
             if (notoolbar) {
-                document.querySelector('.brendpanel > :nth-child(1)').remove();
+                let child = document.querySelector('.brendpanel > :nth-child(1)');
+                child && child.parentNode && child.parentNode.removeChild(child);
                 visible = false;
             } else
                 document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
@@ -317,12 +321,14 @@
         }
 
         if (compact) {
-            document.querySelectorAll('.not-compact').forEach(function(item){
-                item.remove();
-            });
-            document.querySelectorAll('.compact').forEach(function(item){
-                item.style.display = 'inline-block';
-            });
+            var elements = document.querySelectorAll('.not-compact');
+            for (let i = 0; i < elements.length; i++) {
+                elements[i].parentNode.removeChild(elements[i]);
+            }
+            elements = document.querySelectorAll('.compact');
+            for (let i = 0; i < elements.length; i++) {
+                elements[i].style.display = 'inline-block';
+            }
             if (document.body.classList.contains('rtl'))
                 document.querySelector('.fat').style.right = '865px';
             else
diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html
index 1167ddb7b3..c4e5888ca9 100644
--- a/apps/spreadsheeteditor/main/index.html
+++ b/apps/spreadsheeteditor/main/index.html
@@ -330,15 +330,21 @@
             visible = true;
 
         if (internal) {
-            document.querySelector('.brendpanel').remove();
-            document.querySelector('.sktoolbar').remove();
+            let child = document.querySelector('.brendpanel');
+            child && child.parentNode && child.parentNode.removeChild(child);
+            child = document.querySelector('.sktoolbar');
+            child && child.parentNode && child.parentNode.removeChild(child);
         }
 
-        (compact || view || notoolbar) && document.querySelector('.brendpanel > :nth-child(2)').remove();
+        if (compact || view || notoolbar) {
+            let child = document.querySelector('.brendpanel > :nth-child(2)');
+            child && child.parentNode && child.parentNode.removeChild(child);
+        }
 
         if (compact || view) {
             if (notoolbar) {
-                document.querySelector('.brendpanel > :nth-child(1)').remove();
+                let child = document.querySelector('.brendpanel > :nth-child(1)');
+                child && child.parentNode && child.parentNode.removeChild(child);
                 visible = false;
             } else
                 document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
@@ -347,12 +353,14 @@
         }
 
         if (compact) {
-            document.querySelectorAll('.not-compact').forEach(function(item){
-                item.remove();
-            });
-            document.querySelectorAll('.compact').forEach(function(item){
-                item.style.display = 'inline-block';
-            });
+            var elements = document.querySelectorAll('.not-compact');
+            for (let i = 0; i < elements.length; i++) {
+                elements[i].parentNode.removeChild(elements[i]);
+            }
+            elements = document.querySelectorAll('.compact');
+            for (let i = 0; i < elements.length; i++) {
+                elements[i].style.display = 'inline-block';
+            }
             if (document.body.classList.contains('rtl'))
                 document.querySelector('.fat').style.right = '923px';
             else
diff --git a/apps/spreadsheeteditor/main/index.html.deploy b/apps/spreadsheeteditor/main/index.html.deploy
index 73b2798757..0dbbd26513 100644
--- a/apps/spreadsheeteditor/main/index.html.deploy
+++ b/apps/spreadsheeteditor/main/index.html.deploy
@@ -316,15 +316,21 @@
             visible = true;
 
         if (internal) {
-            document.querySelector('.brendpanel').remove();
-            document.querySelector('.sktoolbar').remove();
+            let child = document.querySelector('.brendpanel');
+            child && child.parentNode && child.parentNode.removeChild(child);
+            child = document.querySelector('.sktoolbar');
+            child && child.parentNode && child.parentNode.removeChild(child);
         }
 
-        (compact || view || notoolbar) && document.querySelector('.brendpanel > :nth-child(2)').remove();
+        if (compact || view || notoolbar) {
+            let child = document.querySelector('.brendpanel > :nth-child(2)');
+            child && child.parentNode && child.parentNode.removeChild(child);
+        }
 
         if (compact || view) {
             if (notoolbar) {
-                document.querySelector('.brendpanel > :nth-child(1)').remove();
+                let child = document.querySelector('.brendpanel > :nth-child(1)');
+                child && child.parentNode && child.parentNode.removeChild(child);
                 visible = false;
             } else
                 document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
@@ -333,12 +339,14 @@
         }
 
         if (compact) {
-            document.querySelectorAll('.not-compact').forEach(function(item){
-                item.remove();
-            });
-            document.querySelectorAll('.compact').forEach(function(item){
-                item.style.display = 'inline-block';
-            });
+            var elements = document.querySelectorAll('.not-compact');
+            for (let i = 0; i < elements.length; i++) {
+                elements[i].parentNode.removeChild(elements[i]);
+            }
+            elements = document.querySelectorAll('.compact');
+            for (let i = 0; i < elements.length; i++) {
+                elements[i].style.display = 'inline-block';
+            }
             if (document.body.classList.contains('rtl'))
                 document.querySelector('.fat').style.right = '923px';
             else