diff --git a/core/resources-src/pix/icon/icon-windows.ico b/core/resources-src/pix/icon/icon-windows.ico
deleted file mode 100644
index 44eb480a2..000000000
Binary files a/core/resources-src/pix/icon/icon-windows.ico and /dev/null differ
diff --git a/install4j/22.02/OpenRocket.icns b/core/resources/pix/icon/icon-macos.icns
similarity index 100%
rename from install4j/22.02/OpenRocket.icns
rename to core/resources/pix/icon/icon-macos.icns
diff --git a/core/resources/pix/icon/icon-windows.ico b/core/resources/pix/icon/icon-windows.ico
new file mode 100644
index 000000000..3b0725e0a
Binary files /dev/null and b/core/resources/pix/icon/icon-windows.ico differ
diff --git a/install4j/22.02/openrocket-22.02.install4j b/install4j/22.02/openrocket-22.02.install4j
index 1ac751328..3fba1a04d 100644
--- a/install4j/22.02/openrocket-22.02.install4j
+++ b/install4j/22.02/openrocket-22.02.install4j
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="10.0.4" transformSequenceNumber="10">
-  <directoryPresets config="../../core/resources-src/pix/icon" />
+  <directoryPresets config="../../core/resources/pix/icon" />
   <application name="OpenRocket 22.02.RC.01" applicationId="8434-9327-1469-6373" mediaDir="media" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.version}_${compiler:sys.platform}" shortName="OpenRocket" publisher="OpenRocket" publisherWeb="http://openrocket.info" version="22.02.RC.01" allPathsRelative="true" convertDotsToUnderscores="false" macVolumeId="5f58a2be20d8e22f" javaMinVersion="11" javaMaxVersion="11" jdkMode="jdk" jdkName="JDK 11.0">
     <codeSigning macEnabled="true" macPkcs12File="./code_signing/OpenRocket_macOS.p12" windowsEnabled="true" windowsPkcs12File="./code_signing/OpenRocket_Windows.pfx" macNotarize="true" appleId="sibo.vangool@hotmail.com" />
     <jreBundles jdkProviderId="Liberica" release="11/11.0.17+7">
@@ -19,9 +19,9 @@
     </entries>
   </files>
   <launchers>
-    <launcher name="OpenRocket 22.02" id="59" icnsFile="OpenRocket.icns">
-      <executable name="OpenRocket" iconSet="true" iconFile="../../core/resources-src/pix/icon/icon-windows.ico" executableDir="." executableMode="gui">
-        <versionInfo legalCopyright="Copyright 2007-2022 Sampo Niskanen and Others" />
+    <launcher name="OpenRocket 22.02" id="59" icnsFile="../../core/resources/pix/icon/icon-macos.icns">
+      <executable name="OpenRocket" iconSet="true" iconFile="../../core/resources/pix/icon/icon-windows.ico" executableDir="." executableMode="gui">
+        <versionInfo include="true" fileDescription="A model rocket flight-trajectory simulator." legalCopyright="Copyright 2007-2023 Sampo Niskanen and Others" internalName="${compiler:sys.shortName} ${compiler:sys.version}" />
       </executable>
       <splashScreen show="true" width="662" height="336" bitmapFile="../../core/resources/pix/splashscreen.png">
         <text>
@@ -35,99 +35,51 @@
         </classPath>
       </java>
       <iconImageFiles>
-        <file path="../../core/resources-src/pix/icon/icon-016-4bit.png" />
-        <file path="../../core/resources-src/pix/icon/icon-016-8bit.png" />
-        <file path="../../core/resources-src/pix/icon/icon-032-4bit.png" />
-        <file path="../../core/resources-src/pix/icon/icon-032-8bit.png" />
-        <file path="../../core/resources-src/pix/icon/icon-048-4bit.png" />
-        <file path="../../core/resources-src/pix/icon/icon-048-8bit.png" />
-        <file path="../../core/resources-src/pix/icon/icon-064-4bit.png" />
-        <file path="../../core/resources-src/pix/icon/icon-064-8bit.png" />
-        <file path="../../core/resources-src/pix/icon/icon-256-1.png" />
-        <file path="../../core/resources-src/pix/icon/icon-016.png" />
-        <file path="../../core/resources-src/pix/icon/icon-032.png" />
-        <file path="../../core/resources-src/pix/icon/icon-048.png" />
-        <file path="../../core/resources-src/pix/icon/icon-064.png" />
-        <file path="../../core/resources-src/pix/icon/icon-256.png" />
+        <file path="../../core/resources/pix/icon/icon-016.png" />
+        <file path="../../core/resources/pix/icon/icon-032.png" />
+        <file path="../../core/resources/pix/icon/icon-048.png" />
+        <file path="../../core/resources/pix/icon/icon-064.png" />
+        <file path="../../core/resources/pix/icon/icon-128.png" />
+        <file path="../../core/resources/pix/icon/icon-256.png" />
       </iconImageFiles>
       <macStaticAssociations>
-        <fileAssociation extension="ork" description="OpenRocket Design" iconFile="./OpenRocket.icns" role="editor" />
+        <fileAssociation extension="ork" description="OpenRocket Design" iconFile="../../core/resources/pix/icon/icon-macos.icns" role="editor" />
       </macStaticAssociations>
     </launcher>
   </launchers>
   <installerGui>
     <applications>
-      <application id="installer" beanClass="com.install4j.runtime.beans.applications.InstallerApplication" customIcnsFile="./OpenRocket.icns" customIcoFile="../../core/resources-src/pix/icon/icon-windows.ico">
+      <application id="installer" beanClass="com.install4j.runtime.beans.applications.InstallerApplication" customIcnsFile="../../core/resources/pix/icon/icon-macos.icns" customIcoFile="../../core/resources/pix/icon/icon-windows.ico">
         <serializedBean>
           <property name="customIconImageFiles">
             <add>
               <object class="com.install4j.api.beans.ExternalFile">
-                <string>../../core/resources-src/pix/icon/icon-016-4bit.png</string>
+                <string>../../core/resources/pix/icon/icon-016.png</string>
               </object>
             </add>
             <add>
               <object class="com.install4j.api.beans.ExternalFile">
-                <string>../../core/resources-src/pix/icon/icon-016-8bit.png</string>
+                <string>../../core/resources/pix/icon/icon-032.png</string>
               </object>
             </add>
             <add>
               <object class="com.install4j.api.beans.ExternalFile">
-                <string>../../core/resources-src/pix/icon/icon-016.png</string>
+                <string>../../core/resources/pix/icon/icon-048.png</string>
               </object>
             </add>
             <add>
               <object class="com.install4j.api.beans.ExternalFile">
-                <string>../../core/resources-src/pix/icon/icon-032-4bit.png</string>
+                <string>../../core/resources/pix/icon/icon-064.png</string>
               </object>
             </add>
             <add>
               <object class="com.install4j.api.beans.ExternalFile">
-                <string>../../core/resources-src/pix/icon/icon-032-8bit.png</string>
+                <string>../../core/resources/pix/icon/icon-128.png</string>
               </object>
             </add>
             <add>
               <object class="com.install4j.api.beans.ExternalFile">
-                <string>../../core/resources-src/pix/icon/icon-032.png</string>
-              </object>
-            </add>
-            <add>
-              <object class="com.install4j.api.beans.ExternalFile">
-                <string>../../core/resources-src/pix/icon/icon-048-4bit.png</string>
-              </object>
-            </add>
-            <add>
-              <object class="com.install4j.api.beans.ExternalFile">
-                <string>../../core/resources-src/pix/icon/icon-048-8bit.png</string>
-              </object>
-            </add>
-            <add>
-              <object class="com.install4j.api.beans.ExternalFile">
-                <string>../../core/resources-src/pix/icon/icon-048.png</string>
-              </object>
-            </add>
-            <add>
-              <object class="com.install4j.api.beans.ExternalFile">
-                <string>../../core/resources-src/pix/icon/icon-064-4bit.png</string>
-              </object>
-            </add>
-            <add>
-              <object class="com.install4j.api.beans.ExternalFile">
-                <string>../../core/resources-src/pix/icon/icon-064-8bit.png</string>
-              </object>
-            </add>
-            <add>
-              <object class="com.install4j.api.beans.ExternalFile">
-                <string>../../core/resources-src/pix/icon/icon-064.png</string>
-              </object>
-            </add>
-            <add>
-              <object class="com.install4j.api.beans.ExternalFile">
-                <string>../../core/resources-src/pix/icon/icon-256-1.png</string>
-              </object>
-            </add>
-            <add>
-              <object class="com.install4j.api.beans.ExternalFile">
-                <string>../../core/resources-src/pix/icon/icon-256.png</string>
+                <string>../../core/resources/pix/icon/icon-256.png</string>
               </object>
             </add>
           </property>
@@ -272,12 +224,12 @@ return console.askOkCancel(message, true);
                   </property>
                   <property name="icon">
                     <object class="com.install4j.api.beans.ExternalFile">
-                      <string>../../core/resources-src/pix/icon/icon-windows.ico</string>
+                      <string>../../core/resources/pix/icon/icon-windows.ico</string>
                     </object>
                   </property>
                   <property name="unixIconFile">
                     <object class="com.install4j.api.beans.ExternalFile">
-                      <string>../../core/resources-src/pix/icon/icon-048.png</string>
+                      <string>../../core/resources/pix/icon/icon-048.png</string>
                     </object>
                   </property>
                 </serializedBean>
@@ -304,12 +256,12 @@ return console.askOkCancel(message, true);
                   <property name="name" type="string">${compiler:sys.fullName}</property>
                   <property name="unixIconFile">
                     <object class="com.install4j.api.beans.ExternalFile">
-                      <string>../../core/resources-src/pix/icon/icon-064.png</string>
+                      <string>../../core/resources/pix/icon/icon-064.png</string>
                     </object>
                   </property>
                   <property name="winIconFile">
                     <object class="com.install4j.api.beans.ExternalFile">
-                      <string>../../core/resources-src/pix/icon/icon-windows.ico</string>
+                      <string>../../core/resources/pix/icon/icon-windows.ico</string>
                     </object>
                   </property>
                 </serializedBean>
@@ -323,13 +275,13 @@ return console.askOkCancel(message, true);
                   <property name="unix" type="boolean" value="true" />
                   <property name="unixIconFile">
                     <object class="com.install4j.api.beans.ExternalFile">
-                      <string>../../core/resources-src/pix/icon/icon-064.png</string>
+                      <string>../../core/resources/pix/icon/icon-064.png</string>
                     </object>
                   </property>
                   <property name="unixMimeType" type="string">application/x-openrocket</property>
                   <property name="windowsIconFile">
                     <object class="com.install4j.api.beans.ExternalFile">
-                      <string>../../core/resources-src/pix/icon/icon-windows.ico</string>
+                      <string>../../core/resources/pix/icon/icon-windows.ico</string>
                     </object>
                   </property>
                 </serializedBean>