diff --git a/ide/frames/compiler_codegen_options.lfm b/ide/frames/compiler_codegen_options.lfm
index 1e59e7aee9..96636fd11b 100644
--- a/ide/frames/compiler_codegen_options.lfm
+++ b/ide/frames/compiler_codegen_options.lfm
@@ -3,6 +3,7 @@ inherited CompilerCodegenOptionsFrame: TCompilerCodegenOptionsFrame
   Width = 601
   ClientHeight = 523
   ClientWidth = 601
+  TabOrder = 0
   DesignLeft = 415
   DesignTop = 197
   object grpSmartLinkUnit: TGroupBox[0]
@@ -252,18 +253,6 @@ inherited CompilerCodegenOptionsFrame: TCompilerCodegenOptionsFrame
     ClientHeight = 309
     ClientWidth = 597
     TabOrder = 4
-    object lblOptMiddle: TLabel
-      AnchorSideLeft.Control = grpOptimizations
-      AnchorSideLeft.Side = asrCenter
-      AnchorSideTop.Control = grpOptimizations
-      AnchorSideTop.Side = asrCenter
-      Left = 298
-      Height = 1
-      Top = 154
-      Width = 1
-      AutoSize = False
-      ParentColor = False
-    end
     object radOptLevelNone: TRadioButton
       AnchorSideLeft.Control = grpOptimizations
       AnchorSideTop.Control = grpOptimizations
@@ -317,39 +306,60 @@ inherited CompilerCodegenOptionsFrame: TCompilerCodegenOptionsFrame
       TabStop = False
     end
     object chkOptVarsInReg: TCheckBox
-      AnchorSideLeft.Control = lblOptMiddle
-      AnchorSideTop.Control = grpOptimizations
-      Left = 298
+      AnchorSideLeft.Control = grpOptimizations
+      AnchorSideTop.Control = Bevel1
+      AnchorSideTop.Side = asrBottom
+      Left = 6
       Height = 17
-      Top = 6
+      Top = 107
       Width = 102
+      BorderSpacing.Left = 6
       BorderSpacing.Top = 6
+      BorderSpacing.Bottom = 6
       Caption = 'chkOptVarsInReg'
       TabOrder = 4
     end
     object chkOptUncertain: TCheckBox
-      AnchorSideLeft.Control = lblOptMiddle
+      AnchorSideLeft.Control = grpOptimizations
       AnchorSideTop.Control = chkOptVarsInReg
       AnchorSideTop.Side = asrBottom
-      Left = 298
+      Left = 6
       Height = 17
-      Top = 29
+      Top = 130
       Width = 98
+      BorderSpacing.Left = 6
       BorderSpacing.Top = 6
+      BorderSpacing.Bottom = 6
       Caption = 'chkOptUncertain'
       TabOrder = 5
     end
     object chkOptSmaller: TCheckBox
-      AnchorSideLeft.Control = lblOptMiddle
+      AnchorSideLeft.Control = grpOptimizations
       AnchorSideTop.Control = chkOptUncertain
       AnchorSideTop.Side = asrBottom
-      Left = 298
+      AnchorSideBottom.Side = asrBottom
+      Left = 6
       Height = 17
-      Top = 52
+      Top = 153
       Width = 86
+      BorderSpacing.Left = 6
       BorderSpacing.Top = 6
+      BorderSpacing.Bottom = 6
       Caption = 'chkOptSmaller'
       TabOrder = 6
     end
+    object Bevel1: TBevel
+      AnchorSideLeft.Control = grpOptimizations
+      AnchorSideTop.Control = radOptLevel3
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = grpOptimizations
+      AnchorSideRight.Side = asrBottom
+      Left = 6
+      Height = 3
+      Top = 98
+      Width = 585
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Around = 6
+    end
   end
 end
diff --git a/ide/frames/compiler_codegen_options.pas b/ide/frames/compiler_codegen_options.pas
index 855a6d3765..f862f9344f 100644
--- a/ide/frames/compiler_codegen_options.pas
+++ b/ide/frames/compiler_codegen_options.pas
@@ -5,14 +5,15 @@ unit compiler_codegen_options;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, IDEOptionsIntf, Project, CompilerOptions, LazarusIDEStrConsts;
+  Classes,SysUtils,FileUtil,Forms,Controls,Graphics,Dialogs,StdCtrls,ExtCtrls,
+  IDEOptionsIntf,Project,CompilerOptions,LazarusIDEStrConsts;
 
 type
 
   { TCompilerCodegenOptionsFrame }
 
   TCompilerCodegenOptionsFrame = class(TAbstractIDEOptionsEditor)
+    Bevel1:TBevel;
     chkChecksIO: TCheckBox;
     chkChecksOverflow: TCheckBox;
     chkChecksRange: TCheckBox;
@@ -28,7 +29,6 @@ type
     grpOptimizations: TGroupBox;
     grpSmartLinkUnit: TGroupBox;
     grpTargetPlatform: TGroupBox;
-    lblOptMiddle: TLabel;
     lblTargetCPU: TLabel;
     lblTargetOS: TLabel;
     lblTargetProcessorProc: TLabel;