diff --git a/packager/frames/package_i18n_options.lfm b/packager/frames/package_i18n_options.lfm
index 6da6a4a88d..7c0865cfc3 100644
--- a/packager/frames/package_i18n_options.lfm
+++ b/packager/frames/package_i18n_options.lfm
@@ -15,34 +15,36 @@ object PackageI18NOptionsFrame: TPackageI18NOptionsFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 96
-    Top = 25
+    Height = 126
+    Top = 28
     Width = 551
     Anchors = [akTop, akLeft, akRight]
     AutoSize = True
     BorderSpacing.Top = 6
     Caption = 'i18n Options'
-    ClientHeight = 76
+    ClientHeight = 96
     ClientWidth = 547
     TabOrder = 1
     object PoOutDirLabel: TLabel
       AnchorSideLeft.Control = I18NGroupBox
       AnchorSideTop.Control = I18NGroupBox
       Left = 6
-      Height = 15
+      Height = 18
       Top = 6
-      Width = 111
+      Width = 128
       BorderSpacing.Around = 6
       Caption = 'PO Output Directory:'
       ParentColor = False
     end
     object PoForFormsCheckBox: TCheckBox
-      AnchorSideLeft.Control = PoOutDirLabel
+      AnchorSideLeft.Control = I18NGroupBox
+      AnchorSideTop.Control = POOutDirEdit
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 19
-      Top = 57
-      Width = 136
+      Height = 22
+      Top = 68
+      Width = 162
+      BorderSpacing.Around = 6
       Caption = 'PoForFormsCheckBox'
       ParentShowHint = False
       ShowHint = True
@@ -54,8 +56,8 @@ object PackageI18NOptionsFrame: TPackageI18NOptionsFrame
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Side = asrBottom
       Left = 6
-      Height = 23
-      Top = 27
+      Height = 32
+      Top = 30
       Width = 536
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Around = 6
@@ -71,9 +73,9 @@ object PackageI18NOptionsFrame: TPackageI18NOptionsFrame
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
     Left = 0
-    Height = 19
+    Height = 22
     Top = 0
-    Width = 80
+    Width = 99
     Caption = 'Enable i18n'
     OnChange = EnableI18NCheckBoxChange
     TabOrder = 0
diff --git a/packager/frames/package_i18n_options.pas b/packager/frames/package_i18n_options.pas
index c029c39294..fe7736c6a4 100644
--- a/packager/frames/package_i18n_options.pas
+++ b/packager/frames/package_i18n_options.pas
@@ -10,8 +10,10 @@ uses
   FileUtil,
   // LCL
   Forms, StdCtrls, EditBtn,
+  // BuildIntf
+  IDEOptionsIntf,
   // IdeIntf
-  IDEOptionsIntf, IDEOptEditorIntf, IDEImagesIntf, IDEDialogs,
+  IDEOptEditorIntf, IDEImagesIntf, IDEDialogs,
   // IDE
   LazarusIDEStrConsts, PackageDefs;
 
@@ -52,8 +54,7 @@ procedure TPackageI18NOptionsFrame.POOutDirButtonClick(Sender: TObject);
 var
   NewDirectory: string;
 begin
-  NewDirectory := LazSelectDirectory(lisPOChoosePoFileDirectory,
-    FLazPackage.Directory);
+  NewDirectory := LazSelectDirectory(lisPOChoosePoFileDirectory, FLazPackage.Directory);
   if NewDirectory = '' then
     exit;
   FLazPackage.ShortenFilename(NewDirectory, True);
@@ -101,7 +102,6 @@ begin
 end;
 
 initialization
-  RegisterIDEOptionsEditor(GroupPackage, TPackageI18NOptionsFrame,
-    PackageOptionsI18N);
+  RegisterIDEOptionsEditor(GroupPackage, TPackageI18NOptionsFrame, PackageOptionsI18N);
 end.