From bb20ba6e2575fa2adf088a1a00f278ae141eff8f Mon Sep 17 00:00:00 2001
From: maxkadushkin <maxim.kadushkin@onlyoffice.com>
Date: Wed, 25 Jun 2025 00:51:04 +0300
Subject: [PATCH] [forms] fix bug 75432

---
 apps/common/main/lib/controller/Themes.js   | 4 ++--
 apps/common/main/lib/util/themeinit.js      | 2 +-
 apps/documenteditor/forms/index.html        | 3 +++
 apps/documenteditor/forms/index.html.deploy | 3 +++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js
index 2d23113d92..be0e3871e3 100644
--- a/apps/common/main/lib/controller/Themes.js
+++ b/apps/common/main/lib/controller/Themes.js
@@ -550,7 +550,7 @@ define([
                     document.body.classList.add('theme-icons-cls-' + themes_map[theme_id].icons.cls);
             }
 
-            if ( icons_base_url ) {
+            if ( icons_base_url && !(window.uitheme.embedicons === true) ) {
                 window.uitheme.apply_icons_from_url(theme_id, icons_base_url);
             }
 
@@ -640,7 +640,7 @@ define([
 
                 const comp_style = getComputedStyle(document.body);
                 if (themes_map[theme_id] && themes_map[theme_id].icons) {
-                    if ( !document.querySelector('style#' + theme_id) ) {
+                    if ( !document.querySelector('style#' + theme_id) && !(window.uitheme.embedicons === true) ) {
                         const icons_base_url = !!themes_map[theme_id].icons.basepath ? themes_map[theme_id].icons.basepath :
                                 comp_style.getPropertyValue('--sprite-button-icons-base-url');
 
diff --git a/apps/common/main/lib/util/themeinit.js b/apps/common/main/lib/util/themeinit.js
index a8e1b3ace6..6d819148b4 100644
--- a/apps/common/main/lib/util/themeinit.js
+++ b/apps/common/main/lib/util/themeinit.js
@@ -157,7 +157,7 @@
                     inject_style_tag('.' + objtheme.id + '{' + colors.join(';') + ';}');
                 }
 
-                if ( objtheme.icons ) {
+                if ( objtheme.icons && !(window.uitheme.embedicons === true) ) {
                     window.uitheme.apply_icons_from_url(objtheme.id, objtheme.icons.basepath);
                 }
 
diff --git a/apps/documenteditor/forms/index.html b/apps/documenteditor/forms/index.html
index 28e3bfcb28..52d4f7bf7f 100644
--- a/apps/documenteditor/forms/index.html
+++ b/apps/documenteditor/forms/index.html
@@ -171,6 +171,9 @@
 
           window.frameEditorId = params["frameEditorId"];
           window.parentOrigin = params["parentOrigin"];
+
+          !window.uitheme && (window.uitheme = {});
+          window.uitheme.embedicons = true;
       </script>
   </head>
 
diff --git a/apps/documenteditor/forms/index.html.deploy b/apps/documenteditor/forms/index.html.deploy
index 1fd7f0180f..5c90ce6164 100644
--- a/apps/documenteditor/forms/index.html.deploy
+++ b/apps/documenteditor/forms/index.html.deploy
@@ -146,6 +146,9 @@
 
         window.frameEditorId = params["frameEditorId"];
         window.parentOrigin = params["parentOrigin"];
+
+        !window.uitheme && (window.uitheme = {});
+        window.uitheme.embedicons = true;
     </script>
     <script src="../../../../../apps/common/main/lib/util/desktopinit.js?__inline=true"></script>
   </head>