diff --git a/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs b/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs
index 7f217917b..75e3fff23 100644
--- a/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs
+++ b/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs
@@ -94,7 +94,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 {
                     if (actor != null)
                         group.Panel.TooltipText = Surface.SurfaceUtils.GetVisualScriptTypeDescription(TypeUtils.GetObjectType(actor));
-                    const float settingsButtonSize = 20;
+                    float settingsButtonSize = group.Panel.HeaderHeight;
                     var settingsButton = new Image
                     {
                         TooltipText = "Settings",
diff --git a/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs b/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
index a02b84617..73a43f1bf 100644
--- a/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
+++ b/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
@@ -635,22 +635,22 @@ namespace FlaxEditor.CustomEditors.Dedicated
                     group.Panel.HeaderTextColor = FlaxEngine.GUI.Style.Current.ProgressNormal;
 
                 // Add toggle button to the group
+                var headerHeight = group.Panel.HeaderHeight;
                 var scriptToggle = new CheckBox
                 {
                     TooltipText = "If checked, script will be enabled.",
                     IsScrollable = false,
                     Checked = script.Enabled,
                     Parent = group.Panel,
-                    Size = new Float2(20, 20),
-                    Bounds = new Rectangle(20, 0, 20, 20),
-                    BoxSize = 16.0f,
+                    Size = new Float2(headerHeight),
+                    Bounds = new Rectangle(headerHeight, 0, headerHeight, headerHeight),
+                    BoxSize = headerHeight - 4.0f,
                     Tag = script,
                 };
                 scriptToggle.StateChanged += OnScriptToggleCheckChanged;
                 _scriptToggles[i] = scriptToggle;
 
                 // Add drag button to the group
-                const float dragIconSize = 20;
                 var scriptDrag = new ScriptDragIcon(this, script)
                 {
                     TooltipText = "Script reference",
@@ -658,21 +658,20 @@ namespace FlaxEditor.CustomEditors.Dedicated
                     IsScrollable = false,
                     Color = FlaxEngine.GUI.Style.Current.ForegroundGrey,
                     Parent = group.Panel,
-                    Bounds = new Rectangle(scriptToggle.Right, 0.5f, dragIconSize, dragIconSize),
+                    Bounds = new Rectangle(scriptToggle.Right, 0.5f, headerHeight, headerHeight),
                     Margin = new Margin(1),
                     Brush = new SpriteBrush(Editor.Instance.Icons.DragBar12),
                     Tag = script,
                 };
 
                 // Add settings button to the group
-                const float settingsButtonSize = 20;
                 var settingsButton = new Image
                 {
                     TooltipText = "Settings",
                     AutoFocus = true,
                     AnchorPreset = AnchorPresets.TopRight,
                     Parent = group.Panel,
-                    Bounds = new Rectangle(group.Panel.Width - settingsButtonSize, 0, settingsButtonSize, settingsButtonSize),
+                    Bounds = new Rectangle(group.Panel.Width - headerHeight, 0, headerHeight, headerHeight),
                     IsScrollable = false,
                     Color = FlaxEngine.GUI.Style.Current.ForegroundGrey,
                     Margin = new Margin(1),
diff --git a/Source/Editor/CustomEditors/Elements/Container/GroupElement.cs b/Source/Editor/CustomEditors/Elements/Container/GroupElement.cs
index 676dd99ae..e0ae259ec 100644
--- a/Source/Editor/CustomEditors/Elements/Container/GroupElement.cs
+++ b/Source/Editor/CustomEditors/Elements/Container/GroupElement.cs
@@ -19,7 +19,7 @@ namespace FlaxEditor.CustomEditors.Elements
             ArrowImageOpened = new SpriteBrush(Style.Current.ArrowDown),
             EnableDropDownIcon = true,
             ItemsMargin = new Margin(7, 7, 3, 3),
-            HeaderHeight = 20,
+            HeaderHeight = 18.0f,
             EnableContainmentLines = true,
         };