diff --git a/src/ce_main.lfm b/src/ce_main.lfm
index 673f8a56..346142cd 100644
--- a/src/ce_main.lfm
+++ b/src/ce_main.lfm
@@ -334,6 +334,42 @@ object CEMainForm: TCEMainForm
       end
       object MenuItem62: TMenuItem
         Action = actFileHtmlExport
+        Bitmap.Data = {
+          36040000424D3604000000000000360000002800000010000000100000000100
+          2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
+          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00000000300000
+          0033000000330000003300000033000000330000003300000033000000330000
+          0033000000330000003300000033000000330000003300000030AE5E18F2AF5B
+          15FFAD5912FFAD5912FFAD5912FFAD5912FFAD5912FFAD5912FFAD5912FFAD59
+          12FFAD5912FFAD5912FFAD5912FFAD5912FFAF5B15FFAE5E18F2AF5B14FFEAC0
+          84FFE5B879FFE5B779FFE5B778FFE5B779FFE5B778FFE5B779FFE5B778FFE5B7
+          79FFE5B779FFE5B778FFE5B778FFE5B879FFEAC084FFAF5B14FFAD5912FFE4B5
+          7BFFDCA663FFDCA663FFDCA562FFDCA663FFDCA562FFDCA663FFDBA561FFDCA6
+          63FFDCA663FFDCA562FFDBA45FFFDCA662FFE4B67BFFAD5912FFAD5810FFE1B0
+          72FFFFFFFFFFD5964BFFFFFFFFFFD5974CFFFFFFFFFFD5964CFFFFFFFFFFD495
+          49FFF5E8D8FFE1B27DFFFFFFFFFFFEFDF9FFE1B276FFAD5911FFAD5810FFDFAD
+          70FFFFFFFFFFCE8837FFFFFFFFFFD08C3DFFFFFFFFFFD08B3CFFFFFFFFFFF1DC
+          C3FFFAF3E9FFDBA96EFFFDFBF7FFD39247FFE1B27AFFAD5912FFAD5810FFDDAB
+          6FFFFFFFFFFFFFFFFFFFFFFFFFFFCC8430FFFFFFFFFFCB832FFFFFFFFFFFFFFF
+          FFFFFFFFFFFFD9A366FFFEFBF8FFD08F41FFE1B37CFFAE5912FFAD5810FFDCAC
+          72FFFFFFFFFFC67A23FFFFFFFFFFC67A22FFFFFFFFFFC57A22FFFFFFFFFFF8EE
+          E4FFFFFFFFFFD69F62FFFFFFFFFFCC8839FFE0B47FFFAE5A12FFAD5810FFDCAF
+          79FFFFFFFFFFC67B28FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCF7F3FFC57A
+          25FFFEFBFAFFC77E2BFFFFFEFFFFCA8435FFDFB583FFAE5A12FFAE5911FFDFB5
+          83FFC67D2BFFC77E2EFFC67D2BFFC57B28FFC57A28FFC57B29FFC67D2CFFC77F
+          30FFC78030FFC78032FFC78030FFC88031FFE0B787FFAE5A12FFAE5A12FFE0B9
+          8CFFC47928FFC57A2BFFC57A2BFFC47A2AFFC47A2AFFC57A2AFFC57A2BFFC57B
+          2CFFC57B2CFFC57B2CFFC57A2BFFC47A29FFE0B98DFFAE5A12FFAF5B14FFE2BD
+          92FFE0BB8FFFE0BB90FFE0BB90FFE0BB90FFE0BB90FFE0BB90FFE0BB90FFE0BB
+          90FFE0BB90FFE0BB90FFE0BB90FFE0BB8FFFE2BD92FFAF5B14FFB15F18B0AF5B
+          14FFAE5A12FFAE5A12FFAE5A12FFAE5A12FFAE5A12FFAE5A12FFAE5A12FFAE5A
+          12FFAE5A12FFAE5A12FFAE5A12FFAE5A12FFAF5B14FFB15F18B0FFFFFF00FFFF
+          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
+        }
       end
       object MenuItem25: TMenuItem
         Caption = '-'
diff --git a/src/ce_main.pas b/src/ce_main.pas
index 295e5ae9..14b08920 100644
--- a/src/ce_main.pas
+++ b/src/ce_main.pas
@@ -5,7 +5,7 @@ unit ce_main;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, SynEditKeyCmds, SynHighlighterLFM, Forms, asyncprocess,
+  Classes, SysUtils, FileUtil, SynEditKeyCmds, SynHighlighterLFM, Forms,
   AnchorDocking, AnchorDockStorage, AnchorDockOptionsDlg, Controls, Graphics,
   Dialogs, Menus, ActnList, ExtCtrls, process, XMLPropStorage, dynlibs, SynExportHTML,
   ce_common, ce_dmdwrap, ce_project, ce_dcd, ce_plugin, ce_synmemo, ce_widget,
@@ -17,7 +17,6 @@ type
 
   // TODO-cfeature: options
   // TODO-cwidget: options editor
-  // TODO-cfeature: tools menu
 
   { TCEMainForm }
   TCEMainForm = class(TForm, ICEMultiDocObserver, ICESessionOptionsObserver)
@@ -1556,6 +1555,7 @@ procedure TCEMainForm.actLayoutSaveExecute(Sender: TObject);
 var
   fname: string;
 begin
+  fname := '';
   if not InputQuery('New layout name', '', fname) then
     exit;
   //
diff --git a/src/ce_miniexplorer.pas b/src/ce_miniexplorer.pas
index 1869f26b..3d7780d2 100644
--- a/src/ce_miniexplorer.pas
+++ b/src/ce_miniexplorer.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, ListFilterEdit, Forms, Controls, Graphics,
-  ExtCtrls, Menus, ComCtrls, Buttons, lcltype, StdCtrls, strutils, ce_widget,
+  ExtCtrls, Menus, ComCtrls, Buttons, lcltype, strutils, ce_widget,
   ce_common, ce_interfaces, ce_observer;
 
 type
diff --git a/src/ce_procinput.pas b/src/ce_procinput.pas
index be9fddbd..8503821a 100644
--- a/src/ce_procinput.pas
+++ b/src/ce_procinput.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  Menus, StdCtrls, ce_widget, process, ce_common, ce_interfaces;
+  Menus, StdCtrls, ce_widget, process, ce_common;
 
 type
   TCEProcInputWidget = class(TCEWidget)
diff --git a/src/ce_project.pas b/src/ce_project.pas
index 55ef87e2..970b759c 100644
--- a/src/ce_project.pas
+++ b/src/ce_project.pas
@@ -8,7 +8,7 @@ uses
   {$IFDEF DEBUG}
   LclProc,
   {$ENDIF}
-  Classes, SysUtils, process, asyncprocess, strUtils, ce_common, ce_writableComponent,
+  Classes, SysUtils, process, strUtils, ce_common, ce_writableComponent,
   ce_dmdwrap, ce_observer;
 
 type
diff --git a/src/ce_tools.pas b/src/ce_tools.pas
index 3ba98192..e82f0c2d 100644
--- a/src/ce_tools.pas
+++ b/src/ce_tools.pas
@@ -5,7 +5,7 @@ unit ce_tools;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, process, asyncprocess, menus,
+  Classes, SysUtils, FileUtil, process, menus,
   ce_common, ce_writableComponent, ce_interfaces, ce_observer;
 
 type