diff --git a/examples/canvas_test/canvastest.lpi b/examples/canvas_test/canvastest.lpi
index d31674f3b5..8476bac44b 100644
--- a/examples/canvas_test/canvastest.lpi
+++ b/examples/canvas_test/canvastest.lpi
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="9"/>
+    <Version Value="12"/>
     <General>
+      <Flags>
+        <CompatibilityMode Value="True"/>
+      </Flags>
       <SessionStorage Value="InProjectDir"/>
-      <MainUnit Value="0"/>
       <UseXPManifest Value="True"/>
       <Icon Value="0"/>
     </General>
     <VersionInfo>
       <Language Value=""/>
       <CharSet Value=""/>
-      <StringTable ProductVersion=""/>
     </VersionInfo>
     <BuildModes Count="3">
       <Item1 Name="default" Default="True"/>
@@ -29,9 +30,6 @@
         </CompilerOptions>
       </Item2>
       <Item3 Name="Cocoa">
-        <MacroValues Count="1">
-          <Macro1 Name="LCLWidgetType" Value="cocoa"/>
-        </MacroValues>
         <CompilerOptions>
           <Version Value="11"/>
           <SearchPaths>
@@ -47,14 +45,12 @@
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
-      <local>
-        <FormatVersion Value="1"/>
-      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default"/>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -72,7 +68,6 @@
         <ComponentName Value="frmCanvasTest"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="canvastestunit"/>
       </Unit1>
       <Unit2>
         <Filename Value="pentest.pas"/>
@@ -111,7 +106,6 @@
         <ComponentName Value="frmEllipse"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="ellipseunit"/>
       </Unit7>
       <Unit8>
         <Filename Value="screenshotunit.pas"/>
@@ -139,7 +133,6 @@
         <ComponentName Value="frmSystemColors"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="systemcolorstest"/>
       </Unit11>
     </Units>
   </ProjectOptions>
@@ -149,6 +142,9 @@
       <IncludeFiles Value="$(ProjOutDir)"/>
     </SearchPaths>
     <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf3"/>
+      </Debugging>
       <Options>
         <LinkerOptions Value="-framework Qt4Intf -lobjc -framework Foundation -framework QtGui -framework QtCore"/>
         <Win32>
diff --git a/examples/canvas_test/canvastest.res b/examples/canvas_test/canvastest.res
index 5565379563..647f2a75a4 100644
Binary files a/examples/canvas_test/canvastest.res and b/examples/canvas_test/canvastest.res differ
diff --git a/images/general_purpose/IconTable.html b/images/general_purpose/IconTable.html
index a43b2efc25..796ede9e92 100644
--- a/images/general_purpose/IconTable.html
+++ b/images/general_purpose/IconTable.html
@@ -1310,6 +1310,15 @@
     <td><img src="Color_03_48.png" loading="lazy" alt=""></td>
     <td><img src="Color_03_64.png" loading="lazy" alt=""></td>
   </tr>
+  <tr>
+    <td class="right_border">Color_04</td>
+    <td><img src="Color_04_16.png" loading="lazy" alt=""></td>
+    <td><img src="Color_04_24.png" loading="lazy" alt=""></td>
+    <td><img src="Color_04_32.png" loading="lazy" alt=""></td>
+    <td><img src="Color_04_36.png" loading="lazy" alt=""></td>
+    <td><img src="Color_04_48.png" loading="lazy" alt=""></td>
+    <td><img src="Color_04_64.png" loading="lazy" alt=""></td>
+  </tr>
   <tr>
     <td class="right_border">Comment_01</td>
     <td><img src="Comment_01_16.png" loading="lazy" alt=""></td>
@@ -4172,6 +4181,15 @@
     <td><img src="Paint_02_48.png" loading="lazy" alt=""></td>
     <td><img src="Paint_02_64.png" loading="lazy" alt=""></td>
   </tr>
+  <tr>
+    <td class="right_border">Paint_03</td>
+    <td><img src="Paint_03_16.png" loading="lazy" alt=""></td>
+    <td><img src="Paint_03_24.png" loading="lazy" alt=""></td>
+    <td><img src="Paint_03_32.png" loading="lazy" alt=""></td>
+    <td><img src="Paint_03_36.png" loading="lazy" alt=""></td>
+    <td><img src="Paint_03_48.png" loading="lazy" alt=""></td>
+    <td><img src="Paint_03_64.png" loading="lazy" alt=""></td>
+  </tr>
   <tr>
     <td class="right_border">Paperclip_01</td>
     <td><img src="Paperclip_01_16.png" loading="lazy" alt=""></td>
@@ -5009,6 +5027,15 @@
     <td><img src="Setup_08_48.png" loading="lazy" alt=""></td>
     <td><img src="Setup_08_64.png" loading="lazy" alt=""></td>
   </tr>
+  <tr>
+    <td class="right_border">Setup_09</td>
+    <td><img src="Setup_09_16.png" loading="lazy" alt=""></td>
+    <td><img src="Setup_09_24.png" loading="lazy" alt=""></td>
+    <td><img src="Setup_09_32.png" loading="lazy" alt=""></td>
+    <td><img src="Setup_09_36.png" loading="lazy" alt=""></td>
+    <td><img src="Setup_09_48.png" loading="lazy" alt=""></td>
+    <td><img src="Setup_09_64.png" loading="lazy" alt=""></td>
+  </tr>
   <tr>
     <td class="right_border">share_01</td>
     <td><img src="share_01_16.png" loading="lazy" alt=""></td>
@@ -5171,6 +5198,15 @@
     <td><img src="Target_01_48.png" loading="lazy" alt=""></td>
     <td><img src="Target_01_64.png" loading="lazy" alt=""></td>
   </tr>
+  <tr>
+    <td class="right_border">Target_02</td>
+    <td><img src="Target_02_16.png" loading="lazy" alt=""></td>
+    <td><img src="Target_02_24.png" loading="lazy" alt=""></td>
+    <td><img src="Target_02_32.png" loading="lazy" alt=""></td>
+    <td><img src="Target_02_36.png" loading="lazy" alt=""></td>
+    <td><img src="Target_02_48.png" loading="lazy" alt=""></td>
+    <td><img src="Target_02_64.png" loading="lazy" alt=""></td>
+  </tr>
   <tr>
     <td class="right_border">Temperature_01</td>
     <td><img src="Temperature_01_16.png" loading="lazy" alt=""></td>
@@ -5576,6 +5612,24 @@
     <td><img src="Window_17_48.png" loading="lazy" alt=""></td>
     <td><img src="Window_17_64.png" loading="lazy" alt=""></td>
   </tr>
+  <tr>
+    <td class="right_border">Window_18</td>
+    <td><img src="Window_18_16.png" loading="lazy" alt=""></td>
+    <td><img src="Window_18_24.png" loading="lazy" alt=""></td>
+    <td><img src="Window_18_32.png" loading="lazy" alt=""></td>
+    <td><img src="Window_18_36.png" loading="lazy" alt=""></td>
+    <td><img src="Window_18_48.png" loading="lazy" alt=""></td>
+    <td><img src="Window_18_64.png" loading="lazy" alt=""></td>
+  </tr>
+  <tr>
+    <td class="right_border">Window_19</td>
+    <td><img src="Window_19_16.png" loading="lazy" alt=""></td>
+    <td><img src="Window_19_24.png" loading="lazy" alt=""></td>
+    <td><img src="Window_19_32.png" loading="lazy" alt=""></td>
+    <td><img src="Window_19_36.png" loading="lazy" alt=""></td>
+    <td><img src="Window_19_48.png" loading="lazy" alt=""></td>
+    <td><img src="Window_19_64.png" loading="lazy" alt=""></td>
+  </tr>
   <tr>
     <td class="right_border">Zoom_01</td>
     <td><img src="Zoom_01_16.png" loading="lazy" alt=""></td>
@@ -5641,7 +5695,7 @@
   </tr>
 </table>
 <div class="infobox colorset2">
-This folder contains 3738 icons in 623 icon groups with 6 icon sizes.
+This folder contains 3774 icons in 629 icon groups with 6 icon sizes.
 <hr>
 The images in this folder can be used in Lazarus applications as toolbar or button icons.<br>
 <br>
diff --git a/images/general_purpose/Window_10_16.png b/images/general_purpose/Window_10_16.png
index 0dde2f81ff..5e6e5229b3 100644
Binary files a/images/general_purpose/Window_10_16.png and b/images/general_purpose/Window_10_16.png differ
diff --git a/images/general_purpose/Window_10_24.png b/images/general_purpose/Window_10_24.png
index 7d9540a7f3..cc79bd9666 100644
Binary files a/images/general_purpose/Window_10_24.png and b/images/general_purpose/Window_10_24.png differ
diff --git a/images/general_purpose/Window_10_32.png b/images/general_purpose/Window_10_32.png
index 2097d300db..161e99c052 100644
Binary files a/images/general_purpose/Window_10_32.png and b/images/general_purpose/Window_10_32.png differ
diff --git a/images/general_purpose/Window_10_36.png b/images/general_purpose/Window_10_36.png
index a58d75fa2d..d04ee6cf20 100644
Binary files a/images/general_purpose/Window_10_36.png and b/images/general_purpose/Window_10_36.png differ
diff --git a/images/general_purpose/Window_10_48.png b/images/general_purpose/Window_10_48.png
index ac8c62d8d9..82d7deaa2a 100644
Binary files a/images/general_purpose/Window_10_48.png and b/images/general_purpose/Window_10_48.png differ
diff --git a/images/general_purpose/Window_10_64.png b/images/general_purpose/Window_10_64.png
index ec59932f00..ca0bafc7be 100644
Binary files a/images/general_purpose/Window_10_64.png and b/images/general_purpose/Window_10_64.png differ
diff --git a/images/general_purpose/Window_11_16.png b/images/general_purpose/Window_11_16.png
index d3d2c21153..70244decdb 100644
Binary files a/images/general_purpose/Window_11_16.png and b/images/general_purpose/Window_11_16.png differ
diff --git a/images/general_purpose/Window_11_24.png b/images/general_purpose/Window_11_24.png
index ec3c89049a..2583e46812 100644
Binary files a/images/general_purpose/Window_11_24.png and b/images/general_purpose/Window_11_24.png differ
diff --git a/images/general_purpose/Window_11_32.png b/images/general_purpose/Window_11_32.png
index 2eb6f63c8d..6e7c37135d 100644
Binary files a/images/general_purpose/Window_11_32.png and b/images/general_purpose/Window_11_32.png differ
diff --git a/images/general_purpose/Window_11_36.png b/images/general_purpose/Window_11_36.png
index 926eba32bb..ccf59d7ba8 100644
Binary files a/images/general_purpose/Window_11_36.png and b/images/general_purpose/Window_11_36.png differ
diff --git a/images/general_purpose/Window_11_48.png b/images/general_purpose/Window_11_48.png
index 1429ef949c..3e2a594757 100644
Binary files a/images/general_purpose/Window_11_48.png and b/images/general_purpose/Window_11_48.png differ
diff --git a/images/general_purpose/Window_11_64.png b/images/general_purpose/Window_11_64.png
index 3750b118e0..b5800930da 100644
Binary files a/images/general_purpose/Window_11_64.png and b/images/general_purpose/Window_11_64.png differ
diff --git a/images/general_purpose/Window_12_16.png b/images/general_purpose/Window_12_16.png
index 6fdbeca3d9..dd2147ec84 100644
Binary files a/images/general_purpose/Window_12_16.png and b/images/general_purpose/Window_12_16.png differ
diff --git a/images/general_purpose/Window_12_24.png b/images/general_purpose/Window_12_24.png
index 0afd3cb8a3..fb46887188 100644
Binary files a/images/general_purpose/Window_12_24.png and b/images/general_purpose/Window_12_24.png differ
diff --git a/images/general_purpose/Window_12_32.png b/images/general_purpose/Window_12_32.png
index 190cf7a1b6..bc8e683ae8 100644
Binary files a/images/general_purpose/Window_12_32.png and b/images/general_purpose/Window_12_32.png differ
diff --git a/images/general_purpose/Window_12_36.png b/images/general_purpose/Window_12_36.png
index f656f17824..17c1ce4434 100644
Binary files a/images/general_purpose/Window_12_36.png and b/images/general_purpose/Window_12_36.png differ
diff --git a/images/general_purpose/Window_12_48.png b/images/general_purpose/Window_12_48.png
index 3d564adbd6..9b465f443a 100644
Binary files a/images/general_purpose/Window_12_48.png and b/images/general_purpose/Window_12_48.png differ
diff --git a/images/general_purpose/Window_12_64.png b/images/general_purpose/Window_12_64.png
index 9780fca2f5..5af5938a06 100644
Binary files a/images/general_purpose/Window_12_64.png and b/images/general_purpose/Window_12_64.png differ
diff --git a/images/general_purpose/Window_13_16.png b/images/general_purpose/Window_13_16.png
index edee3ca16e..eddab60aae 100644
Binary files a/images/general_purpose/Window_13_16.png and b/images/general_purpose/Window_13_16.png differ
diff --git a/images/general_purpose/Window_13_24.png b/images/general_purpose/Window_13_24.png
index f5576b7061..adbf0ec88b 100644
Binary files a/images/general_purpose/Window_13_24.png and b/images/general_purpose/Window_13_24.png differ
diff --git a/images/general_purpose/Window_13_32.png b/images/general_purpose/Window_13_32.png
index 2a2070216f..f3124905b5 100644
Binary files a/images/general_purpose/Window_13_32.png and b/images/general_purpose/Window_13_32.png differ
diff --git a/images/general_purpose/Window_13_36.png b/images/general_purpose/Window_13_36.png
index 285f42f49b..cc2501d7ad 100644
Binary files a/images/general_purpose/Window_13_36.png and b/images/general_purpose/Window_13_36.png differ
diff --git a/images/general_purpose/Window_13_48.png b/images/general_purpose/Window_13_48.png
index 7fc3a00933..88d6130aec 100644
Binary files a/images/general_purpose/Window_13_48.png and b/images/general_purpose/Window_13_48.png differ
diff --git a/images/general_purpose/Window_13_64.png b/images/general_purpose/Window_13_64.png
index 6362bac0fd..06fa35e09e 100644
Binary files a/images/general_purpose/Window_13_64.png and b/images/general_purpose/Window_13_64.png differ
diff --git a/images/general_purpose/Window_14_16.png b/images/general_purpose/Window_14_16.png
index f1979b82df..4425542130 100644
Binary files a/images/general_purpose/Window_14_16.png and b/images/general_purpose/Window_14_16.png differ
diff --git a/images/general_purpose/Window_14_24.png b/images/general_purpose/Window_14_24.png
index 11d77d585c..7cd8ddbf25 100644
Binary files a/images/general_purpose/Window_14_24.png and b/images/general_purpose/Window_14_24.png differ
diff --git a/images/general_purpose/Window_14_32.png b/images/general_purpose/Window_14_32.png
index 8df01e1e5c..91e8eac872 100644
Binary files a/images/general_purpose/Window_14_32.png and b/images/general_purpose/Window_14_32.png differ
diff --git a/images/general_purpose/Window_14_36.png b/images/general_purpose/Window_14_36.png
index b9c3893bcc..a50cfb1eb2 100644
Binary files a/images/general_purpose/Window_14_36.png and b/images/general_purpose/Window_14_36.png differ
diff --git a/images/general_purpose/Window_14_48.png b/images/general_purpose/Window_14_48.png
index d38dab0564..569023930a 100644
Binary files a/images/general_purpose/Window_14_48.png and b/images/general_purpose/Window_14_48.png differ
diff --git a/images/general_purpose/Window_14_64.png b/images/general_purpose/Window_14_64.png
index cb9991a3b7..d2cf47e3fa 100644
Binary files a/images/general_purpose/Window_14_64.png and b/images/general_purpose/Window_14_64.png differ
diff --git a/images/general_purpose/Window_15_16.png b/images/general_purpose/Window_15_16.png
index 70d86ab670..fdfce3c75b 100644
Binary files a/images/general_purpose/Window_15_16.png and b/images/general_purpose/Window_15_16.png differ
diff --git a/images/general_purpose/Window_15_24.png b/images/general_purpose/Window_15_24.png
index fe0f4eaf8f..96fcf35c28 100644
Binary files a/images/general_purpose/Window_15_24.png and b/images/general_purpose/Window_15_24.png differ
diff --git a/images/general_purpose/Window_15_32.png b/images/general_purpose/Window_15_32.png
index 7f33297eb6..f495bf0846 100644
Binary files a/images/general_purpose/Window_15_32.png and b/images/general_purpose/Window_15_32.png differ
diff --git a/images/general_purpose/Window_15_36.png b/images/general_purpose/Window_15_36.png
index c1baebe275..d27a45941a 100644
Binary files a/images/general_purpose/Window_15_36.png and b/images/general_purpose/Window_15_36.png differ
diff --git a/images/general_purpose/Window_15_48.png b/images/general_purpose/Window_15_48.png
index b7d1330b10..34ccaec290 100644
Binary files a/images/general_purpose/Window_15_48.png and b/images/general_purpose/Window_15_48.png differ
diff --git a/images/general_purpose/Window_15_64.png b/images/general_purpose/Window_15_64.png
index 96f3ad17e3..89a1630fef 100644
Binary files a/images/general_purpose/Window_15_64.png and b/images/general_purpose/Window_15_64.png differ
diff --git a/images/general_purpose/Window_16_16.png b/images/general_purpose/Window_16_16.png
index e0f42de07e..c12b563eba 100644
Binary files a/images/general_purpose/Window_16_16.png and b/images/general_purpose/Window_16_16.png differ
diff --git a/images/general_purpose/Window_16_24.png b/images/general_purpose/Window_16_24.png
index e10b744e38..88af13b4aa 100644
Binary files a/images/general_purpose/Window_16_24.png and b/images/general_purpose/Window_16_24.png differ
diff --git a/images/general_purpose/Window_16_32.png b/images/general_purpose/Window_16_32.png
index 2a98f614a3..ef1d63e446 100644
Binary files a/images/general_purpose/Window_16_32.png and b/images/general_purpose/Window_16_32.png differ
diff --git a/images/general_purpose/Window_16_36.png b/images/general_purpose/Window_16_36.png
index 4e1c1d5028..f06275114e 100644
Binary files a/images/general_purpose/Window_16_36.png and b/images/general_purpose/Window_16_36.png differ
diff --git a/images/general_purpose/Window_16_48.png b/images/general_purpose/Window_16_48.png
index b713ac75de..bd961078f7 100644
Binary files a/images/general_purpose/Window_16_48.png and b/images/general_purpose/Window_16_48.png differ
diff --git a/images/general_purpose/Window_16_64.png b/images/general_purpose/Window_16_64.png
index b7e3d0e6b8..e6febb5a8b 100644
Binary files a/images/general_purpose/Window_16_64.png and b/images/general_purpose/Window_16_64.png differ
diff --git a/images/general_purpose/Window_17_16.png b/images/general_purpose/Window_17_16.png
index 60e96f3375..c37091c0de 100644
Binary files a/images/general_purpose/Window_17_16.png and b/images/general_purpose/Window_17_16.png differ
diff --git a/images/general_purpose/Window_17_24.png b/images/general_purpose/Window_17_24.png
index 2f10690ae6..9056837ab9 100644
Binary files a/images/general_purpose/Window_17_24.png and b/images/general_purpose/Window_17_24.png differ
diff --git a/images/general_purpose/Window_17_32.png b/images/general_purpose/Window_17_32.png
index e7aa1213ad..6a18cbae37 100644
Binary files a/images/general_purpose/Window_17_32.png and b/images/general_purpose/Window_17_32.png differ
diff --git a/images/general_purpose/Window_17_36.png b/images/general_purpose/Window_17_36.png
index a9ac6a396c..3150908168 100644
Binary files a/images/general_purpose/Window_17_36.png and b/images/general_purpose/Window_17_36.png differ
diff --git a/images/general_purpose/Window_17_48.png b/images/general_purpose/Window_17_48.png
index 9520b09aa9..78dcb181e4 100644
Binary files a/images/general_purpose/Window_17_48.png and b/images/general_purpose/Window_17_48.png differ
diff --git a/images/general_purpose/Window_17_64.png b/images/general_purpose/Window_17_64.png
index b789d7fad2..c146dc02b8 100644
Binary files a/images/general_purpose/Window_17_64.png and b/images/general_purpose/Window_17_64.png differ
diff --git a/images/general_purpose/metadata.xml b/images/general_purpose/metadata.xml
index ff36dd3079..3f6e9d003d 100644
--- a/images/general_purpose/metadata.xml
+++ b/images/general_purpose/metadata.xml
@@ -12122,8 +12122,10 @@
       <keywords>
         <keyword>brush</keyword>
         <keyword>color</keyword>
+        <keyword>draw</keyword>
         <keyword>edit</keyword>
         <keyword>font</keyword>
+        <keyword>paint</keyword>
         <keyword>text</keyword>
       </keywords>
     </icon>
@@ -12131,8 +12133,10 @@
       <keywords>
         <keyword>brush</keyword>
         <keyword>color</keyword>
+        <keyword>draw</keyword>
         <keyword>edit</keyword>
         <keyword>font</keyword>
+        <keyword>paint</keyword>
         <keyword>text</keyword>
       </keywords>
     </icon>
@@ -12140,8 +12144,10 @@
       <keywords>
         <keyword>brush</keyword>
         <keyword>color</keyword>
+        <keyword>draw</keyword>
         <keyword>edit</keyword>
         <keyword>font</keyword>
+        <keyword>paint</keyword>
         <keyword>text</keyword>
       </keywords>
     </icon>
@@ -12149,8 +12155,10 @@
       <keywords>
         <keyword>brush</keyword>
         <keyword>color</keyword>
+        <keyword>draw</keyword>
         <keyword>edit</keyword>
         <keyword>font</keyword>
+        <keyword>paint</keyword>
         <keyword>text</keyword>
       </keywords>
     </icon>
@@ -12158,8 +12166,10 @@
       <keywords>
         <keyword>brush</keyword>
         <keyword>color</keyword>
+        <keyword>draw</keyword>
         <keyword>edit</keyword>
         <keyword>font</keyword>
+        <keyword>paint</keyword>
         <keyword>text</keyword>
       </keywords>
     </icon>
@@ -12167,8 +12177,10 @@
       <keywords>
         <keyword>brush</keyword>
         <keyword>color</keyword>
+        <keyword>draw</keyword>
         <keyword>edit</keyword>
         <keyword>font</keyword>
+        <keyword>paint</keyword>
         <keyword>text</keyword>
       </keywords>
     </icon>
@@ -17132,42 +17144,54 @@
       <keywords>
         <keyword>brush</keyword>
         <keyword>color</keyword>
+        <keyword>draw</keyword>
         <keyword>edit</keyword>
+        <keyword>paint</keyword>
       </keywords>
     </icon>
     <icon filename="Paint_01_24.png" width="24" height="24" style="flat">
       <keywords>
         <keyword>brush</keyword>
         <keyword>color</keyword>
+        <keyword>draw</keyword>
         <keyword>edit</keyword>
+        <keyword>paint</keyword>
       </keywords>
     </icon>
     <icon filename="Paint_01_32.png" width="32" height="32" style="flat">
       <keywords>
         <keyword>brush</keyword>
         <keyword>color</keyword>
+        <keyword>draw</keyword>
         <keyword>edit</keyword>
+        <keyword>paint</keyword>
       </keywords>
     </icon>
     <icon filename="Paint_01_36.png" width="36" height="36" style="flat">
       <keywords>
         <keyword>brush</keyword>
         <keyword>color</keyword>
+        <keyword>draw</keyword>
         <keyword>edit</keyword>
+        <keyword>paint</keyword>
       </keywords>
     </icon>
     <icon filename="Paint_01_48.png" width="48" height="48" style="flat">
       <keywords>
         <keyword>brush</keyword>
         <keyword>color</keyword>
+        <keyword>draw</keyword>
         <keyword>edit</keyword>
+        <keyword>paint</keyword>
       </keywords>
     </icon>
     <icon filename="Paint_01_64.png" width="64" height="64" style="flat">
       <keywords>
         <keyword>brush</keyword>
         <keyword>color</keyword>
+        <keyword>draw</keyword>
         <keyword>edit</keyword>
+        <keyword>paint</keyword>
       </keywords>
     </icon>
     <icon filename="Paint_02_16.png" width="16" height="16" style="outline">
@@ -27115,6 +27139,7 @@
     <icon filename="ovl_Brush_01_16.png" width="16" height="16" style="classic">
       <keywords>
         <keyword>color</keyword>
+        <keyword>draw</keyword>
         <keyword>overlay</keyword>
         <keyword>paint</keyword>
         <keyword>pen</keyword>
@@ -27123,6 +27148,7 @@
     <icon filename="ovl_Brush_01_24.png" width="24" height="24" style="classic">
       <keywords>
         <keyword>color</keyword>
+        <keyword>draw</keyword>
         <keyword>overlay</keyword>
         <keyword>paint</keyword>
         <keyword>pen</keyword>
@@ -27131,6 +27157,7 @@
     <icon filename="ovl_Brush_01_32.png" width="32" height="32" style="classic">
       <keywords>
         <keyword>color</keyword>
+        <keyword>draw</keyword>
         <keyword>overlay</keyword>
         <keyword>paint</keyword>
         <keyword>pen</keyword>
@@ -27139,6 +27166,7 @@
     <icon filename="ovl_Brush_01_36.png" width="36" height="36" style="classic">
       <keywords>
         <keyword>color</keyword>
+        <keyword>draw</keyword>
         <keyword>overlay</keyword>
         <keyword>paint</keyword>
         <keyword>pen</keyword>
@@ -27147,6 +27175,7 @@
     <icon filename="ovl_Brush_01_48.png" width="48" height="48" style="classic">
       <keywords>
         <keyword>color</keyword>
+        <keyword>draw</keyword>
         <keyword>overlay</keyword>
         <keyword>paint</keyword>
         <keyword>pen</keyword>
@@ -27155,6 +27184,7 @@
     <icon filename="ovl_Brush_01_64.png" width="64" height="64" style="classic">
       <keywords>
         <keyword>color</keyword>
+        <keyword>draw</keyword>
         <keyword>overlay</keyword>
         <keyword>paint</keyword>
         <keyword>pen</keyword>
@@ -28636,5 +28666,305 @@
         <keyword>wrench</keyword>
       </keywords>
     </icon>
+    <icon filename="Color_04_16.png" width="16" height="16" style="flat">
+      <keywords>
+        <keyword>circle</keyword>
+        <keyword>color</keyword>
+        <keyword>draw</keyword>
+        <keyword>paint</keyword>
+        <keyword>pick</keyword>
+        <keyword>select</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Color_04_24.png" width="24" height="24" style="flat">
+      <keywords>
+        <keyword>circle</keyword>
+        <keyword>color</keyword>
+        <keyword>draw</keyword>
+        <keyword>paint</keyword>
+        <keyword>pick</keyword>
+        <keyword>select</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Color_04_32.png" width="32" height="32" style="flat">
+      <keywords>
+        <keyword>circle</keyword>
+        <keyword>color</keyword>
+        <keyword>draw</keyword>
+        <keyword>paint</keyword>
+        <keyword>pick</keyword>
+        <keyword>select</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Color_04_36.png" width="36" height="36" style="flat">
+      <keywords>
+        <keyword>circle</keyword>
+        <keyword>color</keyword>
+        <keyword>draw</keyword>
+        <keyword>paint</keyword>
+        <keyword>pick</keyword>
+        <keyword>select</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Color_04_48.png" width="48" height="48" style="flat">
+      <keywords>
+        <keyword>circle</keyword>
+        <keyword>color</keyword>
+        <keyword>draw</keyword>
+        <keyword>paint</keyword>
+        <keyword>pick</keyword>
+        <keyword>select</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Color_04_64.png" width="64" height="64" style="flat">
+      <keywords>
+        <keyword>circle</keyword>
+        <keyword>color</keyword>
+        <keyword>draw</keyword>
+        <keyword>paint</keyword>
+        <keyword>pick</keyword>
+        <keyword>select</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Paint_03_16.png" width="16" height="16" style="flat">
+      <keywords>
+        <keyword>color</keyword>
+        <keyword>draw</keyword>
+        <keyword>paint</keyword>
+        <keyword>palette</keyword>
+        <keyword>select</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Paint_03_24.png" width="24" height="24" style="flat">
+      <keywords>
+        <keyword>color</keyword>
+        <keyword>draw</keyword>
+        <keyword>paint</keyword>
+        <keyword>palette</keyword>
+        <keyword>select</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Paint_03_32.png" width="32" height="32" style="flat">
+      <keywords>
+        <keyword>color</keyword>
+        <keyword>draw</keyword>
+        <keyword>paint</keyword>
+        <keyword>palette</keyword>
+        <keyword>select</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Paint_03_36.png" width="36" height="36" style="flat">
+      <keywords>
+        <keyword>color</keyword>
+        <keyword>draw</keyword>
+        <keyword>paint</keyword>
+        <keyword>palette</keyword>
+        <keyword>select</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Paint_03_48.png" width="48" height="48" style="flat">
+      <keywords>
+        <keyword>color</keyword>
+        <keyword>draw</keyword>
+        <keyword>paint</keyword>
+        <keyword>palette</keyword>
+        <keyword>select</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Paint_03_64.png" width="64" height="64" style="flat">
+      <keywords>
+        <keyword>color</keyword>
+        <keyword>draw</keyword>
+        <keyword>paint</keyword>
+        <keyword>palette</keyword>
+        <keyword>select</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Setup_09_16.png" width="16" height="16" style="flat">
+      <keywords>
+        <keyword>configuration</keyword>
+        <keyword>gear</keyword>
+        <keyword>settings</keyword>
+        <keyword>setup</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Setup_09_24.png" width="24" height="24" style="flat">
+      <keywords>
+        <keyword>configuration</keyword>
+        <keyword>gear</keyword>
+        <keyword>settings</keyword>
+        <keyword>setup</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Setup_09_32.png" width="32" height="32" style="flat">
+      <keywords>
+        <keyword>configuration</keyword>
+        <keyword>gear</keyword>
+        <keyword>settings</keyword>
+        <keyword>setup</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Setup_09_36.png" width="36" height="36" style="flat">
+      <keywords>
+        <keyword>configuration</keyword>
+        <keyword>gear</keyword>
+        <keyword>settings</keyword>
+        <keyword>setup</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Setup_09_48.png" width="48" height="48" style="flat">
+      <keywords>
+        <keyword>configuration</keyword>
+        <keyword>gear</keyword>
+        <keyword>settings</keyword>
+        <keyword>setup</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Setup_09_64.png" width="64" height="64" style="flat">
+      <keywords>
+        <keyword>configuration</keyword>
+        <keyword>gear</keyword>
+        <keyword>settings</keyword>
+        <keyword>setup</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Target_02_16.png" width="16" height="16" style="flat">
+      <keywords>
+        <keyword>arrow</keyword>
+        <keyword>target</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Target_02_24.png" width="24" height="24" style="flat">
+      <keywords>
+        <keyword>arrow</keyword>
+        <keyword>target</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Target_02_32.png" width="32" height="32" style="flat">
+      <keywords>
+        <keyword>arrow</keyword>
+        <keyword>target</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Target_02_36.png" width="36" height="36" style="flat">
+      <keywords>
+        <keyword>arrow</keyword>
+        <keyword>target</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Target_02_48.png" width="48" height="48" style="flat">
+      <keywords>
+        <keyword>arrow</keyword>
+        <keyword>target</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Target_02_64.png" width="64" height="64" style="flat">
+      <keywords>
+        <keyword>arrow</keyword>
+        <keyword>target</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Window_18_16.png" width="16" height="16" style="flat">
+      <keywords>
+        <keyword>delete</keyword>
+        <keyword>form</keyword>
+        <keyword>minus</keyword>
+        <keyword>remove</keyword>
+        <keyword>window</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Window_18_24.png" width="24" height="24" style="flat">
+      <keywords>
+        <keyword>delete</keyword>
+        <keyword>form</keyword>
+        <keyword>minus</keyword>
+        <keyword>remove</keyword>
+        <keyword>window</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Window_18_32.png" width="32" height="32" style="flat">
+      <keywords>
+        <keyword>delete</keyword>
+        <keyword>form</keyword>
+        <keyword>minus</keyword>
+        <keyword>remove</keyword>
+        <keyword>window</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Window_18_36.png" width="36" height="36" style="flat">
+      <keywords>
+        <keyword>delete</keyword>
+        <keyword>form</keyword>
+        <keyword>minus</keyword>
+        <keyword>remove</keyword>
+        <keyword>window</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Window_18_48.png" width="48" height="48" style="flat">
+      <keywords>
+        <keyword>delete</keyword>
+        <keyword>form</keyword>
+        <keyword>minus</keyword>
+        <keyword>remove</keyword>
+        <keyword>window</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Window_18_64.png" width="64" height="64" style="flat">
+      <keywords>
+        <keyword>delete</keyword>
+        <keyword>form</keyword>
+        <keyword>minus</keyword>
+        <keyword>remove</keyword>
+        <keyword>window</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Window_19_16.png" width="16" height="16" style="flat">
+      <keywords>
+        <keyword>add</keyword>
+        <keyword>form</keyword>
+        <keyword>plus</keyword>
+        <keyword>window</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Window_19_24.png" width="24" height="24" style="flat">
+      <keywords>
+        <keyword>add</keyword>
+        <keyword>form</keyword>
+        <keyword>plus</keyword>
+        <keyword>window</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Window_19_32.png" width="32" height="32" style="flat">
+      <keywords>
+        <keyword>add</keyword>
+        <keyword>form</keyword>
+        <keyword>plus</keyword>
+        <keyword>window</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Window_19_36.png" width="36" height="36" style="flat">
+      <keywords>
+        <keyword>add</keyword>
+        <keyword>form</keyword>
+        <keyword>plus</keyword>
+        <keyword>window</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Window_19_48.png" width="48" height="48" style="flat">
+      <keywords>
+        <keyword>add</keyword>
+        <keyword>form</keyword>
+        <keyword>plus</keyword>
+        <keyword>window</keyword>
+      </keywords>
+    </icon>
+    <icon filename="Window_19_64.png" width="64" height="64" style="flat">
+      <keywords>
+        <keyword>add</keyword>
+        <keyword>form</keyword>
+        <keyword>plus</keyword>
+        <keyword>window</keyword>
+      </keywords>
+    </icon>
   </icons>
 </metadata>