diff --git a/ide/componentlist.pas b/ide/componentlist.pas
index 84471ba930..411308e06e 100644
--- a/ide/componentlist.pas
+++ b/ide/componentlist.pas
@@ -41,7 +41,7 @@ uses
   // LazControls
   TreeFilterEdit,
   // IdeIntf
-  FormEditingIntf, PropEdits, ComponentReg,
+  FormEditingIntf, IDEImagesIntf, PropEdits, ComponentReg,
   // IDE
   LazarusIDEStrConsts, PackageDefs, IDEOptionDefs, EnvironmentOpts, Designer;
 
@@ -135,8 +135,8 @@ begin
   Name:=NonModalIDEWindowNames[nmiwComponentList];
   FActiveTree := ListTree;
 
+  IDEImages.AssignImage(SelectionToolButton, 'tmouse');
   with SelectionToolButton do begin
-    LoadGlyphFromResourceName(hInstance, 'tmouse');
     ShowHint := EnvironmentOptions.ShowHintsForComponentPalette;
     Width := ComponentPaletteBtnWidth;
     BorderSpacing.Around := (FilterPanel.Height - ComponentPaletteImageHeight) div 2;
diff --git a/ide/componentpalette.pas b/ide/componentpalette.pas
index df8b9c3cd0..8aac0e5826 100644
--- a/ide/componentpalette.pas
+++ b/ide/componentpalette.pas
@@ -403,18 +403,18 @@ end;
 
 procedure TComponentPage.CreateSelectionButton(aButtonUniqueName: string; aScrollBox: TScrollBox);
 var
-  {%H-}Pal: TComponentPalette;
+  Pal: TComponentPalette;
   Btn: TSpeedButton;
 begin
   if Assigned(SelectButton) then Exit;
   Pal := TComponentPalette(Palette);
   Btn := TSpeedButton.Create(nil);
   SelectButton:=Btn;
+  IDEImages.AssignImage(Btn, 'tmouse');
   with Btn do begin
     Name := CompPalSelectionToolBtnPrefix + aButtonUniqueName;
     OnClick := @Pal.SelectionToolClick;
     OnMouseWheel := @Pal.OnPageMouseWheel;
-    IDEImages.AssignImage(Btn, 'tmouse');
     Flat := True;
     GroupIndex:= 1;
     Down := True;
diff --git a/lcl/controls.pp b/lcl/controls.pp
index 19a897bc6f..10b9c9f7dc 100644
--- a/lcl/controls.pp
+++ b/lcl/controls.pp
@@ -346,7 +346,8 @@ type
     procedure DrawForControl(ACanvas: TCanvas; AX, AY, AIndex, AImageWidthAt96PPI: Integer;
       AControl: TControl; ADrawEffect: TGraphicsDrawEffect); overload;
 
-    property ResolutionForControl[AImageWidth: Integer; AControl: TControl]: TScaledImageListResolution read GetResolutionForControl;
+    property ResolutionForControl[AImageWidth: Integer; AControl: TControl]: TScaledImageListResolution
+                                     read GetResolutionForControl;
   end;
 
   TDragImageList = class;