diff --git a/debugger/breakpropertydlg.lfm b/debugger/breakpropertydlg.lfm
index 6c72e29f84..744f558abf 100644
--- a/debugger/breakpropertydlg.lfm
+++ b/debugger/breakpropertydlg.lfm
@@ -1,8 +1,8 @@
 inherited BreakPropertyDlg: TBreakPropertyDlg
-  Left = 597
-  Height = 394
-  Top = 137
-  Width = 402
+  Left = 586
+  Height = 384
+  Top = 151
+  Width = 414
   HorzScrollBar.Page = 386
   VertScrollBar.Page = 366
   VertScrollBar.Range = 325
@@ -11,17 +11,17 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
   BorderIcons = [biSystemMenu]
   BorderStyle = bsDialog
   Caption = 'Breakpoint Properties'
-  ClientHeight = 394
-  ClientWidth = 402
+  ClientHeight = 384
+  ClientWidth = 414
   Position = poScreenCenter
   object lblFileName: TLabel[0]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = edtFilename
     AnchorSideTop.Side = asrCenter
     Left = 6
-    Height = 14
-    Top = 11
-    Width = 47
+    Height = 13
+    Top = 12
+    Width = 55
     BorderSpacing.Around = 6
     Caption = 'Filename:'
     ParentColor = False
@@ -31,9 +31,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
     AnchorSideTop.Control = edtLine
     AnchorSideTop.Side = asrCenter
     Left = 6
-    Height = 14
-    Top = 40
-    Width = 24
+    Height = 13
+    Top = 41
+    Width = 28
     BorderSpacing.Around = 6
     Caption = 'Line:'
     ParentColor = False
@@ -43,9 +43,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
     AnchorSideTop.Control = edtCondition
     AnchorSideTop.Side = asrCenter
     Left = 6
-    Height = 14
-    Top = 69
-    Width = 50
+    Height = 13
+    Top = 70
+    Width = 57
     BorderSpacing.Around = 6
     Caption = 'Condition:'
     ParentColor = False
@@ -55,9 +55,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
     AnchorSideTop.Control = edtCounter
     AnchorSideTop.Side = asrCenter
     Left = 6
-    Height = 14
-    Top = 98
-    Width = 45
+    Height = 13
+    Top = 99
+    Width = 50
     BorderSpacing.Around = 6
     Caption = 'Hitcount:'
     ParentColor = False
@@ -67,9 +67,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
     AnchorSideTop.Control = cmbGroup
     AnchorSideTop.Side = asrCenter
     Left = 6
-    Height = 14
-    Top = 155
-    Width = 34
+    Height = 13
+    Top = 156
+    Width = 38
     BorderSpacing.Around = 6
     Caption = 'Group:'
     ParentColor = False
@@ -79,9 +79,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
     AnchorSideTop.Control = edtAutocontinueMS
     AnchorSideTop.Side = asrCenter
     Left = 6
-    Height = 14
-    Top = 127
-    Width = 95
+    Height = 13
+    Top = 128
+    Width = 107
     BorderSpacing.Around = 6
     Caption = 'Auto continue after'
     ParentColor = False
@@ -91,10 +91,10 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = lblAutoContinue
     AnchorSideTop.Side = asrCenter
-    Left = 179
-    Height = 14
-    Top = 127
-    Width = 22
+    Left = 191
+    Height = 13
+    Top = 128
+    Width = 24
     BorderSpacing.Left = 6
     Caption = '(ms)'
     ParentColor = False
@@ -105,7 +105,7 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
     AnchorSideTop.Control = edtCounter
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Side = asrBottom
-    Left = 113
+    Left = 125
     Height = 23
     Top = 123
     Width = 60
@@ -121,7 +121,7 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 113
+    Left = 125
     Height = 23
     Top = 94
     Width = 283
@@ -138,7 +138,7 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 113
+    Left = 125
     Height = 23
     Top = 65
     Width = 283
@@ -154,7 +154,7 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
     AnchorSideTop.Control = edtFilename
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Side = asrBottom
-    Left = 113
+    Left = 125
     Height = 23
     Top = 36
     Width = 60
@@ -171,7 +171,7 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
     AnchorSideTop.Control = Owner
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 113
+    Left = 125
     Height = 24
     Top = 6
     Width = 283
@@ -190,17 +190,13 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 113
+    Left = 125
     Height = 21
     Top = 152
     Width = 283
     Anchors = [akTop, akLeft, akRight]
-    AutoComplete = False
     BorderSpacing.Left = 6
     BorderSpacing.Around = 6
-    Ctl3D = False
-    ItemHeight = 13
-    ItemWidth = 0
     TabOrder = 5
     Text = 'cmbGroup'
   end
@@ -211,24 +207,23 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 163
+    Height = 165
     Top = 179
-    Width = 390
+    Width = 402
     Anchors = [akTop, akLeft, akRight]
     AutoSize = True
     BorderSpacing.Around = 6
     Caption = 'Actions'
-    ClientHeight = 145
-    ClientWidth = 386
-    Ctl3D = False
+    ClientHeight = 148
+    ClientWidth = 398
     TabOrder = 6
     object chkActionBreak: TCheckBox
       AnchorSideLeft.Control = gbActions
       AnchorSideTop.Control = gbActions
       Left = 6
-      Height = 17
+      Height = 20
       Top = 6
-      Width = 46
+      Width = 56
       BorderSpacing.Around = 6
       Caption = 'Break'
       TabOrder = 0
@@ -238,9 +233,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
       AnchorSideTop.Control = edtEnableGroups
       AnchorSideTop.Side = asrCenter
       Left = 6
-      Height = 17
-      Top = 32
-      Width = 83
+      Height = 20
+      Top = 33
+      Width = 101
       BorderSpacing.Around = 6
       Caption = 'Enable goups'
       TabOrder = 1
@@ -250,9 +245,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
       AnchorSideTop.Control = edtDisableGroups
       AnchorSideTop.Side = asrCenter
       Left = 6
-      Height = 17
-      Top = 61
-      Width = 88
+      Height = 20
+      Top = 62
+      Width = 108
       BorderSpacing.Around = 6
       Caption = 'Disable groups'
       TabOrder = 2
@@ -263,16 +258,15 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
       AnchorSideTop.Control = chkActionBreak
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Side = asrBottom
-      Left = 132
+      Left = 142
       Height = 23
-      Top = 29
-      Width = 225
+      Top = 32
+      Width = 227
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 80
       BorderSpacing.Top = 6
       BorderSpacing.Bottom = 6
       ButtonWidth = 23
-      Ctl3D = False
       Enabled = False
       NumGlyphs = 1
       OnButtonClick = edtEnableGroupsButtonClick
@@ -284,16 +278,15 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
       AnchorSideTop.Control = edtEnableGroups
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Side = asrBottom
-      Left = 132
+      Left = 142
       Height = 23
-      Top = 58
-      Width = 225
+      Top = 61
+      Width = 227
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 80
       BorderSpacing.Top = 6
       BorderSpacing.Bottom = 6
       ButtonWidth = 23
-      Ctl3D = False
       Enabled = False
       NumGlyphs = 1
       OnButtonClick = edtDisableGroupsButtonClick
@@ -304,9 +297,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
       AnchorSideTop.Control = edtEvalExpression
       AnchorSideTop.Side = asrCenter
       Left = 6
-      Height = 17
-      Top = 90
-      Width = 92
+      Height = 20
+      Top = 91
+      Width = 113
       BorderSpacing.Around = 6
       Caption = 'Eval expression'
       Enabled = False
@@ -317,9 +310,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
       AnchorSideTop.Control = edtLogMessage
       AnchorSideTop.Side = asrCenter
       Left = 6
-      Height = 17
-      Top = 119
-      Width = 81
+      Height = 20
+      Top = 120
+      Width = 98
       BorderSpacing.Around = 6
       Caption = 'Log message'
       Enabled = False
@@ -332,10 +325,10 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = gbActions
       AnchorSideRight.Side = asrBottom
-      Left = 132
+      Left = 142
       Height = 23
-      Top = 87
-      Width = 248
+      Top = 90
+      Width = 250
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 80
       BorderSpacing.Top = 6
@@ -351,10 +344,10 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = gbActions
       AnchorSideRight.Side = asrBottom
-      Left = 132
+      Left = 142
       Height = 23
-      Top = 116
-      Width = 248
+      Top = 119
+      Width = 250
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 80
       BorderSpacing.Top = 6
@@ -365,17 +358,18 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
     end
   end
   object ButtonPanel: TButtonPanel[14]
-    AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = gbActions
     AnchorSideTop.Side = asrBottom
-    AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 40
-    Top = 348
-    Width = 390
-    Anchors = [akTop, akLeft, akRight]
+    Height = 28
+    Top = 350
+    Width = 402
+    Align = alBottom
+    Anchors = [akTop, akLeft, akRight, akBottom]
+    AutoSize = True
     TabOrder = 7
     ShowButtons = [pbOK, pbCancel, pbHelp]
+    ShowBevel = False
   end
 end
diff --git a/debugger/breakpropertydlg.lrs b/debugger/breakpropertydlg.lrs
index c6df346b62..b3775f9c62 100644
--- a/debugger/breakpropertydlg.lrs
+++ b/debugger/breakpropertydlg.lrs
@@ -1,135 +1,134 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TBreakPropertyDlg','FORMDATA',[
-  'TPF0'#241#17'TBreakPropertyDlg'#16'BreakPropertyDlg'#4'Left'#3'U'#2#6'Height'
-  +#3#138#1#3'Top'#3#137#0#5'Width'#3#146#1#18'HorzScrollBar.Page'#3#130#1#18'V'
+  'TPF0'#241#17'TBreakPropertyDlg'#16'BreakPropertyDlg'#4'Left'#3'J'#2#6'Height'
+  +#3#128#1#3'Top'#3#151#0#5'Width'#3#158#1#18'HorzScrollBar.Page'#3#130#1#18'V'
   +'ertScrollBar.Page'#3'n'#1#19'VertScrollBar.Range'#3'E'#1#10'AutoScroll'#8#8
   +'AutoSize'#9#11'BorderIcons'#11#12'biSystemMenu'#0#11'BorderStyle'#7#8'bsDia'
-  +'log'#7'Caption'#6#21'Breakpoint Properties'#12'ClientHeight'#3#138#1#11'Cli'
-  +'entWidth'#3#146#1#8'Position'#7#14'poScreenCenter'#0#242#2#0#6'TLabel'#11'l'
+  +'log'#7'Caption'#6#21'Breakpoint Properties'#12'ClientHeight'#3#128#1#11'Cli'
+  +'entWidth'#3#158#1#8'Position'#7#14'poScreenCenter'#0#242#2#0#6'TLabel'#11'l'
   +'blFileName'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'
   +#7#11'edtFilename'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Heigh'
-  +'t'#2#14#3'Top'#2#11#5'Width'#2'/'#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +'t'#2#13#3'Top'#2#12#5'Width'#2'7'#20'BorderSpacing.Around'#2#6#7'Caption'#6
   +#9'Filename:'#11'ParentColor'#8#0#0#242#2#1#6'TLabel'#7'lblLine'#22'AnchorSi'
   +'deLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#7'edtLine'#18'Anchor'
-  +'SideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#14#3'Top'#2'('#5'Width'
-  +#2#24#20'BorderSpacing.Around'#2#6#7'Caption'#6#5'Line:'#11'ParentColor'#8#0
+  +'SideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#13#3'Top'#2')'#5'Width'
+  +#2#28#20'BorderSpacing.Around'#2#6#7'Caption'#6#5'Line:'#11'ParentColor'#8#0
   +#0#242#2#2#6'TLabel'#12'lblCondition'#22'AnchorSideLeft.Control'#7#5'Owner'
   +#21'AnchorSideTop.Control'#7#12'edtCondition'#18'AnchorSideTop.Side'#7#9'asr'
-  +'Center'#4'Left'#2#6#6'Height'#2#14#3'Top'#2'E'#5'Width'#2'2'#20'BorderSpaci'
+  +'Center'#4'Left'#2#6#6'Height'#2#13#3'Top'#2'F'#5'Width'#2'9'#20'BorderSpaci'
   +'ng.Around'#2#6#7'Caption'#6#10'Condition:'#11'ParentColor'#8#0#0#242#2#3#6
   +'TLabel'#11'lblHitCount'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSide'
   +'Top.Control'#7#10'edtCounter'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'
-  +#2#6#6'Height'#2#14#3'Top'#2'b'#5'Width'#2'-'#20'BorderSpacing.Around'#2#6#7
+  +#2#6#6'Height'#2#13#3'Top'#2'c'#5'Width'#2'2'#20'BorderSpacing.Around'#2#6#7
   +'Caption'#6#9'Hitcount:'#11'ParentColor'#8#0#0#242#2#4#6'TLabel'#8'lblGroup'
   +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#8'cmbGrou'
-  +'p'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#14#3'Top'#3
-  +#155#0#5'Width'#2'"'#20'BorderSpacing.Around'#2#6#7'Caption'#6#6'Group:'#11
+  +'p'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#13#3'Top'#3
+  +#156#0#5'Width'#2'&'#20'BorderSpacing.Around'#2#6#7'Caption'#6#6'Group:'#11
   +'ParentColor'#8#0#0#242#2#5#6'TLabel'#15'lblAutoContinue'#22'AnchorSideLeft.'
   +'Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#17'edtAutocontinueMS'#18'An'
-  +'chorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#14#3'Top'#2''#5'W'
-  +'idth'#2'_'#20'BorderSpacing.Around'#2#6#7'Caption'#6#19'Auto continue after'
-  +#11'ParentColor'#8#0#0#242#2#6#6'TLabel'#5'lblMS'#22'AnchorSideLeft.Control'
-  +#7#17'edtAutocontinueMS'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSid'
-  +'eTop.Control'#7#15'lblAutoContinue'#18'AnchorSideTop.Side'#7#9'asrCenter'#4
-  +'Left'#3#179#0#6'Height'#2#14#3'Top'#2''#5'Width'#2#22#18'BorderSpacing.Lef'
-  +'t'#2#6#7'Caption'#6#4'(ms)'#11'ParentColor'#8#0#0#242#2#7#5'TEdit'#17'edtAu'
-  +'tocontinueMS'#22'AnchorSideLeft.Control'#7#15'lblAutoContinue'#19'AnchorSid'
-  +'eLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#10'edtCounter'#18'An'
-  +'chorSideTop.Side'#7#9'asrBottom'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
-  +'Left'#2'q'#6'Height'#2#23#3'Top'#2'{'#5'Width'#2'<'#18'BorderSpacing.Left'#2
-  +#6#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#4#4'Text'#6#17'edtAutocontinue'
-  +'MS'#0#0#242#2#8#5'TEdit'#10'edtCounter'#22'AnchorSideLeft.Control'#7#15'lbl'
-  +'AutoContinue'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Contr'
-  +'ol'#7#12'edtCondition'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideR'
-  +'ight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2
-  +'q'#6'Height'#2#23#3'Top'#2'^'#5'Width'#3#27#1#7'Anchors'#11#5'akTop'#6'akLe'
-  +'ft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#20'BorderSpacing.Around'#2#6#8
-  +'TabOrder'#2#3#4'Text'#6#10'edtCounter'#0#0#242#2#9#5'TEdit'#12'edtCondition'
-  +#22'AnchorSideLeft.Control'#7#15'lblAutoContinue'#19'AnchorSideLeft.Side'#7#9
-  +'asrBottom'#21'AnchorSideTop.Control'#7#7'edtLine'#18'AnchorSideTop.Side'#7#9
-  +'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7
-  +#9'asrBottom'#4'Left'#2'q'#6'Height'#2#23#3'Top'#2'A'#5'Width'#3#27#1#7'Anch'
-  +'ors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#20'Borde'
-  +'rSpacing.Around'#2#6#8'TabOrder'#2#2#4'Text'#6#12'edtCondition'#0#0#242#2#10
-  +#5'TEdit'#7'edtLine'#22'AnchorSideLeft.Control'#7#15'lblAutoContinue'#19'Anc'
-  +'horSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#11'edtFilename'
+  +'chorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#13#3'Top'#3#128#0#5
+  +'Width'#2'k'#20'BorderSpacing.Around'#2#6#7'Caption'#6#19'Auto continue afte'
+  +'r'#11'ParentColor'#8#0#0#242#2#6#6'TLabel'#5'lblMS'#22'AnchorSideLeft.Contr'
+  +'ol'#7#17'edtAutocontinueMS'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'Ancho'
+  +'rSideTop.Control'#7#15'lblAutoContinue'#18'AnchorSideTop.Side'#7#9'asrCente'
+  +'r'#4'Left'#3#191#0#6'Height'#2#13#3'Top'#3#128#0#5'Width'#2#24#18'BorderSpa'
+  +'cing.Left'#2#6#7'Caption'#6#4'(ms)'#11'ParentColor'#8#0#0#242#2#7#5'TEdit'
+  +#17'edtAutocontinueMS'#22'AnchorSideLeft.Control'#7#15'lblAutoContinue'#19'A'
+  +'nchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#10'edtCounte'
+  +'r'#18'AnchorSideTop.Side'#7#9'asrBottom'#20'AnchorSideRight.Side'#7#9'asrBo'
+  +'ttom'#4'Left'#2'}'#6'Height'#2#23#3'Top'#2'{'#5'Width'#2'<'#18'BorderSpacin'
+  +'g.Left'#2#6#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#4#4'Text'#6#17'edtAu'
+  +'tocontinueMS'#0#0#242#2#8#5'TEdit'#10'edtCounter'#22'AnchorSideLeft.Control'
+  +#7#15'lblAutoContinue'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideT'
+  +'op.Control'#7#12'edtCondition'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Anc'
+  +'horSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
+  +'Left'#2'}'#6'Height'#2#23#3'Top'#2'^'#5'Width'#3#27#1#7'Anchors'#11#5'akTop'
+  +#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#20'BorderSpacing.Around'#2
+  +#6#8'TabOrder'#2#3#4'Text'#6#10'edtCounter'#0#0#242#2#9#5'TEdit'#12'edtCondi'
+  +'tion'#22'AnchorSideLeft.Control'#7#15'lblAutoContinue'#19'AnchorSideLeft.Si'
+  +'de'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#7'edtLine'#18'AnchorSideTop.'
+  +'Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRi'
+  +'ght.Side'#7#9'asrBottom'#4'Left'#2'}'#6'Height'#2#23#3'Top'#2'A'#5'Width'#3
+  +#27#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2
+  +#6#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#2#4'Text'#6#12'edtCondition'#0
+  +#0#242#2#10#5'TEdit'#7'edtLine'#22'AnchorSideLeft.Control'#7#15'lblAutoConti'
+  +'nue'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#11
+  +'edtFilename'#18'AnchorSideTop.Side'#7#9'asrBottom'#20'AnchorSideRight.Side'
+  +#7#9'asrBottom'#4'Left'#2'}'#6'Height'#2#23#3'Top'#2'$'#5'Width'#2'<'#18'Bor'
+  +'derSpacing.Left'#2#6#20'BorderSpacing.Around'#2#6#5'Color'#7#9'clBtnFace'#8
+  +'ReadOnly'#9#8'TabOrder'#2#1#4'Text'#6#7'edtLine'#0#0#242#2#11#5'TEdit'#11'e'
+  +'dtFilename'#22'AnchorSideLeft.Control'#7#15'lblAutoContinue'#19'AnchorSideL'
+  +'eft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSide'
+  +'Right.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2
+  +'}'#6'Height'#2#24#3'Top'#2#6#5'Width'#3#27#1#7'Anchors'#11#5'akTop'#6'akLef'
+  +'t'#7'akRight'#0#18'BorderSpacing.Left'#2#6#20'BorderSpacing.Around'#2#6#5'C'
+  +'olor'#7#9'clBtnFace'#8'ReadOnly'#9#8'TabOrder'#2#0#4'Text'#6#11'edtFilename'
+  +#0#0#242#2#12#9'TComboBox'#8'cmbGroup'#22'AnchorSideLeft.Control'#7#15'lblAu'
+  ,'toContinue'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'
+  +#7#17'edtAutocontinueMS'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSide'
+  +'Right.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2
+  +'}'#6'Height'#2#21#3'Top'#3#152#0#5'Width'#3#27#1#7'Anchors'#11#5'akTop'#6'a'
+  +'kLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#20'BorderSpacing.Around'#2#6
+  +#8'TabOrder'#2#5#4'Text'#6#8'cmbGroup'#0#0#242#2#13#9'TGroupBox'#9'gbActions'
+  +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#8'cmbGrou'
+  +'p'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Ow'
+  +'ner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#165#0#3
+  +'Top'#3#179#0#5'Width'#3#146#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
+  +#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#7'Actions'#12'Clien'
+  +'tHeight'#3#148#0#11'ClientWidth'#3#142#1#8'TabOrder'#2#6#0#9'TCheckBox'#14
+  +'chkActionBreak'#22'AnchorSideLeft.Control'#7#9'gbActions'#21'AnchorSideTop.'
+  +'Control'#7#9'gbActions'#4'Left'#2#6#6'Height'#2#20#3'Top'#2#6#5'Width'#2'8'
+  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#5'Break'#8'TabOrder'#2#0#0#0#9'TC'
+  +'heckBox'#15'chkEnableGroups'#22'AnchorSideLeft.Control'#7#9'gbActions'#21'A'
+  +'nchorSideTop.Control'#7#15'edtEnableGroups'#18'AnchorSideTop.Side'#7#9'asrC'
+  +'enter'#4'Left'#2#6#6'Height'#2#20#3'Top'#2'!'#5'Width'#2'e'#20'BorderSpacin'
+  +'g.Around'#2#6#7'Caption'#6#12'Enable goups'#8'TabOrder'#2#1#0#0#9'TCheckBox'
+  +#16'chkDisableGroups'#22'AnchorSideLeft.Control'#7#9'gbActions'#21'AnchorSid'
+  +'eTop.Control'#7#16'edtDisableGroups'#18'AnchorSideTop.Side'#7#9'asrCenter'#4
+  +'Left'#2#6#6'Height'#2#20#3'Top'#2'>'#5'Width'#2'l'#20'BorderSpacing.Around'
+  +#2#6#7'Caption'#6#14'Disable groups'#8'TabOrder'#2#2#0#0#11'TEditButton'#15
+  +'edtEnableGroups'#22'AnchorSideLeft.Control'#7#14'chkActionBreak'#19'AnchorS'
+  +'ideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#14'chkActionBreak'
   +#18'AnchorSideTop.Side'#7#9'asrBottom'#20'AnchorSideRight.Side'#7#9'asrBotto'
-  +'m'#4'Left'#2'q'#6'Height'#2#23#3'Top'#2'$'#5'Width'#2'<'#18'BorderSpacing.L'
-  +'eft'#2#6#20'BorderSpacing.Around'#2#6#5'Color'#7#9'clBtnFace'#8'ReadOnly'#9
-  +#8'TabOrder'#2#1#4'Text'#6#7'edtLine'#0#0#242#2#11#5'TEdit'#11'edtFilename'
-  +#22'AnchorSideLeft.Control'#7#15'lblAutoContinue'#19'AnchorSideLeft.Side'#7#9
-  +'asrBottom'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'
-  +#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'q'#6'Height'#2
-  +#24#3'Top'#2#6#5'Width'#3#27#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
-  +#18'BorderSpacing.Left'#2#6#20'BorderSpacing.Around'#2#6#5'Color'#7#9'clBtnF'
-  +'ace'#8'ReadOnly'#9#8'TabOrder'#2#0#4'Text'#6#11'edtFilename'#0#0#242#2#12#9
-  +'TComboBox'#8'cmbGroup'#22'AnchorSideLeft.Control'#7#15'lblAutoContinue'#19
-  ,'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#17'edtAutoc'
-  +'ontinueMS'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'
-  +#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'q'#6'Height'#2
-  +#21#3'Top'#3#152#0#5'Width'#3#27#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRigh'
-  +'t'#0#12'AutoComplete'#8#18'BorderSpacing.Left'#2#6#20'BorderSpacing.Around'
-  +#2#6#5'Ctl3D'#8#10'ItemHeight'#2#13#9'ItemWidth'#2#0#8'TabOrder'#2#5#4'Text'
-  +#6#8'cmbGroup'#0#0#242#2#13#9'TGroupBox'#9'gbActions'#22'AnchorSideLeft.Cont'
-  +'rol'#7#5'Owner'#21'AnchorSideTop.Control'#7#8'cmbGroup'#18'AnchorSideTop.Si'
-  +'de'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRigh'
-  +'t.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#163#0#3'Top'#3#179#0#5'Width'
-  +#3#134#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#20'Bord'
-  +'erSpacing.Around'#2#6#7'Caption'#6#7'Actions'#12'ClientHeight'#3#145#0#11'C'
-  +'lientWidth'#3#130#1#5'Ctl3D'#8#8'TabOrder'#2#6#0#9'TCheckBox'#14'chkActionB'
-  +'reak'#22'AnchorSideLeft.Control'#7#9'gbActions'#21'AnchorSideTop.Control'#7
-  +#9'gbActions'#4'Left'#2#6#6'Height'#2#17#3'Top'#2#6#5'Width'#2'.'#20'BorderS'
-  +'pacing.Around'#2#6#7'Caption'#6#5'Break'#8'TabOrder'#2#0#0#0#9'TCheckBox'#15
-  +'chkEnableGroups'#22'AnchorSideLeft.Control'#7#9'gbActions'#21'AnchorSideTop'
-  +'.Control'#7#15'edtEnableGroups'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Lef'
-  +'t'#2#6#6'Height'#2#17#3'Top'#2' '#5'Width'#2'S'#20'BorderSpacing.Around'#2#6
-  +#7'Caption'#6#12'Enable goups'#8'TabOrder'#2#1#0#0#9'TCheckBox'#16'chkDisabl'
-  +'eGroups'#22'AnchorSideLeft.Control'#7#9'gbActions'#21'AnchorSideTop.Control'
-  +#7#16'edtDisableGroups'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6
-  +'Height'#2#17#3'Top'#2'='#5'Width'#2'X'#20'BorderSpacing.Around'#2#6#7'Capti'
-  +'on'#6#14'Disable groups'#8'TabOrder'#2#2#0#0#11'TEditButton'#15'edtEnableGr'
-  +'oups'#22'AnchorSideLeft.Control'#7#14'chkActionBreak'#19'AnchorSideLeft.Sid'
-  +'e'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#14'chkActionBreak'#18'AnchorS'
-  +'ideTop.Side'#7#9'asrBottom'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'
-  +#3#132#0#6'Height'#2#23#3'Top'#2#29#5'Width'#3#225#0#7'Anchors'#11#5'akTop'#6
-  +'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2'P'#17'BorderSpacing.Top'#2#6
-  +#20'BorderSpacing.Bottom'#2#6#11'ButtonWidth'#2#23#5'Ctl3D'#8#7'Enabled'#8#9
+  +'m'#4'Left'#3#142#0#6'Height'#2#23#3'Top'#2' '#5'Width'#3#227#0#7'Anchors'#11
+  +#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2'P'#17'BorderSpacin'
+  +'g.Top'#2#6#20'BorderSpacing.Bottom'#2#6#11'ButtonWidth'#2#23#7'Enabled'#8#9
   +'NumGlyphs'#2#1#13'OnButtonClick'#7#26'edtEnableGroupsButtonClick'#8'TabOrde'
   +'r'#2#5#0#0#11'TEditButton'#16'edtDisableGroups'#22'AnchorSideLeft.Control'#7
   +#14'chkActionBreak'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.'
   +'Control'#7#15'edtEnableGroups'#18'AnchorSideTop.Side'#7#9'asrBottom'#20'Anc'
-  +'horSideRight.Side'#7#9'asrBottom'#4'Left'#3#132#0#6'Height'#2#23#3'Top'#2':'
-  +#5'Width'#3#225#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpa'
+  +'horSideRight.Side'#7#9'asrBottom'#4'Left'#3#142#0#6'Height'#2#23#3'Top'#2'='
+  +#5'Width'#3#227#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpa'
   +'cing.Left'#2'P'#17'BorderSpacing.Top'#2#6#20'BorderSpacing.Bottom'#2#6#11'B'
-  +'uttonWidth'#2#23#5'Ctl3D'#8#7'Enabled'#8#9'NumGlyphs'#2#1#13'OnButtonClick'
-  +#7#27'edtDisableGroupsButtonClick'#8'TabOrder'#2#6#0#0#9'TCheckBox'#17'chkEv'
-  +'alExpression'#22'AnchorSideLeft.Control'#7#9'gbActions'#21'AnchorSideTop.Co'
-  +'ntrol'#7#17'edtEvalExpression'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'
-  +#2#6#6'Height'#2#17#3'Top'#2'Z'#5'Width'#2'\'#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#15'Eval expression'#7'Enabled'#8#8'TabOrder'#2#3#0#0#9'TCheckBox'
-  +#13'chkLogMessage'#22'AnchorSideLeft.Control'#7#9'gbActions'#21'AnchorSideTo'
-  +'p.Control'#7#13'edtLogMessage'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'
-  +#2#6#6'Height'#2#17#3'Top'#2'w'#5'Width'#2'Q'#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#11'Log message'#7'Enabled'#8#8'TabOrder'#2#4#0#0#5'TEdit'#17'edt'
-  +'EvalExpression'#22'AnchorSideLeft.Control'#7#14'chkActionBreak'#19'AnchorSi'
-  +'deLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#16'edtDisableGroups'
-  +#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#9'gbAct'
-  +'ions'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#132#0#6'Height'#2#23
-  +#3'Top'#2'W'#5'Width'#3#248#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
-  +#18'BorderSpacing.Left'#2'P'#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Righ'
-  +'t'#2#6#20'BorderSpacing.Bottom'#2#6#7'Enabled'#8#8'TabOrder'#2#7#0#0#5'TEdi'
-  +'t'#13'edtLogMessage'#22'AnchorSideLeft.Control'#7#14'chkActionBreak'#19'Anc'
-  +'horSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#17'edtEvalExpr'
-  +'ession'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7
-  +#9'gbActions'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#132#0#6'Heig'
-  +'ht'#2#23#3'Top'#2't'#5'Width'#3#248#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'ak'
-  +'Right'#0#18'BorderSpacing.Left'#2'P'#17'BorderSpacing.Top'#2#6#19'BorderSpa'
-  +'cing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#7'Enabled'#8#8'TabOrder'#2#8#0
-  +#0#0#242#2#14#12'TButtonPanel'#11'ButtonPanel'#22'AnchorSideLeft.Control'#7#5
-  +'Owner'#21'AnchorSideTop.Control'#7#9'gbActions'#18'AnchorSideTop.Side'#7#9
-  +'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7
-  ,#9'asrBottom'#4'Left'#2#6#6'Height'#2'('#3'Top'#3'\'#1#5'Width'#3#134#1#7'An'
-  +'chors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'TabOrder'#2#7#11'ShowButtons'#11
-  +#4'pbOK'#8'pbCancel'#6'pbHelp'#0#0#0#0
+  +'uttonWidth'#2#23#7'Enabled'#8#9'NumGlyphs'#2#1#13'OnButtonClick'#7#27'edtDi'
+  +'sableGroupsButtonClick'#8'TabOrder'#2#6#0#0#9'TCheckBox'#17'chkEvalExpressi'
+  +'on'#22'AnchorSideLeft.Control'#7#9'gbActions'#21'AnchorSideTop.Control'#7#17
+  +'edtEvalExpression'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Heig'
+  +'ht'#2#20#3'Top'#2'['#5'Width'#2'q'#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#15'Eval expression'#7'Enabled'#8#8'TabOrder'#2#3#0#0#9'TCheckBox'#13'chkLog'
+  +'Message'#22'AnchorSideLeft.Control'#7#9'gbActions'#21'AnchorSideTop.Control'
+  +#7#13'edtLogMessage'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Hei'
+  +'ght'#2#20#3'Top'#2'x'#5'Width'#2'b'#20'BorderSpacing.Around'#2#6#7'Caption'
+  +#6#11'Log message'#7'Enabled'#8#8'TabOrder'#2#4#0#0#5'TEdit'#17'edtEvalExpre'
+  +'ssion'#22'AnchorSideLeft.Control'#7#14'chkActionBreak'#19'AnchorSideLeft.Si'
+  +'de'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#16'edtDisableGroups'#18'Anch'
+  +'orSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#9'gbActions'#20
+  +'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#142#0#6'Height'#2#23#3'Top'#2
+  +'Z'#5'Width'#3#250#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'Border'
+  +'Spacing.Left'#2'P'#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#20
+  +'BorderSpacing.Bottom'#2#6#7'Enabled'#8#8'TabOrder'#2#7#0#0#5'TEdit'#13'edtL'
+  +'ogMessage'#22'AnchorSideLeft.Control'#7#14'chkActionBreak'#19'AnchorSideLef'
+  +'t.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#17'edtEvalExpression'#18
+  +'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#9'gbAction'
+  +'s'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#142#0#6'Height'#2#23#3
+  +'Top'#2'w'#5'Width'#3#250#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18
+  +'BorderSpacing.Left'#2'P'#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2
+  +#6#20'BorderSpacing.Bottom'#2#6#7'Enabled'#8#8'TabOrder'#2#8#0#0#0#242#2#14
+  +#12'TButtonPanel'#11'ButtonPanel'#21'AnchorSideTop.Control'#7#9'gbActions'#18
+  +'AnchorSideTop.Side'#7#9'asrBottom'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
+  +'Left'#2#6#6'Height'#2#28#3'Top'#3'^'#1#5'Width'#3#146#1#5'Align'#7#8'alBott'
+  +'om'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#8'AutoSize'#9
+  ,#8'TabOrder'#2#7#11'ShowButtons'#11#4'pbOK'#8'pbCancel'#6'pbHelp'#0#9'ShowBe'
+  +'vel'#8#0#0#0
 ]);
diff --git a/debugger/watchpropertydlg.lfm b/debugger/watchpropertydlg.lfm
index 3a8bca8d6e..ff032d7f1b 100644
--- a/debugger/watchpropertydlg.lfm
+++ b/debugger/watchpropertydlg.lfm
@@ -1,13 +1,13 @@
 object WatchPropertyDlg: TWatchPropertyDlg
   Left = 331
-  Height = 213
+  Height = 210
   Top = 184
   Width = 420
   ActiveControl = chkAllowFunc
   BorderIcons = [biSystemMenu]
   BorderStyle = bsDialog
   Caption = 'Watch Properties'
-  ClientHeight = 213
+  ClientHeight = 210
   ClientWidth = 420
   Position = poScreenCenter
   LCLVersion = '0.9.27'
@@ -16,9 +16,9 @@ object WatchPropertyDlg: TWatchPropertyDlg
     AnchorSideTop.Control = txtExpression
     AnchorSideTop.Side = asrCenter
     Left = 6
-    Height = 14
-    Top = 10
-    Width = 57
+    Height = 13
+    Top = 11
+    Width = 65
     BorderSpacing.Left = 6
     Caption = 'Expression:'
     ParentColor = False
@@ -28,9 +28,9 @@ object WatchPropertyDlg: TWatchPropertyDlg
     AnchorSideTop.Control = txtRepCount
     AnchorSideTop.Side = asrCenter
     Left = 6
-    Height = 14
-    Top = 39
-    Width = 72
+    Height = 13
+    Top = 40
+    Width = 80
     BorderSpacing.Left = 6
     Caption = 'Repeat Count:'
     ParentColor = False
@@ -41,9 +41,9 @@ object WatchPropertyDlg: TWatchPropertyDlg
     AnchorSideTop.Control = txtDigits
     AnchorSideTop.Side = asrCenter
     Left = 171
-    Height = 14
-    Top = 39
-    Width = 31
+    Height = 13
+    Top = 40
+    Width = 35
     BorderSpacing.Left = 6
     Caption = 'Digits:'
     ParentColor = False
@@ -77,7 +77,7 @@ object WatchPropertyDlg: TWatchPropertyDlg
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = txtExpression
     AnchorSideTop.Side = asrBottom
-    Left = 208
+    Left = 212
     Height = 23
     Top = 35
     Width = 60
@@ -90,9 +90,9 @@ object WatchPropertyDlg: TWatchPropertyDlg
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = chkAllowFunc
     Left = 6
-    Height = 17
+    Height = 20
     Top = 64
-    Width = 57
+    Width = 70
     AllowGrayed = True
     BorderSpacing.Left = 6
     Caption = 'Enabled'
@@ -102,9 +102,9 @@ object WatchPropertyDlg: TWatchPropertyDlg
     AnchorSideTop.Control = txtRepCount
     AnchorSideTop.Side = asrBottom
     Left = 105
-    Height = 17
+    Height = 20
     Top = 64
-    Width = 112
+    Width = 140
     AllowGrayed = True
     BorderSpacing.Top = 6
     Caption = 'Allow Function Calls'
@@ -118,7 +118,7 @@ object WatchPropertyDlg: TWatchPropertyDlg
     AnchorSideRight.Side = asrBottom
     Left = 6
     Height = 78
-    Top = 87
+    Top = 90
     Width = 408
     Anchors = [akTop, akLeft, akRight]
     AutoFill = True
@@ -134,10 +134,9 @@ object WatchPropertyDlg: TWatchPropertyDlg
     ChildSizing.ShrinkVertical = crsScaleChilds
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
     ChildSizing.ControlsPerLine = 3
-    ClientHeight = 60
+    ClientHeight = 61
     ClientWidth = 404
     Columns = 3
-    Ctl3D = False
     ItemIndex = 7
     Items.Strings = (
       'Character'
@@ -153,14 +152,17 @@ object WatchPropertyDlg: TWatchPropertyDlg
     TabOrder = 3
   end
   object ButtonPanel: TButtonPanel
+    AnchorSideTop.Control = rgStyle
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 40
-    Top = 173
+    Height = 30
+    Top = 174
     Width = 408
     Align = alBottom
+    Anchors = [akTop, akLeft, akRight, akBottom]
     AutoSize = True
     TabOrder = 6
     ShowButtons = [pbOK, pbCancel, pbHelp]
+    ShowBevel = False
   end
 end
diff --git a/debugger/watchpropertydlg.lrs b/debugger/watchpropertydlg.lrs
index 09ed622fa6..322d87d2ae 100644
--- a/debugger/watchpropertydlg.lrs
+++ b/debugger/watchpropertydlg.lrs
@@ -2,57 +2,58 @@
 
 LazarusResources.Add('TWatchPropertyDlg','FORMDATA',[
   'TPF0'#17'TWatchPropertyDlg'#16'WatchPropertyDlg'#4'Left'#3'K'#1#6'Height'#3
-  +#213#0#3'Top'#3#184#0#5'Width'#3#164#1#13'ActiveControl'#7#12'chkAllowFunc'
+  +#210#0#3'Top'#3#184#0#5'Width'#3#164#1#13'ActiveControl'#7#12'chkAllowFunc'
   +#11'BorderIcons'#11#12'biSystemMenu'#0#11'BorderStyle'#7#8'bsDialog'#7'Capti'
-  +'on'#6#16'Watch Properties'#12'ClientHeight'#3#213#0#11'ClientWidth'#3#164#1
+  +'on'#6#16'Watch Properties'#12'ClientHeight'#3#210#0#11'ClientWidth'#3#164#1
   +#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.27'#0#6'TLabel'#13
   +'lblExpression'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Contr'
   +'ol'#7#13'txtExpression'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6
-  +'Height'#2#14#3'Top'#2#10#5'Width'#2'9'#18'BorderSpacing.Left'#2#6#7'Caption'
+  +'Height'#2#13#3'Top'#2#11#5'Width'#2'A'#18'BorderSpacing.Left'#2#6#7'Caption'
   +#6#11'Expression:'#11'ParentColor'#8#0#0#6'TLabel'#11'lblRepCount'#22'Anchor'
   +'SideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#11'txtRepCount'#18
-  +'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#14#3'Top'#2''''#5
-  +'Width'#2'H'#18'BorderSpacing.Left'#2#6#7'Caption'#6#13'Repeat Count:'#11'Pa'
+  +'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#13#3'Top'#2'('#5
+  +'Width'#2'P'#18'BorderSpacing.Left'#2#6#7'Caption'#6#13'Repeat Count:'#11'Pa'
   +'rentColor'#8#0#0#6'TLabel'#9'lblDigits'#22'AnchorSideLeft.Control'#7#11'txt'
   +'RepCount'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7
   +#9'txtDigits'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3#171#0#6'Height'
-  +#2#14#3'Top'#2''''#5'Width'#2#31#18'BorderSpacing.Left'#2#6#7'Caption'#6#7'D'
-  +'igits:'#11'ParentColor'#8#0#0#5'TEdit'#13'txtExpression'#21'AnchorSideTop.C'
-  +'ontrol'#7#5'Owner'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRigh'
-  +'t.Side'#7#9'asrBottom'#4'Left'#2'i'#6'Height'#2#23#3'Top'#2#6#5'Width'#3'5'
-  +#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#6#19
+  +#2#13#3'Top'#2'('#5'Width'#2'#'#18'BorderSpacing.Left'#2#6#7'Caption'#6#7'Di'
+  +'gits:'#11'ParentColor'#8#0#0#5'TEdit'#13'txtExpression'#21'AnchorSideTop.Co'
+  +'ntrol'#7#5'Owner'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight'
+  +'.Side'#7#9'asrBottom'#4'Left'#2'i'#6'Height'#2#23#3'Top'#2#6#5'Width'#3'5'#1
+  +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#6#19
   +'BorderSpacing.Right'#2#6#8'TabOrder'#2#1#0#0#5'TEdit'#11'txtRepCount'#21'An'
   +'chorSideTop.Control'#7#13'txtExpression'#18'AnchorSideTop.Side'#7#9'asrBott'
   +'om'#4'Left'#2'i'#6'Height'#2#23#3'Top'#2'#'#5'Width'#2'<'#17'BorderSpacing.'
   +'Top'#2#6#8'TabOrder'#2#2#4'Text'#6#1'0'#0#0#5'TEdit'#9'txtDigits'#22'Anchor'
   +'SideLeft.Control'#7#9'lblDigits'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21
   +'AnchorSideTop.Control'#7#13'txtExpression'#18'AnchorSideTop.Side'#7#9'asrBo'
-  +'ttom'#4'Left'#3#208#0#6'Height'#2#23#3'Top'#2'#'#5'Width'#2'<'#18'BorderSpa'
+  +'ttom'#4'Left'#3#212#0#6'Height'#2#23#3'Top'#2'#'#5'Width'#2'<'#18'BorderSpa'
   +'cing.Left'#2#6#17'BorderSpacing.Top'#2#6#8'TabOrder'#2#4#4'Text'#6#1'0'#0#0
   +#9'TCheckBox'#10'chkEnabled'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anchor'
-  +'SideTop.Control'#7#12'chkAllowFunc'#4'Left'#2#6#6'Height'#2#17#3'Top'#2'@'#5
-  +'Width'#2'9'#11'AllowGrayed'#9#18'BorderSpacing.Left'#2#6#7'Caption'#6#7'Ena'
+  +'SideTop.Control'#7#12'chkAllowFunc'#4'Left'#2#6#6'Height'#2#20#3'Top'#2'@'#5
+  +'Width'#2'F'#11'AllowGrayed'#9#18'BorderSpacing.Left'#2#6#7'Caption'#6#7'Ena'
   +'bled'#8'TabOrder'#2#5#0#0#9'TCheckBox'#12'chkAllowFunc'#21'AnchorSideTop.Co'
   +'ntrol'#7#11'txtRepCount'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'i'
-  +#6'Height'#2#17#3'Top'#2'@'#5'Width'#2'p'#11'AllowGrayed'#9#17'BorderSpacing'
-  +'.Top'#2#6#7'Caption'#6#20'Allow Function Calls'#8'TabOrder'#2#0#0#0#11'TRad'
-  +'ioGroup'#7'rgStyle'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.'
-  +'Control'#7#12'chkAllowFunc'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Anchor'
-  +'SideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Lef'
-  +'t'#2#6#6'Height'#2'N'#3'Top'#2'W'#5'Width'#3#152#1#7'Anchors'#11#5'akTop'#6
-  +'akLeft'#7'akRight'#0#8'AutoFill'#9#18'BorderSpacing.Left'#2#6#17'BorderSpac'
-  +'ing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#5'Style'#28'ChildSizi'
-  +'ng.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizin'
-  +'g.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeV'
-  +'ertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7
+  +#6'Height'#2#20#3'Top'#2'@'#5'Width'#3#140#0#11'AllowGrayed'#9#17'BorderSpac'
+  +'ing.Top'#2#6#7'Caption'#6#20'Allow Function Calls'#8'TabOrder'#2#0#0#0#11'T'
+  +'RadioGroup'#7'rgStyle'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideT'
+  +'op.Control'#7#12'chkAllowFunc'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Anc'
+  +'horSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
+  +'Left'#2#6#6'Height'#2'N'#3'Top'#2'Z'#5'Width'#3#152#1#7'Anchors'#11#5'akTop'
+  +#6'akLeft'#7'akRight'#0#8'AutoFill'#9#18'BorderSpacing.Left'#2#6#17'BorderSp'
+  +'acing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#5'Style'#28'ChildSi'
+  +'zing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSiz'
+  +'ing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.Enlarg'
+  +'eVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7
   +#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'C'
   +'hildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.Contr'
-  +'olsPerLine'#2#3#12'ClientHeight'#2'<'#11'ClientWidth'#3#148#1#7'Columns'#2#3
-  +#5'Ctl3D'#8#9'ItemIndex'#2#7#13'Items.Strings'#1#6#9'Character'#6#6'String'#6
-  +#7'Decimal'#6#11'Hexadecimal'#6#14'Floating Point'#6#7'Pointer'#6#16'Record/'
-  +'Structure'#6#7'Default'#6#11'Memory Dump'#0#8'TabOrder'#2#3#0#0#12'TButtonP'
-  +'anel'#11'ButtonPanel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'H'
-  +'eight'#2'('#3'Top'#3#173#0#5'Width'#3#152#1#5'Align'#7#8'alBottom'#8'AutoSi'
-  +'ze'#9#8'TabOrder'#2#6#11'ShowButtons'#11#4'pbOK'#8'pbCancel'#6'pbHelp'#0#0#0
-  +#0
+  +'olsPerLine'#2#3#12'ClientHeight'#2'='#11'ClientWidth'#3#148#1#7'Columns'#2#3
+  +#9'ItemIndex'#2#7#13'Items.Strings'#1#6#9'Character'#6#6'String'#6#7'Decimal'
+  +#6#11'Hexadecimal'#6#14'Floating Point'#6#7'Pointer'#6#16'Record/Structure'#6
+  +#7'Default'#6#11'Memory Dump'#0#8'TabOrder'#2#3#0#0#12'TButtonPanel'#11'Butt'
+  +'onPanel'#21'AnchorSideTop.Control'#7#7'rgStyle'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#4'Left'#2#6#6'Height'#2#30#3'Top'#3#174#0#5'Width'#3#152#1#5'Ali'
+  +'gn'#7#8'alBottom'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0
+  +#8'AutoSize'#9#8'TabOrder'#2#6#11'ShowButtons'#11#4'pbOK'#8'pbCancel'#6'pbHe'
+  +'lp'#0#9'ShowBevel'#8#0#0#0
 ]);