From a4a402b529c7688d9645c50077ffcc3e69cd07f8 Mon Sep 17 00:00:00 2001
From: daria <95225431+dariiing@users.noreply.github.com>
Date: Wed, 3 Sep 2025 17:40:18 +0300
Subject: [PATCH 1/4] fix drive tree styling

---
 customize.dist/src/less2/include/drive.less | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/customize.dist/src/less2/include/drive.less b/customize.dist/src/less2/include/drive.less
index ff93ff454..b26e3d35f 100644
--- a/customize.dist/src/less2/include/drive.less
+++ b/customize.dist/src/less2/include/drive.less
@@ -425,9 +425,6 @@
                 left: -10px;
                 background-color: transparent;
             }
-            .cp-app-drive-tree-root > .cp-app-drive-element-row > .cp-app-drive-icon-folder {
-                margin-left: -5px;
-            }
             .cp-app-drive-tree-root {
                 &> .cp-app-drive-element-row {
                     padding-left: 15px;
@@ -447,18 +444,18 @@
                 position: relative;
                 &:before {
                     position: absolute;
-                    left: -12px;
+                    left: -5px;
                     top: -10px;
                     content: '';
                     display: block;
                     border-left: 1px solid @cp_drive-tree-branch;
                     height: ~"calc(1em + 11px)";
                     border-bottom: 1px solid @cp_drive-tree-branch;
-                    width: 15px;
+                    width: 5px;
                 }
                 &:after {
                     position: absolute;
-                    left: -12px;
+                    left: -5px;
                     bottom: -7px;
                     content: '';
                     display: block;

From d609ac904c1b4e4965380e416773b5dc7703a19f Mon Sep 17 00:00:00 2001
From: daria <95225431+dariiing@users.noreply.github.com>
Date: Wed, 3 Sep 2025 17:49:36 +0300
Subject: [PATCH 2/4] remove old styling from drive

---
 customize.dist/src/less2/include/drive.less | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/customize.dist/src/less2/include/drive.less b/customize.dist/src/less2/include/drive.less
index b26e3d35f..d9f646828 100644
--- a/customize.dist/src/less2/include/drive.less
+++ b/customize.dist/src/less2/include/drive.less
@@ -188,12 +188,6 @@
     .cp-app-drive-element-selected {
         background: @cp_drive-selected-bg !important;
         color: @cp_drive-selected-fg;
-        .fa-minus-square-o, .fa-plus-square-o {
-            color: @cp_sidebar-left-fg;
-        }
-        .cptools {
-            color: @cp_drive-selected-fg;
-        }
         &.cp-app-drive-element-active {
             background: @cp_drive-selected-bg !important;
             color: @cryptpad_text_col !important;
@@ -203,9 +197,6 @@
     .cp-app-drive-element-selected-tmp {
         background: @cp_drive-selection-bg;
         color: @cp_drive-selection-fg;
-        .fa-minus-square-o, .fa-plus-square-o {
-            color: @cp_sidebar-left-fg;
-        }
     }
 
     .cp-app-drive-color-picker {
@@ -1044,7 +1035,6 @@
         }
         .cp-toolbar-bottom-right {
             .lucide-history { order: 50; }
-            // .fa-list, .fa-th-large,
             .cp-app-drive-viewmode-button {
                 order: 25;
             }

From 9131ff3a62a1b2b8ca797e4c100411f802aa0fbd Mon Sep 17 00:00:00 2001
From: daria <95225431+dariiing@users.noreply.github.com>
Date: Wed, 3 Sep 2025 18:17:34 +0300
Subject: [PATCH 3/4] remove old styling

---
 customize.dist/src/less2/include/creation.less |  5 -----
 customize.dist/src/less2/include/toolbar.less  | 10 ----------
 2 files changed, 15 deletions(-)

diff --git a/customize.dist/src/less2/include/creation.less b/customize.dist/src/less2/include/creation.less
index 2630cb896..bc8a46601 100644
--- a/customize.dist/src/less2/include/creation.less
+++ b/customize.dist/src/less2/include/creation.less
@@ -255,11 +255,6 @@
                         background-color: @cp_creation-button-bg;
                         color: @cp_creation-button-fg;
                     }
-                    .cp-creation-team-avatar {
-                        .fa {
-                            font-size: 25px;
-                        }
-                    }
                     .cp-creation-team-name {
                         overflow: hidden;
                         white-space: nowrap;
diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index 9f1d02c50..5de98697a 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -421,10 +421,6 @@
         color: @toolbar-bg-color;
         color: var(--toolbar-bg-color);
 
-        .fa {
-            font: normal normal normal 14px/1 FontAwesome;
-        }
-
         .tools_unselectable();
 
         font: @toolbar_button-font;
@@ -544,9 +540,6 @@
                         line-height: @toolbar_line-height;
                         display: inline-flex;
 
-                        .fa {
-                            font-size: @colortheme_app-font-size;
-                        }
                     }
                     input {
                         height: @toolbar_line-height;
@@ -676,9 +669,6 @@
                 font-size: 20px;
                 vertical-align: middle;
                 border-radius: 0 @variables_radius @variables_radius 0;
-                .fa {
-                    font-size: 20px;
-                }
             }
             .cp-toolbar-title-readonly {
                 margin-left: 10px;

From 20e35d0b414ad45be2b8a5bc49b12c53338d8296 Mon Sep 17 00:00:00 2001
From: daria <95225431+dariiing@users.noreply.github.com>
Date: Thu, 4 Sep 2025 15:58:42 +0300
Subject: [PATCH 4/4] fix icon flickering issue

---
 www/common/common-interface.js     | 4 ++--
 www/common/common-ui-elements.js   | 2 +-
 www/common/inner/sidebar-layout.js | 2 +-
 www/common/toolbar.js              | 2 +-
 www/kanban/inner.js                | 4 ++--
 www/pad/inner.js                   | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 0354c5f04..8b20683a5 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -356,7 +356,7 @@ define([
                 $container.append($form);
                 isEdit = false;
                 called = false;
-                setTimeout( () => Lucide.createIcons(), 0);
+                Lucide.createIcons();
             });
         };
         resetUI();
@@ -996,7 +996,6 @@ define([
     };
 
     UI.passwordInput = function (opts, displayEye) {
-        setTimeout( () => Lucide.createIcons(), 0);
         opts = opts || {};
         var attributes = merge({
             type: 'password',
@@ -1046,6 +1045,7 @@ define([
             });
         }
 
+        Lucide.createIcons();
         return h('span.cp-password-container', [
             input,
             eye
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index f0fb98bb9..1858a5681 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2961,7 +2961,6 @@ define([
                 icon: UI.getFileIcon({type: type})
             });
             var redraw = function (index) {
-                setTimeout( ()=> Lucide.createIcons());
                 if (index < 0) { i = 0; }
                 else if (index > allData.length - 1) { return; }
                 else { i = index; }
@@ -3013,6 +3012,7 @@ define([
                     $('.cp-creation-template-container').find('[tabindex]:not([tabindex="-1"])').filter(':visible').first().focus();
                 });
                 if (i < TEMPLATES_DISPLAYED) { $(left).addClass('hidden'); }
+                Lucide.createIcons();
             };
             if (fromFileData) {
                 var todo = function (thumbnail) {
diff --git a/www/common/inner/sidebar-layout.js b/www/common/inner/sidebar-layout.js
index 3d332c262..90d488e4f 100644
--- a/www/common/inner/sidebar-layout.js
+++ b/www/common/inner/sidebar-layout.js
@@ -400,7 +400,7 @@ define([
             common.setHash(active);
 
             setTimeout(() => { sidebar.openCategory(active); });
-            setTimeout( () => Lucide.createIcons());
+            Lucide.createIcons();
             $leftside.append(container);
         };
 
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 9cb761021..c7ba90e73 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -249,7 +249,6 @@ MessengerUI, Messages, Pages, PadTypes, Lucide, Icons) {
         var $spansmall = $('<span>').append($editIcon, $editCount, $separator, $viewIcon, $viewCount);
         $userButtons.find('.cp-toolbar-userlist-button').empty().append($spansmall);
 
-        setTimeout( () => Lucide.createIcons(), 0);
         if (!online || toolbar.isDeleted) { return; }
 
         if (metadataMgr.isDegraded() === true) { return; }
@@ -432,6 +431,7 @@ MessengerUI, Messages, Pages, PadTypes, Lucide, Icons) {
             viewText += numberOfViewUsers + ' ' + viewerText + '</div>';
             $editUsers.append(viewText);
         }
+        Lucide.createIcons();
     };
 
     var initUserList = function (toolbar, config) {
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index e44b2a572..680b28a24 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -185,7 +185,6 @@ define([
     var createEditModal = function (framework, kanban) {
         if (framework.isReadOnly()) { return; }
         if (editModal) { return editModal; }
-        setTimeout( () => Lucide.createIcons(), 0);
 
         var dataObject = {};
         var isBoard, id;
@@ -521,6 +520,7 @@ define([
             });
         });
 
+        Lucide.createIcons();
         return {
             modal: modal,
             setId: setId,
@@ -1185,7 +1185,7 @@ define([
                             $tag.attr('aria-pressed', 'true');
                         }
                         commitTags();
-                        setTimeout( () => Lucide.createIcons(), 0);
+                        Lucide.createIcons();
                     }).keydown(function (e) {
                         if (e.which === 13 || e.which === 32) {
                             $tag.click();
diff --git a/www/pad/inner.js b/www/pad/inner.js
index c66126c48..c7c8f8670 100644
--- a/www/pad/inner.js
+++ b/www/pad/inner.js
@@ -214,7 +214,6 @@ define([
 
     var mkSettingsMenu = function(framework) {
         var getSettings = function () {
-            setTimeout( () => Lucide.createIcons(), 0);
             var $d = $(h('div.cp-pad-settings-dialog'));
             var common = framework._.sfCommon;
             var metadataMgr = common.getMetadataMgr();
@@ -339,6 +338,7 @@ define([
                 $comments[0],
             ]);
 
+            Lucide.createIcons();
             return $d[0];
         };
 
@@ -647,7 +647,6 @@ define([
     };
 
     var andThen2 = function(editor, Ckeditor, framework) {
-        setTimeout(() => Lucide.createIcons());
         var mediaTagMap = {};
         var $contentContainer = $('#cke_1_contents');
         var $html = $('html');
@@ -1330,6 +1329,7 @@ define([
             }
         });
 
+        Lucide.createIcons();
         framework.start();
     };