From 9596662a1219abb7cf67a8fb0051a2ac2b0e51cd Mon Sep 17 00:00:00 2001
From: maxim <maxim@lazarus-ide.org>
Date: Mon, 17 Jul 2017 23:24:02 +0000
Subject: [PATCH] Merged revision(s) 55492 #3acd41371c, 55494-55496
 #6b1b12d66d-#6b1b12d66d, 55498-55500 #6f5300c1e9-#6f5300c1e9, 55507-55516
 #76cd4aa108-#76cd4aa108 from trunk: IDE: High-DPI: ObjectInspector: Fixed
 drawing of active row bitmap. Issue #32097 ........ grids: Introduce
 constColRowBorderTolerance for colwidth/rowheight resizing. ........ grids:
 High-dpi scaling of constCellPadding, constRubberSpace and
 constColRowBorderTolerance ........ IDE: High-DPI: ObjectInspector: Size of
 filter edit glyphs. Issue #32097 ........ IDE: High-DPI: Fixed image sizes of
 in IDE used TTreeFilterEdits and TListFilterEdits. ........ IDE: High-DPI:
 ComponentPagesPopup: Size of close button glyph. Issue #32097 ........ IDE:
 High-DPI: ComponentPalette: Size of component pages speedbutton. ........
 IDE: SearchResultWindow: Anchor of TreeFilterEdit to always show its button.
 ........ IDE: High-DPI: ObjectInspector: ComponentTreeView: Fixed image
 sizes. ........ IDE: High-DPI: ComponentPages: Fixed tree image sizes.
 ........ IDE: High-DPI: ActionsEditor: Fixed image sizes. ........ IDE:
 High-DPI: CodeExplorer: Fixed image sizes. ........ IDE: High-DPI: Better
 assigning of images to imagelists. ........ IDE: High-DPI: SourceEditor:
 Fixed source mark image sizes. ........ IDE: High-DPI: CodeBrowser: Fixed
 image sizes. ........ IDE: EditorDisplayOptions: Fixed wrong anchor of
 DisableAntialiasingCheckBox. ........ LCL: TTreeView: High-DPI: Make spaces
 between images DPI-aware. ........

git-svn-id: branches/fixes_1_8@55528 -
---
 .gitattributes                                |   2 +
 components/ideintf/actionseditor.lfm          |  35 ------
 components/ideintf/actionseditor.pas          |  22 ++--
 components/ideintf/changeparentdlg.pas        |   6 +-
 components/ideintf/componenttreeview.pas      |  29 ++---
 components/ideintf/ideimagesintf.pas          |  22 ++++
 components/ideintf/images/ideintf_images.res  | Bin 10792 -> 8627 bytes
 .../ideintf/images/ideintf_images_list.txt    |   4 +-
 .../images/propertygrid/pg_active_row.png     | Bin 2864 -> 166 bytes
 .../images/propertygrid/pg_active_row_150.png | Bin 0 -> 198 bytes
 .../images/propertygrid/pg_active_row_200.png | Bin 0 -> 203 bytes
 components/ideintf/objectinspector.pp         |   4 +-
 ide/codebrowser.pas                           |  42 ++++---
 ide/codeexplorer.pas                          |  64 ++++++-----
 ide/componentlist.lfm                         |   1 +
 ide/componentlist.pas                         |   6 +
 ide/componentpalette.pas                      |   4 +-
 ide/comppagespopup.lfm                        | 104 +-----------------
 ide/comppagespopup.pas                        |  16 ++-
 ide/editorfilemanager.pas                     |   1 +
 ide/frames/compiler_messages_options.pas      |   3 +-
 ide/frames/editor_display_options.lfm         |   1 -
 ide/frames/editor_keymapping_options.pas      |   1 +
 ide/ideoptionsdlg.lfm                         |   1 +
 ide/ideoptionsdlg.pas                         |   7 ++
 ide/projectinspector.lfm                      |   1 +
 ide/projectinspector.pas                      |   6 +
 ide/restrictionbrowser.pas                    |   1 +
 ide/searchresultview.lfm                      |   3 +
 ide/searchresultview.pp                       |  14 +--
 ide/sourcemarks.pas                           |  10 +-
 ide/toolbarconfig.pas                         |   1 +
 ide/useunitdlg.pas                            |   1 +
 ide/viewunit_dlg.pp                           |   1 +
 lcl/comctrls.pp                               |   1 +
 lcl/grids.pas                                 |  45 +++++---
 lcl/include/treeview.inc                      |  29 ++---
 packager/addpkgdependencydlg.pas              |   3 +-
 packager/installpkgsetdlg.pas                 |   2 +
 packager/packageeditor.pas                    |   1 +
 40 files changed, 224 insertions(+), 270 deletions(-)
 create mode 100644 components/ideintf/images/propertygrid/pg_active_row_150.png
 create mode 100644 components/ideintf/images/propertygrid/pg_active_row_200.png

diff --git a/.gitattributes b/.gitattributes
index fbfa60c9e8..055e6ecd61 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1891,6 +1891,8 @@ components/ideintf/images/propertygrid/issue_qt.png -text svneol=unset#image/png
 components/ideintf/images/propertygrid/issue_win32.png -text svneol=unset#image/png
 components/ideintf/images/propertygrid/issue_wince.png -text svneol=unset#image/png
 components/ideintf/images/propertygrid/pg_active_row.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/pg_active_row_150.png -text
+components/ideintf/images/propertygrid/pg_active_row_200.png -text
 components/ideintf/keyvalpropeditdlg.lfm svneol=native#text/plain
 components/ideintf/keyvalpropeditdlg.pas svneol=native#text/pascal
 components/ideintf/languages/objinspstrconsts.ca.po svneol=native#text/plain
diff --git a/components/ideintf/actionseditor.lfm b/components/ideintf/actionseditor.lfm
index ef0d8bb737..2dade48d7a 100644
--- a/components/ideintf/actionseditor.lfm
+++ b/components/ideintf/actionseditor.lfm
@@ -243,40 +243,5 @@ object ActionListEditor: TActionListEditor
     AllocBy = 8
     left = 56
     top = 116
-    Bitmap = {
-      4C69010000001000000010000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF007F7F7FFF7F7F
-      7FFF7F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFF7F7F
-      7FFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF007F7F
-      7FFF7F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFFFFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF007F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFFFFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF007F7F7FFF7F7F7FFF7F7F7FFF7F7F7FFFFFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF007F7F7FFF7F7F7FFFFFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00
-    }
   end
 end
diff --git a/components/ideintf/actionseditor.pas b/components/ideintf/actionseditor.pas
index 9289ef3430..bd9eba7692 100644
--- a/components/ideintf/actionseditor.pas
+++ b/components/ideintf/actionseditor.pas
@@ -27,9 +27,10 @@ uses
   Classes, SysUtils, contnrs,
   // LCL
   LCLIntf, LCLType, LCLProc, Forms, Controls, Dialogs, ExtCtrls, StdCtrls,
-  Graphics, Menus, ComCtrls, DBActns, StdActns, ActnList,
+  Graphics, Menus, ComCtrls, DBActns, StdActns, ActnList, Themes,
   // IDEIntf
-  ObjInspStrConsts, ComponentEditors, PropEdits, PropEditUtils, IDEWindowIntf;
+  ObjInspStrConsts, ComponentEditors, PropEdits, PropEditUtils, IDEWindowIntf,
+  IDEImagesIntf;
 
 type
   TActStdPropItem = class;
@@ -410,14 +411,19 @@ begin
 end;
 
 procedure TActionListEditor.FormCreate(Sender: TObject);
+var
+  ImageSize: Integer;
+  Details: TThemedElementDetails;
 begin
-  //imageindex 0 exists
-  ImageList1.AddResourceName(HInstance, 'laz_add'); //imageindex 1
-  ImageList1.AddResourceName(HInstance, 'laz_delete'); //imageindex 2
-  ImageList1.AddResourceName(HInstance, 'arrow_up'); //imadeindex 3
-  ImageList1.AddResourceName(HInstance, 'arrow_down'); //imageindex 4
+  ImageSize := TIDEImages.ScaledSize;
+  ImageList1.Width := ImageSize;
+  ImageList1.Height := ImageSize;
+  TIDEImages.AddImageToImageList(ImageList1, 'btn_downarrow'); //imageindex 0
+  TIDEImages.AddImageToImageList(ImageList1, 'laz_add'); //imageindex 1
+  TIDEImages.AddImageToImageList(ImageList1, 'laz_delete'); //imageindex 2
+  TIDEImages.AddImageToImageList(ImageList1, 'arrow_up'); //imadeindex 3
+  TIDEImages.AddImageToImageList(ImageList1, 'arrow_down'); //imageindex 4
   btnAddMore.ImageIndex := 0;
-  // These must be set in code because OI does not work with non-existent values.
   btnAdd.ImageIndex := 1;
   btnDelete.ImageIndex := 2;
   btnUp.ImageIndex := 3;
diff --git a/components/ideintf/changeparentdlg.pas b/components/ideintf/changeparentdlg.pas
index 449e7c516a..cdbfe44289 100644
--- a/components/ideintf/changeparentdlg.pas
+++ b/components/ideintf/changeparentdlg.pas
@@ -17,8 +17,8 @@ unit ChangeParentDlg;
 interface
 
 uses
-  Classes, SysUtils, strutils, FileUtil, ListFilterEdit, PropEditUtils, Forms,
-  Controls, Graphics, Dialogs, StdCtrls, ButtonPanel;
+  Classes, SysUtils, strutils, FileUtil, ListFilterEdit, PropEditUtils,
+  IDEImagesIntf, Forms, Controls, Graphics, Dialogs, StdCtrls, ButtonPanel;
 
 type
 
@@ -103,6 +103,8 @@ begin
 
   Caption := oisChangeParent;
   chShowClasses.Caption := oisShowClasses;
+
+  TIDEImages.AssignImage(ListFilterEdit.Glyph, 'btnfiltercancel');
 end;
 
 {$HINTS OFF}
diff --git a/components/ideintf/componenttreeview.pas b/components/ideintf/componenttreeview.pas
index fcf1262ff9..fa5bdddef3 100644
--- a/components/ideintf/componenttreeview.pas
+++ b/components/ideintf/componenttreeview.pas
@@ -28,7 +28,7 @@ uses
   // LCL
   LCLProc, Dialogs, Controls, ComCtrls, Graphics,
   // IdeIntf
-  ObjInspStrConsts, PropEdits, PropEditUtils;
+  ObjInspStrConsts, PropEdits, PropEditUtils, IDEImagesIntf;
   
 type
   TCTVGetImageIndexEvent = procedure(APersistent: TPersistent;
@@ -582,31 +582,20 @@ begin
 end;
 
 constructor TComponentTreeView.Create(TheOwner: TComponent);
-var
-  Bitmap: TPortableNetworkGraphic;
 begin
   inherited Create(TheOwner);
   DragMode := dmAutomatic;
   FComponentList:=TBackupComponentList.Create;
   Options := Options + [tvoAllowMultiselect, tvoAutoItemHeight, tvoKeepCollapsedNodes, tvoReadOnly];
   FImageList := TImageList.Create(nil);
-  Bitmap := TPortableNetworkGraphic.Create;
-  try
-    Bitmap.LoadFromResourceName(HInstance, 'oi_form');
-    ImgIndexForm:=FImageList.Add(Bitmap, nil);
-    Bitmap.LoadFromResourceName(HInstance, 'oi_comp');
-    ImgIndexComponent:=FImageList.Add(Bitmap, nil);
-    Bitmap.LoadFromResourceName(HInstance, 'oi_control');
-    ImgIndexControl:=FImageList.Add(Bitmap, nil);
-    Bitmap.LoadFromResourceName(HInstance, 'oi_box');
-    ImgIndexBox:=FImageList.Add(Bitmap, nil);
-    Bitmap.LoadFromResourceName(HInstance, 'oi_collection');
-    ImgIndexCollection:=FImageList.Add(Bitmap, nil);
-    Bitmap.LoadFromResourceName(HInstance, 'oi_item');
-    ImgIndexItem:=FImageList.Add(Bitmap, nil);
-  finally
-   Bitmap.Free;
-  end;
+  FImageList.Width := TIDEImages.ScaledSize;
+  FImageList.Height := TIDEImages.ScaledSize;
+  ImgIndexForm := TIDEImages.AddImageToImageList(FImageList, 'oi_form');
+  ImgIndexComponent := TIDEImages.AddImageToImageList(FImageList, 'oi_comp');
+  ImgIndexControl := TIDEImages.AddImageToImageList(FImageList, 'oi_control');
+  ImgIndexBox := TIDEImages.AddImageToImageList(FImageList, 'oi_box');
+  ImgIndexCollection := TIDEImages.AddImageToImageList(FImageList, 'oi_collection');
+  ImgIndexItem := TIDEImages.AddImageToImageList(FImageList, 'oi_item');
   Images := FImageList;
 end;
 
diff --git a/components/ideintf/ideimagesintf.pas b/components/ideintf/ideimagesintf.pas
index 2e13b0a6d4..16bd332f5f 100644
--- a/components/ideintf/ideimagesintf.pas
+++ b/components/ideintf/ideimagesintf.pas
@@ -57,6 +57,9 @@ type
     class function CreateImage(ImageName: String; ImageSize: Integer = 16): TCustomBitmap;
     class procedure AssignImage(const ABitmap: TCustomBitmap; ImageName: String;
       ImageSize: Integer = 16);
+    class function AddImageToImageList(const AImageList: TImageList;
+      ImageName: String; ImageSize: Integer = 16): Integer;
+    class function ScaledSize(ImageSize: Integer = 16): Integer;
 
     function LoadImage(ImageSize: Integer; ImageName: String): Integer; deprecated 'Use the other overload instead.';
     function LoadImage(ImageName: String; ImageSize: Integer = 16): Integer;
@@ -176,6 +179,25 @@ begin
   end;
 end;
 
+class function TIDEImages.AddImageToImageList(const AImageList: TImageList;
+  ImageName: String; ImageSize: Integer): Integer;
+var
+  xBmp: TCustomBitmap;
+begin
+  Result := -1;
+  xBmp := TIDEImages.CreateImage(ImageName, ImageSize);
+  try
+    Result := AImageList.Add(xBmp, nil);
+  finally
+    xBmp.Free;
+  end;
+end;
+
+class function TIDEImages.ScaledSize(ImageSize: Integer): Integer;
+begin
+  Result := ImageSize * GetScalePercent div 100;
+end;
+
 constructor TIDEImages.Create;
 begin
   FImageNames_12 := TStringList.Create;
diff --git a/components/ideintf/images/ideintf_images.res b/components/ideintf/images/ideintf_images.res
index f66024ddd14842fe94e6eb865586eb1054f08990..3b4007ef76ab75b3137ce60df355e075fa8bb20e 100644
GIT binary patch
delta 504
zcmZ1xve|jV0Xe2+43iJZMNKvom8utJVBi*JWSBKaf`Ng7y~NYkmHi<*kBEe*?By~;
zppdbri(`ny<>Ukf(HT$Q|IeSc|G#}Cmt>;Q4U;*uUYs~_00>-8gfw*}s7-uVv8cA4
zmx1B*X=%BAN7xI2+8I1u{an^LB{VTG90T$kfcXD^E`|UGcZPTdM+WD~SLFoR;~5MY
zOc@L&H*%`+0kt#ma<Bo(qSsGqChLjH;&P&#@ywPGFQCF;kP|h|1D(ihu!tMvO8(^e
zK(}@H3JcpcPvAX}Eo^9J^vGCHQXxA<>DuQLY{nCXvJ84vGMg+Xc82gyX_cFm#0CU=
z1bfa_vIMh4GB9XwQ55oTeZL-Pya19PP6PQ4laI<N0^MxHU;uTq5KvSI?B=j@ec|}r
zEXG|KpLPeRJOboqi_^&o5;+Zm(_13{{ri97Pq478<VmBBki!z3mNO#`OLTs;H*7O}
z6y(FPK>C<Vp3cJPGcKM}l!5HEB`y;kPdq&0!t0zN{MW>HLdZ#_C26+~vNKF$(GlUZ
M<U4->XbIfm0E;T08vp<R

delta 2872
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
W%@7e15P_Tk0000<MNUMnLSTZg$a)k2

diff --git a/components/ideintf/images/ideintf_images_list.txt b/components/ideintf/images/ideintf_images_list.txt
index 11c1f198fc..383a07cd50 100644
--- a/components/ideintf/images/ideintf_images_list.txt
+++ b/components/ideintf/images/ideintf_images_list.txt
@@ -11,4 +11,6 @@ propertygrid/issue_nogui.png
 propertygrid/issue_qt.png
 propertygrid/issue_win32.png
 propertygrid/issue_wince.png
-propertygrid/pg_active_row.png
\ No newline at end of file
+propertygrid/pg_active_row.png
+propertygrid/pg_active_row_150.png
+propertygrid/pg_active_row_200.png
diff --git a/components/ideintf/images/propertygrid/pg_active_row.png b/components/ideintf/images/propertygrid/pg_active_row.png
index 6295a5a046e2d4f47b6d8d34c8accb689560982a..0dad5e103ea9ccfc847ce5046f224ac79cdb2381 100644
GIT binary patch
delta 118
zcmdlWwv2It3O`$tx4R3&e-K=-clqRrisCU0>?NMQuIvxlc|;^cWiOW*GB7Y0d%8G=
zNL)@%P!OH*^!@+*Y5V`%M{-Ff3f(Z7Gwa2P69<66<wQtRSAyEacNL3j+j$unPM?;R
U+joS$5U8EO)78&qol`;+07uI$_5c6?

delta 2857
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
Hu0mjf6l-+v

diff --git a/components/ideintf/images/propertygrid/pg_active_row_150.png b/components/ideintf/images/propertygrid/pg_active_row_150.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfd6c73f48f4e8a3e950a679691581e044a88030
GIT binary patch
literal 198
zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uAB#T}@sR2@KN#5=*4F5rJ!QSPQfg+p*9+AZi
z4BWyX%*Zfnjs#GUy~NYkmHi<*kBFS{%$5)@pir=<i(`n!`Q!uzW`jlCGoHTx&!0Sh
z){7GzzQV$G%@cSJWD6Ub89g!<lvK!0QM&f|1e@_hp)7-5mCPo~iJc+5Q(EO_C9wg)
j9>Jcol`O$5kqivlTNH)-Ti>q-8qeVA>gTe~DWM4f(%Lxw

literal 0
HcmV?d00001

diff --git a/components/ideintf/images/propertygrid/pg_active_row_200.png b/components/ideintf/images/propertygrid/pg_active_row_200.png
new file mode 100644
index 0000000000000000000000000000000000000000..d52bf9c81c43f414c5e36885dc982e32a554adff
GIT binary patch
literal 203
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|wj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&pI+okv8ByD~oQ4p1n<)5S5w;&gI?L{5X?^p?nf|Nfu&
z6D%w%dD5sO<gf&%<;;k~5}hCI4ciPK1^I9+kUr*;r?W8njEm<KWgvTPiOWRC6AzEL
q@H%G*|26TQ5OPv!N!qQ0><rUbbVT?p&tCxA!QkoY=d#Wzp$P!DL_eMY

literal 0
HcmV?d00001

diff --git a/components/ideintf/objectinspector.pp b/components/ideintf/objectinspector.pp
index 32aa1377ff..6011b7b22a 100644
--- a/components/ideintf/objectinspector.pp
+++ b/components/ideintf/objectinspector.pp
@@ -1123,7 +1123,7 @@ begin
   end;
 
   FHintManager := THintWindowManager.Create;
-  FActiveRowBmp := CreateBitmapFromResourceName(HInstance, 'pg_active_row');
+  FActiveRowBmp := TIDEImages.CreateImage('pg_active_row', 9);
 
   FDefaultItemHeight:=DefItemHeight;
 
@@ -4311,6 +4311,7 @@ begin
   ComponentPanel.Constraints.MinHeight := 8;
   ComponentPanel.Visible := FShowComponentTree;
   CompFilterEdit.FilteredTreeview := ComponentTree;
+  TIDEImages.AssignImage(CompFilterEdit.Glyph, 'btnfiltercancel');
 
   InfoPanel := TPanel.Create(Self);
   with InfoPanel do
@@ -4373,6 +4374,7 @@ begin
     OnAfterFilter := @PropFilterEditAfterFilter;
     OnResize := @PropFilterEditResize;
   end;
+  TIDEImages.AssignImage(PropFilterEdit.Glyph, 'btnfiltercancel');
 
   CreateNoteBook;
 end;
diff --git a/ide/codebrowser.pas b/ide/codebrowser.pas
index 7153c74b2b..31bc387876 100644
--- a/ide/codebrowser.pas
+++ b/ide/codebrowser.pas
@@ -58,6 +58,7 @@ uses
   // IDEIntf
   IDEWindowIntf, SrcEditorIntf, IDEMsgIntf, IDEDialogs, LazConfigStorage,
   IDEHelpIntf, PackageIntf, IDECommands, LazIDEIntf, IDEExternToolIntf,
+  IDEImagesIntf,
   // IDE
   Project, DialogProcs, PackageSystem, PackageDefs, LazarusIDEStrConsts,
   IDEOptionDefs, etFPCMsgParser, BasePkgManager, EnvironmentOpts;
@@ -813,25 +814,30 @@ begin
 end;
 
 procedure TCodeBrowserView.InitImageList;
+var
+  ImageSize: Integer;
 begin
-  ImgIDDefault := Imagelist1.AddResourceName(HInstance, 'ce_default');
-  ImgIDProgramCode := Imagelist1.AddResourceName(HInstance, 'ce_program');
-  ImgIDUnitCode := Imagelist1.AddResourceName(HInstance, 'ce_unit');
-  ImgIDInterfaceSection := Imagelist1.AddResourceName(HInstance, 'ce_interface');
-  ImgIDImplementation := Imagelist1.AddResourceName(HInstance, 'ce_implementation');
-  ImgIDInitialization := Imagelist1.AddResourceName(HInstance, 'ce_initialization');
-  ImgIDFinalization := Imagelist1.AddResourceName(HInstance, 'ce_finalization');
-  ImgIDTypeSection := Imagelist1.AddResourceName(HInstance, 'ce_type');
-  ImgIDType := Imagelist1.AddResourceName(HInstance, 'ce_type');
-  ImgIDVarSection := Imagelist1.AddResourceName(HInstance, 'ce_variable');
-  ImgIDVariable := Imagelist1.AddResourceName(HInstance, 'ce_variable');
-  ImgIDConstSection := Imagelist1.AddResourceName(HInstance, 'ce_const');
-  ImgIDConst := Imagelist1.AddResourceName(HInstance, 'ce_const');
-  ImgIDClass := Imagelist1.AddResourceName(HInstance, 'ce_class');
-  ImgIDProc := Imagelist1.AddResourceName(HInstance, 'ce_procedure');
-  ImgIDProperty := Imagelist1.AddResourceName(HInstance, 'ce_property');
-  ImgIDPackage := Imagelist1.AddResourceName(HInstance, 'item_package');
-  ImgIDProject := Imagelist1.AddResourceName(HInstance, 'item_project');
+  ImageSize := TIDEImages.ScaledSize;
+  ImageList1.Width := ImageSize;
+  ImageList1.Height := ImageSize;
+  ImgIDDefault := TIDEImages.AddImageToImageList(Imagelist1, 'ce_default');
+  ImgIDProgramCode := TIDEImages.AddImageToImageList(Imagelist1, 'ce_program');
+  ImgIDUnitCode := TIDEImages.AddImageToImageList(Imagelist1, 'ce_unit');
+  ImgIDInterfaceSection := TIDEImages.AddImageToImageList(Imagelist1, 'ce_interface');
+  ImgIDImplementation := TIDEImages.AddImageToImageList(Imagelist1, 'ce_implementation');
+  ImgIDInitialization := TIDEImages.AddImageToImageList(Imagelist1, 'ce_initialization');
+  ImgIDFinalization := TIDEImages.AddImageToImageList(Imagelist1, 'ce_finalization');
+  ImgIDTypeSection := TIDEImages.AddImageToImageList(Imagelist1, 'ce_type');
+  ImgIDType := TIDEImages.AddImageToImageList(Imagelist1, 'ce_type');
+  ImgIDVarSection := TIDEImages.AddImageToImageList(Imagelist1, 'ce_variable');
+  ImgIDVariable := TIDEImages.AddImageToImageList(Imagelist1, 'ce_variable');
+  ImgIDConstSection := TIDEImages.AddImageToImageList(Imagelist1, 'ce_const');
+  ImgIDConst := TIDEImages.AddImageToImageList(Imagelist1, 'ce_const');
+  ImgIDClass := TIDEImages.AddImageToImageList(Imagelist1, 'ce_class');
+  ImgIDProc := TIDEImages.AddImageToImageList(Imagelist1, 'ce_procedure');
+  ImgIDProperty := TIDEImages.AddImageToImageList(Imagelist1, 'ce_property');
+  ImgIDPackage := TIDEImages.AddImageToImageList(Imagelist1, 'item_package');
+  ImgIDProject := TIDEImages.AddImageToImageList(Imagelist1, 'item_project');
 end;
 
 procedure TCodeBrowserView.SetScannedBytes(const AValue: PtrInt);
diff --git a/ide/codeexplorer.pas b/ide/codeexplorer.pas
index abda8ecd44..d14e26101b 100644
--- a/ide/codeexplorer.pas
+++ b/ide/codeexplorer.pas
@@ -199,6 +199,7 @@ type
     ImgIDUnit: Integer;
     ImgIDVariable: Integer;
     ImgIDHint: Integer;
+    procedure AssignAllImages;
     procedure ClearCodeTreeView;
     procedure ClearDirectivesTreeView;
     function GetCodeFilter: string;
@@ -484,33 +485,7 @@ begin
   CodeFilterEdit.TextHint:=lisCEFilter;
   DirectivesFilterEdit.TextHint:=lisCEFilter;
 
-  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');
-  ImgIDUnit := Imagelist1.AddResourceName(HInstance, 'ce_unit');
-  ImgIDInterface := Imagelist1.AddResourceName(HInstance, 'ce_interface');
-  ImgIDImplementation := Imagelist1.AddResourceName(HInstance, 'ce_implementation');
-  ImgIDInitialization := Imagelist1.AddResourceName(HInstance, 'ce_initialization');
-  ImgIDFinalization := Imagelist1.AddResourceName(HInstance, 'ce_finalization');
-  ImgIDType := Imagelist1.AddResourceName(HInstance, 'ce_type');
-  ImgIDVariable := Imagelist1.AddResourceName(HInstance, 'ce_variable');
-  ImgIDConst := Imagelist1.AddResourceName(HInstance, 'ce_const');
-  ImgIDClass := Imagelist1.AddResourceName(HInstance, 'ce_class');
-  ImgIDClassInterface := Imagelist1.AddResourceName(HInstance, 'ce_classinterface');
-  ImgIDHelper := Imagelist1.AddResourceName(HInstance, 'ce_helper');
-  ImgIDRecord := Imagelist1.AddResourceName(HInstance, 'ce_record');
-  ImgIDProcedure := Imagelist1.AddResourceName(HInstance, 'ce_procedure');
-  ImgIDFunction := Imagelist1.AddResourceName(HInstance, 'ce_function');
-  ImgIDProperty := Imagelist1.AddResourceName(HInstance, 'ce_property');
-  ImgIDPropertyReadOnly := Imagelist1.AddResourceName(HInstance, 'ce_property_readonly');
-  // sections
-  ImgIDSection := Imagelist1.AddResourceName(HInstance, 'ce_section');
-  ImgIDHint := Imagelist1.AddResourceName(HInstance, 'state_hint');
-
+  AssignAllImages;
   // assign the root TMenuItem to the registered menu root.
   // This will automatically create all registered items
   CodeExplorerMenuRoot.MenuItem:=TreePopupMenu.Items;
@@ -738,6 +713,41 @@ begin
     CheckOnIdle;
 end;
 
+procedure TCodeExplorerView.AssignAllImages;
+var
+  ImageSize: Integer;
+begin
+  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');
+
+  ImageSize := TIDEImages.ScaledSize;
+  Imagelist1.Width := ImageSize;
+  Imagelist1.Height := ImageSize;
+  ImgIDDefault := TIDEImages.AddImageToImageList(Imagelist1, 'ce_default');
+  ImgIDProgram := TIDEImages.AddImageToImageList(Imagelist1, 'ce_program');
+  ImgIDUnit := TIDEImages.AddImageToImageList(Imagelist1, 'ce_unit');
+  ImgIDInterface := TIDEImages.AddImageToImageList(Imagelist1, 'ce_interface');
+  ImgIDImplementation := TIDEImages.AddImageToImageList(Imagelist1, 'ce_implementation');
+  ImgIDInitialization := TIDEImages.AddImageToImageList(Imagelist1, 'ce_initialization');
+  ImgIDFinalization := TIDEImages.AddImageToImageList(Imagelist1, 'ce_finalization');
+  ImgIDType := TIDEImages.AddImageToImageList(Imagelist1, 'ce_type');
+  ImgIDVariable := TIDEImages.AddImageToImageList(Imagelist1, 'ce_variable');
+  ImgIDConst := TIDEImages.AddImageToImageList(Imagelist1, 'ce_const');
+  ImgIDClass := TIDEImages.AddImageToImageList(Imagelist1, 'ce_class');
+  ImgIDClassInterface := TIDEImages.AddImageToImageList(Imagelist1, 'ce_classinterface');
+  ImgIDHelper := TIDEImages.AddImageToImageList(Imagelist1, 'ce_helper');
+  ImgIDRecord := TIDEImages.AddImageToImageList(Imagelist1, 'ce_record');
+  ImgIDProcedure := TIDEImages.AddImageToImageList(Imagelist1, 'ce_procedure');
+  ImgIDFunction := TIDEImages.AddImageToImageList(Imagelist1, 'ce_function');
+  ImgIDProperty := TIDEImages.AddImageToImageList(Imagelist1, 'ce_property');
+  ImgIDPropertyReadOnly := TIDEImages.AddImageToImageList(Imagelist1, 'ce_property_readonly');
+  // sections
+  ImgIDSection := TIDEImages.AddImageToImageList(Imagelist1, 'ce_section');
+  ImgIDHint := TIDEImages.AddImageToImageList(Imagelist1, 'state_hint');
+end;
+
 function TCodeExplorerView.GetCodeNodeDescription(ACodeTool: TCodeTool;
   CodeNode: TCodeTreeNode): string;
 var
diff --git a/ide/componentlist.lfm b/ide/componentlist.lfm
index cb99f5a0c1..4d5af1baeb 100644
--- a/ide/componentlist.lfm
+++ b/ide/componentlist.lfm
@@ -9,6 +9,7 @@ object ComponentListForm: TComponentListForm
   KeyPreview = True
   OnActivate = FormActivate
   OnClose = FormClose
+  OnCreate = FormCreate
   OnKeyDown = FormKeyDown
   OnShow = FormShow
   LCLVersion = '1.7'
diff --git a/ide/componentlist.pas b/ide/componentlist.pas
index 6ab1ee231d..ca29c1a8c0 100644
--- a/ide/componentlist.pas
+++ b/ide/componentlist.pas
@@ -68,6 +68,7 @@ type
     TreeFilterEd: TTreeFilterEdit;
     procedure chbKeepOpenChange(Sender: TObject);
     procedure FormActivate(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure ListTreeSelectionChanged(Sender: TObject);
     procedure miCollapseAllClick(Sender: TObject);
@@ -235,6 +236,11 @@ begin
     UpdateComponents;
 end;
 
+procedure TComponentListForm.FormCreate(Sender: TObject);
+begin
+  TIDEImages.AssignImage(TreeFilterEd.Glyph, 'btnfiltercancel');
+end;
+
 procedure TComponentListForm.ClearSelection;
 begin
   ListTree.Selected := Nil;
diff --git a/ide/componentpalette.pas b/ide/componentpalette.pas
index 7c4889f919..4594dff352 100644
--- a/ide/componentpalette.pas
+++ b/ide/componentpalette.pas
@@ -347,9 +347,9 @@ begin
       Align := alRight;
       Caption := '';
       BevelOuter := bvNone;
-      Width := OVERVIEW_PANEL_WIDTH;
       Visible := True; // EnvironmentOptions.IDESpeedButtonsVisible;
       Parent := PageComponent;
+      Width := Scale96ToForm(OVERVIEW_PANEL_WIDTH);
       OnMouseWheel := @Pal.OnPageMouseWheel;
     end;
     BtnRight:=TSpeedButton.Create(PageComponent);
@@ -357,13 +357,13 @@ begin
     begin
       TIDEImages.AssignImage(Glyph, 'SelCompPage');
       Flat := True;
-      SetBounds(2,1,16,16);
       Hint := lisClickToSelectPalettePage;
       ShowHint := True;
       OnMouseDown := @MainIDE.SelComponentPageButtonMouseDown;
       OnClick := @MainIDE.SelComponentPageButtonClick;
       OnMouseWheel := @Pal.OnPageMouseWheel;
       Parent := PanelRight;
+      SetBounds(Scale96ToForm(2), Scale96ToForm(1), Scale96ToForm(16), Scale96ToForm(16));
     end;
   end
   else begin
diff --git a/ide/comppagespopup.lfm b/ide/comppagespopup.lfm
index 3b00c92bdb..76ec8e99a7 100644
--- a/ide/comppagespopup.lfm
+++ b/ide/comppagespopup.lfm
@@ -7,6 +7,7 @@ object DlgCompPagesPopup: TDlgCompPagesPopup
   Caption = 'DlgCompPagesPopup'
   ClientHeight = 536
   ClientWidth = 293
+  OnCreate = FormCreate
   OnDeactivate = FormDeactivate
   OnShow = FormShow
   LCLVersion = '1.5'
@@ -60,42 +61,6 @@ object DlgCompPagesPopup: TDlgCompPagesPopup
         Align = alRight
         AutoSize = True
         Flat = True
-        Glyph.Data = {
-          36040000424D3604000000000000360000002800000010000000100000000100
-          2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF000010DEFF0010DEFFFFFFFF00FFFFFF00FFFFFF000010
-          DEFF0010DEFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF000010DEFF0010DEFF0010DEFFFFFFFF000010DEFF0010
-          DEFF0010DEFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF000010DEFF0010DEFF0010DEFF0010DEFF0010
-          DEFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000010DEFF0010DEFF0010DEFFFFFF
-          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF000010DEFF0010DEFF0010DEFF0010DEFF0010
-          DEFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF000010DEFF0010DEFF0010DEFFFFFFFF000010DEFF0010
-          DEFF0010DEFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF000010DEFF0010DEFFFFFFFF00FFFFFF00FFFFFF000010
-          DEFF0010DEFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
-        }
         OnClick = cBtnCloseClick
       end
     end
@@ -103,72 +68,5 @@ object DlgCompPagesPopup: TDlgCompPagesPopup
   object ImageList1: TImageList
     left = 240
     top = 40
-    Bitmap = {
-      4C69020000001000000010000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
-      0000000000000000000000000000FFFFFF00999999FF999999FF999999FF9999
-      99FF999999FF999999FF999999FFFFFFFF00FFFFFF00FFFFFF00FFFFFF000000
-      0000000000000000000000000000FFFFFF00999999FFCEFFE7FFCEFFE7FFCEFF
-      E7FFCEFFE7FFCEFFE7FF999999FF202020FFFFFFFF00FFFFFF00FFFFFF000000
-      0000000000000000000000000000FFFFFF00999999FFCEFFE7FFCEFFE7FFCEFF
-      E7FFCEFFE7FFCEFFE7FF999999FFCEFFE7FF202020FFFFFFFF00FFFFFF000000
-      0000000000000000000000000000FFFFFF00999999FFCEFFE7FFCEFFE7FFCEFF
-      E7FFCEFFE7FFCEFFE7FF222827FF222827FF000000FF202020FFFFFFFF000000
-      0000000000000000000000000000FFFFFF00999999FFCEFFE7FFCEFFE7FFCEFF
-      E7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FF000000FFFFFFFF000000
-      0000000000000000000000000000FFFFFF00999999FFCEFFE7FFCEFFE7FFCEFF
-      E7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FF000000FFFFFFFF000000
-      0000000000000000000000000000FFFFFF00999999FFCEFFE7FFCEFFE7FFCEFF
-      E7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FF000000FFFFFFFF000000
-      0000000000000000000000000000FFFFFF00999999FFCEFFE7FFCEFFE7FFCEFF
-      E7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FF000000FFFFFFFF000000
-      0000000000000000000000000000FFFFFF00999999FFCEFFE7FFCEFFE7FFCEFF
-      E7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FF000000FFFFFFFF000000
-      0000000000000000000000000000FFFFFF00999999FFCEFFE7FFCEFFE7FFCEFF
-      E7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FF000000FFFFFFFF000000
-      0000000000000000000000000000FFFFFF00999999FFCEFFE7FFCEFFE7FFCEFF
-      E7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FFCEFFE7FF000000FFFFFFFF000000
-      0000000000000000000000000000FFFFFF00999999FF000000FF000000FF0000
-      00FF000000FF000000FF000000FF000000FF000000FF000000FFFFFFFF000000
-      0000000000000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00D6D6D6FF929292FF6F7070FF6F70
-      70FF6F7070FF7F7F7FFFBBBBBBFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF007F7F7FFFBDEEF3FFDCFFFFFFDCFF
-      FFFFDCFFFFFFDCFFFFFF6F888BFF6F7070FF6F7070FF6F7070FF6F7070FF6F70
-      70FF929292FFE3E3E3FFFFFFFF00FFFFFF005F5F5FFFB9FBFFFF6DE0EBFF6DE0
-      EBFF6DE0EBFF8AE6F0FFBEFFFFFFBEFFFFFFBEFFFFFFBEFFFFFFBEFFFFFFBEFF
-      FFFF88C9D0FF7F7F7FFFFFFFFF00FFFFFF00555555FF8DE0E9FF6DDBE6FF6DDB
-      E6FF49A3ADFF34858BFF34858BFF34858BFF34858BFF34858BFF34858BFF3485
-      8BFF34858BFF5F5F5FFFFFFFFF00FFFFFF004C4C4CFF31747DFF276D75FF276D
-      75FF31747DFF6CB9C1FFBEFFFFFFBEFFFFFFBEFFFFFFBEFFFFFFBEFFFFFFBEFF
-      FFFFA3EEF4FF4C4C4CFFFFFFFF00FFFFFF00414141FFB6F3F9FFAAFCFFFFAAFC
-      FFFFAAFCFFFF8BF0F8FF6DE0EBFF6DE0EBFF6DE0EBFF6DE0EBFF6DE0EBFF6DE0
-      EBFF6DE0EBFF414141FFFFFFFF00FFFFFF00313131FF8AE6F0FF72E4EEFF72E4
-      EEFF72E4EEFF72E4EEFF72E4EEFF72E4EEFF72E4EEFF72E4EEFF72E4EEFF72E4
-      EEFF6DDBE6FF313131FFFFFFFF00FFFFFF00222222FF6DDBE6FF7AE8F1FF7AE8
-      F1FF7AE8F1FF7AE8F1FF7AE8F1FF7AE8F1FF7AE8F1FF7AE8F1FF7AE8F1FF7AE8
-      F1FF6DDBE6FF222222FFFFFFFF00FFFFFF00000000FF8AE6F0FF95F4FBFF95F4
-      FBFF95F4FBFF95F4FBFF95F4FBFF95F4FBFF95F4FBFF95F4FBFF95F4FBFF95F4
-      FBFF8AE6F0FF000000FFFFFFFF00FFFFFF000B0B0BFF67ABABFF95F4FBFF97F1
-      F3FF97F1F3FF97F1F3FF97F1F3FF97F1F3FF97F1F3FF97F1F3FF97F1F3FF97F1
-      F3FF67ABABFF0B0B0BFFFFFFFF00FFFFFF00555555FF000000FF000000FF0000
-      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
-      00FF000000FF555555FFFFFFFF00FFFFFF00D6D6D6FF888888FF5F5F5FFF5555
-      55FF555555FF555555FF555555FF555555FF555555FF555555FF555555FF5F5F
-      5FFF888888FFD6D6D6FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00F1F1F1FFF1F1
-      F1FFF1F1F1FFF1F1F1FFF1F1F1FFF1F1F1FFF1F1F1FFF1F1F1FFF1F1F1FFF1F1
-      F1FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00
-    }
   end
 end
diff --git a/ide/comppagespopup.pas b/ide/comppagespopup.pas
index b806baec81..37c44a9811 100644
--- a/ide/comppagespopup.pas
+++ b/ide/comppagespopup.pas
@@ -34,8 +34,9 @@ unit CompPagesPopup;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  ExtCtrls, Buttons, MainBar, LazarusIDEStrConsts, LCLIntf, LMessages;
+  Classes, SysUtils, FileUtil, IDEImagesIntf, Forms, Controls, Graphics,
+  Dialogs, ComCtrls, ExtCtrls, Buttons, MainBar, LazarusIDEStrConsts, LCLIntf,
+  LMessages;
 
 type
 
@@ -48,6 +49,7 @@ type
     Panel2: TPanel;
     TreeView1: TTreeView;
     procedure cBtnCloseClick(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
     procedure FormDeactivate(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure TreeView1Click(Sender: TObject);
@@ -105,6 +107,16 @@ begin
   Close;
 end;
 
+procedure TDlgCompPagesPopup.FormCreate(Sender: TObject);
+begin
+  TIDEImages.AssignImage(cBtnClose.Glyph, 'menu_close');
+
+  ImageList1.Width := TIDEImages.ScaledSize;
+  ImageList1.Height := TIDEImages.ScaledSize;
+  TIDEImages.AddImageToImageList(ImageList1, 'item_package');
+  TIDEImages.AddImageToImageList(ImageList1, 'pkg_open');
+end;
+
 procedure TDlgCompPagesPopup.DoClose(var CloseAction: TCloseAction);
 begin
   inherited DoClose(CloseAction);
diff --git a/ide/editorfilemanager.pas b/ide/editorfilemanager.pas
index 6a5ad2855d..d4a07ff2a9 100644
--- a/ide/editorfilemanager.pas
+++ b/ide/editorfilemanager.pas
@@ -118,6 +118,7 @@ begin
   OpenButton.Hint:=lisActivateSelected;
   SortAlphabeticallyButton.Hint:=lisPESortFilesAlphabetically;
   TIDEImages.AssignImage(SortAlphabeticallyButton.Glyph, 'pkg_sortalphabetically');
+  TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel');
 end;
 
 procedure TEditorFileManagerForm.CheckListBox1Click(Sender: TObject);
diff --git a/ide/frames/compiler_messages_options.pas b/ide/frames/compiler_messages_options.pas
index c780806c4f..3f17095e63 100644
--- a/ide/frames/compiler_messages_options.pas
+++ b/ide/frames/compiler_messages_options.pas
@@ -7,7 +7,7 @@ interface
 uses
   Classes, SysUtils, FileUtil, LazFileCache, LazLoggerBase, ListFilterEdit,
   StdCtrls, CheckLst, Dialogs, IDEOptionsIntf, IDEExternToolIntf,
-  IDEDialogs, CompOptsIntf, CodeToolsFPCMsgs, CompilerOptions,
+  IDEDialogs, CompOptsIntf, IDEImagesIntf, CodeToolsFPCMsgs, CompilerOptions,
   LazarusIDEStrConsts, etFPCMsgParser;
 
 type
@@ -102,6 +102,7 @@ begin
   UseMsgFileCheckBox.Visible:=false;
   MsgFileEdit.Visible:=false;
   MsgFileBrowseButton.Visible:=false;
+  TIDEImages.AssignImage(editMsgFilter.Glyph, 'btnfiltercancel');
 end;
 
 destructor TCompilerMessagesOptionsFrame.Destroy;
diff --git a/ide/frames/editor_display_options.lfm b/ide/frames/editor_display_options.lfm
index b658c6ea13..5a82b96408 100644
--- a/ide/frames/editor_display_options.lfm
+++ b/ide/frames/editor_display_options.lfm
@@ -340,7 +340,6 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       Height = 36
       Top = 72
       Width = 195
-      Anchors = [akTop, akLeft, akBottom]
       BorderSpacing.Around = 6
       Caption = 'DisableAntialiasingCheckBox'
       OnChange = GeneralCheckBoxOnChange
diff --git a/ide/frames/editor_keymapping_options.pas b/ide/frames/editor_keymapping_options.pas
index 6e2dfd2b10..08abf802a5 100644
--- a/ide/frames/editor_keymapping_options.pas
+++ b/ide/frames/editor_keymapping_options.pas
@@ -188,6 +188,7 @@ begin
   EditButton.Enabled:=false;
   ClearButton.Enabled:=false;
   fModified:=False;
+  TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel');
 end;
 
 destructor TEditorKeymappingOptionsFrame.Destroy;
diff --git a/ide/ideoptionsdlg.lfm b/ide/ideoptionsdlg.lfm
index 4745bb6a24..4ce1c1c061 100644
--- a/ide/ideoptionsdlg.lfm
+++ b/ide/ideoptionsdlg.lfm
@@ -9,6 +9,7 @@ object IDEOptionsDialog: TIDEOptionsDialog
   ClientWidth = 800
   Constraints.MinHeight = 350
   Constraints.MinWidth = 500
+  OnCreate = FormCreate
   OnShow = FormShow
   Position = poScreenCenter
   LCLVersion = '1.9.0.0'
diff --git a/ide/ideoptionsdlg.pas b/ide/ideoptionsdlg.pas
index 735fa40b7d..37b3a2d41f 100644
--- a/ide/ideoptionsdlg.pas
+++ b/ide/ideoptionsdlg.pas
@@ -35,6 +35,7 @@ uses
   Dialogs, TreeFilterEdit,
   // IdeIntf
   IDEWindowIntf, IDEOptionsIntf, IDECommands, IDEHelpIntf, ProjectIntf,
+  IDEImagesIntf,
   // IDE
   EnvironmentOpts, EditorOptions, BuildModesManager, Compiler_ModeMatrix,
   Project, LazarusIDEStrConsts,
@@ -64,6 +65,7 @@ type
     EditorsPanel: TScrollBox;
     FilterEdit: TTreeFilterEdit;
     SettingsPanel: TPanel;
+    procedure FormCreate(Sender: TObject);
     procedure UseBuildModeCheckBoxChange(Sender: TObject);
     procedure BuildModeComboBoxSelect(Sender: TObject);
     procedure BuildModeManageButtonClick(Sender: TObject);
@@ -233,6 +235,11 @@ begin
   UpdateBuildModeButtons;
 end;
 
+procedure TIDEOptionsDialog.FormCreate(Sender: TObject);
+begin
+  TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel');
+end;
+
 procedure TIDEOptionsDialog.BuildModeComboBoxSelect(Sender: TObject);
 begin
   if AllBuildModes then begin
diff --git a/ide/projectinspector.lfm b/ide/projectinspector.lfm
index c8a81773ac..905782105e 100644
--- a/ide/projectinspector.lfm
+++ b/ide/projectinspector.lfm
@@ -8,6 +8,7 @@ object ProjectInspectorForm: TProjectInspectorForm
   Caption = 'ProjectInspectorForm'
   ClientHeight = 456
   ClientWidth = 299
+  OnCreate = FormCreate
   OnDropFiles = FormDropFiles
   LCLVersion = '1.7'
   object ItemsTreeView: TTreeView
diff --git a/ide/projectinspector.pas b/ide/projectinspector.pas
index b8cf0b64fb..d6732dba2d 100644
--- a/ide/projectinspector.pas
+++ b/ide/projectinspector.pas
@@ -111,6 +111,7 @@ type
     procedure CopyMoveToDirMenuItemClick(Sender: TObject);
     procedure DirectoryHierarchyButtonClick(Sender: TObject);
     procedure FilterEditKeyDown(Sender: TObject; var Key: Word; {%H-}Shift: TShiftState);
+    procedure FormCreate(Sender: TObject);
     procedure FormDropFiles(Sender: TObject; const FileNames: array of String);
     procedure ItemsPopupMenuPopup(Sender: TObject);
     procedure ItemsTreeViewAdvancedCustomDrawItem(Sender: TCustomTreeView;
@@ -542,6 +543,11 @@ begin
   end;
 end;
 
+procedure TProjectInspectorForm.FormCreate(Sender: TObject);
+begin
+  TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel');
+end;
+
 procedure TProjectInspectorForm.FormDropFiles(Sender: TObject;
   const FileNames: array of String);
 var
diff --git a/ide/restrictionbrowser.pas b/ide/restrictionbrowser.pas
index 99347bf862..194d0300a4 100644
--- a/ide/restrictionbrowser.pas
+++ b/ide/restrictionbrowser.pas
@@ -112,6 +112,7 @@ begin
     end;
   end;
   FilterEdit.OnAfterFilter := @SelectFirstVisible;
+  TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel');
   UpdateIssueList;
 end;
 
diff --git a/ide/searchresultview.lfm b/ide/searchresultview.lfm
index 7564c9e515..257fb711e2 100644
--- a/ide/searchresultview.lfm
+++ b/ide/searchresultview.lfm
@@ -62,6 +62,8 @@ object SearchResultsView: TSearchResultsView
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = ToolBar
     AnchorSideTop.Side = asrCenter
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
     Left = 63
     Height = 23
     Top = 1
@@ -70,6 +72,7 @@ object SearchResultsView: TSearchResultsView
     ButtonWidth = 23
     NumGlyphs = 1
     BorderSpacing.Left = 6
+    Anchors = [akTop, akLeft, akRight]
     MaxLength = 0
     TabOrder = 0
     OnChange = SearchInListChange
diff --git a/ide/searchresultview.pp b/ide/searchresultview.pp
index a192a14056..1808fc6b9a 100644
--- a/ide/searchresultview.pp
+++ b/ide/searchresultview.pp
@@ -283,8 +283,6 @@ end;
 procedure TSearchResultsView.Form1Create(Sender: TObject);
 var
   CloseCommand: TIDECommand;
-  ScaledIcon: TGraphic;
-  NewScaledIcon: Boolean;
 begin
   FMaxItems:=50000;
   ResultsNoteBook.Options:= ResultsNoteBook.Options+[nboShowCloseButtons];
@@ -320,17 +318,7 @@ begin
   ClosePageButton.ImageIndex := IDEImages.LoadImage('menu_close');
   ActionList.Images := IDEImages.Images_16;
   actClosePage.ImageIndex := IDEImages.LoadImage('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;
+  TIDEImages.AssignImage(SearchInListEdit.Glyph, 'btnfiltercancel');
 end;
 
 procedure TSearchResultsView.FormClose(Sender: TObject; var CloseAction: TCloseAction);
diff --git a/ide/sourcemarks.pas b/ide/sourcemarks.pas
index 99098c5197..c93498d601 100644
--- a/ide/sourcemarks.pas
+++ b/ide/sourcemarks.pas
@@ -44,7 +44,7 @@ uses
   // SynEdit
   SynEdit, SynEditMarks, SynEditMarkupGutterMark,
   // IdeIntf
-  MenuIntf, SrcEditorIntf, IDEExternToolIntf,
+  MenuIntf, SrcEditorIntf, IDEExternToolIntf, IDEImagesIntf,
   // IDE
   etSrcEditMarks;
   
@@ -543,11 +543,13 @@ var
   ImgIDWarning: Integer;
   ImgIDNote: Integer;
   ImgIDHint: Integer;
+  ImgListSize: Integer;
 begin
   // create default mark icons
   ImgList:=TImageList.Create(Self);
-  ImgList.Width:=11;
-  ImgList.Height:=11;
+  ImgListSize := TIDEImages.ScaledSize(11);
+  ImgList.Width := ImgListSize;
+  ImgList.Height := ImgListSize;
 
   // synedit expects the first 10 icons for the bookmarks
   for i := 0 to 9 do
@@ -808,7 +810,7 @@ end;
 
 function TSourceMarks.AddImage(const ResName: string): integer;
 begin
-  Result := ImgList.AddResourceName(HInstance, Resname);
+  Result := TIDEImages.AddImageToImageList(ImgList, Resname, 11);
 end;
 
 initialization
diff --git a/ide/toolbarconfig.pas b/ide/toolbarconfig.pas
index 53cbedcfb0..529ca6fe7a 100644
--- a/ide/toolbarconfig.pas
+++ b/ide/toolbarconfig.pas
@@ -194,6 +194,7 @@ begin
   TIDEImages.AssignImage(btnMoveUp.Glyph, 'arrow__darkgreen_up');
   TIDEImages.AssignImage(btnMoveDown.Glyph, 'arrow__darkgreen_down');
   TIDEImages.AssignImage(btnAddDivider.Glyph, 'menu_divider16');
+  TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel');
 
   btnAddDivider.Caption := '---';
 
diff --git a/ide/useunitdlg.pas b/ide/useunitdlg.pas
index c28bfa23d6..22d961681f 100644
--- a/ide/useunitdlg.pas
+++ b/ide/useunitdlg.pas
@@ -194,6 +194,7 @@ begin
   ButtonPanel1.OKButton.Caption:=lisMenuOk;
   ButtonPanel1.CancelButton.Caption:=lisCancel;
   UnitImgInd := IDEImages.LoadImage('item_unit');
+  TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel');
   FProjUnits:=TStringList.Create;
 end;
 
diff --git a/ide/viewunit_dlg.pp b/ide/viewunit_dlg.pp
index 2d0dff5284..376cd7d761 100644
--- a/ide/viewunit_dlg.pp
+++ b/ide/viewunit_dlg.pp
@@ -323,6 +323,7 @@ begin
   ButtonPanel.CancelButton.Caption:=lisCancel;
   SortAlphabeticallySpeedButton.Hint:=lisPESortFilesAlphabetically;
   TIDEImages.AssignImage(SortAlphabeticallySpeedButton.Glyph, 'pkg_sortalphabetically');
+  TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel');
 end;
 
 procedure TViewUnitDialog.FormDestroy(Sender: TObject);
diff --git a/lcl/comctrls.pp b/lcl/comctrls.pp
index c3edda8348..ce2cbd6d19 100644
--- a/lcl/comctrls.pp
+++ b/lcl/comctrls.pp
@@ -3254,6 +3254,7 @@ type
     FExpandSignSize: integer;
     FThemeExpandSignSize: integer;
     FDefItemHeight: integer;
+    FDefItemSpace: Integer;
     FDragImage: TDragImageList;
     FDragNode: TTreeNode;
     FIndent: integer;
diff --git a/lcl/grids.pas b/lcl/grids.pas
index 76e5567aaa..9b7801d5e8 100644
--- a/lcl/grids.pas
+++ b/lcl/grids.pas
@@ -180,13 +180,20 @@ type
 
 const
   soAll: TSaveOptions = [soDesign, soAttributes, soContent, soPosition];
-  constRubberSpace: byte = 2;
-  constCellPadding: byte = 3;
 
   DefaultGridOptions = [goFixedVertLine, goFixedHorzLine,
        goVertLine, goHorzLine, goRangeSelect, goSmoothScroll ];
   DefaultGridOptions2 = [];
 
+  constRubberSpace: byte = 2;
+  constCellPadding: byte = 3;
+  constColRowBorderTolerance: byte = 3;
+
+var
+  // Values to be used after HighDPI scaling
+  varRubberSpace: byte;
+  varCellpadding: byte;
+  varColRowBorderTolerance: byte;
 
 type
 
@@ -2021,12 +2028,12 @@ procedure DrawRubberRect(Canvas: TCanvas; aRect: TRect; Color: TColor;
     if Y2<Y1 then
       while Y2<Y1 do begin
         Canvas.Pixels[X1, Y1] := Color;
-        dec(Y1, constRubberSpace);
+        dec(Y1, varRubberSpace);
       end
     else
       while Y1<Y2 do begin
         Canvas.Pixels[X1, Y1] := Color;
-        inc(Y1, constRubberSpace);
+        inc(Y1, varRubberSpace);
       end;
   end;
   procedure DrawHorzLine(X1,Y1,X2: integer);
@@ -2034,12 +2041,12 @@ procedure DrawRubberRect(Canvas: TCanvas; aRect: TRect; Color: TColor;
     if X2<X1 then
       while X2<X1 do begin
         Canvas.Pixels[X1, Y1] := Color;
-        dec(X1, constRubberSpace);
+        dec(X1, varRubberSpace);
       end
     else
       while X1<X2 do begin
         Canvas.Pixels[X1, Y1] := Color;
-        inc(X1, constRubberSpace);
+        inc(X1, varRubberSpace);
       end;
   end;
 begin
@@ -3926,7 +3933,7 @@ begin
       txt2 := GetTruncCellHintText(cell.x, cell.y);
       gds := GetGridDrawState(cell.x, cell.y);
       PrepareCanvas(cell.x, cell.y, gds);
-      w := Canvas.TextWidth(txt2) + constCellPadding*2;
+      w := Canvas.TextWidth(txt2) + varCellPadding*2;
       if w < ColWidths[cell.x] then
         txt2 := '';
     end;
@@ -4418,14 +4425,14 @@ end;
 procedure TCustomGrid.DrawCellText(aCol, aRow: Integer; aRect: TRect;
   aState: TGridDrawState; aText: String);
 begin
-  dec(ARect.Right, constCellPadding);
+  dec(ARect.Right, varCellPadding);
   case Canvas.TextStyle.Alignment of
-    Classes.taLeftJustify: Inc(ARect.Left, constCellPadding);
+    Classes.taLeftJustify: Inc(ARect.Left, varCellPadding);
     Classes.taRightJustify: Dec(ARect.Right, 1);
   end;
   case Canvas.TextStyle.Layout of
-    tlTop: Inc(ARect.Top, constCellPadding);
-    tlBottom: Dec(ARect.Bottom, constCellPadding);
+    tlTop: Inc(ARect.Top, varCellPadding);
+    tlBottom: Dec(ARect.Bottom, varCellPadding);
   end;
 
   if ARect.Right<ARect.Left then
@@ -4467,8 +4474,8 @@ begin
     CSize.cy := MulDiv(CSize.cy, Font.PixelsPerInch, Screen.PixelsPerInch);
     case bmpAlign of
       taCenter: PaintRect.Left := Trunc((aRect.Left + aRect.Right - CSize.cx)/2);
-      taLeftJustify: PaintRect.Left := ARect.Left + constCellPadding;
-      taRightJustify: PaintRect.Left := ARect.Right - CSize.Cx - constCellPadding - 1;
+      taLeftJustify: PaintRect.Left := ARect.Left + varCellPadding;
+      taRightJustify: PaintRect.Left := ARect.Right - CSize.Cx - varCellPadding - 1;
     end;
     PaintRect.Top  := Trunc((aRect.Top + aRect.Bottom - CSize.cy)/2);
     PaintRect := Bounds(PaintRect.Left, PaintRect.Top, CSize.cx, CSize.cy);
@@ -4478,8 +4485,8 @@ begin
     if ChkBitmap<>nil then begin
       case bmpAlign of
         taCenter: XPos := Trunc((aRect.Left+aRect.Right-ChkBitmap.Width)/2);
-        taLeftJustify: XPos := ARect.Left + constCellPadding;
-        taRightJustify: XPos := ARect.Right - ChkBitmap.Width - constCellPadding - 1;
+        taLeftJustify: XPos := ARect.Left + varCellPadding;
+        taRightJustify: XPos := ARect.Right - ChkBitmap.Width - varCellPadding - 1;
       end;
       YPos := Trunc((aRect.Top+aRect.Bottom-ChkBitmap.Height)/2);
       Canvas.Draw(XPos, YPos, ChkBitmap);
@@ -5675,7 +5682,7 @@ begin
     end;
 
     // check if cursor is near boundary and it's a valid column
-    if (Abs(Offset-x)<=2) then begin
+    if (Abs(Offset-x)<=varColRowBorderTolerance) then begin
       if goFixedColSizing in Options then
         Offset := 0
       else
@@ -5747,7 +5754,7 @@ begin
 
     // check if it's not fixed row and if cursor is close enough to
     // selected boundary
-    if (Index>=FFixedRows)and(Abs(Offset-Y)<=2) then begin
+    if (Index>=FFixedRows)and(Abs(Offset-Y)<=varColRowBorderTolerance) then begin
       // start resizing
       if Cursor<>crVSplit then begin
         ChangeCursor(crVSplit);
@@ -9397,6 +9404,10 @@ begin
   FUnCheckedBitmap := LoadResBitmapImage('dbgriduncheckedcb');
   FCheckedBitmap := LoadResBitmapImage('dbgridcheckedcb');
   FGrayedBitmap := LoadResBitmapImage('dbgridgrayedcb');
+
+  varRubberSpace := MulDiv(constRubberSpace, Screen.PixelsPerInch, 96);
+  varCellPadding := MulDiv(constCellPadding, Screen.PixelsPerInch, 96);
+  varColRowBorderTolerance := MulDiv(constColRowBorderTolerance, Screen.PixelsPerInch, 96);
 end;
 
 destructor TCustomGrid.Destroy;
diff --git a/lcl/include/treeview.inc b/lcl/include/treeview.inc
index 57b0eff47c..4437f65e6d 100644
--- a/lcl/include/treeview.inc
+++ b/lcl/include/treeview.inc
@@ -1712,7 +1712,7 @@ begin
   TV := TreeView;
   if (TV = nil) or (TV.StateImages = nil) then Exit;
   if (StateIndex < 0) or (StateIndex >= TV.StateImages.Count) then Exit;
-  Inc(Result, TV.StateImages.Width + 2);
+  Inc(Result, TV.StateImages.Width + TV.FDefItemSpace);
 end;
 
 function TTreeNode.DisplayStateIconLeft: integer;
@@ -1733,7 +1733,7 @@ begin
   else
     ImgIndex:=ImageIndex;
   if (ImgIndex<0) or (ImgIndex>=TV.Images.Count) then Exit;
-  Inc(Result, TV.Images.Width + 2);
+  Inc(Result, TV.Images.Width + TV.FDefItemSpace);
 end;
 
 function TTreeNode.DisplayTextRight: integer;
@@ -3209,6 +3209,7 @@ begin
   ParentColor := False;
 //  FBackgroundColor := clWindow;
   FDefItemHeight := DefaultTreeNodeHeight;
+  FDefItemSpace := ScaleY(2, 96);
   FExpandSignType := tvestTheme;
   FExpandSignSize := -1;
   Details := ThemeServices.GetElementDetails(ttGlyphOpened);
@@ -3574,12 +3575,12 @@ var
 begin
   if (tvoAutoItemHeight in FOptions)
   and HandleAllocated and Canvas.HandleAllocated then begin
-    NewDefItemHeight:=Canvas.TextHeight(TVAutoHeightString)+2; // +2 for spacing
-    if NewDefItemHeight<2 then NewDefItemHeight:=2;
-    if (Images<>nil) and (Images.Height>NewDefItemHeight) then
-      NewDefItemHeight:=Images.Height;
-    if (StateImages<>nil) and (StateImages.Height>NewDefItemHeight) then
-      NewDefItemHeight:=StateImages.Height;
+    NewDefItemHeight:=Canvas.TextHeight(TVAutoHeightString)+FDefItemSpace;
+    if NewDefItemHeight<FDefItemSpace then NewDefItemHeight:=FDefItemSpace;
+    if (Images<>nil) and (Images.Height+FDefItemSpace>NewDefItemHeight) then
+      NewDefItemHeight:=Images.Height+FDefItemSpace;
+    if (StateImages<>nil) and (StateImages.Height+FDefItemSpace>NewDefItemHeight) then
+      NewDefItemHeight:=StateImages.Height+FDefItemSpace;
     if Odd(NewDefItemHeight) then Inc(NewDefItemHeight);
     if NewDefItemHeight<>FDefItemHeight then begin
       FDefItemHeight:=NewDefItemHeight;
@@ -5215,7 +5216,7 @@ begin
         if PaintImages then
           StateImages.Draw(Canvas, x + 1, (NodeRect.Top + NodeRect.Bottom - StateImages.Height) div 2,
             Node.StateIndex, True);
-        Inc(x, StateImages.Width + 2);
+        Inc(x, StateImages.Width + FDefItemSpace);
       end;
     end;
 
@@ -5257,7 +5258,7 @@ begin
                ImgIndex, Node.FNodeEffect);
           end;
        end;
-       Inc(x, Images.Width + 2);
+       Inc(x, Images.Width + FDefItemSpace);
       end;
     end;
 
@@ -5699,8 +5700,8 @@ begin
   if Images <> nil then begin
     Images.RegisterChanges(FImageChangeLink);
     Images.FreeNotification(Self);
-    if DefaultItemHeight<Images.Height+2 then
-      DefaultItemHeight:=Images.Height+2;
+    if DefaultItemHeight<Images.Height+FDefItemSpace then
+      DefaultItemHeight:=Images.Height+FDefItemSpace;
   end;
   Invalidate;
 end;
@@ -5737,8 +5738,8 @@ begin
   if StateImages <> nil then begin
     StateImages.RegisterChanges(FStateChangeLink);
     StateImages.FreeNotification(Self);
-    if DefaultItemHeight<StateImages.Height+2 then
-      DefaultItemHeight:=StateImages.Height+2;
+    if DefaultItemHeight<StateImages.Height+FDefItemSpace then
+      DefaultItemHeight:=StateImages.Height+FDefItemSpace;
   end;
   Invalidate;
 end;
diff --git a/packager/addpkgdependencydlg.pas b/packager/addpkgdependencydlg.pas
index 81b6913e7e..434980c7d5 100644
--- a/packager/addpkgdependencydlg.pas
+++ b/packager/addpkgdependencydlg.pas
@@ -11,7 +11,7 @@ uses
   // LazControls
   ListFilterEdit,
   // IDEIntf
-  IDEWindowIntf, PackageDependencyIntf, PackageIntf, IDEDialogs,
+  IDEWindowIntf, PackageDependencyIntf, PackageIntf, IDEDialogs, IDEImagesIntf,
   // IDE
   LazarusIDEStrConsts, PackageDefs, PackageSystem, ProjPackCommon, ProjPackChecks;
 
@@ -80,6 +80,7 @@ begin
   Caption:=lisProjAddNewRequirement;
   fPackages:=TAVLTree.Create(@CompareLazPackageIDNames);
   IDEDialogLayoutList.ApplyLayout(Self,400,360);
+  TIDEImages.AssignImage(DependPkgNameFilter.Glyph, 'btnfiltercancel');
 
   DependPkgNameLabel.Caption:=lisProjAddPackageName;
   DependMinVersionLabel.Caption:=lisProjAddMinimumVersionOptional;
diff --git a/packager/installpkgsetdlg.pas b/packager/installpkgsetdlg.pas
index 2a6a8225a7..e681ab2400 100644
--- a/packager/installpkgsetdlg.pas
+++ b/packager/installpkgsetdlg.pas
@@ -227,6 +227,8 @@ begin
   SaveAndExitButton.Caption:=lisSaveAndExitDialog;
   HelpButton.Caption:=lisMenuHelp;
   CancelButton.Caption:=lisCancel;
+  TIDEImages.AssignImage(AvailableFilterEdit.Glyph, 'btnfiltercancel');
+  TIDEImages.AssignImage(InstalledFilterEdit.Glyph, 'btnfiltercancel');
 
   FNewInstalledPackages:=TObjectList.Create(true);
   PkgInfoMemo.Clear;
diff --git a/packager/packageeditor.pas b/packager/packageeditor.pas
index 3b874c3af3..2134a8fcc7 100644
--- a/packager/packageeditor.pas
+++ b/packager/packageeditor.pas
@@ -1443,6 +1443,7 @@ begin
   SetupComponents;
   SortAlphabetically := EnvironmentOptions.PackageEditorSortAlphabetically;
   ShowDirectoryHierarchy := EnvironmentOptions.PackageEditorShowDirHierarchy;
+  TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel');
 end;
 
 procedure TPackageEditorForm.FormDestroy(Sender: TObject);