From 55d8f6c18889ab9a1c35bd124a5b6a9947c76c76 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 7 Jul 2017 22:38:47 +0000
Subject: [PATCH] spktoolbar: Improved layout and image size selection in
 design editor windows.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5977 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../spktoolbar/SpkToolbar/spkt_Const.pas      |  10 +-
 .../designtime/spkte_AppearanceEditor.lfm     | 527 +++++++++++++-----
 .../designtime/spkte_AppearanceEditor.pas     | 221 +++++---
 .../designtime/spkte_EditWindow.lfm           |  24 +-
 .../designtime/spkte_EditWindow.pas           |   5 +-
 5 files changed, 533 insertions(+), 254 deletions(-)

diff --git a/components/spktoolbar/SpkToolbar/spkt_Const.pas b/components/spktoolbar/SpkToolbar/spkt_Const.pas
index 1d16b50b7..9c3716859 100644
--- a/components/spktoolbar/SpkToolbar/spkt_Const.pas
+++ b/components/spktoolbar/SpkToolbar/spkt_Const.pas
@@ -4,11 +4,11 @@ unit spkt_Const;
 
 (*******************************************************************************
 *                                                                              *
-*  Plik: spkt_Const.pas                                                        *
-*  Opis: Sta³e wykorzystywane do obliczania geometrii toolbara                 *
-*  Copyright: (c) 2009 by Spook.                                               *
-*  License:   Modified LGPL (with linking exception, like Lazarus LCL)         *
-'             See "license.txt" in this installation                           *
+*  File:        spkt_Const.pas                                                 *
+*  Description: Constants for calculation of toolbar geometry                  *
+*  Copyright:   (c) 2009 by Spook.                                             *
+*  License:     Modified LGPL (with linking exception, like Lazarus LCL)       *
+'               See "license.txt" in this installation                         *
 *                                                                              *
 *******************************************************************************)
 
diff --git a/components/spktoolbar/designtime/spkte_AppearanceEditor.lfm b/components/spktoolbar/designtime/spkte_AppearanceEditor.lfm
index e3404de52..ce3ba06c3 100644
--- a/components/spktoolbar/designtime/spkte_AppearanceEditor.lfm
+++ b/components/spktoolbar/designtime/spkte_AppearanceEditor.lfm
@@ -13,7 +13,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
   OnCreate = FormCreate
   OnShow = FormShow
   ShowHint = True
-  LCLVersion = '1.7'
+  LCLVersion = '1.9.0.0'
   object gbPreview: TGroupBox
     Left = 0
     Height = 132
@@ -176,7 +176,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
             Caption = 'Default'
             GroupBehaviour = gbSingleItem
             HideFrameWhenIdle = True
-            ImageIndex = 1
+            ImageIndex = 0
             ShowCaption = True
             TableBehaviour = tbBeginsRow
             ButtonKind = bkButton
@@ -187,7 +187,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
             Caption = 'Button and dropdown'
             GroupBehaviour = gbSingleItem
             HideFrameWhenIdle = True
-            ImageIndex = 1
+            ImageIndex = 0
             ShowCaption = True
             TableBehaviour = tbBeginsRow
             ButtonKind = bkButtonDropdown
@@ -198,7 +198,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
             Caption = 'Dropdown'
             GroupBehaviour = gbSingleItem
             HideFrameWhenIdle = True
-            ImageIndex = 1
+            ImageIndex = 0
             ShowCaption = True
             TableBehaviour = tbBeginsRow
             ButtonKind = bkDropdown
@@ -220,7 +220,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
             Caption = 'Button'
             GroupBehaviour = gbBeginsGroup
             HideFrameWhenIdle = False
-            ImageIndex = 1
+            ImageIndex = 0
             ShowCaption = False
             TableBehaviour = tbContinuesRow
             ButtonKind = bkButton
@@ -231,7 +231,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
             Caption = 'Button'
             GroupBehaviour = gbContinuesGroup
             HideFrameWhenIdle = False
-            ImageIndex = 1
+            ImageIndex = 0
             ShowCaption = False
             TableBehaviour = tbContinuesRow
             ButtonKind = bkButton
@@ -242,7 +242,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
             Caption = 'Button'
             GroupBehaviour = gbEndsGroup
             HideFrameWhenIdle = False
-            ImageIndex = 1
+            ImageIndex = 0
             ShowCaption = False
             TableBehaviour = tbContinuesRow
             ButtonKind = bkButton
@@ -253,7 +253,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
             Caption = 'Btn1'
             GroupBehaviour = gbSingleItem
             HideFrameWhenIdle = False
-            ImageIndex = 1
+            ImageIndex = 0
             ShowCaption = True
             TableBehaviour = tbBeginsRow
             ButtonKind = bkButton
@@ -264,7 +264,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
             Caption = 'Btn2'
             GroupBehaviour = gbSingleItem
             HideFrameWhenIdle = False
-            ImageIndex = 1
+            ImageIndex = 0
             ShowCaption = True
             TableBehaviour = tbContinuesRow
             ButtonKind = bkButton
@@ -324,7 +324,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
   end
   object PageControl1: TPageControl
     Left = 0
-    Height = 395
+    Height = 387
     Top = 132
     Width = 558
     ActivePage = TabSheet1
@@ -333,7 +333,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
     TabOrder = 1
     object TabSheet1: TTabSheet
       Caption = 'Tab'
-      ClientHeight = 367
+      ClientHeight = 359
       ClientWidth = 550
       object sTabRectangle: TShape
         AnchorSideLeft.Control = LblInactiveTabHeaderFontColor
@@ -344,7 +344,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = TabVSpacer
         AnchorSideBottom.Side = asrBottom
-        Left = 179
+        Left = 183
         Height = 133
         Top = 27
         Width = 141
@@ -358,7 +358,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideRight.Control = LblInactiveTabHeaderFontColor
         AnchorSideRight.Side = asrBottom
-        Left = 134
+        Left = 138
         Height = 15
         Top = 41
         Width = 33
@@ -371,7 +371,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideRight.Control = LblInactiveTabHeaderFontColor
         AnchorSideRight.Side = asrBottom
-        Left = 93
+        Left = 97
         Height = 15
         Top = 72
         Width = 74
@@ -384,7 +384,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideRight.Control = LblInactiveTabHeaderFontColor
         AnchorSideRight.Side = asrBottom
-        Left = 108
+        Left = 112
         Height = 15
         Top = 103
         Width = 59
@@ -397,7 +397,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideRight.Control = LblInactiveTabHeaderFontColor
         AnchorSideRight.Side = asrBottom
-        Left = 96
+        Left = 100
         Height = 15
         Top = 133
         Width = 71
@@ -410,7 +410,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideRight.Control = LblInactiveTabHeaderFontColor
         AnchorSideRight.Side = asrBottom
-        Left = 84
+        Left = 88
         Height = 15
         Top = 235
         Width = 83
@@ -422,7 +422,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideLeft.Control = cbLinkTab
         AnchorSideTop.Control = cbLinkTab
         AnchorSideTop.Side = asrBottom
-        Left = 187
+        Left = 191
         Height = 25
         Top = 36
         Width = 100
@@ -439,7 +439,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = pTabFrame
         AnchorSideRight.Side = asrBottom
-        Left = 187
+        Left = 191
         Height = 25
         Top = 67
         Width = 100
@@ -457,7 +457,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = pTabGradientFrom
         AnchorSideRight.Side = asrBottom
-        Left = 187
+        Left = 191
         Height = 25
         Top = 98
         Width = 100
@@ -475,7 +475,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = pTabGradientTo
         AnchorSideRight.Side = asrBottom
-        Left = 187
+        Left = 191
         Height = 23
         Top = 129
         Width = 100
@@ -500,7 +500,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = bInactiveTabHeaderFontColor
         AnchorSideRight.Side = asrBottom
-        Left = 187
+        Left = 191
         Height = 25
         Top = 230
         Width = 127
@@ -518,7 +518,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = cbTabGradientKind
         AnchorSideRight.Side = asrBottom
-        Left = 187
+        Left = 191
         Height = 25
         Top = 168
         Width = 100
@@ -534,7 +534,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideLeft.Control = LblInactiveTabHeaderFontColor
         AnchorSideLeft.Side = asrBottom
         AnchorSideTop.Control = TabSheet1
-        Left = 187
+        Left = 191
         Height = 19
         Top = 4
         Width = 169
@@ -549,7 +549,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideRight.Control = LblInactiveTabHeaderFontColor
         AnchorSideRight.Side = asrBottom
-        Left = 20
+        Left = 24
         Height = 15
         Top = 173
         Width = 147
@@ -561,11 +561,11 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideLeft.Control = TabSheet1
         AnchorSideTop.Control = pInactiveTabHeaderFont
         AnchorSideTop.Side = asrCenter
-        Left = 12
+        Left = 16
         Height = 15
         Top = 204
         Width = 155
-        BorderSpacing.Left = 12
+        BorderSpacing.Left = 16
         Caption = 'Inactive tab header font color'
         ParentColor = False
       end
@@ -575,7 +575,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = pActiveTabHeaderFont
         AnchorSideRight.Side = asrBottom
-        Left = 187
+        Left = 191
         Height = 25
         Top = 199
         Width = 100
@@ -596,7 +596,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideBottom.Control = pTabFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 289
+        Left = 293
         Height = 25
         Top = 36
         Width = 25
@@ -614,7 +614,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideBottom.Control = pTabFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 289
+        Left = 293
         Height = 25
         Top = 67
         Width = 25
@@ -631,7 +631,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideBottom.Control = pTabFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 289
+        Left = 293
         Height = 25
         Top = 98
         Width = 25
@@ -648,7 +648,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideBottom.Control = pTabFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 289
+        Left = 293
         Height = 25
         Top = 168
         Width = 25
@@ -665,7 +665,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideBottom.Control = pTabFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 289
+        Left = 293
         Height = 25
         Top = 199
         Width = 25
@@ -690,7 +690,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Control = pTabFrame
         AnchorSideBottom.Control = cbTabGradientKind
         AnchorSideBottom.Side = asrBottom
-        Left = 314
+        Left = 318
         Height = 116
         Top = 36
         Width = 6
@@ -700,7 +700,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
     end
     object TabSheet2: TTabSheet
       Caption = 'Pane'
-      ClientHeight = 367
+      ClientHeight = 359
       ClientWidth = 550
       ImageIndex = 1
       object Label8: TLabel
@@ -1187,7 +1187,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
     end
     object TabSheet3: TTabSheet
       Caption = 'Item'
-      ClientHeight = 367
+      ClientHeight = 359
       ClientWidth = 550
       ImageIndex = 2
       object sItemRectangle: TShape
@@ -1199,7 +1199,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = ItemVSpacer
         AnchorSideBottom.Side = asrBottom
-        Left = 108
+        Left = 112
         Height = 239
         Top = 27
         Width = 141
@@ -1213,7 +1213,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideRight.Control = LblLinkInnerLightColor
         AnchorSideRight.Side = asrBottom
-        Left = 63
+        Left = 67
         Height = 15
         Top = 55
         Width = 33
@@ -1226,7 +1226,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideRight.Control = LblLinkInnerLightColor
         AnchorSideRight.Side = asrBottom
-        Left = 22
+        Left = 26
         Height = 15
         Top = 86
         Width = 74
@@ -1239,7 +1239,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideRight.Control = LblLinkInnerLightColor
         AnchorSideRight.Side = asrBottom
-        Left = 37
+        Left = 41
         Height = 15
         Top = 117
         Width = 59
@@ -1252,7 +1252,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideRight.Control = LblLinkInnerLightColor
         AnchorSideRight.Side = asrBottom
-        Left = 25
+        Left = 29
         Height = 15
         Top = 147
         Width = 71
@@ -1265,7 +1265,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideRight.Control = LblLinkInnerLightColor
         AnchorSideRight.Side = asrBottom
-        Left = 47
+        Left = 51
         Height = 15
         Top = 278
         Width = 49
@@ -1278,7 +1278,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideLeft.Side = asrCenter
         AnchorSideTop.Control = cbLinkItem
         AnchorSideTop.Side = asrBottom
-        Left = 157
+        Left = 161
         Height = 15
         Top = 31
         Width = 19
@@ -1292,7 +1292,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideRight.Control = LblLinkInnerLightColor
         AnchorSideRight.Side = asrBottom
-        Left = 24
+        Left = 28
         Height = 15
         Top = 177
         Width = 72
@@ -1305,7 +1305,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideRight.Control = LblLinkInnerLightColor
         AnchorSideRight.Side = asrBottom
-        Left = 13
+        Left = 17
         Height = 15
         Top = 208
         Width = 83
@@ -1317,11 +1317,11 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideLeft.Control = TabSheet3
         AnchorSideTop.Control = pItemIdleInnerLight
         AnchorSideTop.Side = asrCenter
-        Left = 12
+        Left = 16
         Height = 15
         Top = 239
         Width = 84
-        BorderSpacing.Left = 12
+        BorderSpacing.Left = 16
         Caption = 'Inner light color'
         ParentColor = False
       end
@@ -1331,7 +1331,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Control = LblIdle
         AnchorSideBottom.Control = LblIdle
         AnchorSideBottom.Side = asrBottom
-        Left = 286
+        Left = 290
         Height = 15
         Top = 31
         Width = 46
@@ -1346,7 +1346,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Control = LblHotTrack
         AnchorSideBottom.Control = LblHotTrack
         AnchorSideBottom.Side = asrBottom
-        Left = 436
+        Left = 440
         Height = 15
         Top = 31
         Width = 33
@@ -1361,7 +1361,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = pItemIdleInnerLight
         AnchorSideRight.Side = asrBottom
-        Left = 116
+        Left = 120
         Height = 25
         Top = 273
         Width = 100
@@ -1380,7 +1380,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = pItemIdleGradientTo
         AnchorSideRight.Side = asrBottom
-        Left = 116
+        Left = 120
         Height = 23
         Top = 143
         Width = 100
@@ -1405,7 +1405,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = pItemIdleGradientFrom
         AnchorSideRight.Side = asrBottom
-        Left = 116
+        Left = 120
         Height = 25
         Top = 112
         Width = 100
@@ -1423,7 +1423,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = pItemIdleFrame
         AnchorSideRight.Side = asrBottom
-        Left = 116
+        Left = 120
         Height = 25
         Top = 81
         Width = 100
@@ -1439,7 +1439,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideLeft.Control = cbLinkItem
         AnchorSideTop.Control = LblIdle
         AnchorSideTop.Side = asrBottom
-        Left = 116
+        Left = 120
         Height = 25
         Top = 50
         Width = 100
@@ -1456,7 +1456,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = pItemIdleGradientTo
         AnchorSideRight.Side = asrBottom
-        Left = 116
+        Left = 120
         Height = 25
         Top = 172
         Width = 100
@@ -1474,7 +1474,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = pItemIdleCaptionColor
         AnchorSideRight.Side = asrBottom
-        Left = 116
+        Left = 120
         Height = 25
         Top = 203
         Width = 100
@@ -1492,7 +1492,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = pItemIdleInnerDark
         AnchorSideRight.Side = asrBottom
-        Left = 116
+        Left = 120
         Height = 25
         Top = 234
         Width = 100
@@ -1510,7 +1510,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = pItemHottrackGradientTo
         AnchorSideRight.Side = asrBottom
-        Left = 259
+        Left = 263
         Height = 23
         Top = 143
         Width = 100
@@ -1537,7 +1537,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = pItemIdleGradientTo
         AnchorSideBottom.Side = asrBottom
-        Left = 259
+        Left = 263
         Height = 25
         Top = 112
         Width = 100
@@ -1557,7 +1557,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = pItemIdleGradientFrom
         AnchorSideBottom.Side = asrBottom
-        Left = 259
+        Left = 263
         Height = 25
         Top = 81
         Width = 100
@@ -1575,7 +1575,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Control = pItemIdleFrame
         AnchorSideBottom.Control = pItemIdleFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 259
+        Left = 263
         Height = 25
         Top = 50
         Width = 100
@@ -1595,7 +1595,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = pItemIdleCaptionColor
         AnchorSideBottom.Side = asrBottom
-        Left = 259
+        Left = 263
         Height = 25
         Top = 172
         Width = 100
@@ -1615,7 +1615,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = pItemIdleInnerDark
         AnchorSideBottom.Side = asrBottom
-        Left = 259
+        Left = 263
         Height = 25
         Top = 203
         Width = 100
@@ -1635,7 +1635,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = pItemIdleInnerLight
         AnchorSideBottom.Side = asrBottom
-        Left = 259
+        Left = 263
         Height = 25
         Top = 234
         Width = 100
@@ -1653,7 +1653,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = pItemActiveGradientTo
         AnchorSideRight.Side = asrBottom
-        Left = 402
+        Left = 406
         Height = 23
         Top = 143
         Width = 100
@@ -1680,7 +1680,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = pItemHottrackGradientTo
         AnchorSideBottom.Side = asrBottom
-        Left = 402
+        Left = 406
         Height = 25
         Top = 112
         Width = 100
@@ -1700,7 +1700,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = pItemHottrackGradientFrom
         AnchorSideBottom.Side = asrBottom
-        Left = 402
+        Left = 406
         Height = 25
         Top = 81
         Width = 100
@@ -1718,7 +1718,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Control = pItemHottrackFrame
         AnchorSideBottom.Control = pItemHottrackFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 402
+        Left = 406
         Height = 25
         Top = 50
         Width = 100
@@ -1738,7 +1738,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = pItemHottrackCaptionColor
         AnchorSideBottom.Side = asrBottom
-        Left = 402
+        Left = 406
         Height = 25
         Top = 172
         Width = 100
@@ -1758,7 +1758,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = pItemHottrackInnerDark
         AnchorSideBottom.Side = asrBottom
-        Left = 402
+        Left = 406
         Height = 25
         Top = 203
         Width = 100
@@ -1778,7 +1778,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = pItemHottrackInnerLight
         AnchorSideBottom.Side = asrBottom
-        Left = 402
+        Left = 406
         Height = 25
         Top = 234
         Width = 100
@@ -1794,7 +1794,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideLeft.Control = LblLinkInnerLightColor
         AnchorSideLeft.Side = asrBottom
         AnchorSideTop.Control = TabSheet3
-        Left = 116
+        Left = 120
         Height = 19
         Top = 4
         Width = 140
@@ -1811,7 +1811,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideBottom.Control = pTabFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 218
+        Left = 222
         Height = 24
         Top = 50
         Width = 25
@@ -1828,7 +1828,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideBottom.Control = pTabFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 361
+        Left = 365
         Height = 24
         Top = 50
         Width = 25
@@ -1845,7 +1845,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideBottom.Control = pTabFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 504
+        Left = 508
         Height = 24
         Top = 50
         Width = 25
@@ -1863,7 +1863,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideBottom.Control = pTabFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 218
+        Left = 222
         Height = 24
         Top = 81
         Width = 25
@@ -1880,7 +1880,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideBottom.Control = pTabFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 361
+        Left = 365
         Height = 24
         Top = 81
         Width = 25
@@ -1897,7 +1897,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideBottom.Control = pTabFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 504
+        Left = 508
         Height = 24
         Top = 81
         Width = 25
@@ -1915,7 +1915,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideBottom.Control = pTabFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 218
+        Left = 222
         Height = 24
         Top = 112
         Width = 25
@@ -1932,7 +1932,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideBottom.Control = pTabFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 361
+        Left = 365
         Height = 24
         Top = 112
         Width = 25
@@ -1949,7 +1949,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideBottom.Control = pTabFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 504
+        Left = 508
         Height = 24
         Top = 112
         Width = 25
@@ -1967,7 +1967,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideBottom.Control = pTabFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 218
+        Left = 222
         Height = 24
         Top = 172
         Width = 25
@@ -1984,7 +1984,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideBottom.Control = pTabFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 218
+        Left = 222
         Height = 24
         Top = 203
         Width = 25
@@ -2001,7 +2001,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideBottom.Control = pTabFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 218
+        Left = 222
         Height = 24
         Top = 234
         Width = 25
@@ -2018,7 +2018,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideBottom.Control = pTabFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 361
+        Left = 365
         Height = 24
         Top = 172
         Width = 25
@@ -2035,7 +2035,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideBottom.Control = pTabFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 504
+        Left = 508
         Height = 24
         Top = 172
         Width = 25
@@ -2053,7 +2053,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideBottom.Control = pTabFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 361
+        Left = 365
         Height = 24
         Top = 203
         Width = 25
@@ -2070,7 +2070,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideBottom.Control = pTabFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 504
+        Left = 508
         Height = 24
         Top = 203
         Width = 25
@@ -2088,7 +2088,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideBottom.Control = pTabFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 361
+        Left = 365
         Height = 24
         Top = 234
         Width = 25
@@ -2105,7 +2105,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideBottom.Control = pTabFrame
         AnchorSideBottom.Side = asrBottom
-        Left = 504
+        Left = 508
         Height = 24
         Top = 234
         Width = 25
@@ -2122,7 +2122,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = pItemIdleGradientTo
         AnchorSideRight.Side = asrBottom
-        Left = 116
+        Left = 120
         Height = 23
         Top = 304
         Width = 100
@@ -2144,7 +2144,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideRight.Control = LblLinkInnerLightColor
         AnchorSideRight.Side = asrBottom
-        Left = 71
+        Left = 75
         Height = 15
         Top = 308
         Width = 25
@@ -2167,7 +2167,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Control = pItemIdleFrame
         AnchorSideBottom.Control = pItemIdleInnerLight
         AnchorSideBottom.Side = asrBottom
-        Left = 243
+        Left = 247
         Height = 209
         Top = 50
         Width = 6
@@ -2177,7 +2177,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
       object Label19: TLabel
         AnchorSideLeft.Control = edItemHotTrackBrightnessChange
         AnchorSideBottom.Control = edItemHotTrackBrightnessChange
-        Left = 259
+        Left = 263
         Height = 15
         Top = 285
         Width = 97
@@ -2193,7 +2193,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideTop.Side = asrCenter
         AnchorSideRight.Control = pItemHottrackInnerLight
         AnchorSideRight.Side = asrBottom
-        Left = 259
+        Left = 263
         Height = 23
         Top = 304
         Width = 100
@@ -2208,7 +2208,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideLeft.Side = asrBottom
         AnchorSideTop.Control = edItemHotTrackBrightnessChange
         AnchorSideTop.Side = asrCenter
-        Left = 363
+        Left = 367
         Height = 15
         Top = 308
         Width = 10
@@ -2219,7 +2219,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
     end
     object TabSheet4: TTabSheet
       Caption = 'Import / export'
-      ClientHeight = 343
+      ClientHeight = 359
       ClientWidth = 550
       ImageIndex = 3
       object bImport: TButton
@@ -2261,7 +2261,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
         AnchorSideBottom.Control = TabSheet4
         AnchorSideBottom.Side = asrBottom
         Left = 4
-        Height = 306
+        Height = 322
         Top = 33
         Width = 542
         Anchors = [akTop, akLeft, akRight, akBottom]
@@ -2309,7 +2309,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
     end
     object TabSheet5: TTabSheet
       Caption = 'Tools'
-      ClientHeight = 367
+      ClientHeight = 359
       ClientWidth = 550
       ImageIndex = 4
       object Label17: TLabel
@@ -2347,27 +2347,26 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
   end
   object ButtonPanel: TPanel
     Left = 8
-    Height = 25
-    Top = 535
+    Height = 33
+    Top = 527
     Width = 542
     Align = alBottom
     AutoSize = True
     BorderSpacing.Around = 8
     BevelOuter = bvNone
-    ClientHeight = 25
+    ClientHeight = 33
     ClientWidth = 542
     TabOrder = 2
     object bOK: TButton
-      AnchorSideTop.Control = ButtonPanel
+      AnchorSideTop.Control = bCancel
       AnchorSideRight.Control = bCancel
       AnchorSideBottom.Control = bCancel
       AnchorSideBottom.Side = asrBottom
       Left = 432
       Height = 25
-      Top = 0
+      Top = 4
       Width = 42
       Anchors = [akTop, akRight, akBottom]
-      AutoSize = True
       BorderSpacing.Right = 6
       Caption = 'OK'
       Default = True
@@ -2376,14 +2375,17 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
     end
     object bCancel: TButton
       AnchorSideTop.Control = ButtonPanel
+      AnchorSideTop.Side = asrCenter
       AnchorSideRight.Control = ButtonPanel
       AnchorSideRight.Side = asrBottom
       Left = 480
       Height = 25
-      Top = 0
+      Top = 4
       Width = 62
       Anchors = [akTop, akRight]
       AutoSize = True
+      BorderSpacing.Top = 10
+      BorderSpacing.Bottom = 4
       Cancel = True
       Caption = 'Cancel'
       ModalResult = 2
@@ -2396,7 +2398,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
       AnchorSideTop.Side = asrCenter
       Left = 30
       Height = 15
-      Top = 5
+      Top = 9
       Width = 38
       BorderSpacing.Left = 5
       Caption = 'LblRGB'
@@ -2405,15 +2407,14 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
     end
     object ColorView: TShape
       AnchorSideLeft.Control = ButtonPanel
-      AnchorSideTop.Control = bCancel
+      AnchorSideTop.Control = bOK
       AnchorSideBottom.Control = bCancel
       AnchorSideBottom.Side = asrBottom
       Left = 0
-      Height = 24
-      Top = 0
+      Height = 25
+      Top = 4
       Width = 25
       Anchors = [akTop, akLeft, akBottom]
-      BorderSpacing.Bottom = 1
       Visible = False
     end
   end
@@ -2442,7 +2443,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
       'ColorT=A4A0A0'
     )
     left = 280
-    top = 512
+    top = 504
   end
   object fdFontDialog: TFontDialog
     Font.Color = clWindowText
@@ -2451,51 +2452,273 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
     MinFontSize = 0
     MaxFontSize = 0
     left = 376
-    top = 512
+    top = 504
+  end
+  object Images_200: TImageList
+    Height = 32
+    Width = 32
+    left = 56
+    top = 464
+    Bitmap = {
+      4C69010000002000000020000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000006305171FF2E506FFF2E506FFF305272FF000000060000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000062D4E6DFFC7DEF2FFC2D7EAFFC1D6E8FFC3D8E9FF2D4E6EFF0000
+      0006000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00062D4E6DFFC2D9EFFF467FB4FF447DAEFF4278A7FF3B72A1FFBACEE1FF3153
+      72FF000000060000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000063152
+      72FFBCD5EDFF4680B4FF4A81B0FF4A7EABFF4679A6FF3C709DFFAEC5D6FF2F51
+      71FF000000110000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000112F50
+      70FFB1CCE4FF457DAFFF4A7EABFF477AA6FF4476A1FF396C97FFA8BFD1FF3051
+      71FF000000160000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000162D4E
+      6DFFACC5DDFF457BA9FF477AA6FF4476A1FF41729BFF386B93FFA3BCCDFF3253
+      73FF000000160000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000006305171FF305171FF0000000B2F506FFFA9C5
+      DFFF447AA9FF4579A5FF4476A1FF41729BFF3E6F96FF3A6B93FF335473FF0000
+      0037000000110000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000006305171FFC2DCF1FFBDD5EAFF264868FFA2C1DDFF447B
+      AAFF4579A6FF4476A2FF41749DFF3E7198FF3C6D94FF375775FF0000003D0000
+      001C000000060000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000112D5072FFB9D4EDFFDAE6F2FFB5CCDFFF366590FF4478
+      A6FF4476A2FF41749EFF375673FF385775FF385776FF0000003D0000001C0000
+      0006000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000165B5753FF224669FF4480B5FF3E76A7FFB2C7D8FF3763
+      8AFF3F739EFF375674FF0000004800000043000000370000001C000000060000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000006515151FFFFFFFFFFDDD6D0FF254869FF467DAEFF3C719DFFA5BC
+      CEFF2D4E6DFF0000003D00000022000000160000001100000006000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0006515151FFFFFFFFFFCCCAC8FFC4C2BFFFC5C0BAFF284B6DFF3E74A2FFABC2
+      D4FF99B3C7FF325473FF0000000B000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000065151
+      51FFFFFFFFFFCCCAC7FFC1C0BEFFB7B6B4FFB0ADAAFFAFA9A2FF2A4E70FF376D
+      99FF95B0C4FF335473FF00000011000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000006515151FFFFFF
+      FFFFCCCAC7FFC1C0BEFFB7B6B4FFADABA9FFA19F9DFFDBD9D6FF605B57FF3355
+      76FF345574FF0000003700000011000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000000000006515151FFFFFFFFFFCAC7
+      C6FFBFBEBCFFB5B4B3FFACAAA8FFA19F9DFFD6D5D3FF565656FF000000480000
+      0043000000370000001C00000006000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000006515356FFFFFFFFFFEAEDF4FFDFE2
+      EAFFCDD2D9FFBFC2CAFFB0B1B4FFD3D2D2FF565656FF0000003D000000220000
+      0016000000110000000600000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000006505459FFFFF4D2FFE3AA4CFFDDA13FFFD99A
+      30FFD79320FFD58908FFF6C46FFF54575AFF0000003D0000001C000000060000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000004535557B0FFF2CEFFE3AB50FFDDA549FFD99F3CFFD697
+      2CFFD38D15FFF2C475FF535861FF0000003D0000001C00000006000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000D52555BFFFFE8C2FFDCA343FFD99F3CFFD6972DFFD38D
+      16FFF1C371FF525862FF0000003D0000001C0000000600000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000148A7554FFFAE2BCFFD89C35FFD69529FFD38C15FFF1C1
+      6CFF535862FF0000003D0000001C000000060000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000650545CFFFFE6BAFFDB9D33FFDB9826FFEFC273FFF1BE65FF5358
+      63FF0000003D0000001C00000006000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000655595FFFFFE6B4FFDD9D31FFE09B26FF85704BFF535963FF4C4F54C30000
+      003B0000001C0000000600000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00114A5467FFFEDFACFFE49B21FF505968FF000000480000003F000000300000
+      0018000000060000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000000000001A66E
+      0E59D78B07FF766648FF545A65FF0000003D00000022000000140000000D0000
+      0004000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000000000007C68B
+      27B2D69526FFB9801EB70000003B0000001C0000000600000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000000000000000000000000000EE8C0
+      7FFFE7BC76FFE5AE58FF0000001D000000060000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000004BB7300B2F3DA
+      B2FFF1D6ABFFE7B66CFFBD7600B1000000040000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000DC77B00FFE6BC
+      76FFE4B971FFDCA243FFC77D00FF0000000D0000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000014C77D00FFD494
+      27FFD39224FFD59529FFC77D00FF000000140000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000001152370A53CC86
+      0EFACC870CFFCC860EFA52370A53000000110000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000000000000000000070000001E0000
+      003900000042000000390000001E000000070000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000001000000070000
+      0011000000160000001100000007000000010000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000
+    }
+  end
+  object Images_100: TImageList
+    left = 200
+    top = 464
+    Bitmap = {
+      4C69010000001000000010000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000032537266325372FF3253
+      72FF365675FF3253726600000000000000000000000000000000000000000000
+      00000000000000000000000000000000000000000000325372FFA7C5DBFFA4BD
+      D2FF8DAEC7E4365675FF00000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000002F4F6EFF9BB8D2FF346A
+      95FF96B0C4FF335473FF00000000000000000000000000000000000000000000
+      0000000000000000000035577699335372FF2F4F6DFF98B9D8FF4277A6FF3B70
+      9AFF8AA8BFFF335474FF00000000000000000000000000000000000000000000
+      00000000000000000000294D6FFF92B9DCFF93B8DAFF42729DFF477DABFF3554
+      72FF355574FF2640588500000000000000000000000000000000000000000000
+      000000000000535251FFF8F8F7E8306491FF457DADFF4C82B2FF365472FF0000
+      0033000000330000001400000000000000000000000000000000000000000000
+      0000535353FFFFFFFFFFC9C7C4FFA7A19B9E30618CFF4278A5FF375775FF0000
+      0000000000000000000000000000000000000000000000000000000000005252
+      53FFDEDEDCFFC5C4C2FFB5B4B3FFABA8A5FFD5CFC8D52F5272FF314E69AD0000
+      0000000000000000000000000000000000000000000000000000515357FFFEFF
+      FFFFE7EBF2FFD3D7DEFFC1C3C7FFDDDCDBFF595654FF000000330000001F0000
+      0000000000000000000000000000000000000000000057595BA8FFF1CCFFE1A5
+      43FFDA992FFFD78F14FFF3C169FF545659FF0000003300000000000000000000
+      0000000000000000000000000000000000000000000054575BFFFFE7BDFFD999
+      30FFD6921FFFF1C26FFF525861FF000000330000000000000000000000000000
+      0000000000000000000000000000000000000000000051545AFFFFE2AFFFEFC2
+      73FFF2C067FF525862FF00000033000000000000000000000000000000000000
+      00000000000000000000000000000000000054575BFFFFEAAEFF51555BFF5559
+      5FFF505358B90000003300000000000000000000000000000000000000000000
+      0000000000000000000000000000555659FFFFE8A8FF54575CFF000000330000
+      0033000000220000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000B3B2B1BF545659FF00000033000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000003300000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000
+    }
+  end
+  object Images_150: TImageList
+    Height = 24
+    Width = 24
+    left = 128
+    top = 464
+    Bitmap = {
+      4C69010000001800000018000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000003426180F240607DFF426280FF2E4D
+      6A42000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000005086BB010000000258738ED28EB4D7FF8CB2D3FF8BB0D0FE7590
+      ABFF2648676B0000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000426180F188B0D4FF4981B2FF487CAAFF386E9DFFABC4
+      D8FF26496AE50000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000003E5E7DFF83ACD0FF487DAAFF4679A4FF376B97FFA2BC
+      D0FF28496AE50000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000000000000406C9601000000001E40
+      62891B3C5C3113324E707593AFFF5F8EB7FF4578A4FF42739DFF396C95FE6686
+      A0FF213B54860000000200000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000264768C5B6D1
+      E7FF5F7D99F08FACC8FE4C81AFFF4377A4FF4276A0FF3E729AFF3B6589FF1B2D
+      3E6F0000001805090C0200000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000284764E2B0CB
+      E4FFC6DAEBFF4D779DFF4275A2FF4275A0FF365571EC36536FEB293F568C0000
+      0019000000020000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000C0D0F37AEA8A3F2697E
+      92FF256196FF789EBEFF6486A4FF294D6ECE0000003600000020000000140406
+      0803000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000858585010D0D0D129B9B9BFFDAD8D7FFC8C5
+      C1FF687B8DFF326A9AFFB5C9D8FF5C7A94FF1B32472700000002000000010000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000D0D0D12787878FFF0EFEDFEC0BFBDFFB3B2
+      B0FFBDB6ADFF415970FF3C6F99FF638098FF1A2E422B00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000F0F0E32999999FFEDEBEAFEBBBAB7FFB2B1AFFFA7A5
+      A3FFB2B1B0FF5E564EB2243F5AA415293C5E0000000D00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000838A92010E0F1312989BA0FFF2F7FFFFD9E0EDFFC3CCDAFFABAFB8FFC9C7
+      C6FF4A4A4AB30000002A000000180000000E0204050100000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000002030509767773FFFED68DFEDC9D35FFD89422FFD88B07FFECB85FFF3B42
+      4AD0000000180303030500000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000404651C6FFF6C5FFDA9E3BFFD89D39FFD6921EFFCAA460FF464B55B40000
+      00180C0C0D070000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000736247E1FFE5BBFFD49428FFD08811FFE6B867FF464B55B4000000240202
+      0306000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000010151B025155
+      5D9BEFD8AEFFD89420FFD6A551FFEABC6BFB39445BD100000018020303060000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000172B4F27A7A2
+      98FFF4AA2EFE8D754BFF424345A028324382000000170C0D0E07000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000AB700A65A97D
+      32FF6A665FFF040C18460000001C000000110203030400000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000D09635D2D495
+      2CEA2E19003B0505041300000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000009B520047F2D3A3FFEDC3
+      81FFB57A19790000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000000000000C27500DBEBC68AFFE4B4
+      67FFC98108FF0000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000000000000BF7700CFD39121FFD492
+      22FFC67E05F90000000400000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000400000A24A56C08A2A46B
+      08A63B290A3E0000000800000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000007000000160000
+      00180000000B0000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000
+    }
   end
   object LargeImages: TImageList
     Height = 32
     Width = 32
-    left = 112
-    top = 512
+    left = 56
+    top = 408
   end
   object SmallImages: TImageList
-    left = 192
-    top = 512
-    Bitmap = {
-      4C69010000001000000010000000000000000000000000000000000000000000
-      00000000000000000000000000000000000000000000000000005BA36C7380C4
-      97D986C99CD05AA96E4800000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000005EA16B8187D2A6FFA8E4
-      C1FF92DEB1FE65BB81FF50955B1E000000000000000000000000000000000000
-      0000000000000000000000000000437F49003674382185C39AFF82D0A2FF7ED3
-      A2FF6BC68DFF63B67EFF4F945A62000000000000000000000000000000000000
-      00000000000000000000000000003E713C3F5BA572F085CEA5FE6DC893FF6CC5
-      8FFF66BB81FF5AA56BFF49874D24000000000000000000000000000000000000
-      000000000000376C2D3F5F9B66E6699B74F54C8866FE6BC28FFF6CC28FFF65BA
-      83FE5DAC72FF4B8D528500000000000000000000000000000000000000000000
-      00001A4A112D285B25FFC3DBC8FE76BB8AFF6CBA87FF4C8564FF67BC86FE58A2
-      69FF468548560000000045864F00000000000000000000000000000000000000
-      0000154E15331E4C1DFF295227FF5D9363FF5AAA70FF60B07BFE4D845DFF3D77
-      394400000000000000000000000000000000000000000000000000000000ECEA
-      EA00FFFFFF1AA8B6A7FC124415FF91A592FF4A8850FF5FAE74FF457942AD0000
-      0000000000000000000000000000000000000000000000000000EAE8E800EFEB
-      EC15E6E4E4F8D2D0CFFEB2C1B2FCC6D2C8FF3C693DFF4F9359FF40783B790000
-      00000000000000000000000000000000000000000000EAE8E800EDEBEB0EE5E3
-      E4F3CBCAC7FEDDDFDBFEF2F0F1FF8E9E8FCA346B3BEF34662DA2000000000000
-      000000000000000000000000000000000000E8E6E600E9E6E607E7E3E4ECCCCB
-      C9FEDDDEDBFFEEEEEFFFBFBCBCD0000000000000000000000000346328000000
-      0000000000000000000000000000E3E0E000F0E9E903E6E5E5E5CDCACAFEDEDE
-      DCFFEDECECFEBDBABAD900000000B6B3B3000000000000000000000000000000
-      000000000000000000000000000000000000F0F0F0C1CECBCBFEE0DFDEFFEDED
-      EDFEBAB8B8E2B7B5B501B7B4B400000000000000000000000000000000000000
-      000000000000000000000000000000000000E4E2E2FFD9D6D6FFECEBEBFEBBB8
-      B8EBBBB6B606B8B5B50000000000000000000000000000000000000000000000
-      0000000000000000000000000000E8E7E79ACAC6C6FFBEBBBBFFB8B5B5DDC0BB
-      BB0DB9B6B6000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000B3B2B100BCB9B9CEACA9A91900000000B8B5
-      B500000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000
-    }
+    left = 128
+    top = 408
   end
 end
diff --git a/components/spktoolbar/designtime/spkte_AppearanceEditor.pas b/components/spktoolbar/designtime/spkte_AppearanceEditor.pas
index 8faf6f168..434d47bc8 100644
--- a/components/spktoolbar/designtime/spkte_AppearanceEditor.pas
+++ b/components/spktoolbar/designtime/spkte_AppearanceEditor.pas
@@ -15,6 +15,9 @@ type
   { TfrmAppearanceEditWindow }
 
   TfrmAppearanceEditWindow = class(TForm)
+    SmallImages: TImageList;
+    LargeImages: TImageList;
+    Images_150: TImageList;
     Label15: TLabel;
     Label16: TLabel;
     Label19: TLabel;
@@ -63,8 +66,8 @@ type
     Label27: TLabel;
     LblCaptionBackground1: TLabel;
     LblRGB: TLabel;
-    SmallImages: TImageList;
-    LargeImages: TImageList;
+    Images_100: TImageList;
+    Images_200: TImageList;
     Label18: TLabel;
     LblInactiveTabHeaderFontColor: TLabel;
     pInactiveTabHeaderFont: TPanel;
@@ -222,9 +225,9 @@ type
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure LbAppearanceStyleClick(Sender: TObject);
+
     procedure pActiveTabHeaderFontClick(Sender: TObject);
     procedure pInactiveTabHeaderFontClick(Sender: TObject);
-
     procedure pTabFrameClick(Sender: TObject);
     procedure pTabGradientFromClick(Sender: TObject);
     procedure pTabGradientToClick(Sender: TObject);
@@ -292,6 +295,10 @@ type
     procedure ScreenshotMouseUp(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: integer);
 
+  private
+    procedure PositionControls;
+    procedure UpdateImages;
+
   public
     property Appearance : TSpkToolbarAppearance read GetAppearance write SetAppearance;
   end;
@@ -304,7 +311,7 @@ implementation
 {$R *.lfm}
 
 uses
-  clipbrd, Spkt_Const;
+  Types, clipbrd, Spkt_Const;
 
 var
   CurrPageIndex: Integer = 0;
@@ -817,45 +824,9 @@ begin
 end;
 
 procedure TfrmAppearanceEditWindow.FormActivate(Sender: TObject);
-var
-  w, h: Integer;
 begin
-  ColorView.Width := ColorView.Height;
-
-  w := SpkScaleX(pTabFrame.Width, 96);
-  h := SpkScaleY(pTabFrame.Height, 96);
-
-  pTabFrame.Width := w;
-  pTabFrame.Height := h;
-  pTabGradientFrom.Height := h;
-  pTabGradientTo.Height := h;
-  pActiveTabHeaderFont.Height := h;
-  pInactiveTabHeaderFont.Height := h;
-  pTabHeaderFont.Height := h;
-
-  pPaneBorderDark.Width := w;
-  pPaneBorderDark.Height := h;
-  pPaneBorderLight.Height := h;
-  pPaneGradientFrom.Height := h;
-  pPaneGradientTo.Height := h;
-  pPaneCaptionBackground.Height := h;
-  pPaneCaptionFontColor.Height := h;
-  pPaneCaptionFont.Height := h;
-
-  pItemIdleFrame.Width := w;
-  pItemHotTrackFrame.Width := w;
-  pItemActiveFrame.Width := w;
-  pItemIdleFrame.Height := h;
-  pItemIdleGradientFrom.Height := h;
-  pItemIdleGradientTo.Height := h;
-  pItemIdleCaptionColor.Height := h;
-  pItemIdleInnerDark.Height := h;
-  pItemIdleInnerLight.Height := h;
-  pItemFont.Height := h;
-
-  Width := SpkScaleX(Width, 96);
-  Height := SpkScaleY(Height, 96);
-  Position := poScreenCenter;
+  UpdateImages;
+  PositionControls;
 end;
 
 procedure TfrmAppearanceEditWindow.FormCloseQuery(Sender: TObject;
@@ -866,46 +837,6 @@ end;
 
 procedure TfrmAppearanceEditWindow.FormCreate(Sender: TObject);
 begin
-  bOK.AutoSize := false;
-  bOK.Width := bCancel.Width;
-
-  LargeImages.AddIcon(Application.Icon);
-  SmallImages.AddIcon(Application.Icon);
-
-  SmallImages.GetBitmap(0, bTabFrameColor.Glyph);
-  SmallImages.GetBitmap(0, bTabGradientFromColor.Glyph);
-  SmallImages.GetBitmap(0, bTabGradientToColor.Glyph);
-  SmallImages.GetBitmap(0, bActiveTabHeaderFontColor.Glyph);
-  SmallImages.GetBitmap(0, bInactiveTabHeaderFontColor.Glyph);
-
-  SmallImages.GetBitmap(0, bPaneBorderDarkColor.Glyph);
-  SmallImages.GetBitmap(0, bPaneBorderLightColor.Glyph);
-  SmallImages.GetBitmap(0, bPaneGradientFromColor.Glyph);
-  SmallImages.GetBitmap(0, bPaneGradientToColor.Glyph);
-  SmallImages.GetBitmap(0, bPaneCaptionBackgroundColor.Glyph);
-  SmallImages.GetBitmap(0, bPaneCaptionFontColor.Glyph);
-
-  SmallImages.GetBitmap(0, bItemIdleCaptionColor.Glyph);
-  SmallImages.GetBitmap(0, bItemIdleFrameColor.Glyph);
-  SmallImages.GetBitmap(0, bItemIdleGradientFromColor.Glyph);
-  SmallImages.GetBitmap(0, bItemIdleGradientToColor.Glyph);
-  SmallImages.GetBitmap(0, bItemIdleInnerDarkColor.Glyph);
-  SmallImages.GetBitmap(0, bItemIdleInnerLightColor.Glyph);
-
-  SmallImages.GetBitmap(0, bItemHotTrackCaptionColor.Glyph);
-  SmallImages.GetBitmap(0, bItemHotTrackFrameColor.Glyph);
-  SmallImages.GetBitmap(0, bItemHotTrackGradientFromColor.Glyph);
-  SmallImages.GetBitmap(0, bItemHotTrackGradientToColor.Glyph);
-  SmallImages.GetBitmap(0, bItemHotTrackInnerDarkColor.Glyph);
-  SmallImages.GetBitmap(0, bItemHotTrackInnerLightColor.Glyph);
-
-  SmallImages.GetBitmap(0, bItemActiveCaptionColor.Glyph);
-  SmallImages.GetBitmap(0, bItemActiveFrameColor.Glyph);
-  SmallImages.GetBitmap(0, bItemActiveGradientFromColor.Glyph);
-  SmallImages.GetBitmap(0, bItemActiveGradientToColor.Glyph);
-  SmallImages.GetBitmap(0, bItemActiveInnerDarkColor.Glyph);
-  SmallImages.GetBitmap(0, bItemActiveInnerLightColor.Glyph);
-
   PageControl1.PageIndex := CurrPageIndex;
 end;
 
@@ -1384,6 +1315,132 @@ begin
   FScreenshotForm.ModalResult := mrOK;
 end;
 
+procedure TfrmAppearanceEditWindow.PositionControls;
+var
+  w, h, dist: Integer;
+begin
+  // Update layout of controls
+  bOK.AutoSize := false;
+  bOK.Width := bCancel.Width;
+
+  ColorView.Width := ColorView.Height;
+
+  h := CbTabGradientKind.Height;
+  w := SpkScaleX(pTabFrame.Width, 96);
+//  h := SpkScaleY(pTabFrame.Height, 96);
+
+  pTabFrame.Width := w;
+  pTabFrame.Height := h;
+  pTabGradientFrom.Height := h;
+  pTabGradientTo.Height := h;
+  pActiveTabHeaderFont.Height := h;
+  pInactiveTabHeaderFont.Height := h;
+  pTabHeaderFont.Height := h;
+
+  pPaneBorderDark.Width := w;
+  pPaneBorderDark.Height := h;
+  pPaneBorderLight.Height := h;
+  pPaneGradientFrom.Height := h;
+  pPaneGradientTo.Height := h;
+  pPaneCaptionBackground.Height := h;
+  pPaneCaptionFontColor.Height := h;
+  pPaneCaptionFont.Height := h;
+
+  pItemIdleFrame.Width := w;
+  pItemHotTrackFrame.Width := w;
+  pItemActiveFrame.Width := w;
+  pItemIdleFrame.Height := h;
+  pItemIdleGradientFrom.Height := h;
+  pItemIdleGradientTo.Height := h;
+  pItemIdleCaptionColor.Height := h;
+  pItemIdleInnerDark.Height := h;
+  pItemIdleInnerLight.Height := h;
+  pItemFont.Height := h;
+
+  // Adjust width and height
+  Width := SpkScaleX(Width, 96);
+  h := Height - TabSheet1.ClientHeight;
+  dist := pTabHeaderFont.Top - (pInactiveTabHeaderFont.Top + pInactiveTabHeaderFont.Height);
+  Height := cbPaneStyle.Top + cbPanestyle.Height + dist + h;
+  Position := poScreenCenter;
+end;
+
+procedure TfrmAppearanceEditWindow.UpdateImages;
+var
+  imglist: TImageList;
+  m: double;
+  ico: TIcon;
+  w, h: Integer;
+begin
+  // Use correct size of color picker icon
+  if Monitor.PixelsPerInch >= 180 then begin
+    imglist := Images_200;
+    m := 2.0;
+  end
+  else if Monitor.PixelsPerInch >= 135 then begin
+    imglist := Images_150;
+    m := 1.5;
+  end
+  else begin
+    imglist := Images_100;
+    m := 1.0;
+  end;
+
+  ico := TIcon.Create;
+  try
+    ico.Assign(Application.Icon);
+    w := round(LargeImages.Width * m);
+    h := round(LargeImages.Height * m);
+    ico.Current := ico.GetBestIndexForSize(Size(w, h));
+    LargeImages.Width := ico.Width;
+    LargeImages.Height := ico.Height;
+    LargeImages.AddIcon(ico);
+
+    w := round(SmallImages.Width * m);
+    h := round(SmallImages.Height * m);
+    ico.Current := ico.GetBestIndexForSize(Size(w, h));
+    SmallImages.Width := ico.Width;
+    SmallImages.Height := ico.Height;
+    SmallImages.AddIcon(ico);
+  finally
+    ico.Free;
+  end;
+
+  imglist.GetBitmap(0, bTabFrameColor.Glyph);
+  imglist.GetBitmap(0, bTabGradientFromColor.Glyph);
+  imglist.GetBitmap(0, bTabGradientToColor.Glyph);
+  imglist.GetBitmap(0, bActiveTabHeaderFontColor.Glyph);
+  imglist.GetBitmap(0, bInactiveTabHeaderFontColor.Glyph);
+
+  imglist.GetBitmap(0, bPaneBorderDarkColor.Glyph);
+  imglist.GetBitmap(0, bPaneBorderLightColor.Glyph);
+  imglist.GetBitmap(0, bPaneGradientFromColor.Glyph);
+  imglist.GetBitmap(0, bPaneGradientToColor.Glyph);
+  imglist.GetBitmap(0, bPaneCaptionBackgroundColor.Glyph);
+  imglist.GetBitmap(0, bPaneCaptionFontColor.Glyph);
+
+  imglist.GetBitmap(0, bItemIdleCaptionColor.Glyph);
+  imglist.GetBitmap(0, bItemIdleFrameColor.Glyph);
+  imglist.GetBitmap(0, bItemIdleGradientFromColor.Glyph);
+  imglist.GetBitmap(0, bItemIdleGradientToColor.Glyph);
+  imglist.GetBitmap(0, bItemIdleInnerDarkColor.Glyph);
+  imglist.GetBitmap(0, bItemIdleInnerLightColor.Glyph);
+
+  imglist.GetBitmap(0, bItemHotTrackCaptionColor.Glyph);
+  imglist.GetBitmap(0, bItemHotTrackFrameColor.Glyph);
+  imglist.GetBitmap(0, bItemHotTrackGradientFromColor.Glyph);
+  imglist.GetBitmap(0, bItemHotTrackGradientToColor.Glyph);
+  imglist.GetBitmap(0, bItemHotTrackInnerDarkColor.Glyph);
+  imglist.GetBitmap(0, bItemHotTrackInnerLightColor.Glyph);
+
+  imglist.GetBitmap(0, bItemActiveCaptionColor.Glyph);
+  imglist.GetBitmap(0, bItemActiveFrameColor.Glyph);
+  imglist.GetBitmap(0, bItemActiveGradientFromColor.Glyph);
+  imglist.GetBitmap(0, bItemActiveGradientToColor.Glyph);
+  imglist.GetBitmap(0, bItemActiveInnerDarkColor.Glyph);
+  imglist.GetBitmap(0, bItemActiveInnerLightColor.Glyph);
+end;
+
 end.
 
 
diff --git a/components/spktoolbar/designtime/spkte_EditWindow.lfm b/components/spktoolbar/designtime/spkte_EditWindow.lfm
index 3f533c4ad..a88ce5c44 100644
--- a/components/spktoolbar/designtime/spkte_EditWindow.lfm
+++ b/components/spktoolbar/designtime/spkte_EditWindow.lfm
@@ -18,11 +18,9 @@ object frmEditWindow: TfrmEditWindow
     Top = 24
     Width = 341
     Align = alClient
-    Font.Color = clWindowText
     HideSelection = False
     Images = ilTreeImages
     Indent = 19
-    ParentFont = False
     PopupMenu = pmStructure
     RightClickSelect = True
     TabOrder = 0
@@ -63,53 +61,53 @@ object frmEditWindow: TfrmEditWindow
       Top = 0
       Caption = 'ToolButton3'
       ImageIndex = 2
-      Style = tbsSeparator
+      Style = tbsDivider
     end
     object tbAddPane: TToolButton
-      Left = 60
+      Left = 57
       Top = 0
       Action = aAddPane
     end
     object tbRemovePane: TToolButton
-      Left = 84
+      Left = 81
       Top = 0
       Action = aRemovePane
     end
     object ToolButton6: TToolButton
-      Left = 108
+      Left = 105
       Height = 24
       Top = 0
       Caption = 'ToolButton6'
       ImageIndex = 4
-      Style = tbsSeparator
+      Style = tbsDivider
     end
     object tbAddItem: TToolButton
-      Left = 116
+      Left = 110
       Top = 0
       Action = aAddLargeButton
       DropdownMenu = pmAddItem
       Style = tbsDropDown
     end
     object tbRemoveItem: TToolButton
-      Left = 152
+      Left = 146
       Top = 0
       Action = aRemoveItem
     end
     object ToolButton9: TToolButton
-      Left = 176
+      Left = 170
       Height = 24
       Top = 0
       Caption = 'ToolButton9'
       ImageIndex = 6
-      Style = tbsSeparator
+      Style = tbsDivider
     end
     object tbMoveUp: TToolButton
-      Left = 184
+      Left = 175
       Top = 0
       Action = aMoveUp
     end
     object tbMoveDown: TToolButton
-      Left = 208
+      Left = 199
       Top = 0
       Action = aMoveDown
     end
diff --git a/components/spktoolbar/designtime/spkte_EditWindow.pas b/components/spktoolbar/designtime/spkte_EditWindow.pas
index 5a4176024..6a2e6b6e0 100644
--- a/components/spktoolbar/designtime/spkte_EditWindow.pas
+++ b/components/spktoolbar/designtime/spkte_EditWindow.pas
@@ -1157,6 +1157,7 @@ end;
 
 procedure TfrmEditWindow.UpdatePPI;
 begin
+  tbToolbar.Images := nil;
   if Monitor.PixelsPerInch >= 180 then begin
     ActionList.Images := ilActionImages_200;
     tbToolbar.Images := ilActionImages_200;
@@ -1171,8 +1172,8 @@ begin
     tbToolbar.Images := ilActionImages;
     tvStructure.Images := ilTreeImages;
   end;
-  tbToolbar.ButtonHeight := tbToolbar.Images.Height + 8;
-  tbToolbar.ButtonWidth := tbToolbar.Images.Width + 8;
+//  tbToolbar.ButtonHeight := tbToolbar.Images.Height + 8;
+//  tbToolbar.ButtonWidth := tbToolbar.Images.Width + 8;
 end;
 
 end.