diff --git a/Common/DeclareList.pas b/Common/DeclareList.pas
index fb7109b7..34b0ccb3 100644
--- a/Common/DeclareList.pas
+++ b/Common/DeclareList.pas
@@ -255,6 +255,8 @@ constructor TDeclareList.Create(AParent: TWinControl; ALeft, ATop, AWidth, ADisp
 
    edtName := TEdit.Create(gbBox);
    edtName.Parent := gbBox;
+   edtName.ParentCtl3D := False;
+   edtName.Ctl3D := False;
    edtName.OnKeyDown := OnKeyDownCommon;
 
    btnAdd := TButton.Create(Self);
@@ -303,7 +305,7 @@ constructor TConstDeclareList.Create(AParent: TWinControl; ALeft, ATop, AWidth,
 
    inherited Create(AParent, ALeft, ATop, AWidth, ADispRowCount, AColCount);
 
-   edtName.SetBounds(lblName.Width+10, 17, gbBox.Width-lblName.Width-18, 21);
+   edtName.SetBounds(lblName.Width+10, 19, gbBox.Width-lblName.Width-18, 21);
    edtName.Anchors := edtName.Anchors + [akRight];
 
    lblValue := TLabel.Create(gbBox);
@@ -317,9 +319,11 @@ constructor TConstDeclareList.Create(AParent: TWinControl; ALeft, ATop, AWidth,
 
    edtValue := TEdit.Create(gbBox);
    edtValue.Parent := gbBox;
-   edtValue.SetBounds(lblValue.Width+10, 42, gbBox.Width-lblValue.Width-18, 21);
+   edtValue.SetBounds(lblValue.Width+10, 44, gbBox.Width-lblValue.Width-18, 21);
    edtValue.Anchors := edtValue.Anchors + [akRight];
    edtValue.ShowHint := True;
+   edtValue.ParentCtl3D := False;
+   edtValue.Ctl3D := False;
    edtValue.Hint := trnsManager.GetString('DisableFieldValid');
    edtValue.OnKeyDown := OnKeyDownCommon;
 
@@ -337,7 +341,7 @@ constructor TVarDeclareList.Create(AParent: TWinControl; ALeft, ATop, AWidth, AD
 
    inherited Create(AParent, ALeft, ATop, AWidth, ADispRowCount, AColCount);
 
-   edtName.SetBounds(lblName.Width+10, 17, 100, 21);
+   edtName.SetBounds(lblName.Width+10, 19, 100, 21);
    
    lblType := TLabel.Create(gbBox);
    lblType.Parent := gbBox;
@@ -353,14 +357,14 @@ constructor TVarDeclareList.Create(AParent: TWinControl; ALeft, ATop, AWidth, AD
 
    edtSize := TSizeEdit.Create(gbBox);
    edtSize.Parent := gbBox;
-   edtSize.SetBounds(lblSize.BoundsRect.Right+5, 17, gbBox.Width - lblSize.BoundsRect.Right-13, 21);
+   edtSize.SetBounds(lblSize.BoundsRect.Right+5, 19, gbBox.Width - lblSize.BoundsRect.Right-13, 21);
    edtSize.Anchors := edtSize.Anchors + [akRight];
    edtSize.OnKeyDown := OnKeyDownCommon;
 
    cbType := TComboBox.Create(gbBox);
    cbType.Parent := gbBox;
    cbType.Style := csDropDownList;
-   cbType.SetBounds(lblType.BoundsRect.Right + 5, 42, 0, 21);
+   cbType.SetBounds(lblType.BoundsRect.Right + 5, 44, 0, 21);
    cbType.Constraints.MaxWidth := edtName.BoundsRect.Right - lblType.BoundsRect.Right - 5;
    cbType.Constraints.MinWidth := cbType.Constraints.MaxWidth;
    cbType.OnKeyDown := OnKeyDownCommon;
@@ -374,9 +378,11 @@ constructor TVarDeclareList.Create(AParent: TWinControl; ALeft, ATop, AWidth, AD
 
    edtInit := TEdit.Create(gbBox);
    edtInit.Parent := gbBox;
-   edtInit.SetBounds(lblInit.BoundsRect.Right+5, 42, gbBox.Width-lblInit.BoundsRect.Right-13, 21);
+   edtInit.SetBounds(lblInit.BoundsRect.Right+5, 44, gbBox.Width-lblInit.BoundsRect.Right-13, 21);
    edtInit.Anchors := edtInit.Anchors + [akRight];
    edtInit.ShowHint := True;
+   edtInit.ParentCtl3D := False;
+   edtInit.Ctl3D := False;
    edtInit.Hint := trnsManager.GetString('DisableFieldValid');
    edtInit.OnKeyDown := OnKeyDownCommon;
 
diff --git a/Common/Element.pas b/Common/Element.pas
index 84781fef..e3bb2905 100644
--- a/Common/Element.pas
+++ b/Common/Element.pas
@@ -84,9 +84,9 @@ constructor TElement.Create(AParent: TScrollBox; const ATypeId: string);
    edtName.Parent := Self;
    edtName.SetBounds(3, 0, TInfra.Scaled(Self, 70), 21);
    edtName.ParentFont := False;
-   edtName.Font.Style := [];
    edtName.ParentCtl3D := False;
-   edtName.Ctl3D := True;
+   edtName.Font.Style := [];
+   edtName.Ctl3D := False;
    edtName.ShowHint := True;
    edtName.Hint := trnsManager.GetString('BadIdD');
    edtName.Font.Color := NOK_COLOR;
diff --git a/Common/SizeEdit.pas b/Common/SizeEdit.pas
index fa01120d..7ab50fba 100644
--- a/Common/SizeEdit.pas
+++ b/Common/SizeEdit.pas
@@ -53,6 +53,8 @@ constructor TSizeEdit.Create(AParent: TWinControl);
    CharCase := ecUpperCase;
    Hint := trnsManager.GetString('DisableFieldValid') + sLineBreak + ReplaceStr(trnsManager.GetString('edtSizeHint'), LB_PHOLDER2, sLineBreak);
    ParentFont := False;
+   ParentCtl3D := False;
+   Ctl3D := False;
    Font.Style := [];
    Font.Color := BLACK_COLOR;
    DoubleBuffered := True;
diff --git a/Common/TabComponent.pas b/Common/TabComponent.pas
index 639bba47..37b930a1 100644
--- a/Common/TabComponent.pas
+++ b/Common/TabComponent.pas
@@ -240,12 +240,14 @@ procedure TTabComponent.CreateNameControls(AParent: TWinControl; x, y: integer);
 
    edtName := TEdit.Create(AParent);
    edtName.Parent := AParent;
-   edtName.SetBounds(lblName.BoundsRect.Right+5, y-6, 104, 21);
+   edtName.SetBounds(lblName.BoundsRect.Right+5, y-5, 104, 21);
    edtName.ParentFont := False;
+   edtName.ParentCtl3D := False;
    edtName.Font.Style := [];
    edtName.ShowHint := True;
    edtName.Hint := trnsManager.GetString('BadIdD');
    edtName.DoubleBuffered := True;
+   edtName.Ctl3D := False;
    edtName.OnChange := OnChangeName;
 end;
 
@@ -261,12 +263,14 @@ procedure TTabComponent.CreateLibControls(AParent: TWinControl; x, y: integer);
 
    edtLibrary := TEdit.Create(AParent);
    edtLibrary.Parent := AParent;
-   edtLibrary.SetBounds(lblLibrary.BoundsRect.Right+5, y-6, 135-lblLibrary.Width, 21);
+   edtLibrary.SetBounds(lblLibrary.BoundsRect.Right+5, y-5, 135-lblLibrary.Width, 21);
    edtLibrary.ParentFont := False;
+   edtLibrary.ParentCtl3D := False;
    edtLibrary.Font.Style := [];
    edtLibrary.Font.Color := clGreen;
    edtLibrary.ShowHint := True;
    edtLibrary.DoubleBuffered := True;
+   edtLibrary.Ctl3D := False;
    edtLibrary.OnChange := OnChangeLib;
    edtLibrary.Hint := trnsManager.GetFormattedString('edtLibraryHint', [GInfra.CurrentLang.LibraryExt]);
 end;
diff --git a/Common/UserFunction.pas b/Common/UserFunction.pas
index 19a72a74..ffa47a5e 100644
--- a/Common/UserFunction.pas
+++ b/Common/UserFunction.pas
@@ -372,6 +372,8 @@ constructor TUserFunctionHeader.Create(AParentForm: TFunctionsForm);
    memDesc.Parent := gbDesc;
    memDesc.SetBounds(5, 17, gbDesc.Width-12, chkInclDescCode.Top-22);
    memDesc.ParentFont := False;
+   memDesc.ParentCtl3D := False;
+   memDesc.Ctl3D := False;
    memDesc.Font.Style := [];
    memDesc.Font.Color := clGreen;
    memDesc.WordWrap := False;
@@ -629,10 +631,10 @@ constructor TParameter.Create(AParentTab: TUserFunctionHeader);
    edtDefault.Parent := Self;
    edtDefault.SetBounds(TInfra.Scaled(Self, 174), 0, TInfra.Scaled(Self, 50), 21);
    edtDefault.ParentFont := False;
+   edtDefault.ParentCtl3D := False;
    edtDefault.Font.Style := [];
    edtDefault.Font.Color := clGreen;
-   edtDefault.ParentCtl3D := False;
-   edtDefault.Ctl3D := True;
+   edtDefault.Ctl3D := False;
    edtDefault.OnChange := OnChangeType;
 
    chkTable := TCheckBox.Create(Self);
diff --git a/Forms/EditMemo_Form.dfm b/Forms/EditMemo_Form.dfm
index b997b335..22cd78d2 100644
--- a/Forms/EditMemo_Form.dfm
+++ b/Forms/EditMemo_Form.dfm
@@ -27,11 +27,13 @@ object MemoEditorForm: TMemoEditorForm
     Width = 264
     Height = 143
     Align = alClient
+    Ctl3D = False
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clNavy
     Font.Height = -11
     Font.Name = 'Tahoma'
     Font.Style = []
+    ParentCtl3D = False
     ParentFont = False
     TabOrder = 0
   end
diff --git a/Forms/Goto_Form.dfm b/Forms/Goto_Form.dfm
index a28fe9a4..5348061b 100644
--- a/Forms/Goto_Form.dfm
+++ b/Forms/Goto_Form.dfm
@@ -45,10 +45,12 @@ object GotoForm: TGotoForm
     object edtNumber: TEdit
       Tag = 5
       Left = 72
-      Top = 5
+      Top = 7
       Width = 41
       Height = 21
+      Ctl3D = False
       NumbersOnly = True
+      ParentCtl3D = False
       TabOrder = 1
       Text = '0'
     end
diff --git a/Forms/Settings_Form.dfm b/Forms/Settings_Form.dfm
index 533cffec..a1036a33 100644
--- a/Forms/Settings_Form.dfm
+++ b/Forms/Settings_Form.dfm
@@ -131,14 +131,16 @@ object SettingsForm: TSettingsForm
     object edtCompiler: TEdit
       Tag = 5
       Left = 104
-      Top = 46
+      Top = 48
       Width = 345
-      Height = 21
+      Height = 19
+      Ctl3D = False
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clWindowText
       Font.Height = -11
       Font.Name = 'MS Sans Serif'
       Font.Style = []
+      ParentCtl3D = False
       ParentFont = False
       ParentShowHint = False
       ShowHint = True
@@ -181,14 +183,16 @@ object SettingsForm: TSettingsForm
     object edtCompilerNoMain: TEdit
       Tag = 5
       Left = 200
-      Top = 70
+      Top = 72
       Width = 249
-      Height = 21
+      Height = 19
+      Ctl3D = False
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clWindowText
       Font.Height = -11
       Font.Name = 'MS Sans Serif'
       Font.Style = []
+      ParentCtl3D = False
       ParentFont = False
       ParentShowHint = False
       ShowHint = True
@@ -779,15 +783,17 @@ object SettingsForm: TSettingsForm
     object edtEditorIndent: TEdit
       Tag = 5
       Left = 503
-      Top = 13
+      Top = 14
       Width = 38
-      Height = 21
+      Height = 19
+      Ctl3D = False
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clWindowText
       Font.Height = -11
       Font.Name = 'MS Sans Serif'
       Font.Style = []
       NumbersOnly = True
+      ParentCtl3D = False
       ParentFont = False
       TabOrder = 0
     end
@@ -909,14 +915,16 @@ object SettingsForm: TSettingsForm
     object edtTranslationFile: TEdit
       Tag = 5
       Left = 88
-      Top = 24
+      Top = 26
       Width = 361
-      Height = 21
+      Height = 19
+      Ctl3D = False
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clWindowText
       Font.Height = -11
       Font.Name = 'MS Sans Serif'
       Font.Style = []
+      ParentCtl3D = False
       ParentFont = False
       ParentShowHint = False
       ShowHint = True
@@ -1074,13 +1082,15 @@ object SettingsForm: TSettingsForm
       Left = 104
       Top = 21
       Width = 145
-      Height = 21
+      Height = 19
       TabStop = False
+      Ctl3D = False
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clWindowText
       Font.Height = -11
       Font.Name = 'MS Sans Serif'
       Font.Style = []
+      ParentCtl3D = False
       ParentFont = False
       ParentShowHint = False
       ReadOnly = True
@@ -1271,60 +1281,68 @@ object SettingsForm: TSettingsForm
       object edtMarginLeft: TEdit
         Tag = 5
         Left = 56
-        Top = 24
+        Top = 28
         Width = 25
-        Height = 21
+        Height = 19
+        Ctl3D = False
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
         Font.Height = -11
         Font.Name = 'MS Sans Serif'
         Font.Style = []
         NumbersOnly = True
+        ParentCtl3D = False
         ParentFont = False
         TabOrder = 0
       end
       object edtMarginRight: TEdit
         Tag = 5
         Left = 56
-        Top = 48
+        Top = 52
         Width = 25
-        Height = 21
+        Height = 19
+        Ctl3D = False
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
         Font.Height = -11
         Font.Name = 'MS Sans Serif'
         Font.Style = []
         NumbersOnly = True
+        ParentCtl3D = False
         ParentFont = False
         TabOrder = 1
       end
       object edtMarginTop: TEdit
         Tag = 5
         Left = 144
-        Top = 24
+        Top = 28
         Width = 25
-        Height = 21
+        Height = 19
+        Ctl3D = False
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
         Font.Height = -11
         Font.Name = 'MS Sans Serif'
         Font.Style = []
         NumbersOnly = True
+        ParentCtl3D = False
         ParentFont = False
         TabOrder = 2
       end
       object edtMarginBottom: TEdit
         Tag = 5
         Left = 144
-        Top = 48
+        Top = 52
         Width = 25
-        Height = 21
+        Height = 19
+        Ctl3D = False
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
         Font.Height = -11
         Font.Name = 'MS Sans Serif'
         Font.Style = []
         NumbersOnly = True
+        ParentCtl3D = False
         ParentFont = False
         TabOrder = 3
       end
diff --git a/Forms/Settings_Form.pas b/Forms/Settings_Form.pas
index a4ee3d0c..b0f66adb 100644
--- a/Forms/Settings_Form.pas
+++ b/Forms/Settings_Form.pas
@@ -168,12 +168,12 @@ procedure TSettingsForm.AfterTranslation(AList: TStringList);
    var w := TInfra.Scaled(Self, 449);
    lblFileEncoding.Left := cbFileEncoding.Left - lblFileEncoding.Width - 5;
    lblCompiler.Left := 7;
-   edtCompiler.Left := lblCompiler.Width + lblCompiler.Left + 5;
+   edtCompiler.Left := lblCompiler.Width + lblCompiler.Left + 6;
    edtCompiler.Width := w - edtCompiler.Left;
    lblCompilerNoMain.Left := 7;
-   edtCompilerNoMain.Left := lblCompilerNoMain.Width + lblCompilerNoMain.Left + 5;
+   edtCompilerNoMain.Left := lblCompilerNoMain.Width + lblCompilerNoMain.Left + 6;
    edtCompilerNoMain.Width := w - edtCompilerNoMain.Left;
-   edtTranslationFile.Left := lblFile.Width + lblFile.Left + 5;;
+   edtTranslationFile.Left := lblFile.Width + lblFile.Left + 6;
    edtTranslationFile.Width := w - edtTranslationFile.Left;
    var val := lblDesktop.Width;
    if val < lblSelectColor.Width then