diff --git a/ide/ideoptionsdlg.lfm b/ide/ideoptionsdlg.lfm
index 9204cb5dd6..77d3706e24 100644
--- a/ide/ideoptionsdlg.lfm
+++ b/ide/ideoptionsdlg.lfm
@@ -3,7 +3,6 @@ object IDEOptionsDialog: TIDEOptionsDialog
   Height = 500
   Top = 202
   Width = 800
-  ActiveControl = FilterEdit
   BorderIcons = [biSystemMenu]
   Caption = 'IDEOptionsDialog'
   ClientHeight = 500
@@ -19,8 +18,8 @@ object IDEOptionsDialog: TIDEOptionsDialog
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = Owner
     Left = 6
-    Height = 38
-    Top = 456
+    Height = 36
+    Top = 458
     Width = 788
     BorderSpacing.Left = 6
     BorderSpacing.Right = 6
@@ -40,7 +39,7 @@ object IDEOptionsDialog: TIDEOptionsDialog
   end
   object CatTVSplitter: TSplitter
     Left = 255
-    Height = 456
+    Height = 458
     Top = 0
     Width = 4
   end
@@ -48,12 +47,12 @@ object IDEOptionsDialog: TIDEOptionsDialog
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
     Left = 0
-    Height = 456
+    Height = 458
     Top = 0
     Width = 255
     Align = alLeft
     BevelOuter = bvNone
-    ClientHeight = 456
+    ClientHeight = 458
     ClientWidth = 255
     Constraints.MinWidth = 150
     TabOrder = 2
@@ -65,12 +64,12 @@ object IDEOptionsDialog: TIDEOptionsDialog
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Control = SettingsPanel
       Left = 6
-      Height = 396
-      Top = 40
+      Height = 401
+      Top = 37
       Width = 249
       Anchors = [akTop, akLeft, akRight, akBottom]
       BorderSpacing.Top = 6
-      DefaultItemHeight = 22
+      DefaultItemHeight = 18
       ReadOnly = True
       TabOrder = 0
       OnChange = CategoryTreeChange
@@ -84,7 +83,7 @@ object IDEOptionsDialog: TIDEOptionsDialog
       AnchorSideTop.Control = CategoryPanel
       AnchorSideRight.Side = asrBottom
       Left = 6
-      Height = 28
+      Height = 25
       Top = 6
       Width = 249
       OnFilterItem = FilterEditFilterItem
@@ -102,7 +101,7 @@ object IDEOptionsDialog: TIDEOptionsDialog
     object SettingsPanel: TPanel
       Left = 0
       Height = 20
-      Top = 436
+      Top = 438
       Width = 255
       Align = alBottom
       AutoSize = True
@@ -131,12 +130,12 @@ object IDEOptionsDialog: TIDEOptionsDialog
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = UseBuildModeCheckBox
       AnchorSideTop.Side = asrCenter
-      Left = 126
-      Height = 28
+      Left = 112
+      Height = 29
       Top = 5
       Width = 154
       BorderSpacing.Left = 7
-      ItemHeight = 20
+      ItemHeight = 0
       OnSelect = BuildModeComboBoxSelect
       Style = csDropDownList
       TabOrder = 0
@@ -146,7 +145,7 @@ object IDEOptionsDialog: TIDEOptionsDialog
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = BuildModeComboBox
       AnchorSideTop.Side = asrCenter
-      Left = 291
+      Left = 277
       Height = 25
       Top = 7
       Width = 25
@@ -160,7 +159,7 @@ object IDEOptionsDialog: TIDEOptionsDialog
       Left = 12
       Height = 24
       Top = 7
-      Width = 107
+      Width = 93
       BorderSpacing.Left = 6
       Caption = 'Build modes'
       OnChange = UseBuildModeCheckBoxChange
@@ -168,19 +167,19 @@ object IDEOptionsDialog: TIDEOptionsDialog
       ShowHint = True
       TabOrder = 2
     end
-    object SupportUtf8RtlButton: TButton
+    object SetUtf8InRtlButton: TButton
       AnchorSideLeft.Control = BuildModeManageButton
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = BuildModeManageButton
       AnchorSideTop.Side = asrCenter
-      Left = 331
-      Height = 30
-      Top = 4
-      Width = 150
+      Left = 317
+      Height = 27
+      Top = 6
+      Width = 102
       AutoSize = True
       BorderSpacing.Left = 15
-      Caption = 'Support UTF-8 RTL'
-      OnClick = SupportUtf8RtlButtonClick
+      Caption = 'Set UTF-8 in RTL'
+      OnClick = SetUtf8InRtlButtonClick
       TabOrder = 3
     end
   end
@@ -193,7 +192,7 @@ object IDEOptionsDialog: TIDEOptionsDialog
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = ButtonPanel
     Left = 259
-    Height = 416
+    Height = 418
     Top = 40
     Width = 535
     HorzScrollBar.Page = 1
diff --git a/ide/ideoptionsdlg.pas b/ide/ideoptionsdlg.pas
index c24c83a0cc..7932c5870a 100644
--- a/ide/ideoptionsdlg.pas
+++ b/ide/ideoptionsdlg.pas
@@ -50,7 +50,7 @@ type
 
   TIDEOptionsDialog = class(TAbstractOptionsEditorDialog)
     BuildModeComboBox: TComboBox;
-    SupportUtf8RtlButton: TButton;
+    SetUtf8InRtlButton: TButton;
     UseBuildModeCheckBox: TCheckBox;
     BuildModeManageButton: TButton;
     BuildModeSelectPanel: TPanel;
@@ -61,7 +61,7 @@ type
     EditorsPanel: TScrollBox;
     FilterEdit: TTreeFilterEdit;
     SettingsPanel: TPanel;
-    procedure SupportUtf8RtlButtonClick(Sender: TObject);
+    procedure SetUtf8InRtlButtonClick(Sender: TObject);
     procedure UseBuildModeCheckBoxChange(Sender: TObject);
     procedure BuildModeComboBoxSelect(Sender: TObject);
     procedure BuildModeManageButtonClick(Sender: TObject);
@@ -139,7 +139,7 @@ begin
   SettingsPanel.Constraints.MinHeight:=0;
   SetBuildModeVisibility(False);
   UseBuildModeCheckBox.Caption:=lisBuildModes;
-  SupportUtf8RtlButton.Caption := lisSupportUTF8RTL;
+  SetUtf8InRtlButton.Caption := lisSetUTF8InRTL;
 
   IDEDialogLayoutList.ApplyLayout(Self, Width, Height);
   Caption := dlgIDEOptions;
@@ -232,11 +232,11 @@ begin
   OtherOptions:=TCompilerOtherOptionsFrame(FindEditor(TCompilerOtherOptionsFrame));
   ModeMatrix:=TCompOptModeMatrixFrame(FindEditor(TCompOptModeMatrixFrame));
   if Assigned(OtherOptions) and Assigned(ModeMatrix) then
-    SupportUtf8RtlButton.Enabled :=
+    SetUtf8InRtlButton.Enabled :=
       not (OtherOptions.HasSupportForUtf8Rtl and ModeMatrix.HasSupportForUtf8Rtl);
 end;
 
-procedure TIDEOptionsDialog.SupportUtf8RtlButtonClick(Sender: TObject);
+procedure TIDEOptionsDialog.SetUtf8InRtlButtonClick(Sender: TObject);
 var
   OtherOptions: TCompilerOtherOptionsFrame;
   ModeMatrix: TCompOptModeMatrixFrame;
@@ -249,15 +249,15 @@ begin
     // Make FPC default string UTF-8. Assign UTF-8 backends for Ansi...() functions etc.
     ModeMatrix.SupportUtf8Rtl;
     UpdateUtf8RtlButtonState;
-    ShowMessage('This build mode now has support for UTF-8 RTL.' + LineEnding
-      +' Flags are in pages "Other" and "Additions and Overrides".');
+    ShowMessage(Format(lisThisBuildModeNowSetsUTF8InTheRTLFlagsAreInPagesOth, [
+      LineEnding]));
   end;
 end;
 
 procedure TIDEOptionsDialog.BuildModeComboBoxSelect(Sender: TObject);
 begin
   if AllBuildModes then begin
-    ShowMessage('This will allow changing all build modes at once. Not implemented yet.');
+    ShowMessage(lisThisWillAllowChangingAllBuildModesAtOnceNotImpleme);
   end
   else begin
     Assert(BuildModeSelectPanel.Visible, 'BuildModeComboBoxSelect: BuildModeSelectPanel not Visible');
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index 3c146a61dd..546dec32b2 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -242,6 +242,11 @@ resourcestring
   lisMenuTools = '&Tools';
   lisMenuWindow = '&Window';
   lisMenuHelp = '&Help';
+  lisThisBuildModeNowSetsUTF8InTheRTLFlagsAreInPagesOth = 'This build mode now'
+    +' sets UTF-8 in the RTL.%s Flags are in pages "Other" and "Additions and '
+    +'Overrides".';
+  lisThisWillAllowChangingAllBuildModesAtOnceNotImpleme = 'This will allow '
+    +'changing all build modes at once. Not implemented yet.';
   
   lisMenuNewUnit = 'New Unit';
   lisMenuNewForm = 'New Form';
@@ -5420,7 +5425,6 @@ resourcestring
   lisConditionals = 'Conditionals';
   lisDlgAllOptions = 'All options ...';
   lisDlgDefines = 'Defines ...';
-  lisSupportUTF8RTL = 'Support UTF-8 RTL';
   lisWithIncludes2 = ', with includes ';
   lisParsed = ', parsed ';
   lisCreatingFileIndexOfFPCSources =
@@ -5431,6 +5435,7 @@ resourcestring
     +'not-found errors. This can take a minute.';
   lisActive = 'Active';
   lisBuildModes = 'Build modes';
+  lisSetUTF8InRTL = 'Set UTF-8 in RTL';
   lisInSession = 'In session';
   lisTheDefaultModeMustBeStoredInProject =
     'The default mode must be stored in project, not in session.';