diff --git a/ide/frames/editor_mouseaction_options_advanced.lfm b/ide/frames/editor_mouseaction_options_advanced.lfm
index 7cb600acfe..51e4f870b5 100644
--- a/ide/frames/editor_mouseaction_options_advanced.lfm
+++ b/ide/frames/editor_mouseaction_options_advanced.lfm
@@ -43,13 +43,12 @@ object EditorMouseOptionsAdvFrame: TEditorMouseOptionsAdvFrame
     Align = alLeft
     AutoExpand = True
     Constraints.MinWidth = 50
-    DefaultItemHeight = 18
     ReadOnly = True
     ShowButtons = False
     ShowRoot = False
     TabOrder = 1
-    OnChange = ContextTreeChange
     Options = [tvoAutoExpand, tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoShowLines, tvoToolTips, tvoNoDoubleClickExpand, tvoThemedDraw]
+    OnChange = ContextTreeChange
   end
   object Splitter1: TSplitter
     Left = 130
@@ -65,6 +64,7 @@ object EditorMouseOptionsAdvFrame: TEditorMouseOptionsAdvFrame
     Width = 610
     AutoSize = True
     ButtonHeight = 46
+    ButtonWidth = 23
     Caption = 'ToolBar1'
     EdgeBorders = []
     ShowCaptions = True
@@ -83,8 +83,8 @@ object EditorMouseOptionsAdvFrame: TEditorMouseOptionsAdvFrame
     end
     object ToolButton3: TToolButton
       Left = 139
+      Height = 5
       Top = 0
-      Width = 5
       Caption = 'ToolButton3'
       Style = tbsDivider
     end
@@ -148,9 +148,9 @@ object EditorMouseOptionsAdvFrame: TEditorMouseOptionsAdvFrame
         AutoSize = True
         Caption = 'OtherActToggleBox'
         Checked = True
-        OnChange = OtherActToggleBoxChange
         State = cbChecked
         TabOrder = 0
+        OnChange = OtherActToggleBoxChange
       end
     end
     object OtherActionGrid: TStringGrid
@@ -194,13 +194,13 @@ object EditorMouseOptionsAdvFrame: TEditorMouseOptionsAdvFrame
     DefaultExt = '.xml'
     Filter = 'xml|*.xml|any|*.*'
     Options = [ofOverwritePrompt, ofPathMustExist, ofEnableSizing, ofViewDetail]
-    left = 24
-    top = 184
+    Left = 24
+    Top = 184
   end
   object OpenDialog1: TOpenDialog
     DefaultExt = '.xml'
     Options = [ofPathMustExist, ofFileMustExist, ofEnableSizing, ofViewDetail]
-    left = 72
-    top = 184
+    Left = 72
+    Top = 184
   end
 end
diff --git a/ide/frames/editor_mouseaction_options_advanced.pas b/ide/frames/editor_mouseaction_options_advanced.pas
index 28f98c8f1c..05d1a057f4 100644
--- a/ide/frames/editor_mouseaction_options_advanced.pas
+++ b/ide/frames/editor_mouseaction_options_advanced.pas
@@ -104,7 +104,7 @@ type
     FCurActions: TSynEditMouseActions;
 
     FSort, FOtherSort: Array [1..4] of Integer;
-    ChangeDlg: TMouseaActionDialog;
+    ChangeDlg: TMouseActionDialog;
 
     FColWidths: Array of Integer;
     FLastWidth: Integer;
@@ -598,7 +598,7 @@ end;
 constructor TEditorMouseOptionsAdvFrame.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);
-  ChangeDlg := TMouseaActionDialog.Create(self);
+  ChangeDlg := TMouseActionDialog.Create(self);
 end;
 
 destructor TEditorMouseOptionsAdvFrame.Destroy;
diff --git a/ide/mouseactiondialog.lfm b/ide/mouseactiondialog.lfm
index 1c0f4e6ad2..5a6c6f45f9 100644
--- a/ide/mouseactiondialog.lfm
+++ b/ide/mouseactiondialog.lfm
@@ -1,16 +1,16 @@
-object MouseaActionDialog: TMouseaActionDialog
+object MouseActionDialog: TMouseActionDialog
   Left = 412
   Height = 449
   Top = 225
   Width = 627
   BorderIcons = [biSystemMenu]
   BorderStyle = bsDialog
-  Caption = 'MouseaActionDialog'
+  Caption = 'MouseActionDialog'
   ClientHeight = 449
   ClientWidth = 627
-  OnCreate = FormCreate
   Position = poScreenCenter
-  LCLVersion = '2.1.0.0'
+  LCLVersion = '4.99.0.0'
+  OnCreate = FormCreate
   object BtnLabel: TLabel
     AnchorSideLeft.Control = Owner
     AnchorSideRight.Control = ActionLabel
@@ -83,6 +83,7 @@ object MouseaActionDialog: TMouseaActionDialog
     ClientHeight = 68
     ClientWidth = 368
     Color = clBtnShadow
+    ParentBackground = False
     ParentColor = False
     TabOrder = 13
     OnMouseDown = CapturePanelMouseDown
@@ -148,8 +149,8 @@ object MouseaActionDialog: TMouseaActionDialog
     AutoSize = True
     BorderSpacing.Top = 6
     Caption = 'BtnDefault'
-    OnClick = BtnDefaultClick
     TabOrder = 11
+    OnClick = BtnDefaultClick
   end
   object CaretCheck: TCheckBox
     AnchorSideLeft.Control = ActionBox
@@ -176,9 +177,9 @@ object MouseaActionDialog: TMouseaActionDialog
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Around = 6
     ItemHeight = 15
-    OnChange = ActionBoxChange
     Style = csDropDownList
     TabOrder = 0
+    OnChange = ActionBoxChange
   end
   object ButtonPanel1: TButtonPanel
     AnchorSideLeft.Control = Owner
@@ -283,9 +284,9 @@ object MouseaActionDialog: TMouseaActionDialog
     Width = 147
     Anchors = [akTop, akLeft, akRight]
     ItemHeight = 15
-    OnChange = ButtonBoxChange
     Style = csDropDownList
     TabOrder = 5
+    OnChange = ButtonBoxChange
   end
   object ClickBox: TComboBox
     AnchorSideLeft.Control = ButtonBox
@@ -313,7 +314,7 @@ object MouseaActionDialog: TMouseaActionDialog
     Width = 68
     BorderSpacing.Top = 6
     Caption = 'DirCheck'
-    OnChange = DirCheckChange
     TabOrder = 7
+    OnChange = DirCheckChange
   end
 end
diff --git a/ide/mouseactiondialog.pas b/ide/mouseactiondialog.pas
index fac1dcce9e..c3f43a883b 100644
--- a/ide/mouseactiondialog.pas
+++ b/ide/mouseactiondialog.pas
@@ -22,9 +22,9 @@ var
 
 type
 
-  { TMouseaActionDialog }
+  { TMouseActionDialog }
 
-  TMouseaActionDialog = class(TForm)
+  TMouseActionDialog = class(TForm)
     ActionBox: TComboBox;
     ActionLabel: TLabel;
     AltCheck: TCheckBox;
@@ -95,9 +95,9 @@ begin
   Result := -1;
 end;
 
-{ MouseaActionDialog }
+{ MouseActionDialog }
 
-procedure TMouseaActionDialog.AddMouseCmd(const S: string);
+procedure TMouseActionDialog.AddMouseCmd(const S: string);
 var
   i: Integer;
   s2: String;
@@ -112,7 +112,7 @@ begin
   end;
 end;
 
-procedure TMouseaActionDialog.FillListbox;
+procedure TMouseActionDialog.FillListbox;
 var
   r: TSynMAUpRestriction;
   s: string;
@@ -132,7 +132,7 @@ begin
     end;
 end;
 
-procedure TMouseaActionDialog.CreateHandle;
+procedure TMouseActionDialog.CreateHandle;
 const
   cCheckSize=35;
 var
@@ -149,7 +149,7 @@ begin
   end;
 end;
 
-procedure TMouseaActionDialog.FormCreate(Sender: TObject);
+procedure TMouseActionDialog.FormCreate(Sender: TObject);
 var
   mb: TSynMouseButton;
   cc: TSynMAClickCount;
@@ -200,7 +200,7 @@ begin
   OptBox.DropDownCount := EnvironmentOptions.DropDownCount;
 end;
 
-procedure TMouseaActionDialog.ResetInputs;
+procedure TMouseActionDialog.ResetInputs;
 var
   r: TSynMAUpRestriction;
 begin
@@ -218,20 +218,20 @@ begin
   OptBox.ItemIndex := 0;
 end;
 
-procedure TMouseaActionDialog.BtnDefaultClick(Sender: TObject);
+procedure TMouseActionDialog.BtnDefaultClick(Sender: TObject);
 begin
   ShiftCheck.State := cbGrayed;
   AltCheck.State := cbGrayed;
   CtrlCheck.State := cbGrayed;
 end;
 
-procedure TMouseaActionDialog.ButtonBoxChange(Sender: TObject);
+procedure TMouseActionDialog.ButtonBoxChange(Sender: TObject);
 begin
   DirCheck.Enabled := not(IndexToBtn[ButtonBox.ItemIndex] in [mbXWheelUp, mbXWheelDown, mbXWheelLeft, mbXWheelRight]);
   chkUpRestrict.Enabled := DirCheck.Enabled and DirCheck.Checked;
 end;
 
-procedure TMouseaActionDialog.ActionBoxChange(Sender: TObject);
+procedure TMouseActionDialog.ActionBoxChange(Sender: TObject);
 var
   ACmd: TSynEditorMouseCommand;
   i: Integer;
@@ -265,7 +265,7 @@ begin
   end;
 end;
 
-procedure TMouseaActionDialog.CapturePanelMouseDown(Sender: TObject;
+procedure TMouseActionDialog.CapturePanelMouseDown(Sender: TObject;
   Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
 begin
   ButtonBox.ItemIndex := BtnToIndex[SynMouseButtonMap[Button]];
@@ -278,12 +278,12 @@ begin
   CtrlCheck.Checked  := ssCtrl in Shift;
 end;
 
-procedure TMouseaActionDialog.DirCheckChange(Sender: TObject);
+procedure TMouseActionDialog.DirCheckChange(Sender: TObject);
 begin
   chkUpRestrict.Enabled := DirCheck.Checked;
 end;
 
-procedure TMouseaActionDialog.PaintBox1MouseWheel(Sender: TObject; Shift: TShiftState;
+procedure TMouseActionDialog.PaintBox1MouseWheel(Sender: TObject; Shift: TShiftState;
   WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
 begin
   if WheelDelta > 0
@@ -295,7 +295,7 @@ begin
   CtrlCheck.Checked  := ssCtrl in Shift;
 end;
 
-procedure TMouseaActionDialog.PaintBox1MouseWheelHorz(Sender: TObject;
+procedure TMouseActionDialog.PaintBox1MouseWheelHorz(Sender: TObject;
   Shift: TShiftState; WheelDelta: Integer; MousePos: TPoint;
   var Handled: Boolean);
 begin
@@ -308,7 +308,7 @@ begin
   CtrlCheck.Checked  := ssCtrl in Shift;
 end;
 
-procedure TMouseaActionDialog.ReadFromAction(MAct: TSynEditMouseAction);
+procedure TMouseActionDialog.ReadFromAction(MAct: TSynEditMouseAction);
 var
   r: TSynMAUpRestriction;
 begin
@@ -338,7 +338,7 @@ begin
   end;
 end;
 
-procedure TMouseaActionDialog.WriteToAction(MAct: TSynEditMouseAction);
+procedure TMouseActionDialog.WriteToAction(MAct: TSynEditMouseAction);
 var
   r: TSynMAUpRestriction;
 begin