diff --git a/components/externhelp/externhelpfrm.pas b/components/externhelp/externhelpfrm.pas
index baf257a034..5dda765a70 100644
--- a/components/externhelp/externhelpfrm.pas
+++ b/components/externhelp/externhelpfrm.pas
@@ -38,7 +38,8 @@ uses
   Classes, SysUtils, LCLProc, FileUtil, LResources, Forms, Controls, Graphics,
   Dialogs, LazConfigStorage, LazFileUtils, ComCtrls, Buttons, StdCtrls,
   ExtCtrls, ButtonPanel, LazHelpIntf, PackageIntf, MacroIntf, IDEOptionsIntf,
-  LazIDEIntf, BaseIDEIntf, IDEDialogs, HelpIntfs, IDEImagesIntf, SrcEditorIntf;
+  LazIDEIntf, IDEImagesIntf, BaseIDEIntf, IDEDialogs, HelpIntfs, IDEImagesIntf,
+  SrcEditorIntf;
 
 const
   ExternHelpConfigVersion = 1;
@@ -1132,8 +1133,8 @@ constructor TExternHelpGeneralOptsFrame.Create(TheOwner: TComponent);
 begin
   inherited Create(TheOwner);
   FOptions:=TExternHelpOptions.Create;
-  AddSpeedButton.LoadGlyphFromResourceName(HInstance, 'laz_add');
-  DeleteSpeedButton.LoadGlyphFromResourceName(HInstance, 'laz_delete');
+  TIDEImages.AssignImage(AddSpeedButton.Glyph, 'laz_add');
+  TIDEImages.AssignImage(DeleteSpeedButton.Glyph, 'laz_delete');
 end;
 
 destructor TExternHelpGeneralOptsFrame.Destroy;
diff --git a/components/ideintf/filefilterpropeditor.pas b/components/ideintf/filefilterpropeditor.pas
index ffae8d98eb..87ee754854 100644
--- a/components/ideintf/filefilterpropeditor.pas
+++ b/components/ideintf/filefilterpropeditor.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ButtonPanel,
-  Grids, Buttons, ObjInspStrConsts;
+  IDEImagesIntf, Grids, Buttons, ObjInspStrConsts;
 
 type
 
@@ -45,8 +45,8 @@ begin
   Caption:=peFilterEditor;
   StringGrid1.Cells[0, 0] := peFilterName;
   StringGrid1.Cells[1, 0] := peFilter;
-  MoveUpBtn.LoadGlyphFromResourceName(HInstance, 'arrow_up');
-  MoveDownBtn.LoadGlyphFromResourceName(HInstance, 'arrow_down');
+  TIDEImages.AssignImage(MoveUpBtn.Glyph, 'arrow_up');
+  TIDEImages.AssignImage(MoveDownBtn.Glyph, 'arrow_down');
   MoveUpBtn.Hint := rscdMoveUp;
   MoveDownBtn.Hint := rscdMoveDown;
 end;
diff --git a/components/ideintf/frmselectprops.pas b/components/ideintf/frmselectprops.pas
index 1b5efc0970..886be1ee88 100644
--- a/components/ideintf/frmselectprops.pas
+++ b/components/ideintf/frmselectprops.pas
@@ -15,7 +15,7 @@ interface
 uses
   Classes, SysUtils, RTTIUtils, TypInfo,
   Forms, StdCtrls, Buttons, ExtCtrls, ButtonPanel,
-  IDEWindowIntf, ObjInspStrConsts;
+  IDEWindowIntf, IDEImagesIntf, ObjInspStrConsts;
 
 type
 
@@ -98,11 +98,11 @@ end;
 procedure TSelectPropertiesForm.SelectPropertiesFormCreate(Sender: TObject);
 begin
   BAdd.Caption:=ilesAdd;
-  BAdd.LoadGlyphFromResourceName(HInstance, 'laz_add');
+  TIDEImages.AssignImage(BAdd.Glyph, 'laz_add');
   BDelete.Caption:=oisDelete;
-  BDelete.LoadGlyphFromResourceName(HInstance, 'laz_delete');
+  TIDEImages.AssignImage(BDelete.Glyph, 'laz_delete');
   BClear.Caption:=oisClear;
-  BClear.LoadGlyphFromResourceName(HInstance, 'menu_clean');
+  TIDEImages.AssignImage(BClear.Glyph, 'menu_clean');
   LComponents.Caption:=oisBtnComponents;
   LProperties.Caption:=oisBtnProperties;
   LLBSelected.Caption:=oisSelectedProperties;
diff --git a/components/ideintf/ideimagesintf.pas b/components/ideintf/ideimagesintf.pas
index 87d8efb709..1933fe6085 100644
--- a/components/ideintf/ideimagesintf.pas
+++ b/components/ideintf/ideimagesintf.pas
@@ -53,6 +53,8 @@ type
     class function ScaleImage(const AImage: TCustomBitmap; out ANewInstance: Boolean;
       TargetWidth, TargetHeight: Integer): TCustomBitmap;
     class function CreateImage(ImageSize: Integer; ImageName: String): TCustomBitmap;
+    class procedure AssignImage(const ABitmap: TCustomBitmap; ImageName: String;
+      ImageSize: Integer = 16);
 
     function GetImageIndex(ImageSize: Integer; ImageName: String): Integer;
     function LoadImage(ImageSize: Integer; ImageName: String): Integer;
@@ -152,6 +154,19 @@ begin
   Result := nil; // not found
 end;
 
+class procedure TIDEImages.AssignImage(const ABitmap: TCustomBitmap;
+  ImageName: String; ImageSize: Integer);
+var
+  xBmp: TCustomBitmap;
+begin
+  xBmp := TIDEImages.CreateImage(ImageSize, ImageName);
+  try
+    ABitmap.Assign(xBmp);
+  finally
+    xBmp.Free;
+  end;
+end;
+
 constructor TIDEImages.Create;
 begin
   FImageNames_12 := TStringList.Create;
diff --git a/components/ideintf/treeviewpropedit.pas b/components/ideintf/treeviewpropedit.pas
index 2e9230fe33..0d38ce77f9 100644
--- a/components/ideintf/treeviewpropedit.pas
+++ b/components/ideintf/treeviewpropedit.pas
@@ -19,7 +19,8 @@ interface
 
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, Buttons,
-  PropEdits, Componenteditors, StdCtrls, ComCtrls, ObjInspStrConsts, ExtCtrls;
+  PropEdits, Componenteditors, StdCtrls, ComCtrls, IDEImagesIntf,
+  ObjInspStrConsts, ExtCtrls;
 
 type
 
@@ -141,8 +142,8 @@ begin
   BtnLoad.Caption := sccsTrEdtLoad;
   BtnSave.Caption := sccsTrEdtSave;
   BtnApply.Caption := sccsTrEdtApply;
-  MoveUpBtn.LoadGlyphFromResourceName(HInstance, 'arrow_up');
-  MoveDownBtn.LoadGlyphFromResourceName(HInstance, 'arrow_down');
+  TIDEImages.AssignImage(MoveUpBtn.Glyph, 'arrow_up');
+  TIDEImages.AssignImage(MoveDownBtn.Glyph, 'arrow_down');
   MoveUpBtn.Hint:=rscdMoveUp;
   MoveDownBtn.Hint:=rscdMoveDown;
 
diff --git a/components/lazsvnpkg/svndiffform.pas b/components/lazsvnpkg/svndiffform.pas
index 86a8762087..0db295ac75 100644
--- a/components/lazsvnpkg/svndiffform.pas
+++ b/components/lazsvnpkg/svndiffform.pas
@@ -24,7 +24,8 @@ interface
 
 uses
   Classes, SysUtils, LazFileUtils, Forms, Dialogs,
-  ButtonPanel, StdCtrls, Buttons, LazIDEIntf, SynEdit, SynHighlighterDiff;
+  ButtonPanel, StdCtrls, Buttons, LazIDEIntf, IDEImagesIntf, SynEdit,
+  SynHighlighterDiff;
 
 type
 
@@ -109,7 +110,7 @@ procedure TSVNDiffFrm.FormCreate(Sender: TObject);
 begin
   ButtonPanel.HelpButton.Enabled := False;
   ButtonPanel.HelpButton.Caption := rsSave;
-  ButtonPanel.HelpButton.LoadGlyphFromResourceName(HInstance, 'laz_save');
+  TIDEImages.AssignImage(ButtonPanel.HelpButton.Glyph, 'laz_save');
 end;
 
 procedure TSVNDiffFrm.FormClose(Sender: TObject; var CloseAction: TCloseAction);
diff --git a/components/lazsvnpkg/svnupdateform.pas b/components/lazsvnpkg/svnupdateform.pas
index e04263f9cc..9dfa618b44 100644
--- a/components/lazsvnpkg/svnupdateform.pas
+++ b/components/lazsvnpkg/svnupdateform.pas
@@ -24,7 +24,8 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, UTF8Process, LResources, Forms, Controls,
-  Graphics, Dialogs, ComCtrls, ButtonPanel, Process, Buttons, Menus, LCLProc;
+  Graphics, Dialogs, ComCtrls, ButtonPanel, Process, Buttons, Menus, LCLProc,
+  IDEImagesIntf;
 
 type
 
@@ -84,7 +85,7 @@ begin
 
   ButtonPanel.OKButton.OnClick := @OKButtonClick;
   ButtonPanel.HelpButton.Caption := rsShowLog;
-  ButtonPanel.HelpButton.LoadGlyphFromResourceName(HInstance, 'tsynsyncroedit');
+  TIDEImages.AssignImage(ButtonPanel.HelpButton.Glyph, 'tsynsyncroedit');
   mnuShowDiff.Caption:=rsShowDiff;
 end;
 
diff --git a/converter/chgencodingdlg.pas b/converter/chgencodingdlg.pas
index 79ff5e6590..c4d4a762bf 100644
--- a/converter/chgencodingdlg.pas
+++ b/converter/chgencodingdlg.pas
@@ -39,7 +39,7 @@ uses
   // LazUtils
   LConvEncoding, LazFileUtils, LazFileCache, AvgLvlTree,
   // IDEIntf
-  IDEWindowIntf, SrcEditorIntf, IDEHelpIntf,
+  IDEWindowIntf, SrcEditorIntf, IDEHelpIntf, IDEImagesIntf,
   // IDE
   IDEProcs, PackageDefs, PackageSystem, Project, LazarusIDEStrConsts;
 
@@ -116,9 +116,9 @@ begin
   CloseButton.Caption:=lisClose;
   ApplyButton.Caption:=lisConvert;
   HelpButton.Caption:=lisHelp;
-  CloseButton.LoadGlyphFromResourceName(hInstance, 'btn_close');
-  ApplyButton.LoadGlyphFromResourceName(hInstance, 'btn_ok');
-  HelpButton.LoadGlyphFromResourceName(hInstance, 'btn_help');
+  TIDEImages.AssignImage(CloseButton.Glyph, 'btn_close');
+  TIDEImages.AssignImage(ApplyButton.Glyph, 'btn_ok');
+  TIDEImages.AssignImage(HelpButton.Glyph, 'btn_help');
 
   PreviewGroupBox.Caption:=dlgWRDPreview;
   PreviewListView.Column[0].Caption:=dlgEnvFiles;
diff --git a/converter/convertsettings.pas b/converter/convertsettings.pas
index efefebaf4e..0cb381a350 100644
--- a/converter/convertsettings.pas
+++ b/converter/convertsettings.pas
@@ -38,7 +38,7 @@ uses
   // CodeTools
   CodeToolManager, CodeCache,
   // IdeIntf
-  BaseIDEIntf, IDEMsgIntf, IDEExternToolIntf,
+  BaseIDEIntf, IDEMsgIntf, IDEExternToolIntf, IDEImagesIntf,
   // IDE
   IDEProcs, DialogProcs, LazarusIDEStrConsts,
   // Converter
@@ -883,11 +883,11 @@ begin
   // File system scanning
   ScanLabel.Caption := lisScanParentDir;
   StopScanButton.Caption:=lisStop;
-  StopScanButton.LoadGlyphFromResourceName(HInstance, 'menu_stop');
+  TIDEImages.AssignImage(StopScanButton.Glyph, 'menu_stop');
   // Unit Replacements
   UnitReplaceDivider.Caption:=lisConvUnitReplacements;
   UnitReplaceButton.Caption:=lisEdit;    // Recycled string.
-  UnitReplaceButton.LoadGlyphFromResourceName(HInstance, 'laz_edit');
+  TIDEImages.AssignImage(UnitReplaceButton.Glyph, 'laz_edit');
   UnitReplaceDivider.Hint:=lisConvUnitReplHint;
   UnitReplaceButton.Hint:=lisConvUnitReplHint;
   UnitReplaceComboBox.Items.Add(lisDisabled);    // 'Disabled'
@@ -901,7 +901,7 @@ begin
   // Type Replacements
   TypeReplaceDivider.Caption:=lisConvTypeReplacements;
   TypeReplaceButton.Caption:=lisEdit;
-  TypeReplaceButton.LoadGlyphFromResourceName(HInstance, 'laz_edit');
+  TIDEImages.AssignImage(TypeReplaceButton.Glyph, 'laz_edit');
   TypeReplaceDivider.Hint:=lisConvTypeReplHint;
   TypeReplaceButton.Hint:=lisConvTypeReplHint;
   TypeReplaceComboBox.Items.Add(lisInteractive);
@@ -909,7 +909,7 @@ begin
   // Func Replacements
   FuncReplaceDivider.Caption:=lisConvFuncReplacements;
   FuncReplaceButton.Caption:=lisEdit;
-  FuncReplaceButton.LoadGlyphFromResourceName(HInstance, 'laz_edit');
+  TIDEImages.AssignImage(FuncReplaceButton.Glyph, 'laz_edit');
   FuncReplaceDivider.Hint:=lisConvFuncReplHint;
   FuncReplaceButton.Hint:=lisConvFuncReplHint;
   FuncReplaceComboBox.Items.Add(lisDisabled);
@@ -918,7 +918,7 @@ begin
   // Coordinate Offsets
   CoordOffsDivider.Caption:=lisConvCoordOffs;
   CoordOffsButton.Caption:=lisEdit;
-  CoordOffsButton.LoadGlyphFromResourceName(HInstance, 'laz_edit');
+  TIDEImages.AssignImage(CoordOffsButton.Glyph, 'laz_edit');
   CoordOffsDivider.Hint:=lisConvCoordHint;
   CoordOffsButton.Hint:=lisConvCoordHint;
   CoordOffsComboBox.Items.Add(lisDisabled);
diff --git a/converter/missingpropertiesdlg.pas b/converter/missingpropertiesdlg.pas
index c85f372220..f9f71d77ab 100644
--- a/converter/missingpropertiesdlg.pas
+++ b/converter/missingpropertiesdlg.pas
@@ -42,7 +42,7 @@ uses
   // codetools
   CodeCache, CodeToolManager, CodeCompletionTool, LFMTrees,
   // IdeIntf
-  IDEExternToolIntf, ComponentReg,
+  IDEExternToolIntf, ComponentReg, IDEImagesIntf,
   // IDE
   LazarusIDEStrConsts, EditorOptions, CheckLFMDlg, Project, SourceMarks,
   // Converter
@@ -741,7 +741,7 @@ begin
   PropertiesText.Caption:=lisProperties;
   TypesText.Caption:=lisTypes;
   ReplaceAllButton.Caption:=lisReplaceRemoveUnknown;
-  ReplaceAllButton.LoadGlyphFromResourceName(HInstance, 'laz_refresh');
+  TIDEImages.AssignImage(ReplaceAllButton.Glyph, 'laz_refresh');
   EditorOpts.GetHighlighterSettings(SynLFMSyn1);
   EditorOpts.GetSynEditSettings(LFMSynEdit);
 end;
diff --git a/converter/missingunits.pas b/converter/missingunits.pas
index 770112f5b6..e32d02b127 100644
--- a/converter/missingunits.pas
+++ b/converter/missingunits.pas
@@ -39,7 +39,7 @@ uses
   // IDEIntf
   LazIDEIntf,
   // IDE
-  CompilerOptions,
+  CompilerOptions, IDEImagesIntf,
   PackageDefs, Project, IDEProcs, LazarusIDEStrConsts;
 
 type
@@ -132,10 +132,10 @@ begin
     MissingUnitsGroupBox.Caption:=lisTheseUnitsWereNotFound;
     ChoicesLabel.Caption:=lisMissingUnitsChoices;
     SearchButton.Caption:=lisMissingUnitsSearch;
-    SearchButton.LoadGlyphFromResourceName(HInstance, 'menu_search_find');
+    TIDEImages.AssignImage(SearchButton.Glyph, 'menu_search_find');
     SkipButton.Caption:=lisMissingUnitsSkip;
-    SkipButton.LoadGlyphFromResourceName(HInstance, 'debugger_current_line_breakpoint');
-    CommentButton.LoadGlyphFromResourceName(HInstance, 'menu_comment'); // or insertremark
+    TIDEImages.AssignImage(SkipButton.Glyph, 'debugger_current_line_breakpoint');
+    TIDEImages.AssignImage(CommentButton.Glyph, 'menu_comment'); // or insertremark
     if ATargetDelphi then begin
       CommentButton.Caption:=lisMissingUnitsForDelphi;
       Info1Label.Caption:=lisMissingUnitsInfo1b;
diff --git a/debugger/exceptiondlg.pas b/debugger/exceptiondlg.pas
index 374c553a62..38a32a0a44 100644
--- a/debugger/exceptiondlg.pas
+++ b/debugger/exceptiondlg.pas
@@ -28,7 +28,7 @@ unit ExceptionDlg;
 interface
 
 uses
-  Classes, Forms, Dialogs, StdCtrls, Buttons, LazarusIDEStrConsts;
+  Classes, Forms, Dialogs, StdCtrls, Buttons, IDEImagesIntf, LazarusIDEStrConsts;
 
 type
   
@@ -77,8 +77,8 @@ begin
   btnContinue.Caption := lisMenuContinue;
   cbIgnoreExceptionType.Caption := lisIgnoreExceptionType;
 
-  btnBreak.LoadGlyphFromResourceName(HInstance, 'menu_pause');
-  btnContinue.LoadGlyphFromResourceName(HInstance, 'menu_run');
+  TIDEImages.AssignImage(btnBreak.Glyph, 'menu_pause');
+  TIDEImages.AssignImage(btnContinue.Glyph, 'menu_run');
 
   DefaultControl := btnBreak;
   CancelControl := btnContinue;
diff --git a/debugger/frames/debugger_language_exceptions_options.pas b/debugger/frames/debugger_language_exceptions_options.pas
index 44c22d4a2d..bd29818364 100644
--- a/debugger/frames/debugger_language_exceptions_options.pas
+++ b/debugger/frames/debugger_language_exceptions_options.pas
@@ -27,7 +27,7 @@ interface
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, StdCtrls, CheckLst,
   Buttons, Dialogs,
-  LazarusIDEStrConsts, IDEOptionsIntf, Debugger, BaseDebugManager;
+  LazarusIDEStrConsts, IDEImagesIntf, IDEOptionsIntf, Debugger, BaseDebugManager;
 
 type
 
@@ -149,8 +149,8 @@ begin
   DbgLangExceptHint.Caption := lisTheseSettingsAreStoredWithTheProject;
   cmdExceptionRemove.Caption := lisRemove;
   cmdExceptionAdd.Caption := lisAdd;
-  cmdExceptionRemove.LoadGlyphFromResourceName(HInstance, 'laz_delete');
-  cmdExceptionAdd.LoadGlyphFromResourceName(HInstance, 'laz_add');
+  TIDEImages.AssignImage(cmdExceptionRemove.Glyph, 'laz_delete');
+  TIDEImages.AssignImage(cmdExceptionAdd.Glyph, 'laz_add');
   chkNotifyOnException.Caption := lisDebugOptionsFrmNotifyOnLazarusExceptions;
 end;
 
diff --git a/debugger/frames/debugger_signals_options.pas b/debugger/frames/debugger_signals_options.pas
index 1c2424bec9..af42258ee7 100644
--- a/debugger/frames/debugger_signals_options.pas
+++ b/debugger/frames/debugger_signals_options.pas
@@ -27,7 +27,7 @@ interface
 uses
   Classes, SysUtils, FileUtil, Forms, StdCtrls, Menus,
   ComCtrls, Buttons,
-  LazarusIDEStrConsts, IDEOptionsIntf, Debugger, BaseDebugManager;
+  LazarusIDEStrConsts, IDEOptionsIntf, IDEImagesIntf, Debugger, BaseDebugManager;
 type
 
   { TDebuggerSignalsOptions }
@@ -89,8 +89,8 @@ begin
   lvSignals.Column[3].Caption := lisDebugOptionsFrmResume;
   cmdSignalAdd.Caption := lisAdd;
   cmdSignalRemove.Caption := lisRemove;
-  cmdSignalAdd.LoadGlyphFromResourceName(HInstance, 'laz_add');
-  cmdSignalRemove.LoadGlyphFromResourceName(HInstance, 'laz_delete');
+  TIDEImages.AssignImage(cmdSignalAdd.Glyph, 'laz_add');
+  TIDEImages.AssignImage(cmdSignalRemove.Glyph, 'laz_delete');
 
   mnuHandledByProgram.Caption := lisDebugOptionsFrmHandledByProgram;
   mnuiHandledByDebugger.Caption := lisDebugOptionsFrmHandledByDebugger;
diff --git a/designer/anchoreditor.pas b/designer/anchoreditor.pas
index 0d11fe60ce..a113dd7da8 100644
--- a/designer/anchoreditor.pas
+++ b/designer/anchoreditor.pas
@@ -465,32 +465,19 @@ begin
 end;
 
 procedure TAnchorDesigner.LoadGlyphs;
-
-  procedure LoadGlyph(const aBtn: TSpeedButton; const aName: String);
-  var
-    xBmp: TCustomBitmap;
-  begin
-    xBmp := TIDEImages.CreateImage(16, aName);
-    try
-      aBtn.Glyph.Assign(xBmp);
-    finally
-      xBmp.Free;
-    end;
-  end;
-
 begin
-  LoadGlyph(LeftRefLeftSpeedButton, 'anchor_left_left');
-  LoadGlyph(LeftRefCenterSpeedButton, 'anchor_left_center');
-  LoadGlyph(LeftRefRightSpeedButton, 'anchor_left_right');
-  LoadGlyph(RightRefLeftSpeedButton, 'anchor_right_left');
-  LoadGlyph(RightRefCenterSpeedButton, 'anchor_right_center');
-  LoadGlyph(RightRefRightSpeedButton, 'anchor_right_right');
-  LoadGlyph(TopRefTopSpeedButton, 'anchor_top_top');
-  LoadGlyph(TopRefCenterSpeedButton, 'anchor_top_center');
-  LoadGlyph(TopRefBottomSpeedButton, 'anchor_top_bottom');
-  LoadGlyph(BottomRefTopSpeedButton, 'anchor_bottom_top');
-  LoadGlyph(BottomRefCenterSpeedButton, 'anchor_bottom_center');
-  LoadGlyph(BottomRefBottomSpeedButton, 'anchor_bottom_bottom');
+  TIDEImages.AssignImage(LeftRefLeftSpeedButton.Glyph, 'anchor_left_left');
+  TIDEImages.AssignImage(LeftRefCenterSpeedButton.Glyph, 'anchor_left_center');
+  TIDEImages.AssignImage(LeftRefRightSpeedButton.Glyph, 'anchor_left_right');
+  TIDEImages.AssignImage(RightRefLeftSpeedButton.Glyph, 'anchor_right_left');
+  TIDEImages.AssignImage(RightRefCenterSpeedButton.Glyph, 'anchor_right_center');
+  TIDEImages.AssignImage(RightRefRightSpeedButton.Glyph, 'anchor_right_right');
+  TIDEImages.AssignImage(TopRefTopSpeedButton.Glyph, 'anchor_top_top');
+  TIDEImages.AssignImage(TopRefCenterSpeedButton.Glyph, 'anchor_top_center');
+  TIDEImages.AssignImage(TopRefBottomSpeedButton.Glyph, 'anchor_top_bottom');
+  TIDEImages.AssignImage(BottomRefTopSpeedButton.Glyph, 'anchor_bottom_top');
+  TIDEImages.AssignImage(BottomRefCenterSpeedButton.Glyph, 'anchor_bottom_center');
+  TIDEImages.AssignImage(BottomRefBottomSpeedButton.Glyph, 'anchor_bottom_bottom');
 end;
 
 procedure TAnchorDesigner.CreateSideControls;
diff --git a/designer/menueditorform.pas b/designer/menueditorform.pas
index e7ad3beb7f..ed9a21b443 100644
--- a/designer/menueditorform.pas
+++ b/designer/menueditorform.pas
@@ -31,7 +31,7 @@ uses
   Controls, StdCtrls, ExtCtrls, Forms, Graphics, Buttons, Menus, ButtonPanel,
   ImgList, Themes, LCLintf, LCLProc,
   // IdeIntf
-  FormEditingIntf, PropEdits, ObjectInspector,
+  FormEditingIntf, PropEdits, ObjectInspector, IDEImagesIntf,
   // IDE
   LazarusIDEStrConsts, MenuDesignerBase, MenuShortcuts;
 
@@ -474,18 +474,18 @@ procedure TMenuDesignerForm.LoadVariableButtonGlyphs(isInMenubar: boolean);
 begin
   if isInMenubar then
   begin
-    MoveItemUpButton.LoadGlyphFromResourceName(HINSTANCE,'arrow_left');
-    MoveItemDownButton.LoadGlyphFromResourceName(HINSTANCE,'arrow_right');
-    AddItemAboveButton.LoadGlyphFromResourceName(HINSTANCE,'add_item_left');
-    AddItemBelowButton.LoadGlyphFromResourceName(HINSTANCE,'add_item_right');
-    AddSubMenuButton.LoadGlyphFromResourceName(HINSTANCE,'add_submenu_below');
+    TIDEImages.AssignImage(MoveItemUpButton.Glyph, 'arrow_left');
+    TIDEImages.AssignImage(MoveItemDownButton.Glyph, 'arrow_right');
+    TIDEImages.AssignImage(AddItemAboveButton.Glyph, 'add_item_left', 24);
+    TIDEImages.AssignImage(AddItemBelowButton.Glyph, 'add_item_right', 24);
+    TIDEImages.AssignImage(AddSubMenuButton.Glyph, 'add_submenu_below', 24);
   end else
   begin
-    MoveItemUpButton.LoadGlyphFromResourceName(HINSTANCE,'arrow_up');
-    MoveItemDownButton.LoadGlyphFromResourceName(HINSTANCE,'arrow_down');
-    AddItemAboveButton.LoadGlyphFromResourceName(HINSTANCE,'add_item_above');
-    AddItemBelowButton.LoadGlyphFromResourceName(HINSTANCE,'add_item_below');
-    AddSubMenuButton.LoadGlyphFromResourceName(HINSTANCE,'add_submenu_right');
+    TIDEImages.AssignImage(MoveItemUpButton.Glyph, 'arrow_up');
+    TIDEImages.AssignImage(MoveItemDownButton.Glyph, 'arrow_down');
+    TIDEImages.AssignImage(AddItemAboveButton.Glyph, 'add_item_above', 24);
+    TIDEImages.AssignImage(AddItemBelowButton.Glyph, 'add_item_below', 24);
+    TIDEImages.AssignImage(AddSubMenuButton.Glyph, 'add_submenu_right', 24);
   end;
   UpdateSubmenuGroupBox(nil, nil);
   FDesigner.VariableGlyphsInMenuBar:=isInMenubar;
@@ -493,9 +493,9 @@ end;
 
 procedure TMenuDesignerForm.LoadFixedButtonGlyphs;
 begin
-  DeleteItemButton.LoadGlyphFromResourceName(HINSTANCE,'laz_delete');
-  AddSeparatorAboveButton.LoadGlyphFromResourceName(HINSTANCE,'add_sep_above');
-  AddSeparatorBelowButton.LoadGlyphFromResourceName(HINSTANCE,'add_sep_below');
+  TIDEImages.AssignImage(DeleteItemButton.Glyph, 'laz_delete');
+  TIDEImages.AssignImage(AddSeparatorAboveButton.Glyph, 'add_sep_above', 24);
+  TIDEImages.AssignImage(AddSeparatorBelowButton.Glyph, 'add_sep_below', 24);
   HelpButton.Hint:=lisMenuEditorGetHelpToUseThisEditor;
 end;
 
diff --git a/designer/taborderdlg.pas b/designer/taborderdlg.pas
index 29df5cf69c..d314b96544 100644
--- a/designer/taborderdlg.pas
+++ b/designer/taborderdlg.pas
@@ -36,7 +36,7 @@ uses
   // LCL
   Forms, Controls, Dialogs, Buttons, ExtCtrls, StdCtrls, ComCtrls, LCLType, LCLProc,
   // IdeIntf
-  PropEdits, IDEDialogs,
+  PropEdits, IDEDialogs, IDEImagesIntf,
   //IDE
   IDEOptionDefs, LazarusIDEStrConsts;
 
@@ -139,9 +139,9 @@ begin
   GlobalDesignHook.AddHandlerDeletePersistent(@OnDeletePersistent);
   GlobalDesignHook.AddHandlerSetSelection(@OnSetSelection);
 
-  ArrowDown.LoadGlyphFromResourceName(HInstance, 'arrow_down');
-  ArrowUp.LoadGlyphFromResourceName(HInstance, 'arrow_up');
-  SortByPositionButton.LoadGlyphFromResourceName(HInstance, 'menu_edit_sort');
+  TIDEImages.AssignImage(ArrowDown.Glyph, 'arrow_down');
+  TIDEImages.AssignImage(ArrowUp.Glyph, 'arrow_up');
+  TIDEImages.AssignImage(SortByPositionButton.Glyph, 'menu_edit_sort');
 
   ArrowDown.Hint:=lisTabOrderDownHint;
   ArrowUp.Hint:=lisTabOrderUpHint;
diff --git a/ide/addtoprojectdlg.pas b/ide/addtoprojectdlg.pas
index b224d98147..40ecd123ff 100644
--- a/ide/addtoprojectdlg.pas
+++ b/ide/addtoprojectdlg.pas
@@ -42,7 +42,8 @@ uses
   // IDEIntf
   IDEWindowIntf, PackageIntf,
   // IDE
-  LazarusIDEStrConsts, Project, InputHistory, PackageDefs, ProjPackChecks;
+  LazarusIDEStrConsts, IDEImagesIntf, Project, InputHistory, PackageDefs,
+  ProjPackChecks;
   
 type
   TAddToProjectType = (
@@ -342,7 +343,7 @@ begin
 
   with FilesDirButton do begin
     Caption:=lisAddFilesInDirectory;
-    LoadGlyphFromResourceName(HInstance, 'pkg_files');
+    TIDEImages.AssignImage(Glyph, 'pkg_files');
   end;
 
   with FilesShortenButton do begin
@@ -355,7 +356,7 @@ begin
     Caption:=lisDelete;
     ShowHint:=true;
     Hint:=lisDeleteSelectedFiles;
-    LoadGlyphFromResourceName(HInstance, 'laz_delete');
+    TIDEImages.AssignImage(Glyph, 'laz_delete');
   end;
 
   UpdateFilesButtons;
diff --git a/ide/allcompileroptions.pas b/ide/allcompileroptions.pas
index bc7c3a15d3..e52eff903a 100644
--- a/ide/allcompileroptions.pas
+++ b/ide/allcompileroptions.pas
@@ -7,7 +7,7 @@ interface
 uses
   Classes, SysUtils, math, contnrs,
   Forms, Controls, StdCtrls, Buttons, ButtonPanel, EditBtn, ExtCtrls,
-  LCLProc, LazUTF8, Compiler, LazarusIDEStrConsts;
+  LCLProc, LazUTF8, Compiler, IDEImagesIntf, LazarusIDEStrConsts;
 
 type
 
@@ -85,7 +85,7 @@ procedure TfrmAllCompilerOptions.FormCreate(Sender: TObject);
 begin
   Caption:=lisAllOptions;
   edOptionsFilter.Hint := lisFilterTheAvailableOptionsList;
-  btnResetOptionsFilter.LoadGlyphFromResourceName(HInstance, ResBtnListFilter);
+  TIDEImages.AssignImage(btnResetOptionsFilter.Glyph, ResBtnListFilter);
   btnResetOptionsFilter.Enabled := False;
   btnResetOptionsFilter.Hint := lisClearTheFilterForOptions;
   cbShowModified.Caption:=lisShowOnlyModified;
diff --git a/ide/buildlazdialog.pas b/ide/buildlazdialog.pas
index fe52a18108..75ed0653a5 100644
--- a/ide/buildlazdialog.pas
+++ b/ide/buildlazdialog.pas
@@ -1036,13 +1036,13 @@ begin
   ConfirmBuildCheckBox.Hint := lisLazBuildShowConfirmationDialogWhenBuilding;
 
   CompileButton.Caption := lisBuild;
-  CompileButton.LoadGlyphFromResourceName(HInstance, 'menu_build');
+  TIDEImages.AssignImage(CompileButton.Glyph, 'menu_build');
   CompileAdvancedButton.Caption := lisLazBuildBuildMany;
-  CompileAdvancedButton.LoadGlyphFromResourceName(HInstance, 'menu_build_all');
+  TIDEImages.AssignImage(CompileAdvancedButton.Glyph, 'menu_build_all');
   SaveSettingsButton.Caption := lisSaveSettings;
   SaveSettingsButton.LoadGlyphFromStock(idButtonSave);
   if SaveSettingsButton.Glyph.Empty then
-    SaveSettingsButton.LoadGlyphFromResourceName(HInstance, 'laz_save');
+    TIDEImages.AssignImage(SaveSettingsButton.Glyph, 'laz_save');
   CancelButton.Caption := lisCancel;
   HelpButton.Caption := lisMenuHelp;
 
diff --git a/ide/charactermapdlg.pas b/ide/charactermapdlg.pas
index 5f2713f1b0..aa674f283f 100644
--- a/ide/charactermapdlg.pas
+++ b/ide/charactermapdlg.pas
@@ -41,7 +41,7 @@ uses
   StdCtrls, LCLType, LCLUnicodeData, GraphType, Grids, ButtonPanel, ComCtrls,
   IDEHelpIntf, LazUTF8,
   {$ifdef WINDOWS}Windows,{$endif} lconvencoding,
-  LazarusIDEStrConsts, EditorOptions, EnvironmentOpts;
+  LazarusIDEStrConsts, IDEImagesIntf, EditorOptions, EnvironmentOpts;
 
 type
   TOnInsertCharacterEvent = procedure (const C: TUTF8Char) of object;
@@ -125,7 +125,7 @@ begin
   RangeLabel.Caption := lisRange;
   SortUniRangeListButton.Flat:=True;
   SortUniRangeListButton.Hint:=lisSortUnicodeRangeListAlphabetically;
-  SortUniRangeListButton.LoadGlyphFromResourceName(HInstance, 'pkg_sortalphabetically');
+  TIDEImages.AssignImage(SortUniRangeListButton.Glyph, 'pkg_sortalphabetically');
   ButtonPanel.HelpButton.Caption:=lisMenuHelp;
   ButtonPanel.CloseButton.Caption:=lisBtnClose;
 
diff --git a/ide/checklfmdlg.pas b/ide/checklfmdlg.pas
index 32802f8188..05cef46a00 100644
--- a/ide/checklfmdlg.pas
+++ b/ide/checklfmdlg.pas
@@ -42,7 +42,7 @@ uses
   IDEExternToolIntf, PackageIntf, IDEWindowIntf, PropEdits, PropEditUtils,
   IDEMsgIntf, IDEDialogs, ComponentReg,
   // IDE
-  CustomFormEditor, LazarusIDEStrConsts,
+  CustomFormEditor, LazarusIDEStrConsts, IDEImagesIntf,
   IDEProcs, EditorOptions, SourceMarks, JITForms;
 
 type
@@ -748,7 +748,7 @@ begin
   ErrorsGroupBox.Caption:=lisErrors;
   LFMGroupBox.Caption:=lisLFMFile;
   RemoveAllButton.Caption:=lisRemoveAllInvalidProperties;
-  RemoveAllButton.LoadGlyphFromResourceName(HInstance, 'laz_delete');
+  TIDEImages.AssignImage(RemoveAllButton.Glyph, 'laz_delete');
   CancelButton.Caption:=lisCancel;
   EditorOpts.GetHighlighterSettings(SynLFMSyn1);
   EditorOpts.GetSynEditSettings(LFMSynEdit);
diff --git a/ide/codecontextform.pas b/ide/codecontextform.pas
index 3c3fe5016c..c288a0ec78 100644
--- a/ide/codecontextform.pas
+++ b/ide/codecontextform.pas
@@ -41,7 +41,8 @@ uses
   Graphics, Dialogs, LCLType, LCLIntf, Themes, Buttons, SynEdit, SynEditKeyCmds,
   BasicCodeTools, KeywordFuncLists, LinkScanner, CodeCache, FindDeclarationTool,
   IdentCompletionTool, CodeTree, CodeAtom, PascalParserTool, CodeToolManager,
-  SrcEditorIntf, LazIDEIntf, IDEProcs, LazarusIDEStrConsts, LMessages;
+  SrcEditorIntf, LazIDEIntf, IDEProcs, LazarusIDEStrConsts, IDEImagesIntf,
+  LMessages;
 
 type
 
@@ -517,7 +518,7 @@ begin
       Btn.Name:='CopyAllSpeedButton'+IntToStr(i+1);
       Btn.OnClick:=@CopyAllBtnClick;
       Btn.Visible:=false;
-      Btn.LoadGlyphFromResourceName(HInstance, 'laz_copy');
+      TIDEImages.AssignImage(Btn.Glyph, 'laz_copy');
       Btn.Flat:=true;
       Btn.Parent:=Self;
       FHints.Add(Item);
diff --git a/ide/codeexplorer.pas b/ide/codeexplorer.pas
index bfc431a4d6..08476ab746 100644
--- a/ide/codeexplorer.pas
+++ b/ide/codeexplorer.pas
@@ -47,7 +47,7 @@ uses
   CodeCache, CodeTree, KeywordFuncLists, FindDeclarationTool, DirectivesTree,
   PascalParserTool,
   // IDEIntf
-  LazIDEIntf, IDECommands, MenuIntf, SrcEditorIntf, IDEDialogs,
+  LazIDEIntf, IDECommands, MenuIntf, SrcEditorIntf, IDEDialogs, IDEImagesIntf,
   // IDE
   LazarusIDEStrConsts, IDEOptionDefs, IDEProcs, CodeExplOpts;
 
@@ -484,10 +484,10 @@ begin
   CodeFilterEdit.TextHint:=lisCEFilter;
   DirectivesFilterEdit.TextHint:=lisCEFilter;
 
-  CodeRefreshSpeedButton.LoadGlyphFromResourceName(HInstance, 'laz_refresh');
-  CodeOptionsSpeedButton.LoadGlyphFromResourceName(HInstance, 'menu_environment_options');
-  DirRefreshSpeedButton.LoadGlyphFromResourceName(HInstance, 'laz_refresh');
-  DirOptionsSpeedButton.LoadGlyphFromResourceName(HInstance, 'menu_environment_options');
+  TIDEImages.AssignImage(CodeRefreshSpeedButton.Glyph, 'laz_refresh');
+  TIDEImages.AssignImage(CodeOptionsSpeedButton.Glyph, 'menu_environment_options');
+  TIDEImages.AssignImage(DirRefreshSpeedButton.Glyph, 'laz_refresh');
+  TIDEImages.AssignImage(DirOptionsSpeedButton.Glyph, 'menu_environment_options');
 
   ImgIDDefault := Imagelist1.AddResourceName(HInstance, 'ce_default');
   ImgIDProgram := Imagelist1.AddResourceName(HInstance, 'ce_program');
@@ -1929,11 +1929,11 @@ procedure TCodeExplorerView.UpdateMode;
 begin
   if FMode=cemCategory
   then begin
-    CodeModeSpeedButton.LoadGlyphFromResourceName(HInstance, 'show_category');
+    TIDEImages.AssignImage(CodeModeSpeedButton.Glyph, 'show_category');
     CodeModeSpeedButton.Hint:=lisCEModeShowSourceNodes;
   end
   else begin
-    CodeModeSpeedButton.LoadGlyphFromResourceName(HInstance, 'show_source');
+    TIDEImages.AssignImage(CodeModeSpeedButton.Glyph, 'show_source');
     CodeModeSpeedButton.Hint:=lisCEModeShowCategories;
   end;
   Refresh(true);
diff --git a/ide/componentpalette.pas b/ide/componentpalette.pas
index d92eb249bc..c23cb3edd2 100644
--- a/ide/componentpalette.pas
+++ b/ide/componentpalette.pas
@@ -355,7 +355,7 @@ begin
     BtnRight:=TSpeedButton.Create(PageComponent);
     with BtnRight do
     begin
-      LoadGlyphFromResourceName(HInstance, 'SelCompPage');
+      TIDEImages.AssignImage(Glyph, 'SelCompPage');
       Flat := True;
       SetBounds(2,1,16,16);
       Hint := lisClickToSelectPalettePage;
@@ -408,7 +408,7 @@ begin
     Name := CompPalSelectionToolBtnPrefix + aButtonUniqueName;
     OnClick := @Pal.SelectionToolClick;
     OnMouseWheel := @Pal.OnPageMouseWheel;
-    LoadGlyphFromResourceName(hInstance, 'tmouse');
+    TIDEImages.AssignImage(Glyph, 'tmouse');
     Flat := True;
     GroupIndex:= 1;
     Down := True;
diff --git a/ide/definesgui.pas b/ide/definesgui.pas
index 311b104788..95cdc446cd 100644
--- a/ide/definesgui.pas
+++ b/ide/definesgui.pas
@@ -26,7 +26,7 @@ interface
 
 uses
   Classes, Forms, StdCtrls, Buttons, ButtonPanel, CheckLst, LCLType, Controls,
-  IDEHelpIntf, LazarusIDEStrConsts, Compiler;
+  IDEHelpIntf, IDEImagesIntf, LazarusIDEStrConsts, Compiler;
 
 type
 
@@ -82,9 +82,9 @@ begin
   Caption := lisLazBuildDefines;
   gbNewDefine.Caption := lisCodeToolsDefsDefine;
   AddBtn.Caption := lisBtnAdd;
-  AddBtn.LoadGlyphFromResourceName(HInstance, 'laz_add');
+  TIDEImages.AssignImage(AddBtn.Glyph, 'laz_add');
   RemoveBtn.Caption := lisBtnRemove;
-  RemoveBtn.LoadGlyphFromResourceName(HInstance, 'laz_delete');
+  TIDEImages.AssignImage(RemoveBtn.Glyph, 'laz_delete');
 end;
 
 procedure TDefinesGuiForm.FormShow(Sender: TObject);
diff --git a/ide/diffdialog.pas b/ide/diffdialog.pas
index e58e0a7620..3cb1539c44 100644
--- a/ide/diffdialog.pas
+++ b/ide/diffdialog.pas
@@ -42,7 +42,7 @@ uses
   Classes, SysUtils, Forms, Controls, Buttons, StdCtrls, FileUtil,
   lazutf8classes, LazarusIDEStrConsts, EditorOptions, LCLType, IDEWindowIntf,
   IDEHelpIntf, InputHistory, DiffPatch, ExtCtrls, Dialogs, ComCtrls, SynEdit,
-  SynHighlighterDiff, SourceEditor;
+  IDEImagesIntf, SynHighlighterDiff, SourceEditor;
 
 type
 
@@ -345,14 +345,14 @@ begin
   end;
 
   // buttons
-  CancelScanningButton.LoadGlyphFromResourceName(hInstance, 'btn_cancel');
+  TIDEImages.AssignImage(CancelScanningButton.Glyph, 'btn_cancel');
   CloseButton.Caption:=lisClose;
   OpenInEditorButton.Caption:=lisDiffDlgOpenDiffInEditor;
   HelpButton.Caption:=lisMenuHelp;
 
   OpenInEditorButton.LoadGlyphFromStock(idButtonOpen);
   if OpenInEditorButton.Glyph.Empty then
-    OpenInEditorButton.LoadGlyphFromResourceName(HInstance, 'laz_open');
+    TIDEImages.AssignImage(OpenInEditorButton.Glyph, 'laz_open');
   
   // dialogs
   dlgOpen.Title:=lisOpenExistingFile;
diff --git a/ide/editorfilemanager.pas b/ide/editorfilemanager.pas
index 037bde2423..1aabf196aa 100644
--- a/ide/editorfilemanager.pas
+++ b/ide/editorfilemanager.pas
@@ -109,15 +109,15 @@ begin
   PopupMenu1.Images:=IDEImages.Images_16;
   ActivateMenuItem.ImageIndex:=IDEImages.LoadImage(16, 'laz_open');
   CloseMenuItem.ImageIndex:=IDEImages.LoadImage(16, 'menu_close');
-  CloseCheckedButton.LoadGlyphFromResourceName(HInstance, 'menu_close_all');
-  SaveCheckedButton.LoadGlyphFromResourceName(HInstance, 'menu_save_all');
-  MoveUpBtn.LoadGlyphFromResourceName(HInstance, 'arrow_up');
-  MoveDownBtn.LoadGlyphFromResourceName(HInstance, 'arrow_down');
+  TIDEImages.AssignImage(CloseCheckedButton.Glyph, 'menu_close_all');
+  TIDEImages.AssignImage(SaveCheckedButton.Glyph, 'menu_save_all');
+  TIDEImages.AssignImage(MoveUpBtn.Glyph, 'arrow_up');
+  TIDEImages.AssignImage(MoveDownBtn.Glyph, 'arrow_down');
   // Buttons on FilterPanel
-  OpenButton.LoadGlyphFromResourceName(HInstance, 'laz_open');
+  TIDEImages.AssignImage(OpenButton.Glyph, 'laz_open');
   OpenButton.Hint:=lisActivateSelected;
   SortAlphabeticallyButton.Hint:=lisPESortFilesAlphabetically;
-  SortAlphabeticallyButton.LoadGlyphFromResourceName(HInstance, 'pkg_sortalphabetically');
+  TIDEImages.AssignImage(SortAlphabeticallyButton.Glyph, 'pkg_sortalphabetically');
 end;
 
 procedure TEditorFileManagerForm.CheckListBox1Click(Sender: TObject);
diff --git a/ide/encloseifdef.pas b/ide/encloseifdef.pas
index b6fc2edb81..e7312708df 100644
--- a/ide/encloseifdef.pas
+++ b/ide/encloseifdef.pas
@@ -54,7 +54,7 @@ interface
 uses
   Classes, SysUtils, Controls, Forms, StdCtrls, Buttons, ButtonPanel,
   LCLProc, LCLType, LazConf, LazFileUtils, Laz2_XMLCfg, LazFileCache,
-  IDEHelpIntf, LazarusIDEStrConsts;
+  IDEHelpIntf, IDEImagesIntf, LazarusIDEStrConsts;
 
 type
 
@@ -232,11 +232,11 @@ begin
   FirstLabel.Caption := lisFirstTest;
   SecondLabel.Caption := lisSecondTest;
   AddBtn.Caption := lisBtnAdd;
-  AddBtn.LoadGlyphFromResourceName(HInstance, 'laz_add');
+  TIDEImages.AssignImage(AddBtn.Glyph, 'laz_add');
   AddInverse.Caption := rsAddInverse;
-  AddInverse.LoadGlyphFromResourceName(HInstance, 'pkg_issues');
+  TIDEImages.AssignImage(AddInverse.Glyph, 'pkg_issues');
   RemoveBtn.Caption := lisBtnRemove;
-  RemoveBtn.LoadGlyphFromResourceName(HInstance, 'laz_delete');
+  TIDEImages.AssignImage(RemoveBtn.Glyph, 'laz_delete');
   ButtonPanel1.CloseButton.Caption := lisSave;
   ButtonPanel1.OKButton.Caption := lisOk;
   //ButtonPanel1.CloseButton.LoadGlyphFromStock(idButtonSave);
diff --git a/ide/etmessageframe.pas b/ide/etmessageframe.pas
index e37c5ff92c..2c5be5dddf 100644
--- a/ide/etmessageframe.pas
+++ b/ide/etmessageframe.pas
@@ -3487,11 +3487,11 @@ begin
   // search
   SearchPanel.Visible:=false; // by default the search is hidden
   HideSearchSpeedButton.Hint:=lisHideSearch;
-  HideSearchSpeedButton.LoadGlyphFromResourceName(HInstance, 'debugger_power_grey');
+  TIDEImages.AssignImage(HideSearchSpeedButton.Glyph, 'debugger_power_grey');
   SearchNextSpeedButton.Hint:=lisUDSearchNextOccurrenceOfThisPhrase;
-  SearchNextSpeedButton.LoadGlyphFromResourceName(HInstance, 'callstack_bottom');
+  TIDEImages.AssignImage(SearchNextSpeedButton.Glyph, 'callstack_bottom');
   SearchPrevSpeedButton.Hint:=lisUDSearchPreviousOccurrenceOfThisPhrase;
-  SearchPrevSpeedButton.LoadGlyphFromResourceName(HInstance, 'callstack_top');
+  TIDEImages.AssignImage(SearchPrevSpeedButton.Glyph, 'callstack_top');
   SearchEdit.TextHint:=lisUDSearch;
 end;
 
diff --git a/ide/examplemanager.pas b/ide/examplemanager.pas
index 4263e4a7c0..d06974e0ca 100644
--- a/ide/examplemanager.pas
+++ b/ide/examplemanager.pas
@@ -7,7 +7,8 @@ interface
 uses
   Classes, SysUtils, lazutf8classes, ListFilterEdit, Forms, Controls, Dialogs,
   StdCtrls, ExtCtrls, ButtonPanel, Buttons, EditBtn, LCLProc, FileUtil, LazFileUtils,
-  IDEWindowIntf, LazIDEIntf, MainIntf, EnvironmentOpts, LazarusIDEStrConsts;
+  IDEWindowIntf, LazIDEIntf, IDEImagesIntf, MainIntf, EnvironmentOpts,
+  LazarusIDEStrConsts;
 
 type
 
@@ -161,10 +162,10 @@ begin
   SelectAllButton.Caption:=lisMenuSelectAll;
   SelectNoneButton.Caption:=lisSAMSelectNone;
 
-  OpenSelectedButton.LoadGlyphFromResourceName(HInstance, 'laz_open');
-  BuildAllSelectedButton.LoadGlyphFromResourceName(HInstance, 'menu_build_all');
-  SelectAllButton.LoadGlyphFromResourceName(HInstance, 'menu_select_all');
-  SelectNoneButton.LoadGlyphFromResourceName(HInstance, 'ce_default');
+  TIDEImages.AssignImage(OpenSelectedButton.Glyph, 'laz_open');
+  TIDEImages.AssignImage(BuildAllSelectedButton.Glyph, 'menu_build_all');
+  TIDEImages.AssignImage(SelectAllButton.Glyph, 'menu_select_all');
+  TIDEImages.AssignImage(SelectNoneButton.Glyph, 'ce_default');
 
   edRootDirectory.Text:=EnvironmentOptions.GetParsedLazarusDirectory;
   FillProjectsPending;
diff --git a/ide/findreplacedialog.pp b/ide/findreplacedialog.pp
index 3d84dbca63..8bee2bb2b0 100644
--- a/ide/findreplacedialog.pp
+++ b/ide/findreplacedialog.pp
@@ -139,7 +139,7 @@ begin
   TextToFindLabel.Caption:=dlgTextToFind;
   ReplaceTextComboBox.Text:='';
   ReplaceWithCheckbox.Caption:=dlgReplaceWith;
-  EnableAutoCompleteSpeedButton.LoadGlyphFromResourceName(HInstance, 'menu_stepinto');
+  TIDEImages.AssignImage(EnableAutoCompleteSpeedButton.Glyph, 'menu_stepinto');
   OptionsGroupBox.Caption:=lisOptions;
 
   with CaseSensitiveCheckBox do begin
@@ -181,7 +181,7 @@ begin
 
   // CloseButton works now as ReplaceAllButton
   BtnPanel.CloseButton.Caption := dlgReplaceAll;
-  BtnPanel.CloseButton.LoadGlyphFromResourceName(hInstance, 'btn_all');
+  TIDEImages.AssignImage(BtnPanel.CloseButton.Glyph, 'btn_all');
 
   fReplaceAllClickedLast:=false;
   UpdateHints;
diff --git a/ide/fpdoceditwindow.pas b/ide/fpdoceditwindow.pas
index 391468f426..8876ff19f2 100644
--- a/ide/fpdoceditwindow.pas
+++ b/ide/fpdoceditwindow.pas
@@ -43,7 +43,7 @@ uses
   CTXMLFixFragment,
   // IDEIntf
   IDEWindowIntf, ProjectIntf, LazIDEIntf, IDEHelpIntf, Menus,
-  SrcEditorIntf, IDEDialogs, LazFileUtils,
+  SrcEditorIntf, IDEDialogs, LazFileUtils, IDEImagesIntf,
   // IDE
   IDEOptionDefs, EnvironmentOpts, PackageSystem, IDEProcs, LazarusIDEStrConsts,
   FPDocSelectInherited, FPDocSelectLink, CodeHelp;
@@ -297,14 +297,14 @@ begin
 
   Name := NonModalIDEWindowNames[nmiwFPDocEditorName];
 
-  BoldFormatButton.LoadGlyphFromResourceName(HInstance, 'formatbold');
-  UnderlineFormatButton.LoadGlyphFromResourceName(HInstance, 'formatunderline');
-  ItalicFormatButton.LoadGlyphFromResourceName(HInstance, 'formatitalic');
-  InsertVarTagButton.LoadGlyphFromResourceName(HInstance, 'insertvartag');
-  InsertCodeTagButton.LoadGlyphFromResourceName(HInstance, 'insertcodetag');
-  InsertRemarkButton.LoadGlyphFromResourceName(HInstance, 'insertremark');
-  InsertURLTagSpeedButton.LoadGlyphFromResourceName(HInstance, 'formatunderline');
-  SaveButton.LoadGlyphFromResourceName(HInstance, 'laz_save');
+  TIDEImages.AssignImage(BoldFormatButton.Glyph, 'formatbold');
+  TIDEImages.AssignImage(UnderlineFormatButton.Glyph, 'formatunderline');
+  TIDEImages.AssignImage(ItalicFormatButton.Glyph, 'formatitalic');
+  TIDEImages.AssignImage(InsertVarTagButton.Glyph, 'insertvartag');
+  TIDEImages.AssignImage(InsertCodeTagButton.Glyph, 'insertcodetag');
+  TIDEImages.AssignImage(InsertRemarkButton.Glyph, 'insertremark');
+  TIDEImages.AssignImage(InsertURLTagSpeedButton.Glyph, 'formatunderline');
+  TIDEImages.AssignImage(SaveButton.Glyph, 'laz_save');
 
   SourceEditorManagerIntf.RegisterChangeEvent(semEditorActivate, @DoEditorUpdate);
   SourceEditorManagerIntf.RegisterChangeEvent(semEditorStatus, @DoEditorUpdate);
diff --git a/ide/frames/compiler_buildmacro_options.pas b/ide/frames/compiler_buildmacro_options.pas
index 52a478ccd1..b2347ba7f9 100644
--- a/ide/frames/compiler_buildmacro_options.pas
+++ b/ide/frames/compiler_buildmacro_options.pas
@@ -489,9 +489,9 @@ begin
     lisHintADefaultValueCanBeDefinedInTheConditionals;
   BuildMacroDescriptionLabel.Caption:=lisCodeToolsDefsDescription;
 
-  BMAddMacroSpeedButton.LoadGlyphFromResourceName(HInstance, 'laz_add');
-  BMAddMacroValueSpeedButton.LoadGlyphFromResourceName(HInstance, 'laz_add');
-  BMDeleteMacroSpeedButton.LoadGlyphFromResourceName(HInstance, 'laz_delete');
+  TIDEImages.AssignImage(BMAddMacroSpeedButton.Glyph, 'laz_add');
+  TIDEImages.AssignImage(BMAddMacroValueSpeedButton.Glyph, 'laz_add');
+  TIDEImages.AssignImage(BMDeleteMacroSpeedButton.Glyph, 'laz_delete');
 end;
 
 destructor TCompOptBuildMacrosFrame.Destroy;
diff --git a/ide/frames/compiler_path_options.pas b/ide/frames/compiler_path_options.pas
index 21fe11dc58..d056a5bec3 100644
--- a/ide/frames/compiler_path_options.pas
+++ b/ide/frames/compiler_path_options.pas
@@ -7,8 +7,9 @@ interface
 uses
   Classes, SysUtils, LCLProc, LazFileUtils, LazFileCache, Controls, Dialogs,
   Buttons, StdCtrls, LCLType, IDEOptionsIntf, MacroIntf, IDEDialogs,
-  CompOptsIntf, Project, CompilerOptions, LazarusIDEStrConsts, PathEditorDlg,
-  IDEProcs, CheckCompilerOpts, ShowCompilerOpts, ImExportCompilerOpts;
+  CompOptsIntf, Project, CompilerOptions, LazarusIDEStrConsts, IDEImagesIntf,
+  PathEditorDlg, IDEProcs, CheckCompilerOpts, ShowCompilerOpts,
+  ImExportCompilerOpts;
 
 type
 
@@ -638,7 +639,7 @@ begin
 
   // register special buttons in the dialog itself
   btnShowOptions := CreateButton(dlgCOShowOptions);
-  btnShowOptions.LoadGlyphFromResourceName(HInstance, 'menu_compiler_options');
+  TIDEImages.AssignImage(btnShowOptions.Glyph, 'menu_compiler_options');
   btnShowOptions.OnClick := @DoShowOptions;
   // Check
   btnCheck := CreateButton(lisCompTest);
@@ -659,7 +660,7 @@ begin
   btnLoadSave.Hint := dlgCOLoadSaveHint;
   btnLoadSave.LoadGlyphFromStock(idButtonOpen);
   if btnLoadSave.Glyph.Empty then
-    btnLoadSave.LoadGlyphFromResourceName(HInstance, 'laz_save');
+    TIDEImages.AssignImage(btnLoadSave.Glyph, 'laz_save');
 
   ADialog.AddButtonSeparator;
 
diff --git a/ide/frames/componentpalette_options.pas b/ide/frames/componentpalette_options.pas
index 96ffb6d6dd..0634a844f5 100644
--- a/ide/frames/componentpalette_options.pas
+++ b/ide/frames/componentpalette_options.pas
@@ -152,12 +152,12 @@ begin
   // Component pages
   PagesGroupBox.Caption := lisCmpPages;
   AddPageButton.Caption := lisBtnDlgAdd;
-  AddPageButton.LoadGlyphFromResourceName(HInstance, 'laz_add');
+  TIDEImages.AssignImage(AddPageButton.Glyph, 'laz_add');
   RestoreButton.Caption := lisCmpRestoreDefaults;
   ImportDividerBevel.Caption := lisExportImport;
-  ImportButton.LoadGlyphFromResourceName(HInstance, 'laz_open');
+  TIDEImages.AssignImage(ImportButton.Glyph, 'laz_open');
   ImportButton.Caption := lisDlgImport;
-  ExportButton.LoadGlyphFromResourceName(HInstance, 'laz_save');
+  TIDEImages.AssignImage(ExportButton.Glyph, 'laz_save');
   ExportButton.Caption := lisDlgExport;
   // File dialogs
   ImportDialog.Title := lisImport;
@@ -171,13 +171,13 @@ begin
   ComponentsListView.Column[3].Caption := lisUnit;
   ComponentsListView.SmallImages := IDEImages.Images_24;
   // Arrow buttons for pages
-  PageMoveUpBtn.LoadGlyphFromResourceName(HInstance, 'arrow_up');
-  PageMoveDownBtn.LoadGlyphFromResourceName(HInstance, 'arrow_down');
+  TIDEImages.AssignImage(PageMoveUpBtn.Glyph, 'arrow_up');
+  TIDEImages.AssignImage(PageMoveDownBtn.Glyph, 'arrow_down');
   PageMoveUpBtn.Hint := lisMoveSelectedUp;
   PageMoveDownBtn.Hint := lisMoveSelectedDown;
   // Arrow buttons for components
-  CompMoveUpBtn.LoadGlyphFromResourceName(HInstance, 'arrow_up');
-  CompMoveDownBtn.LoadGlyphFromResourceName(HInstance, 'arrow_down');
+  TIDEImages.AssignImage(CompMoveUpBtn.Glyph, 'arrow_up');
+  TIDEImages.AssignImage(CompMoveDownBtn.Glyph, 'arrow_down');
   CompMoveUpBtn.Hint := lisMoveSelectedUp;
   CompMoveDownBtn.Hint := lisMoveSelectedDown;
 
diff --git a/ide/frames/editor_keymapping_options.pas b/ide/frames/editor_keymapping_options.pas
index 6038434104..181caf0bba 100644
--- a/ide/frames/editor_keymapping_options.pas
+++ b/ide/frames/editor_keymapping_options.pas
@@ -386,15 +386,15 @@ begin
   ConflictsTreeView.Images := IDEImages.Images_16;
   imgKeyCategory := IDEImages.LoadImage(16, 'item_keyboard');
   imgKeyItem := IDEImages.LoadImage(16, 'item_character');
-  ChooseSchemeButton.LoadGlyphFromResourceName(HInstance, 'item_keyboard'); // keymapcategory
-  FindKeyButton.LoadGlyphFromResourceName(HInstance, 'menu_search_find');
-  EditButton.LoadGlyphFromResourceName(HInstance, 'laz_edit');
-  ClearButton.LoadGlyphFromResourceName(HInstance, 'menu_clean');
+  TIDEImages.AssignImage(ChooseSchemeButton.Glyph, 'item_keyboard'); // keymapcategory
+  TIDEImages.AssignImage(FindKeyButton.Glyph, 'menu_search_find');
+  TIDEImages.AssignImage(EditButton.Glyph, 'laz_edit');
+  TIDEImages.AssignImage(ClearButton.Glyph, 'menu_clean');
   PopupMenu1.Images := IDEImages.Images_16;
   EditMenuItem.ImageIndex := IDEImages.LoadImage(16, 'laz_edit');
   ClearMenuItem.ImageIndex := IDEImages.LoadImage(16, 'menu_clean');
 
-  ResetKeyFilterBtn.LoadGlyphFromResourceName(HInstance, ResBtnListFilter);
+  TIDEImages.AssignImage(ResetKeyFilterBtn.Glyph, ResBtnListFilter);
   ResetKeyFilterBtn.Enabled := not IDEShortCutEmpty(KeyMapKeyFilter);
 
 //  FillKeyMappingTreeView;    ... Done in ReadSettings.
diff --git a/ide/frames/project_application_options.pas b/ide/frames/project_application_options.pas
index 802030322c..7946969faa 100644
--- a/ide/frames/project_application_options.pas
+++ b/ide/frames/project_application_options.pas
@@ -7,7 +7,7 @@ interface
 uses
   Classes, SysUtils, LCLProc, FileUtil, Forms, Controls, Graphics, Dialogs,
   ExtCtrls, StdCtrls, Buttons, ComCtrls, ExtDlgs, Math, LCLType, IDEOptionsIntf,
-  LazIDEIntf, IDEDialogs, DividerBevel, Project, LazarusIDEStrConsts,
+  LazIDEIntf, IDEImagesIntf, IDEDialogs, DividerBevel, Project, LazarusIDEStrConsts,
   EnvironmentOpts, ApplicationBundle, ProjectIcon, W32Manifest, CompilerOptions;
 
 type
@@ -257,7 +257,7 @@ begin
   // Darwin specific, Application Bundle
   DarwinDividerBevel.Caption := lisForMacOSDarwin;
   CreateAppBundleButton.Caption := dlgPOCreateAppBundle;
-  CreateAppBundleButton.LoadGlyphFromResourceName(HInstance, 'pkg_compile');
+  TIDEImages.AssignImage(CreateAppBundleButton.Glyph, 'pkg_compile');
 
   // Icon
   IconLabel.Caption := dlgPOIcon;
@@ -267,11 +267,11 @@ begin
   ClearIconButton.Caption := dlgPOClearIcon;
   LoadIconButton.LoadGlyphFromStock(idButtonOpen);
   if LoadIconButton.Glyph.Empty then
-    LoadIconButton.LoadGlyphFromResourceName(HInstance, 'laz_open');
+    TIDEImages.AssignImage(LoadIconButton.Glyph, 'laz_open');
   SaveIconButton.LoadGlyphFromStock(idButtonSave);
   if SaveIconButton.Glyph.Empty then
-    SaveIconButton.LoadGlyphFromResourceName(HInstance, 'laz_save');
-  ClearIconButton.LoadGlyphFromResourceName(HInstance, 'menu_clean');
+    TIDEImages.AssignImage(SaveIconButton.Glyph, 'laz_save');
+  TIDEImages.AssignImage(ClearIconButton.Glyph, 'menu_clean');
   IconImage.KeepOriginXWhenClipped := True;
   IconImage.KeepOriginYWhenClipped := True;
   IconImagePictureChanged(nil);
diff --git a/ide/frames/project_forms_options.pas b/ide/frames/project_forms_options.pas
index 02ffa0fed7..7d22cb4095 100644
--- a/ide/frames/project_forms_options.pas
+++ b/ide/frames/project_forms_options.pas
@@ -7,7 +7,7 @@ interface
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs,
   StdCtrls, Buttons, IDEOptionsIntf, PackageDefs, ProjectIntf, Project,
-  LazarusIDEStrConsts, CodeToolManager;
+  LazarusIDEStrConsts, IDEImagesIntf, CodeToolManager;
 
 type
 
@@ -186,10 +186,10 @@ begin
   FormsAvailFormsLabel.Caption := dlgAvailableForms;
   FormsAvailFormsListBox.Hint := dlgAvailableFormsHint;
   FormsAutoCreateNewFormsCheckBox.Caption := dlgAutoCreateNewForms;
-  FormsMoveAutoCreatedFormUpBtn.LoadGlyphFromResourceName(HInstance, 'arrow_up');
-  FormsMoveAutoCreatedFormsDownBtn.LoadGlyphFromResourceName(HInstance, 'arrow_down');
-  FormsAddToAutoCreatedFormsBtn.LoadGlyphFromResourceName(HInstance, 'arrow_left');
-  FormsRemoveFromAutoCreatedFormsBtn.LoadGlyphFromResourceName(HInstance, 'arrow_right');
+  TIDEImages.AssignImage(FormsMoveAutoCreatedFormUpBtn.Glyph, 'arrow_up');
+  TIDEImages.AssignImage(FormsMoveAutoCreatedFormsDownBtn.Glyph, 'arrow_down');
+  TIDEImages.AssignImage(FormsAddToAutoCreatedFormsBtn.Glyph, 'arrow_left');
+  TIDEImages.AssignImage(FormsRemoveFromAutoCreatedFormsBtn.Glyph, 'arrow_right');
 end;
 
 procedure TProjectFormsOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);
diff --git a/ide/frames/project_i18n_options.pas b/ide/frames/project_i18n_options.pas
index a63751407c..d976e284a7 100644
--- a/ide/frames/project_i18n_options.pas
+++ b/ide/frames/project_i18n_options.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   StdCtrls, EditBtn, ExtCtrls, LazFileUtils, Project, IDEOptionsIntf,
-  LazarusIDEStrConsts, IDEDialogs, Classes, Graphics;
+  LazarusIDEStrConsts, IDEDialogs, IDEImagesIntf, Classes, Graphics;
 
 type
 
@@ -126,7 +126,7 @@ begin
   ExcludedIdentifiersLabel.ParentFont := True;
   ExcludedOriginalsLabel.ParentFont := True;
   ForceUpdatePoFilesCheckBox.ParentFont := True;
-  POOutDirEdit.Button.LoadGlyphFromResourceName(HInstance, ResBtnSelDir); //DirectoryEdit
+  TIDEImages.AssignImage(POOutDirEdit.Button.Glyph, ResBtnSelDir); //DirectoryEdit
 end;
 
 procedure TProjectI18NOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions);
diff --git a/ide/frames/project_lazdoc_options.pas b/ide/frames/project_lazdoc_options.pas
index 84428b9782..9611736adb 100644
--- a/ide/frames/project_lazdoc_options.pas
+++ b/ide/frames/project_lazdoc_options.pas
@@ -7,7 +7,7 @@ interface
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
   Buttons, EditBtn, Project, IDEOptionsIntf, LazarusIDEStrConsts, IDEProcs,
-  CodeHelp;
+  IDEImagesIntf, CodeHelp;
 
 type
 
@@ -53,8 +53,8 @@ begin
   SearchPathsGroupBox.Caption:=lisSearchPaths2;
   AddPathButton.Caption := lisCodeHelpAddPathButton;
   DeletePathButton.Caption := lisCodeHelpDeletePathButton;
-  DeletePathButton.LoadGlyphFromResourceName(HInstance, 'laz_delete');
-  AddPathButton.LoadGlyphFromResourceName(HInstance, 'laz_add');
+  TIDEImages.AssignImage(DeletePathButton.Glyph, 'laz_delete');
+  TIDEImages.AssignImage(AddPathButton.Glyph, 'laz_add');
 
   PathEdit.Clear;
 end;
diff --git a/ide/genericchecklist.pas b/ide/genericchecklist.pas
index 6e6cb5f4b2..d2919b0376 100644
--- a/ide/genericchecklist.pas
+++ b/ide/genericchecklist.pas
@@ -7,7 +7,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ButtonPanel,
-  CheckLst, Buttons, StdCtrls;
+  CheckLst, Buttons, IDEImagesIntf, StdCtrls;
 
 type
 
@@ -54,7 +54,7 @@ begin
   fActionBtn.BorderSpacing.Left := 6;
   fActionBtn.BorderSpacing.Right := 6;
   if aResourceGlyphName <> '' then
-    fActionBtn.LoadGlyphFromResourceName(HInstance, aResourceGlyphName);
+    TIDEImages.AssignImage(fActionBtn.Glyph, aResourceGlyphName);
   fActionBtn.AutoSize := True;
   fActionBtn.Parent := ButtonPanel1;
 end;
diff --git a/ide/imexportcompileropts.pas b/ide/imexportcompileropts.pas
index 5b3a4c535e..c26133ccc4 100644
--- a/ide/imexportcompileropts.pas
+++ b/ide/imexportcompileropts.pas
@@ -34,7 +34,7 @@ interface
 uses
   SysUtils, Forms, Controls, Dialogs, StdCtrls, Buttons, ExtCtrls, ButtonPanel,
   IDEProcs, FileUtil, LazFileUtils, Laz2_XMLCfg, LCLType, LazarusIDEStrConsts,
-  IDEOptionsIntf, InputHistory, Project, CompilerOptions;
+  IDEOptionsIntf, IDEImagesIntf, InputHistory, Project, CompilerOptions;
 
 type
   { TImExportCompOptsDlg }
@@ -287,7 +287,7 @@ begin
     OKButton.Caption:=lisIECOLoadFromFile;
     OKButton.LoadGlyphFromStock(idButtonOpen);
     if OKButton.Glyph.Empty then
-      OKButton.LoadGlyphFromResourceName(HInstance, 'laz_open');
+      TIDEImages.AssignImage(OKButton.Glyph, 'laz_open');
     OKButton.Enabled:=False;
     OKButton.OnClick:=@OpenButtonCLICK;
   end;
@@ -308,7 +308,7 @@ begin
     OKButton.Caption:=lisIECOSaveToFile;
     OKButton.LoadGlyphFromStock(idButtonSave);
     if OKButton.Glyph.Empty then
-      OKButton.LoadGlyphFromResourceName(HInstance, 'laz_save');
+      TIDEImages.AssignImage(OKButton.Glyph, 'laz_save');
     OKButton.Enabled:=False;
     OKButton.OnClick:=@SaveButtonCLICK;
   end;
diff --git a/ide/initialsetupdlgs.pas b/ide/initialsetupdlgs.pas
index 5803b3d1e3..3584ce851c 100644
--- a/ide/initialsetupdlgs.pas
+++ b/ide/initialsetupdlgs.pas
@@ -49,7 +49,7 @@ uses
   FileUtil, LazUTF8, LazUTF8Classes, LazFileUtils, LazFileCache, LazLogger,
   // Other
   MacroDefIntf, GDBMIDebugger, DbgIntfDebuggerBase,
-  TransferMacros, LazarusIDEStrConsts, LazConf, EnvironmentOpts,
+  TransferMacros, LazarusIDEStrConsts, LazConf, EnvironmentOpts, IDEImagesIntf,
   AboutFrm, IDETranslations, BaseBuildManager, InitialSetupProc;
   
 type
@@ -489,7 +489,7 @@ begin
   ImgIDError := Imagelist1.AddResourceName(HInstance, 'state_error');
   ImgIDWarning := Imagelist1.AddResourceName(HInstance, 'state_warning');
 
-  StopScanButton.LoadGlyphFromResourceName(HInstance, 'menu_stop');
+  TIDEImages.AssignImage(StopScanButton.Glyph, 'menu_stop');
 
   UpdateCaptions;
 
diff --git a/ide/msgvieweditor.pas b/ide/msgvieweditor.pas
index ea893cc0e3..5b8101335c 100644
--- a/ide/msgvieweditor.pas
+++ b/ide/msgvieweditor.pas
@@ -32,7 +32,7 @@ interface
 
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  Buttons, ComCtrls, LazarusIDEStrConsts;
+  Buttons, ComCtrls, IDEImagesIntf, LazarusIDEStrConsts;
 
 type
   { TMessageFilterRule }
@@ -95,9 +95,9 @@ begin
   DeleteSetButton.Caption:=lisDelete;
   FilterSetGroupBox.Caption:=lisFilterSets;
 
-  AddNewSetButton.LoadGlyphFromResourceName(HInstance, 'laz_add');
-  DeleteSetButton.LoadGlyphFromResourceName(HInstance, 'laz_delete');
-  RenameSetButton.LoadGlyphFromResourceName(HInstance, 'laz_edit');
+  TIDEImages.AssignImage(AddNewSetButton.Glyph, 'laz_add');
+  TIDEImages.AssignImage(DeleteSetButton.Glyph, 'laz_delete');
+  TIDEImages.AssignImage(RenameSetButton.Glyph, 'laz_edit');
 end;
 
 procedure TMsgViewEditorDlg.DeleteSetButtonClick(Sender: TObject);
diff --git a/ide/patheditordlg.pas b/ide/patheditordlg.pas
index 4af2a5850a..6fa73abdfc 100644
--- a/ide/patheditordlg.pas
+++ b/ide/patheditordlg.pas
@@ -452,13 +452,13 @@ begin
   OpenDialog1.Filter:=Filt;
   SaveDialog1.Filter:=Filt;
 
-  MoveUpButton.LoadGlyphFromResourceName(HInstance, 'arrow_up');
-  MoveDownButton.LoadGlyphFromResourceName(HInstance, 'arrow_down');
-  ReplaceButton.LoadGlyphFromResourceName(HInstance, 'menu_reportingbug');
-  AddButton.LoadGlyphFromResourceName(HInstance, 'laz_add');
-  DeleteButton.LoadGlyphFromResourceName(HInstance, 'laz_delete');
-  DeleteInvalidPathsButton.LoadGlyphFromResourceName(HInstance, 'menu_clean');
-  AddTemplateButton.LoadGlyphFromResourceName(HInstance, 'laz_add');
+  TIDEImages.AssignImage(MoveUpButton.Glyph, 'arrow_up');
+  TIDEImages.AssignImage(MoveDownButton.Glyph, 'arrow_down');
+  TIDEImages.AssignImage(ReplaceButton.Glyph, 'menu_reportingbug');
+  TIDEImages.AssignImage(AddButton.Glyph, 'laz_add');
+  TIDEImages.AssignImage(DeleteButton.Glyph, 'laz_delete');
+  TIDEImages.AssignImage(DeleteInvalidPathsButton.Glyph, 'menu_clean');
+  TIDEImages.AssignImage(AddTemplateButton.Glyph, 'laz_add');
 end;
 
 procedure TPathEditorDialog.FormResize(Sender: TObject);
diff --git a/ide/projectinspector.pas b/ide/projectinspector.pas
index dacaa93d33..fc73626513 100644
--- a/ide/projectinspector.pas
+++ b/ide/projectinspector.pas
@@ -1037,13 +1037,13 @@ begin
   mnuAddEditorFiles.Caption:=lisProjAddEditorFile;
   mnuAddReq.Caption:=lisProjAddNewRequirement;
 
-  OpenButton.LoadGlyphFromResourceName(HInstance, 'laz_open');
+  TIDEImages.AssignImage(OpenButton.Glyph, 'laz_open');
   OpenButton.Caption:='';
   OpenButton.Hint:=lisOpenFile2;
   SortAlphabeticallyButton.Hint:=lisPESortFilesAlphabetically;
-  SortAlphabeticallyButton.LoadGlyphFromResourceName(HInstance, 'pkg_sortalphabetically');
+  TIDEImages.AssignImage(SortAlphabeticallyButton.Glyph, 'pkg_sortalphabetically');
   DirectoryHierarchyButton.Hint:=lisPEShowDirectoryHierarchy;
-  DirectoryHierarchyButton.LoadGlyphFromResourceName(HInstance, 'pkg_hierarchical');
+  TIDEImages.AssignImage(DirectoryHierarchyButton.Glyph, 'pkg_hierarchical');
 
   with ItemsTreeView do begin
     FFilesNode:=Items.Add(nil, dlgEnvFiles);
diff --git a/ide/projectwizarddlg.pas b/ide/projectwizarddlg.pas
index a64c03b6ef..513cdfe15c 100644
--- a/ide/projectwizarddlg.pas
+++ b/ide/projectwizarddlg.pas
@@ -29,7 +29,7 @@ interface
 
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, Buttons,
-  LazarusIDEStrConsts, EnvironmentOpts, StdCtrls;
+  LazarusIDEStrConsts, IDEImagesIntf, EnvironmentOpts, StdCtrls;
 
 type
   TProjectWizardSelectionType = (
@@ -85,11 +85,11 @@ begin
     btnConvertProject.caption:=lisPWConvertProject;
     gbRecent.Caption:=lisPWOpenRecentProject;
     btnCloseIDE.caption:=lisQuitLazarus;
-    btnNewProject.LoadGlyphFromResourceName(HInstance, 'item_project');
-    btnOpenProject.LoadGlyphFromResourceName(HInstance, 'menu_project_open');
-    btnExamples.LoadGlyphFromResourceName(HInstance, 'camera');
-    btnConvertProject.LoadGlyphFromResourceName(HInstance, 'laz_wand');
-    btnCloseIDE.LoadGlyphFromResourceName(HInstance, 'menu_exit');
+    TIDEImages.AssignImage(btnNewProject.Glyph, 'item_project');
+    TIDEImages.AssignImage(btnOpenProject.Glyph, 'menu_project_open');
+    TIDEImages.AssignImage(btnExamples.Glyph, 'camera');
+    TIDEImages.AssignImage(btnConvertProject.Glyph, 'laz_wand');
+    TIDEImages.AssignImage(btnCloseIDE.Glyph, 'menu_exit');
     cbRecentProjects.Items.AddStrings(EnvironmentOptions.RecentProjectFiles);
   end;
 
diff --git a/ide/publishprojectdlg.pas b/ide/publishprojectdlg.pas
index 06217f4991..2e8a7e6158 100644
--- a/ide/publishprojectdlg.pas
+++ b/ide/publishprojectdlg.pas
@@ -39,7 +39,7 @@ interface
 uses
   Classes, SysUtils, LazFileUtils, Forms, Controls, Graphics, Buttons,
   StdCtrls, Dialogs, LCLType,
-  IDEWindowIntf, IDEHelpIntf, IDEDialogs,
+  IDEWindowIntf, IDEHelpIntf, IDEDialogs, IDEImagesIntf,
   ProjectDefs, PackageDefs, PublishModule, IDEOptionDefs, InputHistory,
   LazarusIDEStrConsts, IDEProcs, ExtCtrls, ButtonPanel;
 
@@ -181,7 +181,7 @@ begin
   ButtonPanel1.CloseButton.Kind := bkCustom;
   ButtonPanel1.CloseButton.LoadGlyphFromStock(idButtonSave);
   if ButtonPanel1.CloseButton.Glyph.Empty then
-    ButtonPanel1.CloseButton.LoadGlyphFromResourceName(HInstance, 'laz_save');
+    TIDEImages.AssignImage(ButtonPanel1.CloseButton.Glyph, 'laz_save');
   ButtonPanel1.CloseButton.OnClick := @SaveSettingsButtonCLICK;
 
   ButtonPanel1.HelpButton.OnClick := @HelpButtonClick;
diff --git a/ide/runparamsopts.pas b/ide/runparamsopts.pas
index 105b437622..923fbf7551 100644
--- a/ide/runparamsopts.pas
+++ b/ide/runparamsopts.pas
@@ -51,7 +51,7 @@ uses
   // LCL
   Controls, Forms, Buttons, StdCtrls, ComCtrls, Dialogs, ButtonPanel,
   // IdeIntf
-  BaseIDEIntf, IDEHelpIntf, ProjectIntf, IDEDialogs,
+  BaseIDEIntf, IDEHelpIntf, ProjectIntf, IDEDialogs, IDEImagesIntf,
   // LazUtils
   LazFileUtils, LazFileCache, LazUTF8, Laz2_XMLCfg,
   // IDE
@@ -389,9 +389,9 @@ begin
 
   SetupLocalPage;
   SetupEnvironmentPage;
-  UserOverridesAddButton.LoadGlyphFromResourceName(HInstance, 'laz_add');
-  UserOverridesEditButton.LoadGlyphFromResourceName(HInstance, 'laz_edit');
-  UserOverridesDeleteButton.LoadGlyphFromResourceName(HInstance, 'laz_delete');
+  TIDEImages.AssignImage(UserOverridesAddButton.Glyph, 'laz_add');
+  TIDEImages.AssignImage(UserOverridesEditButton.Glyph, 'laz_edit');
+  TIDEImages.AssignImage(UserOverridesDeleteButton.Glyph, 'laz_delete');
 end;
 
 procedure TRunParamsOptsDlg.SetupLocalPage;
diff --git a/ide/searchresultview.lfm b/ide/searchresultview.lfm
index dce9f05b2f..7564c9e515 100644
--- a/ide/searchresultview.lfm
+++ b/ide/searchresultview.lfm
@@ -35,20 +35,17 @@ object SearchResultsView: TSearchResultsView
     Align = alNone
     AutoSize = True
     EdgeBorders = []
-    Images = ImageList
     TabOrder = 2
     object SearchAgainButton: TToolButton
       Left = 1
       Top = 2
       Caption = 'SearchAgainButton'
-      ImageIndex = 0
       OnClick = SearchAgainButtonClick
     end
     object ClosePageButton: TToolButton
       Left = 24
       Top = 2
       Caption = 'ClosePageButton'
-      ImageIndex = 1
       OnClick = ClosePageButtonClick
     end
     object ToolButton3: TToolButton
@@ -77,173 +74,6 @@ object SearchResultsView: TSearchResultsView
     TabOrder = 0
     OnChange = SearchInListChange
   end
-  object ImageList: TImageList
-    left = 33
-    top = 65
-    Bitmap = {
-      4C6905000000100000001000000000000000000000000000000000000000BABD
-      B600BABDB600BABDB600BABDB600BABDB600BABDB600BABDB600BABDB6000000
-      0000000000000000000000000000000000000000000000000000BABDB600A9BF
-      AA0083C8920050C66D003ABF5B0036BD590044BE65007BC18C00A5BCA800BABD
-      B6000000000000000000000000000000000000000000BABDB60096C59F009B90
-      83FFBCB0A4FF9D9185FFA5DCAE00AEA093FF9D9185FF646056FF33B153008CBB
-      9500BABDB600000000000000000000000000BABDB60095C49F003CC25B008E84
-      78FFC3B8AEFF655D55FF77CE83007C7268FFA89B8EFF9C9083FF78C88B0026A0
-      3A008BB79200BABDB60000000000BABDB600A9BEAA00746B62FFA4978AFF9589
-      7DFF9F9286FF3E3934FF68C872004C4640FF7E746AFF857A70FF3E3934FF4B4F
-      43FF31953E00A3B6A200BABDB600BABBB40083A181009B8E82FF9D9185FF867B
-      71FF564F48FF504A44FF80766CFF6E665DFF826C58FFA6917DFF948474FF564F
-      48FF1D36210073AC7700BABDB600BABBB400ADA194FFBAAEA2FF82776DFF8277
-      6DFFAA917BFFBAA794FFB7A48EFFB09781FF9F8D7DFF836D5BFF716357FF9589
-      7DFF070806FF35903800BABDB600B8BBB4009D9185FFB1A396FF7F756BFF7C72
-      68FF776D64FF6C635BFF2E2A26FF564F48FF80766CFF7C7268FF776D64FF7067
-      5EFF000000FF207D2300BABDB600B6B9B2005C554EFF423D38FF58514AFF3D38
-      33FF332F2BFF25231FFFA2AAA300312F2DFF1A1816FF252220FF191715FF0F0E
-      0DFF020202FF227C2500BABDB600BABDB60059574DFF9F9286FFCCC3BAFFC0B4
-      AAFFA6988BFF53504AFFFFFFFF0044423EFF908479FFC2B8ADFFC0B4AAFFA89B
-      8EFF181916FF36863A00BABDB600BABDB600534C46FF83786FFFCCC3BAFF7970
-      66FF71685FFF393730FFD4ECD900282624FF857A70FFC2B8ADFF786F65FF7B71
-      67FF0A0908FF72A27300BABDB600BABDB6004D4741FF83786FFFCCC3BAFF786F
-      65FF7B7167FF2F2B28FF59B670001D1B18FF95897DFFC2B8ADFF786F65FF7C72
-      68FF060505FFA5B3A200BABDB6000000000046413BFF857A70FFC3B8AEFF7C72
-      68FF7F756BFF36322DFF5EAA7100292924FF95897DFFBAAEA2FF7C7268FF7F75
-      6BFF010101FFBABDB60000000000000000003E3934FF393430FF332F2BFF2C29
-      25FF272421FF201D1BFF81AE8E00141311FF0B0A09FF070706FF040403FF0000
-      00FF000000FF0000000000000000000000000000000000000000BABDB600A4B5
-      A10073A5730036883A00247928002476280036803A00739E7300A4B2A100BABD
-      B60000000000000000000000000000000000000000000000000000000000BABD
-      B600BABDB600BABDB600BABDB600BABDB600BABDB600BABDB600BABDB6000000
-      0000000000000000000000000000CC00000019000000A016630008C486000900
-      000088C38600880000003800000020C48600D7672000504B260060FE62009C08
-      E5000A00E4000000000078F625000100FF0000000000000000000E0E1F00BE14
-      2B0019000000A016630058C4860009000000D8C38600D800000040102A006797
-      B800B9635400504B260060FE6200FE04FF001800FF000E0E1F007A77FFFF7976
-      FEFF13132B000000000000000000CC0000001900000095227C006461F8FF6A68
-      F9FF4578CEFF2F0D270038000000C0C48600CD683B007A77FFFF817EFFFF817E
-      FEFF7471FDFF12122A0078F625000100FF0010102A00625FF8FF6F6DFBFF7E7C
-      FFFF625FF8FF7A2BA000F7C387000900000078C28A007470FCFF7D7AFEFF8A87
-      FFFF7C79FDFF6C69FBFF61E37B00E313FE00615EF8FF6E6CFAFF7D7AFFFF615F
-      F7FF4845EDFF0101050000000000CC000000190000009F1868006E6CFBFF7774
-      FDFF8682FFFF7673FCFF6462F8FF605DF7FF6D6AFAFF7B79FFFF605DF7FF4A44
-      EFFF0C02FE000000000078F625000200FF000000000000000000030308006762
-      F6FF706DFBFF807EFFFF7E7BFFFF7C79FFFF7977FFFF5E5CF7FF4743ECFFACC1
-      8900DC672000504B260060FE6200FE04FF001800FF000000000078F625000503
-      FF005C59F4FF7D79FFFF5E5BFFFF5B58FFFF7674FFFF4642EEFFE3C189000900
-      000068C58600680200003800000000C68600DD672000504B260060FE6200E312
-      FD005D5BF7FF7976FFFF5956FFFF5754FFFF7270FFFF4846F0FF0A0A2800CC00
-      000019000000A016630038C6860009000000B8C58600B80200003E0F29005C5A
-      F6FF6764FAFF7472FFFF7370FFFF706EFFFF6E6CFFFF5755F7FF3F3DEEFF0A08
-      FB00000000000000000000000000CC0000001900000094217B005B59F6FF6663
-      FAFF7471FFFF5A58F6FF4340EBFF3F3EEBFF504DF4FF6867FFFF504EF5FF3634
-      EBFF0F07FB000000000078F625000300FF000F0F29005B58F6FF6562FAFF7170
-      FFFF5956F6FF433FECFFD3C289000B0207003533E8FF4745F2FF6362FFFF4A48
-      F4FF2F2DE9FF4943460060FE6200FE04FF002715FC005856F5FF6361FAFF5855
-      F6FF403EEAFF0202070000000000CC0000001A0107002D2AE4FF413FF1FF4C4A
-      F6FF312FEAFF85093A003800000040C78600E16720004F4A59004F4CF2FF413E
-      EDFF1B02FE000000000078F625000300FF0000000000010107002422E1FF312F
-      EAFF1B073A00A016630078C7860009000000F8C68600F80300003A103C008DC3
-      8900E2672000504B260060FE6200FE04FF000900FF000000000075EF2B000907
-      F800000000000000000000000000CC00000019000000A0166300C8C786000900
-      000048C786004804000038000000E0C78600E3672000504B260060FE6200FE04
-      FF000B00FF000000000078F625000000000000000000492F1A0093663800C790
-      5600C88E5200C78E5300C58E5300C58F5300C88E5300C48A5200AA7C5F006F43
-      2200040201000000000000000000000000000000000096663800F3EEE800F7F3
-      ED00F8F4ED00F8F3ED00F8F3ED00F8F3ED00F8F2EC00F7F2EC00F2E6D700E2B2
-      7D00D28E6100050302000000000063BBDBFF7EC6E0FF7EC6E0FF7EC6E0FF7EC6
-      E0FF7EC6E0FF7EC6E0FF7EC6E0FF7EC6E0FF7EC6E0FF7EC6E0FF7EC6E0FF7EC6
-      E0FF7EC6E0FF53ADD4FF0503020049B0D6FF95D9F8FF84DDF8FF68E3F8FF4BE9
-      F8FF2CEFF8FF14F1F8FF06F1F8FF06E9F5FF0EDCF1FF1BCCECFF28BFE8FF33B4
-      E5FF3AADE2FF2D8FC8FF7C4F2B0049B0D6FF49B0D6FF84DDF8FF68E3F8FF4EF6
-      FFFF2CFCFFFF10FFFFFF00FFFFFF00F7FCFF08E9F8FF17D9F4FF27BFE8FF33B5
-      E5FF2D8FC8FF2D8FC8FFC17F47009C50480049B0D6FF49B0D6FF68E3F8FF4AE9
-      F8FF2CFDFFFF10FFFFFF00FFFFFF00F7FCFF08E9F8FF1BCCECFF27BFE8FF2D8F
-      C8FF2D8FC8FFF8F4F000C0834A0083231600BF53450049B0D6FF49B0D6FF4AE9
-      F8FF2CEEF8FF10FFFFFF00FFFFFF00F7FCFF0EDCF1FF1BCCECFF2D8FC8FF2D8F
-      C8FFF6D8BB00FAF4EF00C2844A0098421B00E7A85A00EAB5710049B0D6FF49B0
-      D6FF2CEEF8FF14F1F8FF00FFFFFF06E9F5FF0EDCF1FF2D8FC8FF2D8FC8FFF9DD
-      C300F8DCC200FAF4ED00C2834900DEA85E00ECB87900E5A45800F2D8C40049B0
-      D6FF49B0D6FF14F1F8FF06F1F8FF06E9F5FF2D8FC8FF2D8FC8FFFAE0C800FADF
-      C700FADFC600FAF2EA00C28046007C989700E29E5600E8AA6A00E39B5D00F9D8
-      C30049B0D6FF49B0D6FF06F1F8FF2D8FC8FF2D8FC8FFEEB69400FCE2CD00FBE1
-      CB00FBE1C900FBF7F200C07C430044A8D2008C888100D6804000E5A36500E191
-      5800FDE5D30049B0D6FF06F1F8FF2C8EC8FFF9DAC400FCE2CE00FCE2CC00FBE0
-      C900FBE1C800FDFAF700BC763F0061ABCB00CFD2D100C27B4300E0926000E08C
-      4C00F7B456003A9FCFFF06F1F8FF2C8EC8FFF7B35200F7B35200F7B25100F7B2
-      4F00F7B24F00FCF9F500BB713A000104050087B1C000BE794100F7EDE300FDC2
-      6E00FFD8A0003A9FCFFF06F1F8FF2C8EC8FFFFD69600FFD69500FFD59400FFD4
-      9300FBBE6500FBF7F400B5642F000000000000000000BB733F00F4EBDF00FDBF
-      6800FCBD67003A9FCFFF06F1F8FF2C8EC8FFFCBD6200FBBD6300FBBC6100FCBE
-      6000FCBC6200FBF9F600B05F2B000000000000000000A45B2C00F4EFE700F7EC
-      DF00F6EBDE002C8EC8FF2C8EC8FF2C8EC8FFFAF3EB00FAF3EB00FAF2EA00FCF7
-      F300FAF6F200EFEFEE009950230000000000000000004E2C1600894A2300BB6C
-      3B00BA693400B9683400B6683400B5673500B5653200B9683300B9683300B361
-      2D00AD5E2B008849210047261200000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000001F33000071
-      BA000099FC00003254000000000000000000003B62000191F5000169B2000013
-      20000000000000000000000000000000000000000000003E660016A4FD00E8AB
-      80FFC6AC9BFF016EB70000000000000000000174C4004BB8FD0033A8F9000282
-      DF00012E4F0000000000000000000000000000000000002943001EA5FD00EAAB
-      80FFE8A97CFFB4A191FF00132100002641001A9CF60054BCFF0046B4FC000280
-      DD00001B2F00000000000000000000000000000000000000000000467500E6A7
-      79FFEFC8ADFFE8B087FFB28969FF0155910037ABF90052BBFF003E9A7B000338
-      5E0000000000000000000000000000000000000000000000000000000000E2A0
-      6EFFEEC7A8FFEDC2A3FFE3A475FFC08A61FF53BCFF002CA2F6003F8F4B003375
-      3900000000000000000000000000001E320068C7740068C7740065C37100E197
-      62FFECC1A1FFE8B792FFE9BB99FFDD9761FFBC7730FF419149005AA36200559D
-      5C0027622B0001192D0001182D00016EB70068C77400A5DAAE00A2D8AB00DB8E
-      53FFEABB99FFE3AA80FFE3AB81FFE4B18AFFD6884BFFC5641BFF81C587007DC2
-      82004A915000216F51000357A200016DB60065C37100A0D7A9009CD5A500D684
-      43FFE7B590FFE0A374FFE0A477FFE2AB81FFD37F43FFC06223FF7AC1800076BE
-      7C00458C4A002572550003539E00016BB40061BE6D005DB8680058B16200D277
-      35FFE4AF87FFDFA172FFE1A97CFFD07A3FFFB2581BFF4386430059A15E00448B
-      49001C6646000470D700044E9A0000000000000000000000000000000000CD6E
-      23FFE1A87EFFE0A679FFD0773DFFAF5C31FF3CABF9000B659600246628001C54
-      1F0000000000000000000000000000000000000000000000000000000000C962
-      1AFFDFA375FFCF743CFFA44F2DFF32A2F30048B6FF002797EE00195A3E000102
-      010000000000000000000000000000000000000000000000000001477D00C459
-      18FFCC713BFFA45033FF01325A00024986002F9EF20042B4FF00218CE6000231
-      61000000000000000000000000000000000000000000012C4E002198F000C04E
-      16FFA65438FF0374D30000080F0001203B001885E20040B3FF003BAAF9001373
-      D500011328000000000000000000000000000000000000000000000000000000
-      000000000000286E2D0025692900216425001E60220000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000057BCC0025658FFF1C5E89FFB8CCD900FFE5
-      880087FFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00E6FFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF001A5C88FF0A69A6FF0B6DABFF0A5180FFBBCE
-      DB00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00125784FF0C72B2FF107DC1FF0A6BA9FF2564
-      8EFFFDFEFE007DC4CDFFECF6F800FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF0090B0C5000E598BFF0F7ABCFF107DC1FF0E5B
-      8AFF319CADFF008B9CFFD6ECEF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FDFEFE006A95B2FF0C5685FF0B76B2FF0188
-      A1FF33AEBEFF29A5B5FFC2E3E700FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF007EB1C2FF01889CFF41BD
-      CDFF77DEEBFF1E6EB2FF1B4BAAFF2EA3B1FF88C9D100EAF5F700FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00A5D6DC000A91A1FF4FC8D8FF68DC
-      ECFF336DC8FF0D1BABFF62B1D7FF72DCEAFF49BFCEFF1294A5FF61B9C3FFE4F3
-      F500FFFFFF00FFFFFF00FFFFFF00FFFFFF00A0D4DA001496A6FF31A8BDFF284A
-      BBFF1D38B8FF61D8F6FF63EAFDFF6CEBFDFF7DEEFDFF88EAF8FF49BFCEFF0D93
-      A2FF5CB7C2FFBFE2E600FDFEFE00FFFFFF00FFFFFF00F8FCFC002846B0FF1644
-      AEFF84EAFBFF6BECFDFF84EFFDFF6DECFDFF52E9FDFF44E5FBFF65E3F3FF77DD
-      EBFF4AC1CFFF26A3B2FF1595A5FFFFFFFF000687E500FFFFFF00A0CFDA0037B3
-      C2FF8AEFFDFF5FEAFDFF61EBFDFF52E9FDFF3CE6FDFF2ADBF3FF18D0E7FF10C6
-      DCFF49D2E4FF67D4E2FF0B88A2FFF002000010000000F03C87006356BC00108F
-      A0FF8BEDFBFF3CE5FCFF37E4FBFF2FDEF6FF23D7EEFF14CDE5FF04C3DBFF03C2
-      DAFF56D6E6FF36B7C7FF005E69FF000000000000000000000000000000002092
-      9AFF5ECFDDFF46DAEDFF18D0E7FF11CBE3FF07C4DCFF03C2DAFF03C2DAFF4CD3
-      E4FF58CDDCFF048898FF000F11000000000000000000FFFFFF00000000000025
-      29001996A5FF6CDAE8FF10C5DCFF03C2DAFF03C2DAFF15C6DCFF5BD7E7FF56C7
-      D5FF068797FF726CD3009862E40000000000003A000000FF0100C0FF0300E0FF
-      070033A87EFF3AB6C2FF5FD8E7FF26CADFFF4ED4E5FF6DD9E7FF35B5C2FF1898
-      92FFCCEE2400F0FF0F00E0FF0700C0FF070080FF0000007D0000000000000000
-      0000000A0C000C7D8CFF4FC1D0FF5BD3E1FF2FB1C2FF088B9BFF007169FF00F6
-      0D00C0FF0300E0FF0700E0FF0F00F0FF1F00F0FF0F00F8FF1F00F8FF1F00F8FF
-      1F00F8FF0F00D3F12E00119493FF129593FF55B865FFA7F01A0080FF0000007D
-      0000000000000000000000000000
-    }
-  end
   object popList: TPopupMenu
     left = 190
     top = 133
@@ -272,11 +102,9 @@ object SearchResultsView: TSearchResultsView
     end
   end
   object ActionList: TActionList
-    Images = ImageList
     left = 93
     top = 133
     object actClosePage: TAction
-      ImageIndex = 1
       OnExecute = ClosePageButtonClick
       ShortCut = 16499
     end
diff --git a/ide/searchresultview.pp b/ide/searchresultview.pp
index b21374b4ab..cbdc2b8c0d 100644
--- a/ide/searchresultview.pp
+++ b/ide/searchresultview.pp
@@ -47,7 +47,7 @@ uses
   LazUTF8, LazFileUtils,
   // IDE
   IDEOptionDefs, LazarusIDEStrConsts, EnvironmentOpts, InputHistory, IDEProcs,
-  Project, MainIntf, IDECommands;
+  Project, MainIntf, IDECommands, IDEImagesIntf;
 
 
 type
@@ -145,7 +145,6 @@ type
     mniCopyAll: TMenuItem;
     mniCopyItem: TMenuItem;
     popList: TPopupMenu;
-    ImageList: TImageList;
     ResultsNoteBook: TPageControl;
     ToolBar: TToolBar;
     SearchAgainButton: TToolButton;
@@ -284,6 +283,8 @@ end;
 procedure TSearchResultsView.Form1Create(Sender: TObject);
 var
   CloseCommand: TIDECommand;
+  ScaledIcon: TGraphic;
+  NewScaledIcon: Boolean;
 begin
   FMaxItems:=50000;
   ResultsNoteBook.Options:= ResultsNoteBook.Options+[nboShowCloseButtons];
@@ -313,6 +314,23 @@ begin
   mniCopyAll.Caption := lisCopyAllItemsToClipboard;
   mniExpandAll.Caption := lisExpandAll;
   mniCollapseAll.Caption := lisCollapseAll;
+
+  ToolBar.Images := IDEImages.Images_16;
+  SearchAgainButton.ImageIndex := IDEImages.LoadImage(16, 'menu_search_find');
+  ClosePageButton.ImageIndex := IDEImages.LoadImage(16, 'menu_close');
+  ActionList.Images := IDEImages.Images_16;
+  actClosePage.ImageIndex := IDEImages.LoadImage(16, 'menu_close');
+
+  ScaledIcon := TIDEImages.ScaleImage(SearchInListEdit.Glyph, NewScaledIcon,
+    MulDiv(SearchInListEdit.Glyph.Width, TIDEImages.GetScalePercent, 100),
+    MulDiv(SearchInListEdit.Glyph.Height, TIDEImages.GetScalePercent, 100),
+    TIDEImages.GetScalePercent / 100);
+  try
+    SearchInListEdit.Glyph.Assign(ScaledIcon);
+  finally
+    if NewScaledIcon then
+      ScaledIcon.Free;
+  end;
 end;
 
 procedure TSearchResultsView.FormClose(Sender: TObject; var CloseAction: TCloseAction);
diff --git a/ide/toolbarconfig.pas b/ide/toolbarconfig.pas
index f548390806..74a9b52bca 100644
--- a/ide/toolbarconfig.pas
+++ b/ide/toolbarconfig.pas
@@ -187,11 +187,11 @@ begin
   pnlButtons.Color := clBtnFace;
   lblSelect.Caption := '';
   // load button images
-  btnAdd.LoadGlyphFromResourceName(HInstance, 'arrow_right');
-  btnRemove.LoadGlyphFromResourceName(HInstance, 'arrow_left');
-  btnMoveUp.LoadGlyphFromResourceName(HInstance, 'arrow_up');
-  btnMoveDown.LoadGlyphFromResourceName(HInstance, 'arrow_down');
-  btnAddDivider.LoadGlyphFromResourceName(HINSTANCE, 'menu_divider16');
+  TIDEImages.AssignImage(btnAdd.Glyph, 'arrow_right');
+  TIDEImages.AssignImage(btnRemove.Glyph, 'arrow_left');
+  TIDEImages.AssignImage(btnMoveUp.Glyph, 'arrow_up');
+  TIDEImages.AssignImage(btnMoveDown.Glyph, 'arrow_down');
+  TIDEImages.AssignImage(btnAddDivider.Glyph, 'menu_divider16');
 
   btnAddDivider.Caption:='---';
 
diff --git a/ide/unitdependencies.pas b/ide/unitdependencies.pas
index 8448b8cb1b..b87c9aaab6 100644
--- a/ide/unitdependencies.pas
+++ b/ide/unitdependencies.pas
@@ -1777,23 +1777,23 @@ begin
   AllUnitsGroupBox.Caption:=lisUDAllUnits;
 
   AllUnitsShowDirsSpeedButton.Hint:=lisUDShowNodesForDirectories;
-  AllUnitsShowDirsSpeedButton.LoadGlyphFromResourceName(HInstance, 'pkg_hierarchical');
+  TIDEImages.AssignImage(AllUnitsShowDirsSpeedButton.Glyph, 'pkg_hierarchical');
   AllUnitsShowDirsSpeedButton.Down:=true;
   AllUnitsShowGroupNodesSpeedButton.Hint:=lisUDShowNodesForProjectAndPackages;
-  AllUnitsShowGroupNodesSpeedButton.LoadGlyphFromResourceName(HInstance, 'pkg_hierarchical');
+  TIDEImages.AssignImage(AllUnitsShowGroupNodesSpeedButton.Glyph, 'pkg_hierarchical');
   AllUnitsShowGroupNodesSpeedButton.Down:=true;
 
   AllUnitsSearchNextSpeedButton.Hint:=lisUDSearchNextOccurrenceOfThisPhrase;
-  AllUnitsSearchNextSpeedButton.LoadGlyphFromResourceName(HInstance, 'arrow_down');
+  TIDEImages.AssignImage(AllUnitsSearchNextSpeedButton.Glyph, 'arrow_down');
   AllUnitsSearchPrevSpeedButton.Hint:=lisUDSearchPreviousOccurrenceOfThisPhrase;
-  AllUnitsSearchPrevSpeedButton.LoadGlyphFromResourceName(HInstance, 'arrow_up');
+  TIDEImages.AssignImage(AllUnitsSearchPrevSpeedButton.Glyph, 'arrow_up');
 
   // selected units
   SelectedUnitsGroupBox.Caption:=lisUDSelectedUnits;
   SelUnitsSearchNextSpeedButton.Hint:=lisUDSearchNextUnitOfThisPhrase;
-  SelUnitsSearchNextSpeedButton.LoadGlyphFromResourceName(HInstance, 'arrow_down');
+  TIDEImages.AssignImage(SelUnitsSearchNextSpeedButton.Glyph, 'arrow_down');
   SelUnitsSearchPrevSpeedButton.Hint:=lisUDSearchPreviousUnitOfThisPhrase;
-  SelUnitsSearchPrevSpeedButton.LoadGlyphFromResourceName(HInstance, 'arrow_up');
+  TIDEImages.AssignImage(SelUnitsSearchPrevSpeedButton.Glyph, 'arrow_up');
 
   // popup menu
   UnitsTVCopyFilenameMenuItem.Caption:=uemCopyFilename;
diff --git a/ide/viewunit_dlg.pp b/ide/viewunit_dlg.pp
index 99019ade07..fc69a0ee85 100644
--- a/ide/viewunit_dlg.pp
+++ b/ide/viewunit_dlg.pp
@@ -322,7 +322,7 @@ begin
   ButtonPanel.HelpButton.Caption:=lisMenuHelp;
   ButtonPanel.CancelButton.Caption:=lisCancel;
   SortAlphabeticallySpeedButton.Hint:=lisPESortFilesAlphabetically;
-  SortAlphabeticallySpeedButton.LoadGlyphFromResourceName(HInstance, 'pkg_sortalphabetically');
+  TIDEImages.AssignImage(SortAlphabeticallySpeedButton.Glyph, 'pkg_sortalphabetically');
 end;
 
 procedure TViewUnitDialog.FormDestroy(Sender: TObject);
diff --git a/packager/addtopackagedlg.pas b/packager/addtopackagedlg.pas
index 9e7a8995e1..449ffabac2 100644
--- a/packager/addtopackagedlg.pas
+++ b/packager/addtopackagedlg.pas
@@ -37,7 +37,8 @@ uses
   // LazUtils
   FileUtil, LazFileUtils,
   // IDEIntf
-  NewItemIntf, PackageIntf, FormEditingIntf, IDEWindowIntf, ComponentReg, IDEDialogs,
+  NewItemIntf, PackageIntf, FormEditingIntf, IDEWindowIntf, ComponentReg,
+  IDEDialogs, IDEImagesIntf,
   // IDE
   LazarusIDEStrConsts, InputHistory, IDEDefs, EnvironmentOpts,
   PackageSystem, PackageDefs, AddDirToPkgDlg, ProjPackChecks;
@@ -717,7 +718,7 @@ begin
   
   with FilesDirButton do begin
     Caption:=lisAddFilesInDirectory;
-    LoadGlyphFromResourceName(HInstance, 'pkg_files');
+    TIDEImages.AssignImage(Glyph, 'pkg_files');
   end;
 
   with FilesShortenButton do begin
@@ -730,7 +731,7 @@ begin
     Caption:=lisDelete;
     ShowHint:=true;
     Hint:=lisDeleteSelectedFiles;
-    LoadGlyphFromResourceName(HInstance, 'laz_delete');
+    TIDEImages.AssignImage(Glyph, 'laz_delete');
   end;
 
   LabelIconInfo.Caption:=lisNoneClickToChooseOne;
diff --git a/packager/frames/package_i18n_options.pas b/packager/frames/package_i18n_options.pas
index ac0c81f0ec..730e173797 100644
--- a/packager/frames/package_i18n_options.pas
+++ b/packager/frames/package_i18n_options.pas
@@ -6,7 +6,8 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, StdCtrls, EditBtn,
-  IDEOptionsIntf, LazarusIDEStrConsts, PackageDefs, IDEDialogs;
+  IDEOptionsIntf, LazarusIDEStrConsts, PackageDefs, IDEDialogs,
+  IDEImagesIntf;
 
 type
 
@@ -75,7 +76,7 @@ begin
   POOutDirEdit.Text := FLazPackage.POOutputDirectory;
   PoForFormsCheckBox.Checked:=FLazPackage.EnableI18NForLFM;
 
-  POOutDirEdit.Button.LoadGlyphFromResourceName(HInstance, ResBtnSelDir); //DirectoryEdit
+  TIDEImages.AssignImage(POOutDirEdit.Button.Glyph, ResBtnSelDir); //DirectoryEdit
 end;
 
 procedure TPackageI18NOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions);
diff --git a/packager/installpkgsetdlg.pas b/packager/installpkgsetdlg.pas
index 4251ebeb6d..2157fd9c73 100644
--- a/packager/installpkgsetdlg.pas
+++ b/packager/installpkgsetdlg.pas
@@ -218,10 +218,10 @@ begin
   ExportButton.Caption:=lisExportList;
   ImportButton.Caption:=lisImportList;
   UninstallButton.Caption:=lisUninstallSelection;
-  UninstallButton.LoadGlyphFromResourceName(HInstance, 'arrow_right');
+  TIDEImages.AssignImage(UninstallButton.Glyph, 'arrow_right');
   InstallPkgGroupBox.Caption:=lisPckEditInstall;
   AddToInstallButton.Caption:=lisInstallSelection;
-  AddToInstallButton.LoadGlyphFromResourceName(HInstance, 'arrow_left');
+  TIDEImages.AssignImage(AddToInstallButton.Glyph, 'arrow_left');
   PkgInfoGroupBox.Caption := lisPackageInfo;
   SaveAndRebuildButton.Caption:=lisSaveAndRebuildIDE;
   SaveAndExitButton.Caption:=lisSaveAndExitDialog;
diff --git a/packager/packageeditor.pas b/packager/packageeditor.pas
index 60d315bcf6..faf75ec5e1 100644
--- a/packager/packageeditor.pas
+++ b/packager/packageeditor.pas
@@ -1943,16 +1943,16 @@ begin
   mnuAddNewReqr.Caption := lisProjAddNewRequirement;
 
   // Buttons on FilterPanel
-  OpenButton.LoadGlyphFromResourceName(HInstance, 'laz_open');
+  TIDEImages.AssignImage(OpenButton.Glyph, 'laz_open');
   OpenButton.Hint:=lisOpenFile2;
   SortAlphabeticallyButton.Hint:=lisPESortFilesAlphabetically;
-  SortAlphabeticallyButton.LoadGlyphFromResourceName(HInstance, 'pkg_sortalphabetically');
+  TIDEImages.AssignImage(SortAlphabeticallyButton.Glyph, 'pkg_sortalphabetically');
   DirectoryHierarchyButton.Hint:=lisPEShowDirectoryHierarchy;
-  DirectoryHierarchyButton.LoadGlyphFromResourceName(HInstance, 'pkg_hierarchical');
+  TIDEImages.AssignImage(DirectoryHierarchyButton.Glyph, 'pkg_hierarchical');
 
   // Up / Down buttons
-  MoveUpBtn.LoadGlyphFromResourceName(HInstance, 'arrow_up');
-  MoveDownBtn.LoadGlyphFromResourceName(HInstance, 'arrow_down');
+  TIDEImages.AssignImage(MoveUpBtn.Glyph, 'arrow_up');
+  TIDEImages.AssignImage(MoveDownBtn.Glyph, 'arrow_down');
   MoveUpBtn.Hint:=lisMoveSelectedUp;
   MoveDownBtn.Hint:=lisMoveSelectedDown;