Merge branch 'darktoolbar'

Projects/CompForm.dfm

@@ -159,131 +159,140 @@ object CompileForm: TCompileForm
     OnDrawPanel = StatusBarDrawPanel
     OnResize = StatusBarResize
   end
-  object ToolBar: TToolBar
-    AlignWithMargins = True
-    Left = 7
-    Top = 4
-    Width = 351
-    Height = 25
-    Margins.Left = 7
-    Margins.Top = 4
-    Margins.Bottom = 0
-    Images = ToolBarVirtualImageList
-    ParentShowHint = False
-    ShowHint = True
+  object ToolBarPanel: TPanel
+    Left = 0
+    Top = 0
+    Width = 361
+    Height = 29
+    Align = alTop
+    BevelOuter = bvNone
     TabOrder = 2
-    Transparent = True
-    object NewButton: TToolButton
-      Left = 0
-      Top = 0
-      Hint = 'New (Ctrl+N)'
-      ImageIndex = 0
-      OnClick = FNewClick
-    end
-    object OpenButton: TToolButton
-      Left = 23
-      Top = 0
-      Hint = 'Open (Ctrl+O)'
-      ImageIndex = 1
-      OnClick = FOpenClick
-    end
-    object SaveButton: TToolButton
-      Left = 46
-      Top = 0
-      Hint = 'Save (Ctrl+S)'
-      ImageIndex = 2
-      OnClick = FSaveClick
-    end
-    object ToolButton4: TToolButton
-      Left = 69
-      Top = 0
-      Width = 8
-      Caption = 'ToolButton4'
-      Style = tbsSeparator
-    end
-    object CompileButton: TToolButton
-      Left = 77
-      Top = 0
-      Hint = 'Compile (Ctrl+F9)'
-      ImageIndex = 3
-      OnClick = BCompileClick
-    end
-    object StopCompileButton: TToolButton
-      Left = 100
-      Top = 0
-      Hint = 'Stop Compile (Esc)'
-      Enabled = False
-      ImageIndex = 4
-      OnClick = BStopCompileClick
-    end
-    object ToolButton7: TToolButton
-      Left = 123
-      Top = 0
-      Width = 8
-      Caption = 'ToolButton7'
-      Style = tbsSeparator
-    end
-    object RunButton: TToolButton
-      Left = 131
-      Top = 0
-      Hint = 'Run (F9)'
-      ImageIndex = 5
-      OnClick = RRunClick
-    end
-    object PauseButton: TToolButton
-      Left = 154
-      Top = 0
-      Hint = 'Pause'
-      Enabled = False
-      ImageIndex = 6
-      OnClick = RPauseClick
-    end
-    object TerminateButton: TToolButton
-      Left = 177
-      Top = 0
-      Hint = 'Terminate (Ctrl+F2)'
-      Enabled = False
-      ImageIndex = 10
-      OnClick = RTerminateClick
-    end
-    object ToolButton10: TToolButton
-      Left = 200
-      Top = 0
-      Width = 8
-      Caption = 'ToolButton10'
-      Style = tbsSeparator
-    end
-    object TargetSetupButton: TToolButton
-      Left = 208
-      Top = 0
-      Hint = 'Target Setup (Ctrl+Q)'
-      Grouped = True
-      ImageIndex = 7
-      Style = tbsCheck
-      OnClick = RTargetClick
-    end
-    object TargetUninstallButton: TToolButton
-      Left = 231
-      Top = 0
-      Hint = 'Target Uninstall (Ctrl+W)'
-      Grouped = True
-      ImageIndex = 8
-      Style = tbsCheck
-      OnClick = RTargetClick
-    end
-    object ToolButton13: TToolButton
-      Left = 254
-      Top = 0
-      Width = 8
-      Caption = 'ToolButton13'
-      Style = tbsSeparator
-    end
-    object HelpButton: TToolButton
-      Left = 262
-      Top = 0
-      Hint = 'Help (F1)'
-      ImageIndex = 9
-      OnClick = HDocClick
+    object ToolBar: TToolBar
+      AlignWithMargins = True
+      Left = 7
+      Top = 4
+      Width = 351
+      Height = 25
+      Margins.Left = 7
+      Margins.Top = 4
+      Margins.Bottom = 0
+      Images = ToolBarVirtualImageList
+      ParentShowHint = False
+      ShowHint = True
+      TabOrder = 0
+      Transparent = True
+      object NewButton: TToolButton
+        Left = 0
+        Top = 0
+        Hint = 'New (Ctrl+N)'
+        ImageIndex = 0
+        OnClick = FNewClick
+      end
+      object OpenButton: TToolButton
+        Left = 23
+        Top = 0
+        Hint = 'Open (Ctrl+O)'
+        ImageIndex = 1
+        OnClick = FOpenClick
+      end
+      object SaveButton: TToolButton
+        Left = 46
+        Top = 0
+        Hint = 'Save (Ctrl+S)'
+        ImageIndex = 2
+        OnClick = FSaveClick
+      end
+      object ToolButton4: TToolButton
+        Left = 69
+        Top = 0
+        Width = 8
+        Caption = 'ToolButton4'
+        Style = tbsSeparator
+      end
+      object CompileButton: TToolButton
+        Left = 77
+        Top = 0
+        Hint = 'Compile (Ctrl+F9)'
+        ImageIndex = 3
+        OnClick = BCompileClick
+      end
+      object StopCompileButton: TToolButton
+        Left = 100
+        Top = 0
+        Hint = 'Stop Compile (Esc)'
+        Enabled = False
+        ImageIndex = 4
+        OnClick = BStopCompileClick
+      end
+      object ToolButton7: TToolButton
+        Left = 123
+        Top = 0
+        Width = 8
+        Caption = 'ToolButton7'
+        Style = tbsSeparator
+      end
+      object RunButton: TToolButton
+        Left = 131
+        Top = 0
+        Hint = 'Run (F9)'
+        ImageIndex = 5
+        OnClick = RRunClick
+      end
+      object PauseButton: TToolButton
+        Left = 154
+        Top = 0
+        Hint = 'Pause'
+        Enabled = False
+        ImageIndex = 6
+        OnClick = RPauseClick
+      end
+      object TerminateButton: TToolButton
+        Left = 177
+        Top = 0
+        Hint = 'Terminate (Ctrl+F2)'
+        Enabled = False
+        ImageIndex = 10
+        OnClick = RTerminateClick
+      end
+      object ToolButton10: TToolButton
+        Left = 200
+        Top = 0
+        Width = 8
+        Caption = 'ToolButton10'
+        Style = tbsSeparator
+      end
+      object TargetSetupButton: TToolButton
+        Left = 208
+        Top = 0
+        Hint = 'Target Setup (Ctrl+Q)'
+        Grouped = True
+        ImageIndex = 7
+        Style = tbsCheck
+        OnClick = RTargetClick
+      end
+      object TargetUninstallButton: TToolButton
+        Left = 231
+        Top = 0
+        Hint = 'Target Uninstall (Ctrl+W)'
+        Grouped = True
+        ImageIndex = 8
+        Style = tbsCheck
+        OnClick = RTargetClick
+      end
+      object ToolButton13: TToolButton
+        Left = 254
+        Top = 0
+        Width = 8
+        Caption = 'ToolButton13'
+        Style = tbsSeparator
+      end
+      object HelpButton: TToolButton
+        Left = 262
+        Top = 0
+        Hint = 'Help (F1)'
+        ImageIndex = 9
+        OnClick = HDocClick
+      end
     end
   end
   object MainMenu1: TMainMenu
@@ -968,7 +977,7 @@ object CompileForm: TCompileForm
       0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000000000000000000000000000}
   end
-  object ToolBarImageCollection: TImageCollection
+  object LightToolBarImageCollection: TImageCollection
     Images = <
       item
         Name = 'NewFile'
@@ -1571,8 +1580,538 @@ object CompileForm: TCompileForm
         Disabled = False
         Name = 'Stop'
       end>
-    ImageCollection = ToolBarImageCollection
+    ImageCollection = LightToolBarImageCollection
     Left = 272
     Top = 80
   end
+  object DarkToolBarImageCollection: TImageCollection
+    Images = <
+      item
+        Name = 'NewFile'
+        SourceImages = <
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+              61000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              00097048597300000EC300000EC301C76FA864000000C149444154384F636440
+              02FFFFFF87B288074C2002A411A6F9E3E9A9249902360004D035126B1013CCE6
+              05F3E7C2358168109F18C0083200D936DBE4390C87E7A640790C0CFCA6D928E1
+              840EC006C000BA41309090100B653130141515A11A080BC00FA7A6002908ADAB
+              6BF01F461B1A9AC2F1F1E3C7FFF7F6F682D5C1303C10D19D8AEC0264606565C5
+              D0D7D70777298A1790C1891327FE6765E54179A860DAB4490C161616600BE12E
+              20170C0303F00622948915C00211A701C4020ABDC0C00000E62A772CD32335F7
+              0000000049454E44AE426082}
+          end
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D49484452000000280000002808060000008CFEB8
+              6D000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              00097048597300000EC400000EC401952B0E1B000001FC494441545847ED983D
+              48C34014802F5271119C05712CD2CD41AD010717515741DC1CEA505AE8D0CD41
+              A438B87528B442B1433717577573106251D0AD388BE02CB83845DFF5AE4D93FB
+              8B772711F2C171976B12BEBEBBF792D6F17D1F259909D22796C40BC65AE28FC7
+              E6F0E499A5B2438656F99F4BBCBF9DF3AF4F967DE8C9949497CB32BE861C1A23
+              2208528D5A19B99BFB686F751A1F938FB880DCEC7C0E5F635A32227858582723
+              A42449E56C11115CD8693AEFAF7D7224960CCB79375DB475F4603479987B9027
+              19E4A9B5615D0E109619D5E5B3250730234839EDDCA2602459D8940386110C16
+              611E6B85733242E8AE7340467CE8F9EDF619EE299EE7E1BE5AAD4ABF983082B6
+              705D17F7F57A5D1A943F112C952AC3460149683249E9B3589628B0072FEE3FD1
+              F3DB14991927939924A301AD56838C46C092F3965B1841952CA6256871EE8BCC
+              8C08CBF11045922BC82AC24158759225A90A4F9229A8F284E015735DC9301141
+              15398A0DC9309124A16F3340588EF7C21AFC5220BC5B1BD439D53D08D0E4C9E7
+              F363C18844B07BD5772AC74D61E482148B451F8440ECB77222987B1024551F5F
+              D96CF667EFAC6031D37200378B55818D0D9220459B496209C2BEA38D4C6158D9
+              670AED08DA2615D42515D42515D42515D425D6DF6F2C7ABD9EDE0D4248DF66E2
+              427F429A80752FED08DA264D125D122E88D0371BDDFBFAFD63D9B10000000049
+              454E44AE426082}
+          end>
+      end
+      item
+        Name = 'OpenFolder'
+        SourceImages = <
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+              61000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              00097048597300000EC200000EC20115284A800000015749444154384F63FCFF
+              FF3F032580094AC341EEF29BFFAB0F31FC0FEDDE4D94C91806EC9F98CDF0E9E9
+              4D0635735706620C017BC13CAEE1BF7D5431032B172F5418018EAE9FCD70A03F
+              9511CAC5006003CA767CFE7FFFF209866B3B663330BFBECDA01EDB057601C825
+              07DB231856D55B4195A3028DE0A98C2C2006C8E67B27B6A368BE757237C3CDC5
+              65608551ADA7C1343258566D0AA6C161F0FBDB6706250B4F86BFA2AA604D9B73
+              0CE19A595858C1342E003660EFEC7A06455D0B8680FA55604110006924A41904
+              202EB8BD9F6147991DD8665201D8804B97CE33AEA83585DB4A8CCD30008E85AB
+              CBE2FF33B3F34085B0837FFF7E33D44C3BC5F0E0231B980F0A44502C805DF0E8
+              EE75B0203EC0C4C4CA50EC87994EC006AC38FE05CC210484E5F418EC54FE4279
+              10003660E1B66B8CDFDE3E000B1002495ECA501604800D0081ED271F4359F801
+              1BAF2843BE2B226553989D1918006239787DD39204EC0000000049454E44AE42
+              6082}
+          end
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D4948445200000020000000200806000000737A7A
+              F4000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              00097048597300000EC200000EC20115284A80000001F049444154584763FCFF
+              FF3FC3400226283D60806008E42EBFF99F4F5A1DCA6360B8757237C3EA525746
+              2897624030042647AA337E7A7A13CA63605033776508EDDE4DB578232A0A68E9
+              08A2D300AD1C8191068C838BFE3BA73632B072F14245F0034AD3044A0894EDF8
+              FCDF23BF8F68CB41E0F5B307501679001E02209F832C070190AFAEED98CDC0FC
+              FA36980F03EAB15DE0A087015094EC9F98CDC0F4ED2D4367282B83A296295406
+              3FB87FED348367ED2970A8C11D00F23DC8E720CB6F2E2E038B21036A590E031A
+              C153110ED0B170F9EFDFB5072CB1A1318CA0CFD11DC9C2C20A651106CBAA210E
+              853980602EA0A6E5D800D151800EC8B5186708EC9D5D0FA641BE05F9FAAFA82A
+              988F0D50EA6B6480520EC04201196CCE3104D3D4B2146F1AE8F2E065DC31B188
+              E1F7B7CF5011DA03941000013D3D43540128A04B088000284F2FAFD083F2680F
+              301C002A5098D979C03E46C6B40204CB015A03781AB8BA2CFE3FC8E7D402ED73
+              F7335C7E81691ECE34F0E8EE75288B3A20C29238CFC01DB0E2F817288B3A0094
+              967425089B0977C0C26DD71841D524350128140839022511D22214CA6220718E
+              0BA03800140A7F7F52D711A0848D2F14501C0002D44E8C20802F41623880DAD1
+              0002F81224860368911841005782C4700008D02A14605181EC418CDA90DE006B
+              08D00F30300000DC7CE08F416015D30000000049454E44AE426082}
+          end>
+      end
+      item
+        Name = 'Save'
+        SourceImages = <
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+              61000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              00097048597300000EC200000EC20115284A800000007049444154384F63FCFF
+              FF3F032580094A930DC8368091911142C3BC507D8801EE97ED056650160383E7
+              8453601A240662DF3AB99B6175A92B44371090EC0235735786D0EEDD70CBC8F2
+              02C81018206800C8E9C85E420714C702D6402406B4DA3180039262178C1A4005
+              0328CCCE0C0C00223021AC22B58C540000000049454E44AE426082}
+          end
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D4948445200000018000000180806000000E0773D
+              F8000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              00097048597300000EC000000EC0016AD689090000007D49444154484B63FCFF
+              FF3F032D011394A61918B580204089E4EA430C2831BEBDC00CCA4200CF09A7A0
+              2C843C48ECD6C9DD0CAB4B5D19C10248806A3E5033776508EDDE8D9124A91A44
+              D82CA17A1C802C4106245B000A77182606D03C150D7D0BF0E6037241AB1D033C
+              3F8CC60141306A0141306A014140E3660B030300FC9C26523C057FE400000000
+              49454E44AE426082}
+          end
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D4948445200000020000000200806000000737A7A
+              F4000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              00097048597300001D8500001D8501F01B32EC0000008E49444154584763FCFF
+              FF3FC3400226283D6060D401A30EC0C805D58718B0668BED056650162AF09C70
+              0ACA8200983A98F8AD93BB195697BA3282395800CD4340CDDC9521B47B37CEBC
+              4E9728C0E708BAA5015C8EA06B220439021D0CFD5C800BA0E70E1868B56340C9
+              11031E02A30E203A0D500B8CA6017430EA8051078C3A60D401A30E1870078CF4
+              DE310303005F272E8324BA612D0000000049454E44AE426082}
+          end>
+      end
+      item
+        Name = 'BuildSolution'
+        SourceImages = <
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+              61000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              00097048597300000EC200000EC20115284A80000000C049444154384FC593CB
+              0D83300C404D8FACC202CC00ED9519182933243BE4082C90557275B115570909
+              44B4873EC9F24F8E6CCB691011CED8B68D937DDF371C28F008FA6BB2078C3138
+              8EAFAC2D8A512EB81FB211A46DE71C745DC7B1D83E8E9375B02C0B6B2920C496
+              5C4C7189F33CE3344DD0B62DFBDE7BD05A83522A5F263DB0AEEBAE906D916178
+              E25EC442F6312F35897347A426D9012D5096481C7D6B2D920497F9F90E9276EE
+              487104A1364ACCFF47E0433A6BAF069DF5E577AE03F006BA141B648044399D00
+              00000049454E44AE426082}
+          end
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D4948445200000018000000180806000000E0773D
+              F8000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              00097048597300000EC400000EC401952B0E1B0000011549444154484BED96BD
+              0D833010852F59236202164074111D242B448C86D2524694281DB00013C00620
+              5AC203830CC1768C42AA7CD2C9F6D97AA7BB333F87B66D694FB4026459361DB6
+              2CEBC0A6528E6CDC0D6980300C5BCFBB4A53C43ECEB1E51BD20086617476EA45
+              986B06FCD8C73911D21EF0352F8A622694E73999A6C956E29E483328CB92CD86
+              6C7878710417A1BC452883EFDF56CB00E120B853143D8437EAA36B8A208E7326
+              DBB699872849128AE3A7541C4C25E2EBBD042210ABEB9A9AA6A1AAAA94E2931E
+              3280A569DA0DC35C66AE7BE986F53DDE463DED074D559225AB0190DE68CCD5A3
+              EB07DA19E8B27B80B7A67CCB363759176500510345FE25FF260BED674D9EDEA6
+              AA666D011F21ADBF0A7D885EF42C7469BD6562BF0000000049454E44AE426082}
+          end
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D4948445200000020000000200806000000737A7A
+              F4000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              00097048597300000EC400000EC401952B0E1B0000013E494441545847ED9431
+              8E833010452729B90377A04474AB94515ACA282535F788B6A58CB684324A19A5
+              4394DC813BD07AF59107B1DE200F248A297812C2D80C63DED8DE28A5C8255B7D
+              77C66C035555FD090CC370A39B93706EC03A81A228D47E7F98AC093188D58FA3
+              584B00D56DDB525DD774BF3FE876BB76AAC74A80C4BBDD170541409EE7594B23
+              2A013E1445119D4EC72E81EEFE07C6F00EDE458C049101DDEC601B4832A42CCB
+              FEAF87BC6C001F4652866D98987F8D18C4DA106DC32449541CC762AD489EE739
+              655966DD9AE27380EBEBFBBEEE794ED33474B9FCF48BD5C6A483C85CE143786D
+              A4692A4ACCF413E0C52639D1CC924C516EE699751222D1F9FCDDE9C685B624F9
+              3366197885B7187827A306F89931CDCC1D5F9C817502EB2E104F00331F5EBABB
+              C7363EC6BA08D75DB03C039F6279065CE1D800D12F0EA5F45390F3BFFA000000
+              0049454E44AE426082}
+          end>
+      end
+      item
+        Name = 'BuildSolution_Cancel'
+        SourceImages = <
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+              61000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              00097048597300000EC100000EC101B8916BED0000011149444154384F63FCFF
+              FF3F032580094A337CE929FFBF2F2B126E9A9BBE26981F62AC83D58613274E80
+              C5E1061CBD729DC14C498E619AAFDDFF7C6BA3FFD3025D19969CBDC6B0E6EC15
+              46A812B026984618801BE0BE601323C890387B4B864A6F4786B6ED0719E69DBC
+              08D78C0BC00D0039994B541CCCE6616301D3E8C0C2C2821184A15C30001B0072
+              F2A2702F064371218629BB8E80719BBF0B03CCFFD89C0E0360035A81FE0581BC
+              D53B182A761D6504E1F6ADFB19F29D2CC12E034BE202A0689CEA63FB3FD14C0F
+              C8FC0FE6C370B091F67F573D0D0C71103E7EFC3890029A8DCC01D13036213E8C
+              860722D900D93452305E17A0873AC158A008203B87140CD303CE8DB89C470880
+              522585D999810100131F250F00E6072B0000000049454E44AE426082}
+          end
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D4948445200000018000000180806000000E0773D
+              F8000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              00097048597300000EC200000EC20115284A80000001AB49444154484B63FCFF
+              FF3F032D0113948603377DCDFF200CE562807C6B23A25C74E2C409B03A140B40
+              06AF8BF5630061744B40FC2F3DE5FF9FFEF8051541009061300C158203140B76
+              5DBCCEF8E5D71F30BBD6CD064C8300CCE2EAF5BB19D69CBDC20815260A600491
+              44552FD8124371218669BE76FF414102327CD1C1E30C138F9E23C97010C019C9
+              2FDA8AFFF3B0B180D947AF5C67705FB08924C341C1656161C188E10318B878EB
+              3694C5C0B0EDF613288B7480D5826DE12EFFAD753419CEBF7C07767D6BA02B46
+              A4E38B58648061C1CE04BFFF76A6C60CA078B0ED9ECD080A1A9025A0782007A0
+              5870B83415EC7290E1712BB7414519C0E10F8A64903C548878008A64103E5492
+              F2FF7377D9FFE7AD45FF5DF53480421071649C6765F87FAA8F2D908929878E8F
+              1F3F0EA4FE237CF0EDF54BB0CB73D6EE04E707A8300A0025D37DCFDE318418EB
+              10ED13783285252B181B2C08043031100089333232825D882E0E65C2C561E6E1
+              4CA6B800CC41C402922D2019805C04C2B048A116C688645A01821680220B86A1
+              4260804B1C1D0CBC0F2806E891422D4CB74846C9C9600615012827D3B8D9C2C0
+              00007D81A145E4507B530000000049454E44AE426082}
+          end
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D4948445200000020000000200806000000737A7A
+              F4000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              00097048597300000EC200000EC20115284A80000001B649444154584763FCFF
+              FF3FC3400226283D6000C3016EFA9AFFA7F9DA813154082BD899E0F73FC45887
+              E4E03B71E2C47F108672311D102027CA10676F09C6204BA0C27000B2F4455BF1
+              7F2E5171863567AF304285C90678A3C05A47136C2194CB906F6DF47F41A43703
+              0F1B0BC3C47DC7A1A2D801CCA7E83E4607180EC8DA7C88F1FCCB77501E03C394
+              6077300D0A8DD64057303B61F956AAF81E04B086806DF76CB82340BE3D5C9AFA
+              1F141A2050BD7E37D52C07019C5180EC08437121307DF4CA75868947CF51CD72
+              10C09B0628011616168CC8182A8C01B03A0094F040C10EF3392C2440D140287B
+              920A301C00B23CDFC9121EEC20CB41D1018A7B10D0D55047C91930406CAA4707
+              280EC06539880D8A7B902340722035D4027007802C07E5716C96C300C811A02C
+              0852038A22A8304500EE80545D25280BBBE53000CA823047602B294906A0DA10
+              84838DB4FF3F6F2D026398183EECAAA7F1FF5049CAFF3C2B432017BB1A6CF8F8
+              F1E3FF4118C6A77B750C4BA0B0AC097700BA047A4A46CFCBE4CAA3DB83B51CA0
+              27187500CE34402B3074D300C8E5C8182A0C0784E47181D144389A0B065F08D0
+              0B0CBE10182830C021C0C0000035DE55C45B7D725E0000000049454E44AE4260
+              82}
+          end>
+      end
+      item
+        Name = 'Run'
+        SourceImages = <
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+              61000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              00097048597300000EC200000EC20115284A80000000B649444154384F63FCFF
+              FF3F032580094A930D300CA8DD5AF5DFC4CB8668676118202827C81052EFC9E0
+              9CE34C942158BDC0C6C5C6E09DEEC1103D3592A02178C3C0D8CE88A097080622
+              212F11340004F0798928036080959B15CA4200A20CF8F5ED17C39E257B181624
+              2C62840AC1014103DE3F7ACFB0B16737C3B6CE9D189A4100AF0197CE5E66D8D1
+              7198E1F8EA03583583005603909D7CFAF0619C9AC10094999071CD96CAFF1621
+              F64026AA382E3CD0B991810100094168264583ABB30000000049454E44AE4260
+              82}
+          end
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D4948445200000018000000180806000000E0773D
+              F8000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              00097048597300000EC400000EC401952B0E1B0000010049444154484B63FCFF
+              FF3F032D011394A619C06A41C7C9D6FF265E3654F11AD620EABBDC0D167CFFE8
+              3DC3F6A98718CE6C3BC208962003E0B50006F62CD9C3F0EAF257B22C22CA0218
+              20C7229222D925C68521A4DE93C132D401AB03B001927C800C7E7DFBC5B0A671
+              3B41DF906D010C104A08145B0003B8E2876A16C000C8A26D9D3BE1960C4C4E26
+              0780227D59F94614D78300552CE07AC7CD50615ECD882DA229B200E6EA0CFB2C
+              AC290804C8B6001499B85C8D0C48B6005758E302245940ACAB9101511690EA6A
+              6440D002505140AAAB91014E0B40AE060549B3771B5906C301A8A840C7ED275A
+              FE1B7B5A03999872A462AC65113501C9C99434C0C0000093A5E2A7F799D2B900
+              00000049454E44AE426082}
+          end
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D4948445200000020000000200806000000737A7A
+              F4000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              00097048597300000EC200000EC20115284A8000000112494441545847ED9731
+              0AC23014865F1D3AB8F5029EC2451071288875B59B48770F20082A3A798CE25A
+              D7AAA350C1415DF4065EA09B4397C883162420499A573AD86F2974C9C7FF6589
+              C1188332A9A5DFD2A8048402F370C69A4EBBB08B2214B01A160C977D68B9DD42
+              24A412987513DCC5009C698F5C42E90ED8239B3C89F225A44EA22C805026C925
+              904191444B00D14DA22D80E8242111C8C893845400C124FD49473A09B9008212
+              98C4F3C74289420454284420792710AC43F0BDAD91FEFA09B940FC8A61B73AC0
+              2538090F4748051EF7271C3711DCF667A9C3111281EFC9AF51247D38A22DA03A
+              398F96409EC9797209E84CCEA32CA03B398F9200C5E43C52029493F30805A827
+              E7A9DE86FF2E00F001EC31849D918667830000000049454E44AE426082}
+          end>
+      end
+      item
+        Name = 'Pause'
+        SourceImages = <
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+              61000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              00097048597300000EC100000EC101B8916BED0000003649444154384F63FCFF
+              FF3F032580094A930D283600C30BD58718E002AD760C8C201A9B180C0CBC1746
+              0D180C060C83BC40A1010C0C004CE20F15E47030C60000000049454E44AE4260
+              82}
+          end
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D4948445200000020000000200806000000737A7A
+              F4000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              00097048597300000EC200000EC20115284A8000000050494441545847EDD7B1
+              0900200C44D18B83B998B58BB95804B11241BB6BFE354991E2414891C84C3953
+              76B50500003BE079866DE83AD0AB62B72BBF7367580100000000000000C00EE0
+              310100C00C902686A60F3582EBF9140000000049454E44AE426082}
+          end>
+      end
+      item
+        Name = 'CD'
+        SourceImages = <
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+              61000000097048597300000EC300000EC301C76FA8640000011949444154785E
+              A5933172833010457D949C859E3BE402A1B6E9A1A724ADB94468D284824A696D
+              B7495AECD88272ED570822C99BC69EF9331AEFFF5F5FCBEE2AFC4DD3F46CAD7D
+              1FC751FE82FFA82DCC58F874231A7BB15214852449E221CF73E9FB5EE0C0BD27
+              1ECEBF67390E27A9EB5744775196A5C0F54C707562F0FDF523699AAA26555509
+              9AF9CD44CB5E328418782934A041BBA239BC8F02B7B66F2D061EBA8F2E4A8406
+              2DF12148B36D64BDDE5094FDEE20C67C3A326738510AB418103904049E043853
+              530DC28266104235206EF4049EC59966D3603868BD2602D74C08C18D34989AD7
+              44F719116AE0466F4648E13EE33C484C986240226F46183A34D1283361FFA658
+              C483B60F8668614F000BC6A285CBF4F03A5F011A4875582BC364E20000000049
+              454E44AE426082}
+          end
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D4948445200000020000000200806000000737A7A
+              F4000000097048597300000EC300000EC301C76FA8640000026649444154785E
+              C597BD8ED340148579141E619F217D24CA9488D4EC03A45A6951CA452917A563
+              A574A4484536090DA1F56EB9D0024D0A03769272F057DCD12477C6E3B18B8D74
+              A4C8733DE7CCFDF39D174D7F65595EECF7FBAB0A5F0E8783F181356CB095F73A
+              E3783CBEAE0832081291F16E17E297E7A75DAFD766341A997EBF6F7ABDDE0978
+              C6DA6C3633BBDDEEC42BEC95445E11BFAA0873212EFE15E64FFED7DCDE7E80AC
+              11C6E3B12B2467CF14971B50C512628BEF4F3F22C4DA2B9BCDC67A231A1254DA
+              5317427E8ACBB7971024613A9D5A117004638EABEAC8C1FCD31C822E22726F4E
+              902CDAED1ABF7EFE96244C8684032E6FDC499AC16060B65FB7B522AEAFDFB511
+              807038743E489D4F26136B7C73F33E2400818A20A53AA44FD80E27A73F77EDF0
+              CDD064D9834F049E6A2D42BC0037B1BF42C062B108AABEFB7817CB8BA41E0117
+              9C70DBE45BDDAFEA4A8C3588EA84E0AD4602E898361921076731E6444A10CFC4
+              66F979C93AE0BF3CC7C69B7CD8B186ED43F66884570B1068417840C8158988C0
+              C621A37BFAF64C1010EE8690010951C21EDD04501D7502383DA06BE23D01B68D
+              05602CAEA7F140DA2404A049A754022AB26F9278BAC6C3498830C895784ECF5A
+              A8230AAF9421A5C1620CAA3145803D1E84D45F86BA11C52115E19E382C4C7BC5
+              6D446E2B86A02D089B888AC26DC5EEC788312A9D5CE7482D98356468F57D8E25
+              566D3FB7D27842084E46928C0C0D5DBC40C285C871B94DBEBA918CF1A98B08EF
+              405316A51AC98243694711F40745AE5D1F1FCB0947EB9CA0E45CB703F64EBD98
+              9098A9D581689982D5C5A4EDD50C213490D8D50C9B94ABD9F35F4E9FFD7AFE1F
+              D5AA97E65128864D0000000049454E44AE426082}
+          end>
+      end
+      item
+        Name = 'CD_Cancel'
+        SourceImages = <
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+              61000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              00097048597300000EC200000EC20115284A800000001874455874536F667477
+              617265007061696E742E6E657420342E312E3564475852000001BA4944415438
+              4F6D92314BC3501485F307FC070E4EFE0127D72E4E591D9C840A4E3A3975145A
+              9C848E75292EC1C5C18282228850878A108BA55A2B88A0552B254935ED787DDF
+              350969EC8553D2FBCE3DF7DCFB9E458C46A3AA811878063B61185E44FF1398DC
+              FD783C5ED5826C40D89F9F919395258852AFD7E5EBA92347F6A2F4DC6B711C47
+              0A8582341A0DC45C23341795FE8549069011B9D9DD96EEF1A1380BB3D23EA84A
+              AD56935C2E97A0542AA9D309119378F03F7A72B9B5A622B150ABD512DBB62704
+              40B95C56275ACC5CCD66530683C184002EB2DDD3601CDD8999F9EEE3E559CED7
+              97B51011C008CC3F0C867255BFFAE7849DB06C2BF87CD765C5C5FD7E5F7CDFD7
+              11C873DE6EDFAB485A009831C4A20BC590B981C00FC4F7029D9F25E24C454D6E
+              AA003F8840CAE7F37A0019CB9EE7E9199C9F9F50F36924025965ECBAEE6DF29F
+              EFC74E57BF373736A552D9538E0AB00816129301DD21643B9E9D9E25CB4C96C8
+              55702569812CE8188BBCBDF6D445728D84B1E2F2C2A61503BA52188B7C0FBFB1
+              FFF790089EA54978BCB06902207611154F3E65221271B196DD0928168B129A9B
+              80F3AF381DCCC5720C51B71C831C67112D0ACBFA058D7E87D3045E6D50000000
+              0049454E44AE426082}
+          end
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D4948445200000020000000200806000000737A7A
+              F4000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              00097048597300000EC200000EC20115284A800000001874455874536F667477
+              617265007061696E742E6E657420342E312E3564475852000003B74944415458
+              47BD97CD4B545118C6FD0782FE8016AE5AB40A5AB51337AD06DA29ADA2699B06
+              352EA48565B88C5C5A82339B312292140692540A958C64144451A720482B6631
+              3A333ACBD3F91DEF7B3B77EEB91F5678E0D1997BDE739EE7BC5FF74C47DAD16C
+              362F1F1D1D0D692C1C1F1F2B1798C3065B6FD9E987DEA8536348E3AEC6F956AB
+              7553FF2F6B3849635066ADB76DBAA117751DFEFAA1D69F3F35D0A769D99BCECD
+              CDA97C3EAFF6BE56D4E7278FD4B70FEFD4C6C686CA6432068383836A72725255
+              AB557F0D5ED1423A3D8AF8A1174C405CB878CE60F9E13DB349A3DE5007B543B5
+              BABAAAF6CB9FD4ABAE4BEA4DE6AADAFBB2ABB2D9ACEAEEEE0E616464C41652D3
+              42AE7B34D1A35D00E09408D01BA8CD1713AA78E582014238B18B5C8057E6E7E7
+              7D6F248644933C20049C4E0440C633BC618B1A1D1D7592BA303E3EEE8B88F404
+              71D206358C5C22E4335E989E9E7612C5C1125173E604C982812E21553FAC8744
+              80F7F76FAB7ABDAE7A7A7A9C24499070C0E5D19E0C62C30449D3DBDBABB636B7
+              2205207078F8B1932009E4842466201FF40353E7C4B5582CAA6A653B36043BDB
+              3B4E8234A03AE082D390D3B57880B252A964B2DB264408DEA0EE450C36B95CCE
+              499006E205D331753CE87AAA52A938C9A9751A50B37952863CA70F1CFCDC37BD
+              01EC7DDF576363CF9C642ECCCCCC482E0CF9C947690931400827EFEFEF378B06
+              7203AA56AB193BE64A37AEA966A3E98B00E5F25A88CC05FA87276081F89B2FE2
+              6221C71B857C21B09053D67553620E2F9835DA66F6EDAC2FC2E50992AFEF4E9F
+              99C376ADBC6E38812F404E26E494A26CBAB4B86416E36ABEAF7C5C31A121446B
+              2F0BA61D8B086C6CB29DED5D7F1F1B2101106A971848EF8F0204942B3D81B5BC
+              9078E6B28D424880CB280AD95B272F204E0BF86C0BE0F460EAF594F19E403C08
+              1205602CAEA7F1402A1BE05A3BC6C0CE0362DE3EDF8E9080A5C5654326EE752D
+              625E4820C4166136394028A7174FB50381BE0029C3A457AB8052B3C992803D1E
+              B4BD122843FDC734229A834D14073C61C793CF49C26CAF041A91DD8A5D646941
+              D86C517108B46286FE625E46BC285C9BA7859D235168E8EE09179C869C61BF8E
+              D3647014581BD578041E39EE0FDE8C2419B934B8364F0B12CE450CB84B78E4C1
+              0B09C3BE92717D726D9E16F48F10F91FD7BBAF640CDCE219FD9388F6B66C9187
+              5DDF3E241F00E1F8DB9CA0E40CB9E77610B886C50DCF13261C24E669AB03D1F6
+              559CBD124FDE3E8813C9229B208406421773798567CC6123750ED82332E66986
+              1792B3F9711A37E85AFA34FFF9E77947C76F440289A9451D3FC7000000004945
+              4E44AE426082}
+          end>
+      end
+      item
+        Name = 'StatusHelp'
+        SourceImages = <
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+              61000000097048597300000EC400000EC401952B0E1B0000013649444154785E
+              A593314BC35010C72FA18A26625D9CA25010E7A683B866F00B44509C4C3F838B
+              83B3838B9FA11167BB8BD0ACE2605C5C5CDAAA8B2E69D12875D0FBC3F168C27B
+              51F00FC70BB9FB1D77C9FF5954529EE76D3E228EA0944A3862C7713AD3803505
+              36F8E85EBF7EF99D870FBA7A9E14E82D6F96DAEBF3B4B93C93321072A3BE3450
+              F0EDE1CDDBD245FF93AA842647BE9B31D642135B12DDE3F45DC1BB6B2EDDEF79
+              F4B4BF8AC033DE1184E9500B46EDDC1B8CBEBD78A8C2A0420D18B0982042579D
+              762E5F10DA9C30518D81A0FCC156CE1EE9370913D4A84207CD3AC72255C9AEE0
+              0BF0E9DD9874324DA059C93C4102931840232C4C820631CCA191F2814EC2C436
+              BC0D7B6E37E6E88F5296066B0B109E6C2C64486856305939547F412E468B13E9
+              7950C77EDA9D91430D6A85A17F5FE71F5687A4906F82C1B80000000049454E44
+              AE426082}
+          end
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D49484452000000140000001408060000008D891D
+              0D000001C249444154785EAD953D48C35010C7AFA17EB5B44811972A04C4A15B
+              1C5C74B1207470290E8E5AD0C549370787B683834BAD93833AD45528228E423B
+              B97489837670097E8083484CA1A815EAFDC33384471A6AF50FC72BBDBB5FDEBB
+              CBBB04C843CD6653E565832DCDA64A6E9DADCAB61F0A850C92149040C3BC64AD
+              567BB36CBC53D9F8A0BAF9456E258683B4A80EB00D52B42F9067684E06BA6195
+              CBA74F6DABD62086928F00A3DDE908CDC7FBB1E324834D3814378C77A4AD5F59
+              0E6C69224CC7C9113A4D8DC2F0DBFE0F420C6291835CB9667BE777663B5EBA77
+              ECF0D66A77127CEE58E432C33EBA8206A06638A65B6B8908B9E4EB1325CA82A5
+              A00968805FCD562B2FB6751272C160A583EC984337658D9D3CD06F0446667268
+              053B54F16AFC5582A1057D8EEA74BA301BEB1AAC90BF3C6147F54667205ED06E
+              55B8B62875F14CB99AE9BB4303D7A93BE01BDDBCB63C7D82A18354E5BB99D9D1
+              45637AEC3633B094B0C3BCB8E89EC0C7E571C7FCEE3518AC3305238861455CF4
+              5E855C31790C4538F2981A3D409D89F333C66CA0183D49AE837E3013C5D3DC35
+              744C3E266291835CF93D74A0FCB462652146DB5A189DF3EC267C88E1581C73CA
+              CE15FAF74FC03745B6F2FCB46017AD0000000049454E44AE426082}
+          end
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D4948445200000018000000180806000000E0773D
+              F8000000097048597300000EC400000EC401952B0E1B0000022149444154785E
+              BD9631481B511880FF1C17A5174C246011A4101007C960B752BAC4410B5DD2C5
+              4E0E0974156A57675773D0B56006A76669DC32F596226E7608198A70A01DB410
+              4C4C4E3421FAFF3FEFC1BB872FB910F4831F1EE4EEFBDF7BFFBBFF2506430882
+              E0230EF218398C0C84F1313C8CAAE3383FC140CC2026E13E4BCDE8C98A98C833
+              2550E5251C7C01E45F7700E5BF3770FCBF078DAB3EA82CCFDAF0662E0E85A517
+              B090B040E062926D430296D3AC0BEDDE3D7CAB072C8F0027D9799D0041199314
+              9504E199937CD36B85669C4DC7E1FD2B07546A6701D49BBDD08A0E722948C663
+              A195C4943DFFF598BCF42E0D1B8B09788CCA6917B67F3743490ED76641B04A35
+              B180E182F2B6A8F2CFCB332C374089F91901BFBB7BD205D56989A39891055549
+              4E592069DF0DE0E8E29682C6FA331276908B9CE4B6C4391F59D0EF8D0E6CD42E
+              29786C4273E56DF111F151D4D9FBD3E21807CD95B3682972FF0CA8DBC175793B
+              3F0D263457C68668B0BCB2FE928FAC82A887190B22F26931A1CBF93BF8814775
+              1863AD4072DEE953A1491E6905BEEC2D1141718009AE4D72D5E5DBA2E516B071
+              A9C599E844914BC05F725534AC9145FEBA92A2E0B109CD55B5C465E163CB1D96
+              04C549197C540DA8EDDB27B79C0AB7D7ADAC13B516A6BDE7B6AD3A3981B8895C
+              6CB5D4724512BD066D195C6089DEAE052E398D170E0675C5C92F1CFD43133FB8
+              18FC82F7214D2FCB15E93326313DA3CA5D723CEBA5FFE47F5B1E00833D02F5C6
+              0653B50000000049454E44AE426082}
+          end
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D4948445200000020000000200806000000737A7A
+              F4000000097048597300000EC400000EC401952B0E1B000002A649444154785E
+              CD97BF6B144114C7BF37EC9DE6D43506358A095C6365E136A768E306040B53DC
+              056C25877F40208D85855E616123A4B2920B96167A8D4582904B21FE4873D622
+              041241A284239A4BF4027AEFF10686614C6697E4CE0F2CCCDDCEBCEF9B37F366
+              DF64E049BBDD8E0094005C0310C34D03C022807A3E9F6FC2838C87F024802900
+              1192410ECC741D994DEC80081700D4F46C373A7FF062791BEFBF75F061ADC3BF
+              4DC26C06974E6771F954161385C3F4DB8C4AA5EBC8B29703225E12F141127AD8
+              DC64F104B013F7A223DA91963851878572871C2F49FCF597DF187BB5CEE209A1
+              313C966C902DB2C9B62D32F6CC459C673DFB690BFBC1E4F9018E86503623A1EC
+              35DF4D3CCC294C5F3C8EB9F13358BD3D6A3EF41FBDE33E16648B6D0A35D2722D
+              414DC2EE14BF3094C5FCF8705724A4B6EB3DBDA33ED47639612E470D8232D63D
+              A60D7777E9075C3C289EC0C8D1007B407DB8AF03B62DD91393A6198129093D77
+              707165F810DCF8F7D519656A2A39E1229DE7BE4CBF59C7ADF9357AA89D283B64
+              9211692B395E13A7DAF3CF9B78FBF5173DDCF6C5D22A0572B6F309B71B23CF56
+              B01F8816A726692B396AF978ED059656ACCC0D92941BA30378377196CF015F6C
+              AD00421AF1A76327E162F5E70E7C514849B538887F717FA975B00EC881E39CF9
+              9D85EF985BD9822F81F93DF7DF07E9B3446B6994140C5C4CF4024BAB11480D17
+              5325231F0BEF19A785B4844505A0AE2B985E6069D59554AF4D5A97044E705D20
+              B500B73D31EBC526692B309801A06B384F0742B3EDBBF95843A8EA348494CE0D
+              127F543C8603826DCB041B5496D9E7400540EBFAB91CD7707BF1F8E386D9F6AA
+              0BC9B6AE90FFB3A254901715BD1F9E5C0D396429A1B16C438BBBEE060A16B21F
+              CA7A39166E0EA549511A4363CDB097C9765FAF66FDB89C56ED90DBF4FD7AFE17
+              A24C4FDA1DF2D40E0000000049454E44AE426082}
+          end>
+      end
+      item
+        Name = 'Stop'
+        SourceImages = <
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+              61000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              00097048597300000EC200000EC20115284A800000003549444154384F63FCFF
+              FF3F032580094A930D06DE008C30F8D2538E3750784A3A19A14C30180661306A
+              009674402A18F261C0C000003D8E0D15CDBE594F0000000049454E44AE426082}
+          end
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D4948445200000018000000180806000000E0773D
+              F8000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              00097048597300000EC400000EC401952B0E1B0000004449444154484B63FCFF
+              FF3F032D011394A61918B58020A0B9053853D1979E729292174F492723948902
+              46E3802018B5802018B5802018FA168CD66804C1A8050400030300D2A10D257D
+              6B14990000000049454E44AE426082}
+          end
+          item
+            Image.Data = {
+              89504E470D0A1A0A0000000D4948445200000020000000200806000000737A7A
+              F4000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              00097048597300000EC300000EC301C76FA8640000004C49444154584763FCFF
+              FF3FC3400226283D6060D401A30E187500C172E04B4F394505054F4927239489
+              158C46C1A803461D30EA8051078C3A60D40103EE80D17EC1A803461D30D21DC0
+              C00000ED510D358D4A81E40000000049454E44AE426082}
+          end>
+      end>
+    Left = 152
+    Top = 96
+  end
 end

Projects/CompForm.pas

@@ -171,11 +171,13 @@ type
     Bevel1: TBevel;
     BuildImageList: TImageList;
     TerminateButton: TToolButton;
-    ToolBarImageCollection: TImageCollection;
+    LightToolBarImageCollection: TImageCollection;
+    DarkToolBarImageCollection: TImageCollection;
     ToolBarVirtualImageList: TVirtualImageList;
     PListSelectAll: TMenuItem;
     DebugCallStackList: TListBox;
     VDebugCallStack: TMenuItem;
+    ToolBarPanel: TPanel;
     procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
     procedure FExitClick(Sender: TObject);
     procedure FOpenClick(Sender: TObject);
@@ -3619,7 +3621,13 @@ begin
   FTheme.Typ := FOptions.ThemeType;
   Memo.UpdateThemeColors;
   Memo.UpdateStyleAttributes;
-  Bevel1.Visible := FTheme.Colors[tcMarginBack] = ToolBar.Color;
+  ToolBarPanel.ParentBackground := False;
+  ToolBarPanel.Color := FTheme.Colors[tcMarginBack];
+  if FTheme.Dark then
+    ToolBarVirtualImageList.ImageCollection := DarkToolBarImageCollection
+  else
+    ToolBarVirtualImageList.ImageCollection := LightToolBarImageCollection;
+  Bevel1.Visible := FTheme.Colors[tcMarginBack] = ToolBarPanel.Color;
   SplitPanel.ParentBackground := False;
   SplitPanel.Color := FTheme.Colors[tcSplitterBack];
   CompilerOutputList.Font.Color := FTheme.Colors[tcFore];

Projects/CompStartup.pas

@@ -71,7 +71,7 @@ procedure TStartupForm.UpdateImages;
 
   function GetBitmap(const Button: TToolButton; const WH: Integer): TBitmap;
   begin
-    Result := CompileForm.ToolBarImageCollection.GetBitmap(Button.ImageIndex, WH, WH)
+    Result := CompileForm.LightToolBarImageCollection.GetBitmap(Button.ImageIndex, WH, WH)
   end;
 
 var

whatsnew.htm

@@ -34,8 +34,9 @@ For conditions of distribution and use, see <a href="http://www.jrsoftware.org/f
   <li>Checkboxes displayed by lists now look better on high DPI systems.</li>
   <li>Compiler IDE changes:
   <ul>
-    <li>The "Compiler Output" and "Debug Output" views now support multi selection, an extra <i>Select All</i> popup menu item and <i>Ctrl+C</i> and </i>Ctrl+A</i> keyboard shortcuts. The <i>Copy</i> action now only copies the selected lines instead of all lines.</li>
+    <li>Added Dark theme support to the toolbar.</li>
     <li>When paused on a breakpoint in the [Code] section the new "Debug Call Stack" view now shows the call stack.</li>
+    <li>The "Compiler Output" and "Debug Output" views now support multi selection, an extra <i>Select All</i> popup menu item and <i>Ctrl+C</i> and </i>Ctrl+A</i> keyboard shortcuts. The <i>Copy</i> action now only copies the selected lines instead of all lines.</li>
   </ul>
   </li>
   <li>Inno Setup Preprocessor (ISPP) changes: