diff --git a/debugger/callstackdlg.lfm b/debugger/callstackdlg.lfm
index 8696abb2c6..5570f56557 100644
--- a/debugger/callstackdlg.lfm
+++ b/debugger/callstackdlg.lfm
@@ -50,7 +50,6 @@ inherited CallStackDlg: TCallStackDlg
     ButtonWidth = 50
     Caption = 'tbButtons'
     EdgeBorders = []
-    Images = ImageList1
     ShowCaptions = True
     TabOrder = 1
     object ToolButtonShow: TToolButton
@@ -231,8 +230,4 @@ inherited CallStackDlg: TCallStackDlg
       OnClick = popCountClick
     end
   end
-  object ImageList1: TImageList[5]
-    left = 232
-    top = 112
-  end
 end
diff --git a/debugger/callstackdlg.lrs b/debugger/callstackdlg.lrs
index 16352806a6..0eed8ce855 100644
--- a/debugger/callstackdlg.lrs
+++ b/debugger/callstackdlg.lrs
@@ -12,53 +12,52 @@ LazarusResources.Add('TCallStackDlg','FORMDATA',[
   +'nly'#9#9'RowSelect'#9#8'TabOrder'#2#0#9'ViewStyle'#7#8'vsReport'#10'OnDblCl'
   +'ick'#7#19'lvCallStackDBLCLICK'#0#0#242#2#1#8'TToolBar'#8'ToolBar1'#4'Left'#2
   +#0#6'Height'#2'*'#3'Top'#2#0#5'Width'#3'2'#2#12'ButtonHeight'#2'('#11'Button'
-  +'Width'#2'2'#7'Caption'#6#9'tbButtons'#11'EdgeBorders'#11#0#6'Images'#7#10'I'
-  +'mageList1'#12'ShowCaptions'#9#8'TabOrder'#2#1#0#11'TToolButton'#14'ToolButt'
-  +'onShow'#4'Left'#2#1#3'Top'#2#0#6'Action'#7#7'actShow'#10'ImageIndex'#2#0#0#0
-  +#11'TToolButton'#17'ToolButtonCurrent'#4'Left'#2'3'#3'Top'#2#0#6'Action'#7#13
-  +'actSetCurrent'#0#0#11'TToolButton'#11'ToolButton4'#4'Left'#2'e'#3'Top'#2#0#5
-  +'Width'#2#3#7'Caption'#6#11'ToolButton4'#5'Style'#7#12'tbsSeparator'#0#0#11
-  +'TToolButton'#14'ToolButtonMore'#4'Left'#3#159#0#3'Top'#2#0#6'Action'#7#11'a'
-  +'ctViewMore'#10'ImageIndex'#2#1#0#0#11'TToolButton'#13'ToolButtonMax'#4'Left'
-  +#2'h'#3'Top'#2#0#6'Action'#7#12'actViewLimit'#7'Caption'#6#6'Max 10'#12'Drop'
-  +'downMenu'#7#8'mnuLimit'#5'Style'#7#11'tbsDropDown'#0#0#11'TToolButton'#14'T'
-  +'oolButtonGoto'#4'Left'#3'j'#1#3'Top'#2#0#6'Action'#7#11'actViewGoto'#10'Ima'
-  +'geIndex'#2#4#0#0#11'TToolButton'#17'ToolButtonCopyAll'#4'Left'#3#159#1#3'To'
-  +'p'#2#0#6'Action'#7#10'actCopyAll'#10'ImageIndex'#2#5#0#0#11'TToolButton'#11
-  +'ToolButton8'#4'Left'#3#156#1#3'Top'#2#0#5'Width'#2#3#7'Caption'#6#11'ToolBu'
-  +'tton8'#5'Style'#7#12'tbsSeparator'#0#0#11'TToolButton'#11'ToolButton9'#4'Le'
-  +'ft'#3#209#0#3'Top'#2#0#5'Width'#2#3#7'Caption'#6#11'ToolButton9'#5'Style'#7
-  +#12'tbsSeparator'#0#0#11'TToolButton'#13'ToolButtonTop'#4'Left'#3#212#0#3'To'
-  +'p'#2#0#6'Action'#7#10'actViewTop'#10'ImageIndex'#2#2#0#0#11'TToolButton'#16
-  +'ToolButtonBottom'#4'Left'#3#6#1#3'Top'#2#0#6'Action'#7#13'actViewBottom'#10
-  +'ImageIndex'#2#3#0#0#6'TPanel'#6'Panel1'#4'Left'#3'8'#1#6'Height'#2'('#3'Top'
-  +#2#0#5'Width'#2'2'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'('#11'Clien'
-  +'tWidth'#2'2'#8'TabOrder'#2#0#0#5'TEdit'#7'txtGoto'#4'Left'#2#2#6'Height'#2
-  +#22#3'Top'#2#8#5'Width'#2'.'#10'OnKeyPress'#7#15'txtGotoKeyPress'#8'TabOrder'
-  +#2#0#4'Text'#6#1'0'#0#0#0#0#242#2#2#10'TPopupMenu'#8'mnuPopup'#4'left'#2'B'#3
-  +'top'#2'X'#0#9'TMenuItem'#7'popShow'#6'Action'#7#7'actShow'#7'Default'#9#7'O'
-  +'nClick'#7#12'actShowClick'#0#0#9'TMenuItem'#2'N1'#7'Caption'#6#1'-'#0#0#9'T'
-  +'MenuItem'#15'popSetAsCurrent'#6'Action'#7#13'actSetCurrent'#7'OnClick'#7#20
-  +'actSetAsCurrentClick'#0#0#9'TMenuItem'#10'popCopyAll'#6'Action'#7#10'actCop'
-  +'yAll'#7'OnClick'#7#15'actCopyAllClick'#0#0#0#242#2#3#11'TActionList'#10'acl'
-  +'Actions'#4'left'#3#128#0#3'top'#2'h'#0#7'TAction'#7'actShow'#7'Caption'#6#4
-  +'Show'#18'DisableIfNoHandler'#9#9'OnExecute'#7#12'actShowClick'#0#0#7'TActio'
-  +'n'#13'actSetCurrent'#7'Caption'#6#7'Current'#18'DisableIfNoHandler'#9#9'OnE'
-  +'xecute'#7#20'actSetAsCurrentClick'#0#0#7'TAction'#10'actCopyAll'#7'Caption'
-  +#6#8'Copy All'#18'DisableIfNoHandler'#9#9'OnExecute'#7#15'actCopyAllClick'#0
-  +#0#7'TAction'#11'actViewMore'#8'Category'#6#4'View'#7'Caption'#6#4'More'#18
-  +'DisableIfNoHandler'#9#9'OnExecute'#7#18'actViewMoreExecute'#0#0#7'TAction'
-  +#11'actViewGoto'#8'Category'#6#4'View'#7'Caption'#6#4'Goto'#18'DisableIfNoHa'
-  +'ndler'#9#9'OnExecute'#7#18'actViewGotoExecute'#0#0#7'TAction'#12'actViewLim'
-  +'it'#8'Category'#6#4'View'#7'Caption'#6#2'10'#18'DisableIfNoHandler'#9#9'OnE'
-  +'xecute'#7#19'actViewLimitExecute'#0#0#7'TAction'#10'actViewTop'#8'Category'
-  +#6#4'View'#7'Caption'#6#3'Top'#18'DisableIfNoHandler'#9#9'OnExecute'#7#17'ac'
-  +'tViewTopExecute'#0#0#7'TAction'#13'actViewBottom'#8'Category'#6#4'View'#7'C'
-  +'aption'#6#6'Bottom'#18'DisableIfNoHandler'#9#9'OnExecute'#7#20'actViewBotto'
-  +'mExecute'#0#0#0#242#2#4#10'TPopupMenu'#8'mnuLimit'#4'left'#3#192#0#3'top'#2
-  +'p'#0#9'TMenuItem'#10'popLimit10'#3'Tag'#2#10#7'Caption'#6#6'Max 10'#7'OnCli'
-  +'ck'#7#13'popCountClick'#0#0#9'TMenuItem'#10'popLimit25'#3'Tag'#2#25#7'Capti'
-  +'on'#6#6'Max 25'#7'OnClick'#7#13'popCountClick'#0#0#9'TMenuItem'#10'popLimit'
-  +'50'#3'Tag'#2'2'#7'Caption'#6#6'Max 50'#7'OnClick'#7#13'popCountClick'#0#0#0
-  +#242#2#5#10'TImageList'#10'ImageList1'#4'left'#3#232#0#3'top'#2'p'#0#0#0
+  +'Width'#2'2'#7'Caption'#6#9'tbButtons'#11'EdgeBorders'#11#0#12'ShowCaptions'
+  +#9#8'TabOrder'#2#1#0#11'TToolButton'#14'ToolButtonShow'#4'Left'#2#1#3'Top'#2
+  +#0#6'Action'#7#7'actShow'#10'ImageIndex'#2#0#0#0#11'TToolButton'#17'ToolButt'
+  +'onCurrent'#4'Left'#2'3'#3'Top'#2#0#6'Action'#7#13'actSetCurrent'#0#0#11'TTo'
+  +'olButton'#11'ToolButton4'#4'Left'#2'e'#3'Top'#2#0#5'Width'#2#3#7'Caption'#6
+  +#11'ToolButton4'#5'Style'#7#12'tbsSeparator'#0#0#11'TToolButton'#14'ToolButt'
+  +'onMore'#4'Left'#3#159#0#3'Top'#2#0#6'Action'#7#11'actViewMore'#10'ImageInde'
+  +'x'#2#1#0#0#11'TToolButton'#13'ToolButtonMax'#4'Left'#2'h'#3'Top'#2#0#6'Acti'
+  +'on'#7#12'actViewLimit'#7'Caption'#6#6'Max 10'#12'DropdownMenu'#7#8'mnuLimit'
+  +#5'Style'#7#11'tbsDropDown'#0#0#11'TToolButton'#14'ToolButtonGoto'#4'Left'#3
+  +'j'#1#3'Top'#2#0#6'Action'#7#11'actViewGoto'#10'ImageIndex'#2#4#0#0#11'TTool'
+  +'Button'#17'ToolButtonCopyAll'#4'Left'#3#159#1#3'Top'#2#0#6'Action'#7#10'act'
+  +'CopyAll'#10'ImageIndex'#2#5#0#0#11'TToolButton'#11'ToolButton8'#4'Left'#3
+  +#156#1#3'Top'#2#0#5'Width'#2#3#7'Caption'#6#11'ToolButton8'#5'Style'#7#12'tb'
+  +'sSeparator'#0#0#11'TToolButton'#11'ToolButton9'#4'Left'#3#209#0#3'Top'#2#0#5
+  +'Width'#2#3#7'Caption'#6#11'ToolButton9'#5'Style'#7#12'tbsSeparator'#0#0#11
+  +'TToolButton'#13'ToolButtonTop'#4'Left'#3#212#0#3'Top'#2#0#6'Action'#7#10'ac'
+  +'tViewTop'#10'ImageIndex'#2#2#0#0#11'TToolButton'#16'ToolButtonBottom'#4'Lef'
+  +'t'#3#6#1#3'Top'#2#0#6'Action'#7#13'actViewBottom'#10'ImageIndex'#2#3#0#0#6
+  +'TPanel'#6'Panel1'#4'Left'#3'8'#1#6'Height'#2'('#3'Top'#2#0#5'Width'#2'2'#10
+  +'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'('#11'ClientWidth'#2'2'#8'TabOrd'
+  +'er'#2#0#0#5'TEdit'#7'txtGoto'#4'Left'#2#2#6'Height'#2#22#3'Top'#2#8#5'Width'
+  +#2'.'#10'OnKeyPress'#7#15'txtGotoKeyPress'#8'TabOrder'#2#0#4'Text'#6#1'0'#0#0
+  +#0#0#242#2#2#10'TPopupMenu'#8'mnuPopup'#4'left'#2'B'#3'top'#2'X'#0#9'TMenuIt'
+  +'em'#7'popShow'#6'Action'#7#7'actShow'#7'Default'#9#7'OnClick'#7#12'actShowC'
+  +'lick'#0#0#9'TMenuItem'#2'N1'#7'Caption'#6#1'-'#0#0#9'TMenuItem'#15'popSetAs'
+  +'Current'#6'Action'#7#13'actSetCurrent'#7'OnClick'#7#20'actSetAsCurrentClick'
+  +#0#0#9'TMenuItem'#10'popCopyAll'#6'Action'#7#10'actCopyAll'#7'OnClick'#7#15
+  +'actCopyAllClick'#0#0#0#242#2#3#11'TActionList'#10'aclActions'#4'left'#3#128
+  +#0#3'top'#2'h'#0#7'TAction'#7'actShow'#7'Caption'#6#4'Show'#18'DisableIfNoHa'
+  +'ndler'#9#9'OnExecute'#7#12'actShowClick'#0#0#7'TAction'#13'actSetCurrent'#7
+  +'Caption'#6#7'Current'#18'DisableIfNoHandler'#9#9'OnExecute'#7#20'actSetAsCu'
+  +'rrentClick'#0#0#7'TAction'#10'actCopyAll'#7'Caption'#6#8'Copy All'#18'Disab'
+  +'leIfNoHandler'#9#9'OnExecute'#7#15'actCopyAllClick'#0#0#7'TAction'#11'actVi'
+  +'ewMore'#8'Category'#6#4'View'#7'Caption'#6#4'More'#18'DisableIfNoHandler'#9
+  +#9'OnExecute'#7#18'actViewMoreExecute'#0#0#7'TAction'#11'actViewGoto'#8'Cate'
+  +'gory'#6#4'View'#7'Caption'#6#4'Goto'#18'DisableIfNoHandler'#9#9'OnExecute'#7
+  +#18'actViewGotoExecute'#0#0#7'TAction'#12'actViewLimit'#8'Category'#6#4'View'
+  +#7'Caption'#6#2'10'#18'DisableIfNoHandler'#9#9'OnExecute'#7#19'actViewLimitE'
+  +'xecute'#0#0#7'TAction'#10'actViewTop'#8'Category'#6#4'View'#7'Caption'#6#3
+  +'Top'#18'DisableIfNoHandler'#9#9'OnExecute'#7#17'actViewTopExecute'#0#0#7'TA'
+  +'ction'#13'actViewBottom'#8'Category'#6#4'View'#7'Caption'#6#6'Bottom'#18'Di'
+  +'sableIfNoHandler'#9#9'OnExecute'#7#20'actViewBottomExecute'#0#0#0#242#2#4#10
+  +'TPopupMenu'#8'mnuLimit'#4'left'#3#192#0#3'top'#2'p'#0#9'TMenuItem'#10'popLi'
+  +'mit10'#3'Tag'#2#10#7'Caption'#6#6'Max 10'#7'OnClick'#7#13'popCountClick'#0#0
+  +#9'TMenuItem'#10'popLimit25'#3'Tag'#2#25#7'Caption'#6#6'Max 25'#7'OnClick'#7
+  +#13'popCountClick'#0#0#9'TMenuItem'#10'popLimit50'#3'Tag'#2'2'#7'Caption'#6#6
+  +'Max 50'#7'OnClick'#7#13'popCountClick'#0#0#0#0
 ]);
diff --git a/debugger/callstackdlg.pp b/debugger/callstackdlg.pp
index dd71a38a0a..d88a99b63e 100644
--- a/debugger/callstackdlg.pp
+++ b/debugger/callstackdlg.pp
@@ -38,7 +38,7 @@ interface
 uses
   LResources, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
   ComCtrls, Debugger, DebuggerDlg, Menus, ClipBrd, ExtCtrls, StdCtrls, Spin,
-  ActnList, MainBase;
+  ActnList, MainBase, IDEImagesIntf;
 
 type
 
@@ -54,7 +54,6 @@ type
     actViewMore: TAction;
     actSetCurrent: TAction;
     actShow: TAction;
-    ImageList1: TImageList;
     ToolButtonTop: TToolButton;
     ToolButtonBottom: TToolButton;
     ToolButtonCopyAll: TToolButton;
@@ -97,7 +96,6 @@ type
     FViewCount: Integer;
     FViewLimit: Integer;
     FViewStart: Integer;
-    procedure InitImageList;
     procedure SetViewLimit(const AValue: Integer);
     procedure SetViewStart(AStart: Integer);
     procedure SetViewMax;
@@ -333,16 +331,6 @@ begin
   JumpToSource;
 end;
 
-procedure TCallStackDlg.InitImageList;
-begin
-  Imagelist1.AddLazarusResource('callstack_show');
-  Imagelist1.AddLazarusResource('callstack_more');
-  Imagelist1.AddLazarusResource('callstack_top');
-  Imagelist1.AddLazarusResource('callstack_bottom');
-  Imagelist1.AddLazarusResource('callstack_goto');
-  Imagelist1.AddLazarusResource('laz_copy');
-end;
-
 procedure TCallStackDlg.actViewBottomExecute(Sender: TObject);
 begin
   if CallStack <> nil
@@ -383,7 +371,15 @@ begin
   lvCallStack.Columns[2].Caption:= lisCEOModeSource;
   lvCallStack.Columns[3].Caption:= lisToDoLLine;
   lvCallStack.Columns[4].Caption:= lisFunction;
-  InitImageList;
+
+  ToolBar1.Images := IDEImages.Images_16;
+  ToolButtonShow.ImageIndex := IDEImages.LoadImage(16, 'callstack_show');
+  ToolButtonMore.ImageIndex := IDEImages.LoadImage(16, 'callstack_more');
+  ToolButtonTop.ImageIndex := IDEImages.LoadImage(16, 'callstack_top');
+  ToolButtonBottom.ImageIndex := IDEImages.LoadImage(16, 'callstack_bottom');
+  ToolButtonGoto.ImageIndex := IDEImages.LoadImage(16, 'callstack_goto');
+  ToolButtonGoto.ImageIndex := IDEImages.LoadImage(16, 'callstack_goto');
+  ToolButtonCopyAll.ImageIndex := IDEImages.LoadImage(16, 'laz_copy');
 end;
 
 procedure TCallStackDlg.actViewLimitExecute(Sender: TObject);