diff --git a/components/onlinepackagemanager/opkman_colorsfrm.lfm b/components/onlinepackagemanager/opkman_colorsfrm.lfm
index e335a489e7..886d99f25c 100644
--- a/components/onlinepackagemanager/opkman_colorsfrm.lfm
+++ b/components/onlinepackagemanager/opkman_colorsfrm.lfm
@@ -2,24 +2,24 @@ object ColorsFrm: TColorsFrm
   Left = 549
   Height = 194
   Top = 321
-  Width = 366
+  Width = 372
   BorderIcons = [biSystemMenu]
   BorderStyle = bsDialog
   Caption = 'Colors'
   ClientHeight = 194
-  ClientWidth = 366
+  ClientWidth = 372
   OnCreate = FormCreate
   Position = poOwnerFormCenter
   LCLVersion = '1.9.0.0'
   object lbName: TLabel
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
-    Left = 50
+    Left = 85
     Height = 15
-    Top = 15
+    Top = 25
     Width = 32
-    BorderSpacing.Left = 50
-    BorderSpacing.Top = 15
+    BorderSpacing.Left = 85
+    BorderSpacing.Top = 25
     Caption = 'Name'
     ParentColor = False
   end
@@ -27,9 +27,9 @@ object ColorsFrm: TColorsFrm
     AnchorSideLeft.Control = lbName
     AnchorSideTop.Control = lbName
     AnchorSideTop.Side = asrBottom
-    Left = 50
+    Left = 85
     Height = 15
-    Top = 50
+    Top = 60
     Width = 60
     BorderSpacing.Top = 20
     Caption = 'Description'
@@ -39,9 +39,9 @@ object ColorsFrm: TColorsFrm
     AnchorSideLeft.Control = lbName
     AnchorSideTop.Control = lbDescription
     AnchorSideTop.Side = asrBottom
-    Left = 50
+    Left = 85
     Height = 15
-    Top = 85
+    Top = 95
     Width = 39
     BorderSpacing.Top = 20
     Caption = 'License'
@@ -52,10 +52,10 @@ object ColorsFrm: TColorsFrm
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = lbName
     AnchorSideTop.Side = asrCenter
-    Left = 132
+    Left = 167
     Height = 27
-    Top = 9
-    Width = 131
+    Top = 19
+    Width = 76
     BorderSpacing.Left = 50
     OnMouseUp = shNameMouseUp
   end
@@ -65,10 +65,10 @@ object ColorsFrm: TColorsFrm
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = lbDescription
     AnchorSideTop.Side = asrCenter
-    Left = 132
+    Left = 167
     Height = 27
-    Top = 44
-    Width = 131
+    Top = 54
+    Width = 76
     BorderSpacing.Left = 50
     OnMouseDown = shNameMouseUp
   end
@@ -78,10 +78,10 @@ object ColorsFrm: TColorsFrm
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = lbLicense
     AnchorSideTop.Side = asrCenter
-    Left = 132
+    Left = 167
     Height = 27
-    Top = 79
-    Width = 131
+    Top = 89
+    Width = 76
     BorderSpacing.Left = 50
     OnMouseDown = shNameMouseUp
   end
@@ -89,7 +89,7 @@ object ColorsFrm: TColorsFrm
     Left = 6
     Height = 34
     Top = 154
-    Width = 354
+    Width = 360
     OKButton.Name = 'OKButton'
     OKButton.DefaultCaption = True
     HelpButton.Name = 'HelpButton'
diff --git a/components/onlinepackagemanager/opkman_colorsfrm.pas b/components/onlinepackagemanager/opkman_colorsfrm.pas
index b5b4e663ef..43f8348d25 100644
--- a/components/onlinepackagemanager/opkman_colorsfrm.pas
+++ b/components/onlinepackagemanager/opkman_colorsfrm.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, ExtCtrls,
-  ButtonPanel;
+  ButtonPanel, Buttons;
 
 type
 
@@ -48,6 +48,8 @@ begin
   lbLicense.Caption := rsMainFrm_VSTText_License;
   CD.Title := rsColors_CD_Title;
   bp.HelpButton.Caption := rsOptions_bpOptions_bHelp;
+  bp.HelpButton.Kind := bkCustom;
+  bp.HelpButton.Glyph.Clear;
 end;
 
 procedure TColorsFrm.HelpButtonClick(Sender: TObject);
diff --git a/components/onlinepackagemanager/opkman_optionsfrm.pas b/components/onlinepackagemanager/opkman_optionsfrm.pas
index a0656b5ef3..881d447185 100644
--- a/components/onlinepackagemanager/opkman_optionsfrm.pas
+++ b/components/onlinepackagemanager/opkman_optionsfrm.pas
@@ -33,7 +33,7 @@ uses
   SysUtils, Math, Graphics, Classes,
   // LCL
   Forms, Controls, Dialogs, StdCtrls, ExtCtrls, Spin, ComCtrls, EditBtn, Menus,
-  ButtonPanel,
+  ButtonPanel, Buttons,
   // LazUtils
   LazFileUtils,
   // OpkMan
@@ -556,6 +556,8 @@ begin
   pnProfilesMain.Visible := Options.UserProfile = 1;
   bColors.Caption := rsOptions_bColors_Caption;
   bpOptions.HelpButton.Caption := rsOptions_bpOptions_bHelp;
+  bpOptions.HelpButton.Kind := bkCustom;
+  bpOptions.HelpButton.Glyph.Clear;
   SetupColors;
 end;