diff --git a/components/onlinepackagemanager/opkman_categoriesfrm.lfm b/components/onlinepackagemanager/opkman_categoriesfrm.lfm
index fbc45171b6..90b78f2a63 100644
--- a/components/onlinepackagemanager/opkman_categoriesfrm.lfm
+++ b/components/onlinepackagemanager/opkman_categoriesfrm.lfm
@@ -2,11 +2,11 @@ object CategoriesFrm: TCategoriesFrm
   Left = 520
   Height = 383
   Top = 265
-  Width = 343
+  Width = 345
   BorderIcons = [biSystemMenu]
   Caption = 'CategoriesFrm'
   ClientHeight = 383
-  ClientWidth = 343
+  ClientWidth = 345
   KeyPreview = True
   OnClose = FormClose
   OnCreate = FormCreate
@@ -19,14 +19,14 @@ object CategoriesFrm: TCategoriesFrm
     Left = 0
     Height = 41
     Top = 342
-    Width = 343
+    Width = 345
     Align = alBottom
     BevelOuter = bvNone
     ClientHeight = 41
-    ClientWidth = 343
+    ClientWidth = 345
     TabOrder = 0
     object bOk: TButton
-      Left = 181
+      Left = 183
       Height = 26
       Top = 8
       Width = 75
@@ -37,7 +37,7 @@ object CategoriesFrm: TCategoriesFrm
       TabOrder = 1
     end
     object bCancel: TButton
-      Left = 258
+      Left = 260
       Height = 26
       Top = 8
       Width = 75
@@ -51,17 +51,17 @@ object CategoriesFrm: TCategoriesFrm
     Left = 0
     Height = 47
     Top = 0
-    Width = 343
+    Width = 345
     Align = alTop
     BevelOuter = bvNone
     ClientHeight = 47
-    ClientWidth = 343
+    ClientWidth = 345
     TabOrder = 1
     object lbMessage: TLabel
       Left = 11
       Height = 15
       Top = 11
-      Width = 321
+      Width = 323
       Anchors = [akTop, akLeft, akRight]
       Caption = 'lbMessage'
       ParentColor = False
diff --git a/components/onlinepackagemanager/opkman_createrepositorypackage.lfm b/components/onlinepackagemanager/opkman_createrepositorypackage.lfm
index ac7506bd91..9c8fe5b6f6 100644
--- a/components/onlinepackagemanager/opkman_createrepositorypackage.lfm
+++ b/components/onlinepackagemanager/opkman_createrepositorypackage.lfm
@@ -2,11 +2,11 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
   Left = 585
   Height = 475
   Top = 250
-  Width = 820
+  Width = 819
   BorderIcons = [biSystemMenu]
   Caption = 'CreateRepositoryPackagesFrm'
   ClientHeight = 475
-  ClientWidth = 820
+  ClientWidth = 819
   Color = clBtnFace
   Constraints.MinHeight = 450
   Constraints.MinWidth = 650
@@ -17,82 +17,83 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
   LCLVersion = '1.7'
   inline frCreateRep: TCreateRepositoryPackagefr
     Height = 475
-    Width = 820
+    Width = 819
     Align = alClient
     ClientHeight = 475
-    ClientWidth = 820
+    ClientWidth = 819
     inherited pnMessage: TPanel
       Height = 369
-      Width = 558
+      Width = 557
     end
     inherited pnPackages: TPanel
       Height = 369
     end
     inherited pnBrowse: TPanel
-      Width = 820
-      ClientWidth = 820
+      Width = 819
+      ClientWidth = 819
       inherited Bevel1: TBevel
-        Width = 820
+        Width = 819
       end
     end
     inherited pnData: TPanel
       Height = 369
-      Width = 558
+      Width = 557
       ClientHeight = 369
-      ClientWidth = 558
+      ClientWidth = 557
       inherited pnPackageData: TPanel
         Height = 177
-        Width = 558
+        Width = 557
         ClientHeight = 173
-        ClientWidth = 554
+        ClientWidth = 553
         inherited edSupportedWidgetset: TEdit
-          Width = 356
+          Width = 355
         end
         inherited edLazCompatibility: TEdit
-          Width = 357
-        end
-        inherited edFPCCompatibility: TEdit
           Width = 356
         end
+        inherited edFPCCompatibility: TEdit
+          Width = 355
+        end
         inherited lbOF1: TLabel
-          Left = 529
+          Left = 528
         end
         inherited lbOF3: TLabel
-          Left = 529
+          Left = 528
         end
         inherited lbOF4: TLabel
-          Left = 529
+          Left = 528
         end
       end
       inherited spMain1: TSplitter
-        Width = 558
+        Width = 557
       end
       inherited pnCategory: TPanel
-        Width = 558
-        ClientWidth = 554
+        Width = 557
+        ClientHeight = 185
+        ClientWidth = 553
         inherited lbOF2: TLabel
-          Left = 529
+          Left = 528
         end
         inherited edHomePageURL: TEdit
-          Width = 356
+          Width = 355
         end
         inherited edDownloadURL: TEdit
-          Width = 356
+          Width = 355
         end
         inherited edSVNURL: TEdit
-          Width = 356
+          Width = 355
         end
         inherited edDisplayName: TEdit
-          Width = 356
+          Width = 355
         end
         inherited pnCategories: TPanel
-          Width = 356
-          ClientWidth = 356
+          Width = 355
+          ClientWidth = 355
           inherited spCategories: TSpeedButton
-            Left = 326
+            Left = 325
           end
           inherited edCategories: TEdit
-            Width = 326
+            Width = 325
           end
         end
       end
@@ -102,13 +103,14 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
     end
     inherited pnButtons: TPanel
       Top = 434
-      Width = 820
-      ClientWidth = 816
+      Width = 819
+      ClientHeight = 37
+      ClientWidth = 815
       inherited bCreate: TButton
-        Left = 654
+        Left = 653
       end
       inherited bCancel: TButton
-        Left = 731
+        Left = 730
       end
     end
   end
diff --git a/components/onlinepackagemanager/opkman_mainfrm.lfm b/components/onlinepackagemanager/opkman_mainfrm.lfm
index a27bbb50a6..2347a212f0 100644
--- a/components/onlinepackagemanager/opkman_mainfrm.lfm
+++ b/components/onlinepackagemanager/opkman_mainfrm.lfm
@@ -2,14 +2,13 @@ object MainFrm: TMainFrm
   Left = 463
   Height = 600
   Top = 164
-  Width = 800
+  Width = 801
   Caption = 'Online Package Manager'
   ClientHeight = 600
-  ClientWidth = 800
+  ClientWidth = 801
   Color = clBtnFace
   Constraints.MinHeight = 400
   Constraints.MinWidth = 600
-  DesignTimeDPI = 96
   KeyPreview = True
   OnCreate = FormCreate
   OnDestroy = FormDestroy
@@ -21,11 +20,11 @@ object MainFrm: TMainFrm
     Left = 0
     Height = 530
     Top = 0
-    Width = 800
+    Width = 801
     Align = alClient
     BevelOuter = bvNone
     ClientHeight = 530
-    ClientWidth = 800
+    ClientWidth = 801
     TabOrder = 0
     OnResize = pnMainResize
     object pnMessage: TPanel
@@ -50,18 +49,18 @@ object MainFrm: TMainFrm
       Left = 0
       Height = 60
       Top = 0
-      Width = 800
+      Width = 801
       Align = alTop
       BevelOuter = bvNone
       ClientHeight = 60
-      ClientWidth = 800
+      ClientWidth = 801
       Color = clBtnFace
       ParentColor = False
       TabOrder = 0
       OnResize = pnTopResize
       object spExpand: TSpeedButton
         Tag = 1
-        Left = 752
+        Left = 753
         Height = 20
         Top = 13
         Width = 21
@@ -126,7 +125,7 @@ object MainFrm: TMainFrm
       end
       object spCollapse: TSpeedButton
         Tag = 2
-        Left = 774
+        Left = 775
         Height = 20
         Top = 13
         Width = 21
@@ -371,7 +370,7 @@ object MainFrm: TMainFrm
       Left = 0
       Height = 470
       Top = 60
-      Width = 800
+      Width = 801
       Align = alClient
       Color = clBtnFace
       PopupMenu = pmMemo
@@ -385,10 +384,10 @@ object MainFrm: TMainFrm
     Left = 0
     Height = 70
     Top = 530
-    Width = 800
+    Width = 801
     Align = alBottom
     ClientHeight = 70
-    ClientWidth = 800
+    ClientWidth = 801
     TabOrder = 1
     OnResize = pnToolBarResize
     object tbButtons: TToolBar
@@ -408,7 +407,7 @@ object MainFrm: TMainFrm
       TabOrder = 0
       Transparent = True
       object tbOptions: TToolButton
-        Left = 431
+        Left = 433
         Top = 0
         AutoSize = True
         Caption = 'Options'
@@ -466,7 +465,7 @@ object MainFrm: TMainFrm
         ImageIndex = 5
         ParentShowHint = False
         ShowHint = True
-        Style = tbsButtonDrop
+        Style = tbsDropDown
       end
       object tbUpdate: TToolButton
         Left = 211
diff --git a/components/onlinepackagemanager/opkman_mainfrm.pas b/components/onlinepackagemanager/opkman_mainfrm.pas
index 0dccecd96c..66aa23129a 100644
--- a/components/onlinepackagemanager/opkman_mainfrm.pas
+++ b/components/onlinepackagemanager/opkman_mainfrm.pas
@@ -123,7 +123,8 @@ var
 
 implementation
 
-uses opkman_serializablepackages, opkman_visualtree, opkman_const, opkman_common,
+uses LCLVersion,
+     opkman_serializablepackages, opkman_visualtree, opkman_const, opkman_common,
      opkman_progressfrm, opkman_zipper, opkman_packagelistfrm, opkman_options,
      opkman_optionsfrm, opkman_createrepositorypackage, opkman_updates;
 {$R *.lfm}
@@ -146,6 +147,9 @@ begin
   InstallPackageList := TObjectList.Create(True);
   FHintTimeOut := Application.HintHidePause;
   Application.HintHidePause := 1000000;
+ {$IF LCL_FULLVERSION >= 1070000}
+  tbCreate.Style := tbsButtonDrop;
+ {$ENDIF}
 end;
 
 procedure TMainFrm.FormDestroy(Sender: TObject);
diff --git a/components/onlinepackagemanager/opkman_progressfrm.lfm b/components/onlinepackagemanager/opkman_progressfrm.lfm
index 3e6d25f15f..dcfd7e8007 100644
--- a/components/onlinepackagemanager/opkman_progressfrm.lfm
+++ b/components/onlinepackagemanager/opkman_progressfrm.lfm
@@ -2,11 +2,11 @@ object ProgressFrm: TProgressFrm
   Left = 534
   Height = 284
   Top = 243
-  Width = 504
+  Width = 502
   BorderIcons = []
   Caption = 'Downloading packages'
   ClientHeight = 284
-  ClientWidth = 504
+  ClientWidth = 502
   Color = clBtnFace
   Constraints.MinHeight = 240
   Constraints.MinWidth = 450
@@ -24,11 +24,11 @@ object ProgressFrm: TProgressFrm
     Left = 0
     Height = 41
     Top = 243
-    Width = 504
+    Width = 502
     Align = alBottom
     BevelOuter = bvNone
     ClientHeight = 41
-    ClientWidth = 504
+    ClientWidth = 502
     TabOrder = 0
     object bCancel: TButton
       Left = 192
@@ -55,18 +55,18 @@ object ProgressFrm: TProgressFrm
     Left = 0
     Height = 243
     Top = 0
-    Width = 499
+    Width = 497
     Align = alClient
     BorderSpacing.Right = 5
     BevelOuter = bvNone
     ClientHeight = 243
-    ClientWidth = 499
+    ClientWidth = 497
     TabOrder = 1
     object lbPackageData: TLabel
       Left = 88
       Height = 1
       Top = 12
-      Width = 406
+      Width = 404
       Anchors = [akTop, akLeft, akRight]
       ParentColor = False
     end
@@ -74,7 +74,7 @@ object ProgressFrm: TProgressFrm
       Left = 88
       Height = 15
       Top = 34
-      Width = 406
+      Width = 404
       Anchors = [akTop, akLeft, akRight]
       Caption = 'Calculating. Please wait...'
       ParentColor = False
@@ -83,7 +83,7 @@ object ProgressFrm: TProgressFrm
       Left = 88
       Height = 1
       Top = 78
-      Width = 406
+      Width = 404
       Anchors = [akTop, akLeft, akRight]
       ParentColor = False
     end
@@ -91,7 +91,7 @@ object ProgressFrm: TProgressFrm
       Left = 88
       Height = 1
       Top = 56
-      Width = 406
+      Width = 404
       Anchors = [akTop, akLeft, akRight]
       ParentColor = False
     end
@@ -131,7 +131,7 @@ object ProgressFrm: TProgressFrm
       Left = 16
       Height = 20
       Top = 164
-      Width = 475
+      Width = 473
       Anchors = [akLeft, akRight, akBottom]
       TabOrder = 0
     end
@@ -139,7 +139,7 @@ object ProgressFrm: TProgressFrm
       Left = 16
       Height = 20
       Top = 208
-      Width = 475
+      Width = 473
       Anchors = [akLeft, akRight, akBottom]
       TabOrder = 1
     end