diff --git a/ide/packages/idedebugger/breakpointsdlg.lfm b/ide/packages/idedebugger/breakpointsdlg.lfm
index 19383ab1b6..a6277b8a82 100644
--- a/ide/packages/idedebugger/breakpointsdlg.lfm
+++ b/ide/packages/idedebugger/breakpointsdlg.lfm
@@ -10,14 +10,15 @@ object BreakpointsDlg: TBreakpointsDlg
   Caption = 'Breakpoint list'
   ClientHeight = 205
   ClientWidth = 560
-  LCLVersion = '3.99.0.0'
+  LCLVersion = '4.99.0.0'
   Visible = True
   OnCreate = BreakpointsDlgCREATE
   object ToolBar1: TToolBar
     Left = 0
-    Height = 26
+    Height = 24
     Top = 0
     Width = 560
+    AutoSize = True
     Caption = 'ToolBar1'
     ParentShowHint = False
     ShowHint = True
@@ -93,8 +94,8 @@ object BreakpointsDlg: TBreakpointsDlg
   end
   object tvBreakPoints: TDbgTreeView
     Left = 0
-    Height = 179
-    Top = 26
+    Height = 181
+    Top = 24
     Width = 560
     Align = alClient
     DefaultText = 'Node'
diff --git a/ide/packages/idedebugger/callstackdlg.lfm b/ide/packages/idedebugger/callstackdlg.lfm
index 0aee0c3c35..9701c10dc1 100644
--- a/ide/packages/idedebugger/callstackdlg.lfm
+++ b/ide/packages/idedebugger/callstackdlg.lfm
@@ -7,13 +7,13 @@ object CallStackDlg: TCallStackDlg
   Caption = 'CallStack'
   ClientHeight = 246
   ClientWidth = 562
-  LCLVersion = '3.99.0.0'
+  LCLVersion = '4.99.0.0'
   Visible = True
   OnCreate = FormCreate
   object lvCallStack: TListView
     Left = 0
-    Height = 220
-    Top = 26
+    Height = 221
+    Top = 25
     Width = 562
     Align = alClient
     Columns = <    
@@ -47,9 +47,11 @@ object CallStackDlg: TCallStackDlg
   end
   object ToolBar1: TToolBar
     Left = 0
-    Height = 26
+    Height = 24
     Top = 0
     Width = 562
+    AutoSize = True
+    BorderSpacing.Bottom = 1
     Caption = 'tbButtons'
     List = True
     ParentShowHint = False
diff --git a/ide/packages/idedebugger/historydlg.lfm b/ide/packages/idedebugger/historydlg.lfm
index d0ffbcbcdd..35e79e97ad 100644
--- a/ide/packages/idedebugger/historydlg.lfm
+++ b/ide/packages/idedebugger/historydlg.lfm
@@ -7,11 +7,11 @@ object HistoryDialog: THistoryDialog
   Caption = 'HistoryDialog'
   ClientHeight = 240
   ClientWidth = 422
-  LCLVersion = '3.99.0.0'
+  LCLVersion = '4.99.0.0'
   object lvHistory: TListView
     Left = 0
-    Height = 214
-    Top = 26
+    Height = 216
+    Top = 24
     Width = 422
     Align = alClient
     Columns = <    
@@ -33,14 +33,14 @@ object HistoryDialog: THistoryDialog
   end
   object ToolBar1: TToolBar
     Left = 0
-    Height = 26
+    Height = 24
     Top = 0
     Width = 422
+    AutoSize = True
     Caption = 'ToolBar1'
     ParentShowHint = False
     ShowHint = True
     TabOrder = 1
-    Wrapable = False
     object tbHistorySelected: TToolButton
       Left = 24
       Top = 2
@@ -117,13 +117,13 @@ object HistoryDialog: THistoryDialog
       Style = tbsDivider
     end
     object tbExport: TToolButton
-      Left = 218
+      Left = 208
       Top = 2
       Caption = 'tbExport'
       OnClick = tbExportClick
     end
     object tbImport: TToolButton
-      Left = 195
+      Left = 185
       Top = 2
       Caption = 'tbImport'
       OnClick = tbImportClick
diff --git a/ide/packages/idedebugger/threaddlg.lfm b/ide/packages/idedebugger/threaddlg.lfm
index 879d2e4528..ae21296407 100644
--- a/ide/packages/idedebugger/threaddlg.lfm
+++ b/ide/packages/idedebugger/threaddlg.lfm
@@ -7,11 +7,11 @@ object ThreadsDlg: TThreadsDlg
   Caption = 'Threads'
   ClientHeight = 240
   ClientWidth = 774
-  LCLVersion = '3.99.0.0'
+  LCLVersion = '4.99.0.0'
   object lvThreads: TListView
     Left = 0
-    Height = 214
-    Top = 26
+    Height = 215
+    Top = 25
     Width = 774
     Align = alClient
     Columns = <    
@@ -53,9 +53,11 @@ object ThreadsDlg: TThreadsDlg
   end
   object ToolBar1: TToolBar
     Left = 0
-    Height = 26
+    Height = 24
     Top = 0
     Width = 774
+    AutoSize = True
+    BorderSpacing.Bottom = 1
     Caption = 'ToolBar1'
     ShowCaptions = True
     TabOrder = 1