diff --git a/apps/documenteditor/forms/index.html b/apps/documenteditor/forms/index.html
index 4fb826105..af57622d0 100644
--- a/apps/documenteditor/forms/index.html
+++ b/apps/documenteditor/forms/index.html
@@ -189,7 +189,8 @@
 
            var params = getUrlParams(),
                lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
-               logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null;
+               logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null,
+               logoDark = params["headerlogodark"] ? encodeUrlParam(params["headerlogodark"]) : null;
 
            window.frameEditorId = params["frameEditorId"];
            window.parentOrigin = params["parentOrigin"];
@@ -201,12 +202,12 @@
                document.body.removeChild(document.getElementById('loading-mask'));
            } else {
                var elem = document.querySelector('.loading-logo');
-               if (elem && logo) {
+               if (elem && (logo || logoDark)) {
                    elem.style.backgroundImage= 'none';
                    elem.style.width = 'auto';
                    elem.style.height = 'auto';
                    var img = document.querySelector('.loading-logo img');
-                   img && img.setAttribute('src', logo);
+                   img && img.setAttribute('src', /theme-dark/.test(document.body.className) ? logoDark || logo : logo || logoDark);
                    img.style.opacity = 1;
                }
            }
diff --git a/apps/documenteditor/forms/index.html.deploy b/apps/documenteditor/forms/index.html.deploy
index ddfc2d652..1c6eb17af 100644
--- a/apps/documenteditor/forms/index.html.deploy
+++ b/apps/documenteditor/forms/index.html.deploy
@@ -170,17 +170,18 @@
 
             var params = getUrlParams(),
                            lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
-                           logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null;
+                           logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null,
+                           logoDark = params["headerlogodark"] ? encodeUrlParam(params["headerlogodark"]) : null;
 
             window.frameEditorId = params["frameEditorId"];
             window.parentOrigin = params["parentOrigin"];
             var elem = document.querySelector('.loading-logo');
-            if (elem && logo) {
+            if (elem && (logo || logoDark)) {
                 elem.style.backgroundImage= 'none';
                 elem.style.width = 'auto';
                 elem.style.height = 'auto';
                 var img = document.querySelector('.loading-logo img');
-                img && img.setAttribute('src', logo);
+                img && img.setAttribute('src', /theme-dark/.test(document.body.className) ? logoDark || logo : logo || logoDark);
                 img.style.opacity = 1;
             }
         </script>
diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html
index 3aac9d3ef..4e42d513a 100644
--- a/apps/documenteditor/main/index.html
+++ b/apps/documenteditor/main/index.html
@@ -233,7 +233,8 @@
 
         var params = getUrlParams(),
             lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
-            logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null;
+            logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null,
+            logoDark = params["headerlogodark"] ? encodeUrlParam(params["headerlogodark"]) : null;
 
         window.frameEditorId = params["frameEditorId"];
         window.parentOrigin = params["parentOrigin"];
@@ -292,7 +293,7 @@
         } else {
             var elem = document.querySelector('.loading-logo img');
             if (elem) {
-                logo && (elem.setAttribute('src', logo));
+                (logo || logoDark) && elem.setAttribute('src', /theme-dark/.test(document.body.className) ? logoDark || logo : logo || logoDark);
                 elem.style.opacity = 1;
             }
         }
diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy
index 1f94e89d8..7b6f06933 100644
--- a/apps/documenteditor/main/index.html.deploy
+++ b/apps/documenteditor/main/index.html.deploy
@@ -205,7 +205,8 @@
 
         var params = getUrlParams(),
             lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
-            logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null;
+            logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null,
+            logoDark = params["headerlogodark"] ? encodeUrlParam(params["headerlogodark"]) : null;
 
         window.frameEditorId = params["frameEditorId"];
         window.parentOrigin = params["parentOrigin"];
@@ -264,7 +265,7 @@
         } else {
             var elem = document.querySelector('.loading-logo img');
             if (elem) {
-                logo && (elem.setAttribute('src', logo));
+                (logo || logoDark) && elem.setAttribute('src', /theme-dark/.test(document.body.className) ? logoDark || logo : logo || logoDark);
                 elem.style.opacity = 1;
             }
         }
diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html
index 1b84c63ee..23f19862e 100644
--- a/apps/presentationeditor/main/index.html
+++ b/apps/presentationeditor/main/index.html
@@ -255,16 +255,12 @@
 
         var params = getUrlParams(),
             lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
-            logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null;
+            logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null,
+            logoDark = params["headerlogodark"] ? encodeUrlParam(params["headerlogodark"]) : null;
 
         window.frameEditorId = params["frameEditorId"];
         window.parentOrigin = params["parentOrigin"];
 
-        var ui_theme_name = params.uitheme || localStorage.getItem("ui-theme");
-        if ( !!ui_theme_name ) {
-            document.documentElement.classList.add(ui_theme_name);
-        }
-
         if(/MSIE \d|Trident.*rv:/.test(navigator.userAgent))
             document.write('<script src="../../common/main/lib/util/fix-ie-compat.js"><\/script>');
     </script>
@@ -318,7 +314,7 @@
         } else {
             var elem = document.querySelector('.loading-logo img');
             if (elem) {
-                logo && (elem.setAttribute('src', logo));
+                (logo || logoDark) && elem.setAttribute('src', /theme-dark/.test(document.body.className) ? logoDark || logo : logo || logoDark);
                 elem.style.opacity = 1;
             }
         }
diff --git a/apps/presentationeditor/main/index.html.deploy b/apps/presentationeditor/main/index.html.deploy
index b795b5ef9..f730751ed 100644
--- a/apps/presentationeditor/main/index.html.deploy
+++ b/apps/presentationeditor/main/index.html.deploy
@@ -247,7 +247,8 @@
 
         var params = getUrlParams(),
             lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
-            logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null;
+            logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null,
+            logoDark = params["headerlogodark"] ? encodeUrlParam(params["headerlogodark"]) : null;
 
         window.frameEditorId = params["frameEditorId"];
         window.parentOrigin = params["parentOrigin"];
@@ -315,7 +316,7 @@
         } else {
             var elem = document.querySelector('.loading-logo img');
             if (elem) {
-                logo && (elem.setAttribute('src', logo));
+                (logo || logoDark) && elem.setAttribute('src', /theme-dark/.test(document.body.className) ? logoDark || logo : logo || logoDark);
                 elem.style.opacity = 1;
             }
         }
diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html
index 936febcb3..c0f50cf8d 100644
--- a/apps/spreadsheeteditor/main/index.html
+++ b/apps/spreadsheeteditor/main/index.html
@@ -262,7 +262,8 @@
 
         var params = getUrlParams(),
             lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
-            logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null;
+            logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null,
+            logoDark = params["headerlogodark"] ? encodeUrlParam(params["headerlogodark"]) : null;
 
         window.frameEditorId = params["frameEditorId"];
         window.parentOrigin = params["parentOrigin"];
@@ -334,7 +335,7 @@
         } else {
             var elem = document.querySelector('.loading-logo img');
             if (elem) {
-                logo && (elem.setAttribute('src', logo));
+                (logo || logoDark) && elem.setAttribute('src', /theme-dark/.test(document.body.className) ? logoDark || logo : logo || logoDark);
                 elem.style.opacity = 1;
             }
         }
diff --git a/apps/spreadsheeteditor/main/index.html.deploy b/apps/spreadsheeteditor/main/index.html.deploy
index 2e9d6fab0..609a47f39 100644
--- a/apps/spreadsheeteditor/main/index.html.deploy
+++ b/apps/spreadsheeteditor/main/index.html.deploy
@@ -247,7 +247,8 @@
 
         var params = getUrlParams(),
             lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
-            logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null;
+            logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null,
+            logoDark = params["headerlogodark"] ? encodeUrlParam(params["headerlogodark"]) : null;
 
         window.frameEditorId = params["frameEditorId"];
         window.parentOrigin = params["parentOrigin"];
@@ -328,7 +329,7 @@
         } else {
             var elem = document.querySelector('.loading-logo img');
             if (elem) {
-                logo && (elem.setAttribute('src', logo));
+                (logo || logoDark) && elem.setAttribute('src', /theme-dark/.test(document.body.className) ? logoDark || logo : logo || logoDark);
                 elem.style.opacity = 1;
             }
         }