diff --git a/components/onguard/source/qonguard4.lfm b/components/onguard/source/qonguard4.lfm
index 8f7971104..9ed3c8f16 100644
--- a/components/onguard/source/qonguard4.lfm
+++ b/components/onguard/source/qonguard4.lfm
@@ -1,30 +1,47 @@
 object EditProductFrm: TEditProductFrm
   Left = 280
-  Height = 110
+  Height = 128
   Top = 326
-  Width = 526
+  Width = 516
   HorzScrollBar.Page = 525
   HorzScrollBar.Range = 521
   VertScrollBar.Page = 109
   VertScrollBar.Range = 105
   ActiveControl = ProductEd
+  AutoSize = True
   BorderIcons = []
+  BorderStyle = bsDialog
   Caption = 'Description and Key'
+  ClientHeight = 128
+  ClientWidth = 516
   OnCreate = FormCreate
   Position = poScreenCenter
+  LCLVersion = '2.3.0.0'
   object Panel1: TPanel
-    Left = 4
-    Height = 68
-    Top = 5
-    Width = 517
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    Left = 8
+    Height = 80
+    Top = 8
+    Width = 495
+    AutoSize = True
+    BorderSpacing.Around = 8
+    BevelOuter = bvLowered
+    ClientHeight = 80
+    ClientWidth = 495
     TabOrder = 0
     object GenerateKeySb: TSpeedButton
-      Left = 482
+      AnchorSideLeft.Control = KeyPasteSb
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = KeyEd
+      AnchorSideTop.Side = asrCenter
+      Left = 455
       Height = 23
       Hint = 'Generate encryption key'
-      Top = 37
+      Top = 44
       Width = 23
-      Color = clBtnFace
+      BorderSpacing.Left = 4
+      BorderSpacing.Right = 16
       Glyph.Data = {
         42010000424D4201000000000000760000002800000011000000110000000100
         040000000000CC00000000000000000000000000000000000000000000000000
@@ -38,16 +55,19 @@ object EditProductFrm: TEditProductFrm
         0000800000088888888880000000888888888888888880000000888888888888
         888880000000
       }
-      NumGlyphs = 0
       OnClick = GenerateKeySbClick
     end
     object KeyPasteSb: TSpeedButton
-      Left = 456
+      AnchorSideLeft.Control = KeyEd
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = KeyEd
+      AnchorSideTop.Side = asrCenter
+      Left = 428
       Height = 23
       Hint = 'Paste from clipboard'
-      Top = 37
+      Top = 44
       Width = 23
-      Color = clBtnFace
+      BorderSpacing.Left = 4
       Glyph.Data = {
         42010000424D4201000000000000760000002800000011000000110000000100
         040000000000CC00000000000000000000000000000000000000000000000000
@@ -61,49 +81,73 @@ object EditProductFrm: TEditProductFrm
         0000200000BB0000022220000000222220000222222220000000222222222222
         222220000000
       }
-      NumGlyphs = 0
       OnClick = KeyPasteSbClick
     end
     object Label1: TLabel
-      Left = 12
-      Height = 20
-      Top = 12
-      Width = 84
+      AnchorSideLeft.Control = Panel1
+      AnchorSideTop.Control = ProductEd
+      AnchorSideTop.Side = asrCenter
+      Left = 13
+      Height = 15
+      Top = 17
+      Width = 63
+      BorderSpacing.Left = 12
       Caption = '&Description:'
       Color = clNone
       ParentColor = False
     end
     object Label2: TLabel
-      Left = 12
-      Height = 20
-      Top = 40
-      Width = 32
+      AnchorSideLeft.Control = Panel1
+      AnchorSideTop.Control = KeyEd
+      Left = 13
+      Height = 15
+      Top = 44
+      Width = 22
+      BorderSpacing.Left = 12
       Caption = '&Key:'
       Color = clNone
       ParentColor = False
     end
     object ProductEd: TEdit
-      Left = 104
-      Height = 28
-      Top = 8
-      Width = 345
+      AnchorSideLeft.Control = Label1
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = Panel1
+      Left = 84
+      Height = 23
+      Top = 13
+      Width = 340
+      BorderSpacing.Left = 8
+      BorderSpacing.Top = 12
       OnChange = InfoChanged
       TabOrder = 0
     end
     object KeyEd: TEdit
-      Left = 104
-      Height = 28
-      Top = 38
-      Width = 345
+      AnchorSideLeft.Control = ProductEd
+      AnchorSideTop.Control = ProductEd
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = ProductEd
+      AnchorSideRight.Side = asrBottom
+      Left = 84
+      Height = 23
+      Top = 44
+      Width = 340
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Top = 8
+      BorderSpacing.Bottom = 12
       OnChange = InfoChanged
       TabOrder = 1
     end
   end
   object OKBtn: TButton
-    Left = 361
+    AnchorSideTop.Control = Panel1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = CancelBtn
+    Left = 349
     Height = 25
-    Top = 80
+    Top = 96
     Width = 75
+    Anchors = [akTop, akRight]
+    BorderSpacing.Right = 4
     BorderSpacing.InnerBorder = 4
     Caption = 'OK'
     Default = True
@@ -111,10 +155,16 @@ object EditProductFrm: TEditProductFrm
     TabOrder = 1
   end
   object CancelBtn: TButton
-    Left = 441
+    AnchorSideTop.Control = Panel1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Panel1
+    AnchorSideRight.Side = asrBottom
+    Left = 428
     Height = 25
-    Top = 80
+    Top = 96
     Width = 75
+    Anchors = [akTop, akRight]
+    BorderSpacing.Bottom = 8
     BorderSpacing.InnerBorder = 4
     Cancel = True
     Caption = 'Cancel'
diff --git a/components/onguard/source/qonguard4.lrs b/components/onguard/source/qonguard4.lrs
index 3b86462f5..88f3195a3 100644
--- a/components/onguard/source/qonguard4.lrs
+++ b/components/onguard/source/qonguard4.lrs
@@ -1,51 +1,74 @@
-{ To jest automatycznie wygenerowany plik zasobów lazarusa }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TEditProductFrm','FORMDATA',[
-  'TPF0'#15'TEditProductFrm'#14'EditProductFrm'#4'Left'#3#24#1#6'Height'#2'n'#3
-  +'Top'#3'F'#1#5'Width'#3#14#2#18'HorzScrollBar.Page'#3#13#2#19'HorzScrollBar.'
-  +'Range'#3#9#2#18'VertScrollBar.Page'#2'm'#19'VertScrollBar.Range'#2'i'#13'Ac'
-  +'tiveControl'#7#9'ProductEd'#11'BorderIcons'#11#0#7'Caption'#6#19'Descriptio'
-  +'n and Key'#8'OnCreate'#7#10'FormCreate'#8'Position'#7#14'poScreenCenter'#0#6
-  +'TPanel'#6'Panel1'#4'Left'#2#4#6'Height'#2'D'#3'Top'#2#5#5'Width'#3#5#2#8'Ta'
-  +'bOrder'#2#0#0#12'TSpeedButton'#13'GenerateKeySb'#4'Left'#3#226#1#6'Height'#2
-  +#23#4'Hint'#6#23'Generate encryption key'#3'Top'#2'%'#5'Width'#2#23#5'Color'
-  +#7#9'clBtnFace'#10'Glyph.Data'#10'F'#1#0#0'B'#1#0#0'BMB'#1#0#0#0#0#0#0'v'#0#0
-  +#0'('#0#0#0#17#0#0#0#17#0#0#0#1#0#4#0#0#0#0#0#204#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128#0#128#0#0#0#128#0#128#0#128
-  +#128#0#0#128#128#128#0#192#192#192#0#0#0#255#0#0#255#0#0#0#255#255#0#255#0#0
-  +#0#255#0#255#0#255#255#0#0#255#255#255#0#136#136#136#136#136#136#136#136#128
-  +#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#132'DDDD'#128#0
-  +#0#0#136#136#136#132#255#255#255#244#128#0#0#0#136#136#136#132#240#0#0#244
-  +#128#0#0#0#128#0#0#4#255#255#255#244#128#0#0#0#128#255#255#244#240#0#0#244
-  +#128#0#0#0#128#240#0#4#255#255#255#244#128#0#0#0#128#255#255#244#240#15'DD'
-  +#128#0#0#0#128#240#0#4#255#255'OH'#128#0#0#0#128#255#255#244#255#255'D'#136
-  +#128#0#0#0#128#240#15#4'DDH'#136#128#0#0#0#128#255#255#15#8#136#136#136#128#0
-  +#0#0#128#255#255#0#136#136#136#136#128#0#0#0#128#0#0#8#136#136#136#136#128#0
-  +#0#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136#136#136#136#136#136
-  +#136#128#0#0#0#9'NumGlyphs'#2#0#7'OnClick'#7#18'GenerateKeySbClick'#0#0#12'T'
-  +'SpeedButton'#10'KeyPasteSb'#4'Left'#3#200#1#6'Height'#2#23#4'Hint'#6#20'Pas'
-  +'te from clipboard'#3'Top'#2'%'#5'Width'#2#23#5'Color'#7#9'clBtnFace'#10'Gly'
-  +'ph.Data'#10'F'#1#0#0'B'#1#0#0'BMB'#1#0#0#0#0#0#0'v'#0#0#0'('#0#0#0#17#0#0#0
-  +#17#0#0#0#1#0#4#0#0#0#0#0#204#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#128#0#0#128#0#0#0#128#128#0#128#0#0#0#128#0#128#0#128#128#0#0#192#192#192
-  +#0#128#128#128#0#0#0#255#0#0#255#0#0#0#255#255#0#255#0#0#0#255#0#255#0#255
-  +#255#0#0#255#255#255#0'"""""""" '#0#0#0'"""""""" '#0#0#0'"""DDDDD '#0#0#0' '
-  +#0#0'O'#255#255#255#244' '#0#0#0#8'88O'#0#0#0#244' '#0#0#0#3#131#131'O'#255
-  +#255#255#244' '#0#0#0#8'88O'#0#15'DD '#0#0#0#3#131#131'O'#255#255'OB '#0#0#0
-  +#8'88O'#255#255'D" '#0#0#0#3#131#131'DDD@" '#0#0#0#8'888880" '#0#0#0#3#128#0
-  +#0#0#3#128'" '#0#0#0#8'0www'#8'0" '#0#0#0#3#131#11#0#176#131#128'" '#0#0#0' '
-  +#0#0#187#0#0#2'" '#0#0#0'"" '#0#2'""" '#0#0#0'"""""""" '#0#0#0#9'NumGlyphs'#2
-  +#0#7'OnClick'#7#15'KeyPasteSbClick'#0#0#6'TLabel'#6'Label1'#4'Left'#2#12#6'H'
-  +'eight'#2#20#3'Top'#2#12#5'Width'#2'T'#7'Caption'#6#13'&Description:'#5'Colo'
-  +'r'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#6'Label2'#4'Left'#2#12#6'Hei'
-  +'ght'#2#20#3'Top'#2'('#5'Width'#2' '#7'Caption'#6#5'&Key:'#5'Color'#7#6'clNo'
-  +'ne'#11'ParentColor'#8#0#0#5'TEdit'#9'ProductEd'#4'Left'#2'h'#6'Height'#2#28
-  +#3'Top'#2#8#5'Width'#3'Y'#1#8'OnChange'#7#11'InfoChanged'#8'TabOrder'#2#0#0#0
-  +#5'TEdit'#5'KeyEd'#4'Left'#2'h'#6'Height'#2#28#3'Top'#2'&'#5'Width'#3'Y'#1#8
-  +'OnChange'#7#11'InfoChanged'#8'TabOrder'#2#1#0#0#0#7'TButton'#5'OKBtn'#4'Lef'
-  +'t'#3'i'#1#6'Height'#2#25#3'Top'#2'P'#5'Width'#2'K'#25'BorderSpacing.InnerBo'
-  +'rder'#2#4#7'Caption'#6#2'OK'#7'Default'#9#11'ModalResult'#2#1#8'TabOrder'#2
-  +#1#0#0#7'TButton'#9'CancelBtn'#4'Left'#3#185#1#6'Height'#2#25#3'Top'#2'P'#5
-  +'Width'#2'K'#25'BorderSpacing.InnerBorder'#2#4#6'Cancel'#9#7'Caption'#6#6'Ca'
-  +'ncel'#11'ModalResult'#2#2#8'TabOrder'#2#2#0#0#0
+  'TPF0'#15'TEditProductFrm'#14'EditProductFrm'#4'Left'#3#24#1#6'Height'#3#128#0
+  +#3'Top'#3'F'#1#5'Width'#3#4#2#18'HorzScrollBar.Page'#3#13#2#19'HorzScrollBar'
+  +'.Range'#3#9#2#18'VertScrollBar.Page'#2'm'#19'VertScrollBar.Range'#2'i'#13'A'
+  +'ctiveControl'#7#9'ProductEd'#8'AutoSize'#9#11'BorderIcons'#11#0#11'BorderSt'
+  +'yle'#7#8'bsDialog'#7'Caption'#6#19'Description and Key'#12'ClientHeight'#3
+  +#128#0#11'ClientWidth'#3#4#2#8'OnCreate'#7#10'FormCreate'#8'Position'#7#14'p'
+  +'oScreenCenter'#10'LCLVersion'#6#7'2.3.0.0'#0#6'TPanel'#6'Panel1'#22'AnchorS'
+  +'ideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2#8
+  +#6'Height'#2'P'#3'Top'#2#8#5'Width'#3#239#1#8'AutoSize'#9#20'BorderSpacing.A'
+  +'round'#2#8#10'BevelOuter'#7#9'bvLowered'#12'ClientHeight'#2'P'#11'ClientWid'
+  +'th'#3#239#1#8'TabOrder'#2#0#0#12'TSpeedButton'#13'GenerateKeySb'#22'AnchorS'
+  +'ideLeft.Control'#7#10'KeyPasteSb'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21
+  +'AnchorSideTop.Control'#7#5'KeyEd'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'L'
+  +'eft'#3#199#1#6'Height'#2#23#4'Hint'#6#23'Generate encryption key'#3'Top'#2
+  +','#5'Width'#2#23#18'BorderSpacing.Left'#2#4#19'BorderSpacing.Right'#2#16#10
+  +'Glyph.Data'#10'F'#1#0#0'B'#1#0#0'BMB'#1#0#0#0#0#0#0'v'#0#0#0'('#0#0#0#17#0#0
+  +#0#17#0#0#0#1#0#4#0#0#0#0#0#204#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#128#0#0#128#0#0#0#128#128#0#128#0#0#0#128#0#128#0#128#128#0#0#128#128
+  +#128#0#192#192#192#0#0#0#255#0#0#255#0#0#0#255#255#0#255#0#0#0#255#0#255#0
+  +#255#255#0#0#255#255#255#0#136#136#136#136#136#136#136#136#128#0#0#0#136#136
+  +#136#136#136#136#136#136#128#0#0#0#136#136#136#132'DDDD'#128#0#0#0#136#136
+  +#136#132#255#255#255#244#128#0#0#0#136#136#136#132#240#0#0#244#128#0#0#0#128
+  +#0#0#4#255#255#255#244#128#0#0#0#128#255#255#244#240#0#0#244#128#0#0#0#128
+  +#240#0#4#255#255#255#244#128#0#0#0#128#255#255#244#240#15'DD'#128#0#0#0#128
+  +#240#0#4#255#255'OH'#128#0#0#0#128#255#255#244#255#255'D'#136#128#0#0#0#128
+  +#240#15#4'DDH'#136#128#0#0#0#128#255#255#15#8#136#136#136#128#0#0#0#128#255
+  +#255#0#136#136#136#136#128#0#0#0#128#0#0#8#136#136#136#136#128#0#0#0#136#136
+  +#136#136#136#136#136#136#128#0#0#0#136#136#136#136#136#136#136#136#128#0#0#0
+  +#7'OnClick'#7#18'GenerateKeySbClick'#0#0#12'TSpeedButton'#10'KeyPasteSb'#22
+  +'AnchorSideLeft.Control'#7#5'KeyEd'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21
+  +'AnchorSideTop.Control'#7#5'KeyEd'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'L'
+  +'eft'#3#172#1#6'Height'#2#23#4'Hint'#6#20'Paste from clipboard'#3'Top'#2','#5
+  +'Width'#2#23#18'BorderSpacing.Left'#2#4#10'Glyph.Data'#10'F'#1#0#0'B'#1#0#0
+  +'BMB'#1#0#0#0#0#0#0'v'#0#0#0'('#0#0#0#17#0#0#0#17#0#0#0#1#0#4#0#0#0#0#0#204#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128#0
+  +#128#0#0#0#128#0#128#0#128#128#0#0#192#192#192#0#128#128#128#0#0#0#255#0#0
+  +#255#0#0#0#255#255#0#255#0#0#0#255#0#255#0#255#255#0#0#255#255#255#0'"""""""'
+  +'" '#0#0#0'"""""""" '#0#0#0'"""DDDDD '#0#0#0' '#0#0'O'#255#255#255#244' '#0#0
+  +#0#8'88O'#0#0#0#244' '#0#0#0#3#131#131'O'#255#255#255#244' '#0#0#0#8'88O'#0
+  +#15'DD '#0#0#0#3#131#131'O'#255#255'OB '#0#0#0#8'88O'#255#255'D" '#0#0#0#3
+  +#131#131'DDD@" '#0#0#0#8'888880" '#0#0#0#3#128#0#0#0#3#128'" '#0#0#0#8'0www'
+  +#8'0" '#0#0#0#3#131#11#0#176#131#128'" '#0#0#0' '#0#0#187#0#0#2'" '#0#0#0'""'
+  +' '#0#2'""" '#0#0#0'"""""""" '#0#0#0#7'OnClick'#7#15'KeyPasteSbClick'#0#0#6
+  +'TLabel'#6'Label1'#22'AnchorSideLeft.Control'#7#6'Panel1'#21'AnchorSideTop.C'
+  +'ontrol'#7#9'ProductEd'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#13#6
+  +'Height'#2#15#3'Top'#2#17#5'Width'#2'?'#18'BorderSpacing.Left'#2#12#7'Captio'
+  +'n'#6#13'&Description:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'
+  +#6'Label2'#22'AnchorSideLeft.Control'#7#6'Panel1'#21'AnchorSideTop.Control'#7
+  +#5'KeyEd'#4'Left'#2#13#6'Height'#2#15#3'Top'#2','#5'Width'#2#22#18'BorderSpa'
+  +'cing.Left'#2#12#7'Caption'#6#5'&Key:'#5'Color'#7#6'clNone'#11'ParentColor'#8
+  +#0#0#5'TEdit'#9'ProductEd'#22'AnchorSideLeft.Control'#7#6'Label1'#19'AnchorS'
+  +'ideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#6'Panel1'#4'Left'#2
+  +'T'#6'Height'#2#23#3'Top'#2#13#5'Width'#3'T'#1#18'BorderSpacing.Left'#2#8#17
+  +'BorderSpacing.Top'#2#12#8'OnChange'#7#11'InfoChanged'#8'TabOrder'#2#0#0#0#5
+  +'TEdit'#5'KeyEd'#22'AnchorSideLeft.Control'#7#9'ProductEd'#21'AnchorSideTop.'
+  +'Control'#7#9'ProductEd'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSide'
+  +'Right.Control'#7#9'ProductEd'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Lef'
+  +'t'#2'T'#6'Height'#2#23#3'Top'#2','#5'Width'#3'T'#1#7'Anchors'#11#5'akTop'#6
+  +'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#8#20'BorderSpacing.Bottom'#2#12
+  +#8'OnChange'#7#11'InfoChanged'#8'TabOrder'#2#1#0#0#0#7'TButton'#5'OKBtn'#21
+  +'AnchorSideTop.Control'#7#6'Panel1'#18'AnchorSideTop.Side'#7#9'asrBottom'#23
+  +'AnchorSideRight.Control'#7#9'CancelBtn'#4'Left'#3']'#1#6'Height'#2#25#3'Top'
+  +#2'`'#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderSpacing.Rig'
+  +'ht'#2#4#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#2'OK'#7'Default'#9#11
+  ,'ModalResult'#2#1#8'TabOrder'#2#1#0#0#7'TButton'#9'CancelBtn'#21'AnchorSideT'
+  +'op.Control'#7#6'Panel1'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSide'
+  +'Right.Control'#7#6'Panel1'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3
+  +#172#1#6'Height'#2#25#3'Top'#2'`'#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akR'
+  +'ight'#0#20'BorderSpacing.Bottom'#2#8#25'BorderSpacing.InnerBorder'#2#4#6'Ca'
+  +'ncel'#9#7'Caption'#6#6'Cancel'#11'ModalResult'#2#2#8'TabOrder'#2#2#0#0#0
 ]);