diff --git a/components/exctrls/examples/ButtonEx/main.lfm b/components/exctrls/examples/ButtonEx/main.lfm
index 33a148063..2bdfa5134 100644
--- a/components/exctrls/examples/ButtonEx/main.lfm
+++ b/components/exctrls/examples/ButtonEx/main.lfm
@@ -8,7 +8,7 @@ object Form1: TForm1
   ClientWidth = 838
   OnCreate = FormCreate
   OnShow = FormShow
-  LCLVersion = '2.1.0.0'
+  LCLVersion = '2.3.0.0'
   object Button1: TButton
     Left = 160
     Height = 25
@@ -21,19 +21,21 @@ object Form1: TForm1
   end
   object GroupBox1: TGroupBox
     Left = 304
-    Height = 267
+    Height = 274
     Top = 12
-    Width = 520
+    Width = 510
+    AutoSize = True
     Caption = 'TButtonEx Appearance'
-    ClientHeight = 247
-    ClientWidth = 516
+    ClientHeight = 254
+    ClientWidth = 506
     TabOrder = 6
     object cbColorNormalFrom: TColorButton
+      AnchorSideLeft.Control = cmbAlignment
       AnchorSideTop.Control = Label6
       AnchorSideTop.Side = asrBottom
-      Left = 88
+      Left = 82
       Height = 25
-      Top = 26
+      Top = 47
       Width = 65
       BorderSpacing.Top = 3
       BorderWidth = 2
@@ -48,9 +50,9 @@ object Form1: TForm1
       AnchorSideLeft.Control = cbColorNormalFrom
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = cbColorNormalFrom
-      Left = 157
+      Left = 151
       Height = 25
-      Top = 26
+      Top = 47
       Width = 65
       BorderSpacing.Left = 4
       BorderWidth = 2
@@ -64,50 +66,58 @@ object Form1: TForm1
     object Label1: TLabel
       AnchorSideTop.Control = cbColorNormalFrom
       AnchorSideTop.Side = asrCenter
-      Left = 18
+      AnchorSideRight.Control = cbColorNormalFrom
+      Left = 34
       Height = 15
-      Top = 31
+      Top = 52
       Width = 40
+      Anchors = [akTop, akRight]
+      BorderSpacing.Right = 8
       Caption = 'Normal'
-      ParentColor = False
     end
     object Label2: TLabel
       AnchorSideTop.Control = cbColorHotFrom
       AnchorSideTop.Side = asrCenter
-      Left = 18
+      AnchorSideRight.Control = cbColorHotFrom
+      Left = 54
       Height = 15
-      Top = 60
+      Top = 81
       Width = 20
+      Anchors = [akTop, akRight]
+      BorderSpacing.Right = 8
       Caption = 'Hot'
-      ParentColor = False
     end
     object Label3: TLabel
       AnchorSideTop.Control = cbColorDisabledFrom
       AnchorSideTop.Side = asrCenter
-      Left = 18
+      AnchorSideRight.Control = cbColorDisabledFrom
+      Left = 29
       Height = 15
-      Top = 89
+      Top = 110
       Width = 45
+      Anchors = [akTop, akRight]
+      BorderSpacing.Right = 8
       Caption = 'Disabled'
-      ParentColor = False
     end
     object Label4: TLabel
       AnchorSideTop.Control = cbColorFocusedFrom
       AnchorSideTop.Side = asrCenter
-      Left = 18
+      AnchorSideRight.Control = cbColorFocusedFrom
+      Left = 30
       Height = 15
-      Top = 118
+      Top = 139
       Width = 44
+      Anchors = [akTop, akRight]
+      BorderSpacing.Right = 8
       Caption = 'Focused'
-      ParentColor = False
     end
     object cbColorHotFrom: TColorButton
       AnchorSideLeft.Control = cbColorNormalFrom
       AnchorSideTop.Control = cbColorNormalFrom
       AnchorSideTop.Side = asrBottom
-      Left = 88
+      Left = 82
       Height = 25
-      Top = 55
+      Top = 76
       Width = 65
       BorderSpacing.Top = 4
       BorderWidth = 2
@@ -121,9 +131,9 @@ object Form1: TForm1
     object cbColorHotTo: TColorButton
       AnchorSideLeft.Control = cbColorNormalTo
       AnchorSideTop.Control = cbColorHotFrom
-      Left = 157
+      Left = 151
       Height = 25
-      Top = 55
+      Top = 76
       Width = 65
       BorderWidth = 2
       ButtonColorAutoSize = False
@@ -137,9 +147,9 @@ object Form1: TForm1
       AnchorSideLeft.Control = cbColorNormalFrom
       AnchorSideTop.Control = cbColorHotFrom
       AnchorSideTop.Side = asrBottom
-      Left = 88
+      Left = 82
       Height = 25
-      Top = 84
+      Top = 105
       Width = 65
       BorderSpacing.Top = 4
       BorderWidth = 2
@@ -153,9 +163,9 @@ object Form1: TForm1
     object cbColorDisabledTo: TColorButton
       AnchorSideLeft.Control = cbColorNormalTo
       AnchorSideTop.Control = cbColorDisabledFrom
-      Left = 157
+      Left = 151
       Height = 25
-      Top = 84
+      Top = 105
       Width = 65
       BorderWidth = 2
       ButtonColorAutoSize = False
@@ -169,9 +179,9 @@ object Form1: TForm1
       AnchorSideLeft.Control = cbColorNormalFrom
       AnchorSideTop.Control = cbColorDisabledFrom
       AnchorSideTop.Side = asrBottom
-      Left = 88
+      Left = 82
       Height = 25
-      Top = 113
+      Top = 134
       Width = 65
       BorderSpacing.Top = 4
       BorderWidth = 2
@@ -185,9 +195,9 @@ object Form1: TForm1
     object cbColorFocusedTo: TColorButton
       AnchorSideLeft.Control = cbColorNormalTo
       AnchorSideTop.Control = cbColorFocusedFrom
-      Left = 157
+      Left = 151
       Height = 25
-      Top = 113
+      Top = 134
       Width = 65
       BorderWidth = 2
       ButtonColorAutoSize = False
@@ -200,20 +210,22 @@ object Form1: TForm1
     object Label5: TLabel
       AnchorSideTop.Control = cbColorDownFrom
       AnchorSideTop.Side = asrCenter
-      Left = 18
+      AnchorSideRight.Control = cbColorDownFrom
+      Left = 43
       Height = 15
-      Top = 147
+      Top = 168
       Width = 31
+      Anchors = [akTop, akRight]
+      BorderSpacing.Right = 8
       Caption = 'Down'
-      ParentColor = False
     end
     object cbColorDownFrom: TColorButton
       AnchorSideLeft.Control = cbColorNormalFrom
       AnchorSideTop.Control = cbColorFocusedFrom
       AnchorSideTop.Side = asrBottom
-      Left = 88
+      Left = 82
       Height = 25
-      Top = 142
+      Top = 163
       Width = 65
       BorderSpacing.Top = 4
       BorderWidth = 2
@@ -227,9 +239,9 @@ object Form1: TForm1
     object cbColorDownTo: TColorButton
       AnchorSideLeft.Control = cbColorNormalTo
       AnchorSideTop.Control = cbColorDownFrom
-      Left = 157
+      Left = 151
       Height = 25
-      Top = 142
+      Top = 163
       Width = 65
       BorderWidth = 2
       ButtonColorAutoSize = False
@@ -240,22 +252,25 @@ object Form1: TForm1
       OnColorChanged = cbColorDownFromToChanged
     end
     object Label6: TLabel
-      AnchorSideTop.Control = GroupBox1
-      Left = 88
+      AnchorSideLeft.Control = cmbAlignment
+      AnchorSideLeft.Side = asrCenter
+      AnchorSideTop.Control = cbDefaultDrawing
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Side = asrBottom
+      Left = 90
       Height = 15
-      Top = 8
+      Top = 29
       Width = 111
       BorderSpacing.Top = 8
       Caption = 'Background gradient'
-      ParentColor = False
     end
     object cbBorderColorNormal: TColorButton
       AnchorSideLeft.Control = cbColorNormalTo
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = cbColorNormalFrom
-      Left = 238
+      Left = 232
       Height = 25
-      Top = 26
+      Top = 47
       Width = 65
       BorderSpacing.Left = 16
       BorderWidth = 2
@@ -271,9 +286,9 @@ object Form1: TForm1
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = cbBorderColorNormal
       AnchorSideTop.Side = asrBottom
-      Left = 238
+      Left = 232
       Height = 25
-      Top = 55
+      Top = 76
       Width = 65
       BorderSpacing.Left = 16
       BorderSpacing.Top = 4
@@ -290,9 +305,9 @@ object Form1: TForm1
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = cbBorderColorHot
       AnchorSideTop.Side = asrBottom
-      Left = 238
+      Left = 232
       Height = 25
-      Top = 84
+      Top = 105
       Width = 65
       BorderSpacing.Left = 16
       BorderSpacing.Top = 4
@@ -309,9 +324,9 @@ object Form1: TForm1
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = cbBorderColorDisabled
       AnchorSideTop.Side = asrBottom
-      Left = 238
+      Left = 232
       Height = 25
-      Top = 113
+      Top = 134
       Width = 65
       BorderSpacing.Left = 16
       BorderSpacing.Top = 4
@@ -328,9 +343,9 @@ object Form1: TForm1
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = cbBorderColorFocused
       AnchorSideTop.Side = asrBottom
-      Left = 238
+      Left = 232
       Height = 25
-      Top = 142
+      Top = 163
       Width = 65
       BorderSpacing.Left = 16
       BorderSpacing.Top = 4
@@ -343,23 +358,24 @@ object Form1: TForm1
       OnColorChanged = cbColorDownFromToChanged
     end
     object Label7: TLabel
+      AnchorSideLeft.Control = cbBorderColorNormal
+      AnchorSideLeft.Side = asrCenter
       AnchorSideTop.Control = Label6
-      Left = 238
+      Left = 247
       Height = 15
-      Top = 10
+      Top = 31
       Width = 35
       BorderSpacing.Top = 2
       Caption = 'Border'
-      ParentColor = False
     end
     object seBorderWidthNormal: TSpinEdit
       AnchorSideLeft.Control = cbBorderColorNormal
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = cbColorNormalFrom
       AnchorSideTop.Side = asrCenter
-      Left = 319
+      Left = 313
       Height = 23
-      Top = 27
+      Top = 48
       Width = 45
       Alignment = taRightJustify
       BorderSpacing.Left = 16
@@ -367,23 +383,24 @@ object Form1: TForm1
       TabOrder = 1
     end
     object Label8: TLabel
+      AnchorSideLeft.Control = seBorderWidthNormal
+      AnchorSideLeft.Side = asrCenter
       AnchorSideTop.Control = Label6
       Left = 319
       Height = 15
-      Top = 10
+      Top = 31
       Width = 32
       BorderSpacing.Top = 2
       Caption = 'Width'
-      ParentColor = False
     end
     object seBorderWidthHot: TSpinEdit
       AnchorSideLeft.Control = cbBorderColorNormal
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = cbColorHotTo
       AnchorSideTop.Side = asrCenter
-      Left = 319
+      Left = 313
       Height = 23
-      Top = 56
+      Top = 77
       Width = 45
       Alignment = taRightJustify
       BorderSpacing.Left = 16
@@ -395,9 +412,9 @@ object Form1: TForm1
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = cbColorDisabledFrom
       AnchorSideTop.Side = asrCenter
-      Left = 319
+      Left = 313
       Height = 23
-      Top = 85
+      Top = 106
       Width = 45
       Alignment = taRightJustify
       BorderSpacing.Left = 16
@@ -409,9 +426,9 @@ object Form1: TForm1
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = cbColorFocusedFrom
       AnchorSideTop.Side = asrCenter
-      Left = 319
+      Left = 313
       Height = 23
-      Top = 114
+      Top = 135
       Width = 45
       Alignment = taRightJustify
       BorderSpacing.Left = 16
@@ -423,9 +440,9 @@ object Form1: TForm1
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = cbColorDownFrom
       AnchorSideTop.Side = asrCenter
-      Left = 319
+      Left = 313
       Height = 23
-      Top = 143
+      Top = 164
       Width = 45
       Alignment = taRightJustify
       BorderSpacing.Left = 16
@@ -436,9 +453,9 @@ object Form1: TForm1
       AnchorSideLeft.Control = seBorderWidthHot
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = cbColorNormalFrom
-      Left = 380
+      Left = 374
       Height = 25
-      Top = 26
+      Top = 47
       Width = 65
       BorderSpacing.Left = 16
       BorderWidth = 2
@@ -453,9 +470,9 @@ object Form1: TForm1
       AnchorSideLeft.Control = clbFontColorNormal
       AnchorSideTop.Control = clbFontColorNormal
       AnchorSideTop.Side = asrBottom
-      Left = 380
+      Left = 374
       Height = 25
-      Top = 55
+      Top = 76
       Width = 65
       BorderSpacing.Top = 4
       BorderWidth = 2
@@ -470,9 +487,9 @@ object Form1: TForm1
       AnchorSideLeft.Control = clbFontColorNormal
       AnchorSideTop.Control = clbFontColorHot
       AnchorSideTop.Side = asrBottom
-      Left = 380
+      Left = 374
       Height = 25
-      Top = 84
+      Top = 105
       Width = 65
       BorderSpacing.Top = 4
       BorderWidth = 2
@@ -487,9 +504,9 @@ object Form1: TForm1
       AnchorSideLeft.Control = clbFontColorNormal
       AnchorSideTop.Control = clbFontColorDisabled
       AnchorSideTop.Side = asrBottom
-      Left = 380
+      Left = 374
       Height = 25
-      Top = 113
+      Top = 134
       Width = 65
       BorderSpacing.Top = 4
       BorderWidth = 2
@@ -504,9 +521,9 @@ object Form1: TForm1
       AnchorSideLeft.Control = clbFontColorNormal
       AnchorSideTop.Control = clbFontColorFocused
       AnchorSideTop.Side = asrBottom
-      Left = 380
+      Left = 374
       Height = 25
-      Top = 142
+      Top = 163
       Width = 65
       BorderSpacing.Top = 4
       BorderWidth = 2
@@ -518,20 +535,25 @@ object Form1: TForm1
       OnColorChanged = cbColorDownFromToChanged
     end
     object Label9: TLabel
+      AnchorSideLeft.Control = clbFontColorNormal
+      AnchorSideLeft.Side = asrCenter
       AnchorSideTop.Control = Label6
-      Left = 380
+      Left = 394
       Height = 15
-      Top = 10
+      Top = 31
       Width = 24
       BorderSpacing.Top = 2
       Caption = 'Font'
-      ParentColor = False
     end
     object cbGradient: TCheckBox
-      Left = 88
+      AnchorSideLeft.Control = cmbAlignment
+      AnchorSideTop.Control = cbColorDownFrom
+      AnchorSideTop.Side = asrBottom
+      Left = 82
       Height = 19
-      Top = 176
-      Width = 65
+      Top = 196
+      Width = 63
+      BorderSpacing.Top = 8
       Caption = 'Gradient'
       Checked = True
       OnChange = cbGradientChange
@@ -539,10 +561,16 @@ object Form1: TForm1
       TabOrder = 11
     end
     object cbShowFocusRect: TCheckBox
-      Left = 241
+      AnchorSideLeft.Control = cbGradient
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = cbBorderColorDown
+      AnchorSideTop.Side = asrBottom
+      Left = 169
       Height = 19
-      Top = 176
-      Width = 106
+      Top = 192
+      Width = 104
+      BorderSpacing.Left = 24
+      BorderSpacing.Top = 4
       Caption = 'Show FocusRect'
       Checked = True
       OnChange = cbShowFocusRectChange
@@ -554,10 +582,10 @@ object Form1: TForm1
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = clbFontColorNormal
       AnchorSideTop.Side = asrCenter
-      Left = 470
+      Left = 464
       Height = 19
-      Top = 29
-      Width = 44
+      Top = 50
+      Width = 42
       BorderSpacing.Left = 8
       Caption = 'Bold'
       OnChange = cbFontBoldChange
@@ -568,10 +596,10 @@ object Form1: TForm1
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = cbColorHotFrom
       AnchorSideTop.Side = asrCenter
-      Left = 453
+      Left = 447
       Height = 19
-      Top = 58
-      Width = 44
+      Top = 79
+      Width = 42
       BorderSpacing.Left = 8
       Caption = 'Bold'
       OnChange = cbFontBoldChange
@@ -582,10 +610,10 @@ object Form1: TForm1
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = cbColorDisabledFrom
       AnchorSideTop.Side = asrCenter
-      Left = 453
+      Left = 447
       Height = 19
-      Top = 87
-      Width = 44
+      Top = 108
+      Width = 42
       BorderSpacing.Left = 8
       Caption = 'Bold'
       OnChange = cbFontBoldChange
@@ -596,10 +624,10 @@ object Form1: TForm1
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = cbColorFocusedFrom
       AnchorSideTop.Side = asrCenter
-      Left = 453
+      Left = 447
       Height = 19
-      Top = 116
-      Width = 44
+      Top = 137
+      Width = 42
       BorderSpacing.Left = 8
       Caption = 'Bold'
       OnChange = cbFontBoldChange
@@ -610,35 +638,38 @@ object Form1: TForm1
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = cbColorDownFrom
       AnchorSideTop.Side = asrCenter
-      Left = 453
+      Left = 447
       Height = 19
-      Top = 145
-      Width = 44
+      Top = 166
+      Width = 42
       BorderSpacing.Left = 8
       Caption = 'Bold'
       OnChange = cbFontBoldChange
       TabOrder = 10
     end
-    object Label10: TLabel
+    object lblAlignment: TLabel
+      AnchorSideLeft.Control = GroupBox1
       AnchorSideTop.Control = cmbAlignment
       AnchorSideTop.Side = asrCenter
-      Left = 13
+      Left = 18
       Height = 15
-      Top = 212
+      Top = 227
       Width = 56
+      BorderSpacing.Left = 18
+      BorderSpacing.Right = 8
       Caption = 'Alignment'
-      ParentColor = False
     end
     object cmbAlignment: TComboBox
-      AnchorSideLeft.Control = cbColorDownFrom
-      AnchorSideTop.Control = cbColorDownFrom
+      AnchorSideLeft.Control = lblAlignment
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = cbGradient
       AnchorSideTop.Side = asrBottom
-      Left = 88
+      Left = 82
       Height = 23
-      Top = 208
-      Width = 137
-      Anchors = []
+      Top = 223
+      Width = 126
       BorderSpacing.Top = 8
+      BorderSpacing.Bottom = 8
       ItemHeight = 15
       ItemIndex = 2
       Items.Strings = (
@@ -652,15 +683,16 @@ object Form1: TForm1
       Text = 'taCenter'
     end
     object cbDefaultDrawing: TCheckBox
+      AnchorSideLeft.Control = GroupBox1
       AnchorSideTop.Control = GroupBox1
-      AnchorSideRight.Control = GroupBox1
       AnchorSideRight.Side = asrBottom
-      Left = 396
+      Left = 18
       Height = 19
-      Top = -16
-      Width = 104
+      Top = 2
+      Width = 102
       Alignment = taLeftJustify
-      Anchors = [akRight]
+      BorderSpacing.Left = 18
+      BorderSpacing.Top = 2
       BorderSpacing.Right = 16
       Caption = 'Default drawing'
       Checked = True
@@ -669,10 +701,16 @@ object Form1: TForm1
       TabOrder = 0
     end
     object cbWordWrap: TCheckBox
-      Left = 384
+      AnchorSideLeft.Control = cbShowFocusRect
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = clbFontColorDown
+      AnchorSideTop.Side = asrBottom
+      Left = 297
       Height = 19
-      Top = 176
-      Width = 77
+      Top = 192
+      Width = 75
+      BorderSpacing.Left = 24
+      BorderSpacing.Top = 4
       Caption = 'WordWrap'
       OnChange = cbWordWrapChange
       TabOrder = 13
@@ -683,9 +721,9 @@ object Form1: TForm1
       AnchorSideTop.Control = clbFontColorNormal
       AnchorSideBottom.Control = cbColorNormalFrom
       AnchorSideBottom.Side = asrBottom
-      Left = 445
+      Left = 439
       Height = 25
-      Top = 26
+      Top = 47
       Width = 17
       Anchors = [akTop, akLeft, akBottom]
       Max = 20
@@ -699,7 +737,7 @@ object Form1: TForm1
     Left = 160
     Height = 19
     Top = 95
-    Width = 62
+    Width = 60
     Caption = 'Enabled'
     Checked = True
     OnChange = cbEnabledChange
@@ -731,7 +769,7 @@ object Form1: TForm1
     Left = 160
     Height = 19
     Top = 119
-    Width = 66
+    Width = 64
     Caption = 'AutoSize'
     OnChange = cbAutoSizeChange
     TabOrder = 2
@@ -753,7 +791,6 @@ object Form1: TForm1
     Top = 149
     Width = 32
     Caption = 'Width'
-    ParentColor = False
   end
   object Label12: TLabel
     Left = 162
@@ -761,7 +798,6 @@ object Form1: TForm1
     Top = 207
     Width = 36
     Caption = 'Height'
-    ParentColor = False
   end
   object SpinEdit2: TSpinEdit
     Left = 160
diff --git a/components/exctrls/examples/ButtonEx/main.pas b/components/exctrls/examples/ButtonEx/main.pas
index cafa617de..652cab438 100644
--- a/components/exctrls/examples/ButtonEx/main.pas
+++ b/components/exctrls/examples/ButtonEx/main.pas
@@ -49,7 +49,7 @@ type
     cmbAlignment: TComboBox;
     GroupBox1: TGroupBox;
     Label1: TLabel;
-    Label10: TLabel;
+    lblAlignment: TLabel;
     Label11: TLabel;
     Label12: TLabel;
     Label2: TLabel;
diff --git a/components/exctrls/examples/ButtonEx/unit2.lfm b/components/exctrls/examples/ButtonEx/unit2.lfm
index 37b93f57a..680b68f80 100644
--- a/components/exctrls/examples/ButtonEx/unit2.lfm
+++ b/components/exctrls/examples/ButtonEx/unit2.lfm
@@ -1,19 +1,18 @@
 object Form2: TForm2
   Left = 670
-  Height = 128
+  Height = 115
   Top = 218
   Width = 298
   Caption = 'Form2'
-  ClientHeight = 128
+  ClientHeight = 115
   ClientWidth = 298
   OnCreate = FormCreate
-  LCLVersion = '2.1.0.0'
+  LCLVersion = '2.3.0.0'
   object Label1: TLabel
     Left = 19
     Height = 15
     Top = 16
     Width = 212
     Caption = 'Testing ModalResult, Default and Cancel'
-    ParentColor = False
   end
 end