New UI

.idea/runConfigurations/Delete_Finished_Icons.xml

@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Delete Finished Icons" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="deleteFinishedIcons" />
-        </list>
-      </option>
-      <option name="vmOptions" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <RunAsTest>false</RunAsTest>
-    <method v="2" />
-  </configuration>
-</component>

build.gradle.kts

@@ -1,38 +1,24 @@
-import java.io.FileFilter
-
 plugins {
 	java
 	id("org.jetbrains.intellij") version "1.15.0"
 }
 
 group = "com.chylex.intellij.coloredicons"
-version = "1.6.0"
+version = "1.4"
 
 repositories {
 	mavenCentral()
-	maven("https://www.jetbrains.com/intellij-repository/releases/")
 	maven("https://www.jetbrains.com/intellij-repository/snapshots/")
 }
 
 intellij {
 	type.set("IU")
-	version.set("242.20224-EAP-CANDIDATE-SNAPSHOT")
+	version.set("2023.2")
 	updateSinceUntilBuild.set(false)
-	
-	plugins.set(listOf(
-		"com.intellij.classic.ui:242.20224.22",    // https://plugins.jetbrains.com/plugin/24468-classic-ui/versions
-		"com.jetbrains.php:242.20224.44",          // https://plugins.jetbrains.com/plugin/6610-php/versions
-		"com.jetbrains.rust:242.1",                // https://plugins.jetbrains.com/plugin/22407-rust/versions
-		"org.intellij.scala:2024.2.11",            // https://plugins.jetbrains.com/plugin/1347-scala/versions
-		"org.jetbrains.plugins.go:242.20224.38",   // https://plugins.jetbrains.com/plugin/9568-go/versions
-		"org.jetbrains.plugins.ruby:242.20224.38", // https://plugins.jetbrains.com/plugin/1293-ruby/versions
-		"PythonCore:242.20224.38",                 // https://plugins.jetbrains.com/plugin/7322-python-community-edition/versions
-		"Pythonid:242.20224.38",                   // https://plugins.jetbrains.com/plugin/631-python/versions
-	))
 }
 
 tasks.patchPluginXml {
-	sinceBuild.set("242")
+	sinceBuild.set("232")
 }
 
 tasks.buildSearchableOptions {
@@ -63,9 +49,12 @@ dependencies {
 	"helpersImplementation"("commons-io:commons-io:2.11.0")
 	
 	if (System.getProperty("downloadExtraIDEs", "") == "true") {
-		"ides"("com.jetbrains.intellij.idea:ideaIU:2023.3")
+		"ides"("com.jetbrains.intellij.idea:ideaIU:LATEST-EAP-SNAPSHOT")
-		"ides"("com.jetbrains.intellij.clion:clion:2023.3")
+		"ides"("com.jetbrains.intellij.clion:clion:LATEST-EAP-SNAPSHOT")
-		"ides"("com.jetbrains.intellij.rider:riderRD:2023.3")
+		"ides"("com.jetbrains.intellij.goland:goland:LATEST-EAP-SNAPSHOT")
+		"ides"("com.jetbrains.intellij.phpstorm:phpstorm:LATEST-EAP-SNAPSHOT")
+		"ides"("com.jetbrains.intellij.pycharm:pycharmPY:LATEST-EAP-SNAPSHOT")
+		"ides"("com.jetbrains.intellij.rider:riderRD:2023.3-SNAPSHOT")
 	}
 }
 
@@ -83,16 +72,15 @@ fun getClassPathFolders(configuration: Configuration): List<String> {
 }
 
 createHelperTask("fixSVGs",                    main = "FixSVGs")
-createHelperTask("deleteFinishedIcons",        main = "DeleteFinishedIcons")
 createHelperTask("grabIconsFromInstalledIDEs", main = "GrabIcons\$FromInstalledIDEs")
-createHelperTask("grabIconsFromGradle",        main = "GrabIcons\$FromArgumentPaths") { task ->
+createHelperTask("grabIconsFromGradle",        main = "GrabIcons\$FromArgumentPaths") {
 	val ideLibraries = getClassPathFolders(project.configurations.getByName("ides"))
-	val downloadedPlugins = File(buildDir, "idea-sandbox/plugins").listFiles(FileFilter { it.isDirectory && it.name != rootProject.name })
+	val downloadedPlugins = File(buildDir, "idea-sandbox/system/plugins").absolutePath
 	
-	if (downloadedPlugins != null) {
+	if (File(downloadedPlugins).exists()) {
-		task.args = ideLibraries + downloadedPlugins.map(File::getAbsolutePath)
+		it.args = ideLibraries + downloadedPlugins
 	}
 	else {
-		task.args = ideLibraries
+		it.args = ideLibraries
 	}
 }

helpers/com/chylex/intellij/coloredicons/DeleteFinishedIcons.java

@@ -1,50 +0,0 @@
-package com.chylex.intellij.coloredicons;
-
-import org.apache.commons.io.FileUtils;
-import java.io.File;
-import java.nio.file.Path;
-import java.util.Collection;
-import java.util.Set;
-import static java.util.stream.Collectors.toSet;
-
-public final class DeleteFinishedIcons {
-	@SuppressWarnings("ResultOfMethodCallIgnored")
-	public static void main(final String[] args) {
-		final Path extractedRootPath = Path.of("./extracted");
-		final Path finishedRootPath = Path.of("./resources/icons");
-		
-		final Collection<File> extractedFiles = FileUtils.listFiles(extractedRootPath.toFile(), null, true);
-		final Collection<File> finishedFiles = FileUtils.listFiles(finishedRootPath.toFile(), null, true);
-		
-		System.out.println("Extracted files: " + extractedFiles.size());
-		System.out.println("Finished files: " + finishedFiles.size());
-		
-		final Set<String> finishedRelativePaths = finishedFiles.stream()
-			.map(file -> relativize(finishedRootPath, file))
-			.collect(toSet());
-		
-		int deleted = 0;
-		
-		for (final File extractedFile : extractedFiles) {
-			if (finishedRelativePaths.remove(relativize(extractedRootPath, extractedFile))) {
-				++deleted;
-				extractedFile.delete();
-			}
-		}
-		
-		System.out.println("Deleted files: " + deleted);
-		
-		if (!finishedRelativePaths.isEmpty()) {
-			System.out.println("Undeleted files: " + finishedRelativePaths.size());
-			System.out.println();
-			
-			finishedRelativePaths.stream()
-				.sorted()
-				.forEachOrdered(undeletedPath -> System.out.println("Undeleted file: " + undeletedPath));
-		}
-	}
-	
-	private static String relativize(final Path basePath, final File file) {
-		return basePath.relativize(file.toPath()).toString();
-	}
-}

helpers/com/chylex/intellij/coloredicons/GrabIcons.java

@@ -26,10 +26,7 @@ abstract class GrabIcons {
 	private static final List<String> EXPECTED_OLD_UI_VIEW_BOXES_LOWERCASE = List.of(
 		"viewbox=\"0 0 12 12\"",
 		"viewbox=\"0 0 13 13\"",
-		"viewbox=\"0 0 16 16\"",
+		"viewbox=\"0 0 16 16\""
-		"width=\"12\" height=\"12\"",
-		"width=\"13\" height=\"13\"",
-		"width=\"16\" height=\"16\""
 	);
 	
 	private static final List<String> EXPECTED_OLD_UI_COLORS_LOWERCASE = List.of(
@@ -40,10 +37,7 @@ abstract class GrabIcons {
 	private static final List<String> EXPECTED_NEW_UI_VIEW_BOXES_LOWERCASE = List.of(
 		"viewbox=\"0 0 14 14\"",
 		"viewbox=\"0 0 16 16\"",
-		"viewbox=\"0 0 20 20\"",
+		"viewbox=\"0 0 20 20\""
-		"width=\"14\" height=\"14\"",
-		"width=\"16\" height=\"16\"",
-		"width=\"20\" height=\"20\""
 	);
 	
 	private static final List<String> EXPECTED_NEW_UI_COLORS_LOWERCASE = List.of(

palette.svg

@@ -1,22 +1,48 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 32 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+<svg width="100%" height="100%" viewBox="0 0 33 29" version="1.1" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g id="Light">
+    <g id="Dark---New" serif:id="Dark / New">
-        <rect x="2" y="18" width="5.5" height="5.5" style="fill:#b76db7;"/>
+        <rect x="28" y="24" width="4" height="4" style="fill:#ced0d6;"/>
-        <rect x="8.5" y="18" width="5.5" height="5.5" style="fill:#6e6e6e;"/>
+        <rect x="23" y="24" width="4" height="4" style="fill:#b466b4;"/>
-        <rect x="2" y="5" width="5.5" height="5.5" style="fill:#59a869;"/>
+        <rect x="18" y="19" width="4" height="4" style="fill:#57965c;"/>
-        <rect x="8.5" y="5" width="5.5" height="5.5" style="fill:#eda200;"/>
+        <rect x="23" y="19" width="4" height="4" style="fill:#f2c55c;"/>
-        <rect x="2" y="11.5" width="5.5" height="5.5" style="fill:#389fd6;"/>
+        <rect x="28" y="19" width="4" height="4" style="fill:#548af7;"/>
-        <rect x="8.5" y="11.5" width="5.5" height="5.5" style="fill:#db5860;"/>
+        <rect x="18" y="24" width="4" height="4" style="fill:#db5c5c;"/>
-        <text x="5.832px" y="3.216px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:2px;">Light</text>
+        <g transform="matrix(2,0,0,2,29.8363,17.216)">
+        </g>
+        <text x="19.946px" y="17.216px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:2px;">Dark / New</text>
     </g>
-    <g id="Dark">
+    <g id="Dark---Old" serif:id="Dark / Old">
-        <rect x="24.5" y="18" width="5.5" height="5.5" style="fill:#afb1b3;"/>
+        <rect x="28" y="10" width="4" height="4" style="fill:#afb1b3;"/>
-        <rect x="18" y="18" width="5.5" height="5.5" style="fill:#b066b0;"/>
+        <rect x="23" y="10" width="4" height="4" style="fill:#b066b0;"/>
-        <rect x="18" y="5" width="5.5" height="5.5" style="fill:#499c54;"/>
+        <rect x="18" y="5" width="4" height="4" style="fill:#499c54;"/>
-        <rect x="24.5" y="5" width="5.5" height="5.5" style="fill:#f0a732;"/>
+        <rect x="23" y="5" width="4" height="4" style="fill:#f0a732;"/>
-        <rect x="18" y="11.5" width="5.5" height="5.5" style="fill:#3592c4;"/>
+        <rect x="28" y="5" width="4" height="4" style="fill:#3592c4;"/>
-        <rect x="24.5" y="11.5" width="5.5" height="5.5" style="fill:#c75450;"/>
+        <rect x="18" y="10" width="4" height="4" style="fill:#c75450;"/>
-        <text x="21.889px" y="3.216px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:2px;">Dark</text>
+        <g transform="matrix(2,0,0,2,29.4477,3.216)">
+        </g>
+        <text x="20.446px" y="3.216px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:2px;">Dark / Old</text>
+    </g>
+    <g id="Light---New" serif:id="Light / New">
+        <rect x="6" y="24" width="4" height="4" style="fill:#b857b8;"/>
+        <rect x="11" y="24" width="4" height="4" style="fill:#6c707e;"/>
+        <rect x="1" y="19" width="4" height="4" style="fill:#369650;"/>
+        <rect x="6" y="19" width="4" height="4" style="fill:#ffaf0f;"/>
+        <rect x="11" y="19" width="4" height="4" style="fill:#3574f0;"/>
+        <rect x="1.156" y="24" width="4" height="4" style="fill:#db3b4b;"/>
+        <g transform="matrix(2,0,0,2,12.9584,17.216)">
+        </g>
+        <text x="2.954px" y="17.216px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:2px;">Light / New</text>
+    </g>
+    <g id="Light---Old" serif:id="Light / Old">
+        <rect x="6" y="10" width="4" height="4" style="fill:#b76db7;"/>
+        <rect x="10.943" y="10" width="4" height="4" style="fill:#6e6e6e;"/>
+        <rect x="1" y="5" width="4" height="4" style="fill:#59a869;"/>
+        <rect x="6" y="5" width="4" height="4" style="fill:#eda200;"/>
+        <rect x="10.943" y="5" width="4" height="4" style="fill:#389fd6;"/>
+        <rect x="1" y="10" width="4" height="4" style="fill:#db5860;"/>
+        <g transform="matrix(2,0,0,2,12.5697,3.216)">
+        </g>
+        <text x="3.454px" y="3.216px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:2px;">Light / Old</text>
     </g>
 </svg>

resources/META-INF/plugin.xml

@@ -9,19 +9,6 @@
   </description>
   
   <change-notes><![CDATA[
-    <b>Version 1.6.0</b>
-    <ul>
-      <li>Added dependency on the Classic UI plugin for 2024.2</li>
-    </ul>
-    <b>Version 1.5.1</b>
-    <ul>
-      <li>Fixed a random exception while loading the plugin</li>
-    </ul>
-    <b>Version 1.5</b>
-    <ul>
-      <li>Fixed tool window icons for 2023.3</li>
-      <li>Fixed exception when using the new UI</li>
-    </ul>
     <b>Version 1.4</b>
     <ul>
       <li>Added tool window icons for Bookmarks, Notifications, Dependencies, Scala, and more</li>
@@ -50,7 +37,6 @@
   ]]></change-notes>
   
   <depends>com.intellij.modules.platform</depends>
-  <depends>com.intellij.classic.ui</depends>
   
   <application-components>
     <component>

resources/icons/expui/toolwindow/vcs.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;">
+    <circle cx="4.5" cy="4" r="2" style="fill:none;stroke:#3574f0;stroke-width:1px;"/>
+    <path d="M4.5,11.5L8.5,11.5C9.605,11.5 10.5,10.605 10.5,9.5L10.5,8" style="fill:none;fill-rule:nonzero;stroke:#3574f0;stroke-width:1px;"/>
+    <path d="M4.5,6.5L4.5,14.5" style="fill:none;fill-rule:nonzero;stroke:#3574f0;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;"/>
+    <circle cx="10.5" cy="6" r="2" style="fill:none;stroke:#3574f0;stroke-width:1px;"/>
+</svg>

resources/icons/expui/toolwindow/vcs@20x20.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <path d="M7.5,4.5C7.5,5.605 6.605,6.5 5.5,6.5C4.395,6.5 3.5,5.605 3.5,4.5C3.5,3.395 4.395,2.5 5.5,2.5C6.605,2.5 7.5,3.395 7.5,4.5ZM9,4.5C9,6.176 7.823,7.576 6.25,7.919L6.25,13.25L9.5,13.25C10.209,13.25 10.704,13.25 11.09,13.223C11.471,13.197 11.692,13.149 11.861,13.079C12.412,12.85 12.85,12.412 13.079,11.861C13.149,11.692 13.197,11.471 13.223,11.09C13.244,10.785 13.249,10.412 13.25,9.919C11.677,9.576 10.5,8.175 10.5,6.5C10.5,4.567 12.067,3 14,3C15.933,3 17.5,4.567 17.5,6.5C17.5,8.176 16.323,9.576 14.75,9.92C14.749,10.419 14.744,10.838 14.72,11.193C14.689,11.649 14.623,12.053 14.464,12.435C14.084,13.354 13.354,14.084 12.435,14.464C12.053,14.623 11.649,14.689 11.193,14.72C10.749,14.75 10.203,14.75 9.527,14.75L6.25,14.75L6.25,18C6.25,18.414 5.914,18.75 5.5,18.75C5.086,18.75 4.75,18.414 4.75,18L4.75,7.919C3.177,7.576 2,6.176 2,4.5C2,2.567 3.567,1 5.5,1C7.433,1 9,2.567 9,4.5ZM16,6.5C16,7.605 15.105,8.5 14,8.5C12.895,8.5 12,7.605 12,6.5C12,5.395 12.895,4.5 14,4.5C15.105,4.5 16,5.395 16,6.5Z" style="fill:#3574f0;"/>
+</svg>

resources/icons/expui/toolwindow/vcs@20x20_dark.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <path d="M7.5,4.5C7.5,5.605 6.605,6.5 5.5,6.5C4.395,6.5 3.5,5.605 3.5,4.5C3.5,3.395 4.395,2.5 5.5,2.5C6.605,2.5 7.5,3.395 7.5,4.5ZM9,4.5C9,6.176 7.823,7.576 6.25,7.919L6.25,13.25L9.5,13.25C10.209,13.25 10.704,13.25 11.09,13.223C11.471,13.197 11.692,13.149 11.861,13.079C12.412,12.85 12.85,12.412 13.079,11.861C13.149,11.692 13.197,11.471 13.223,11.09C13.244,10.785 13.249,10.412 13.25,9.919C11.677,9.576 10.5,8.175 10.5,6.5C10.5,4.567 12.067,3 14,3C15.933,3 17.5,4.567 17.5,6.5C17.5,8.176 16.323,9.576 14.75,9.92C14.749,10.419 14.744,10.838 14.72,11.193C14.689,11.649 14.623,12.053 14.464,12.435C14.084,13.354 13.354,14.084 12.435,14.464C12.053,14.623 11.649,14.689 11.193,14.72C10.749,14.75 10.203,14.75 9.527,14.75L6.25,14.75L6.25,18C6.25,18.414 5.914,18.75 5.5,18.75C5.086,18.75 4.75,18.414 4.75,18L4.75,7.919C3.177,7.576 2,6.176 2,4.5C2,2.567 3.567,1 5.5,1C7.433,1 9,2.567 9,4.5ZM16,6.5C16,7.605 15.105,8.5 14,8.5C12.895,8.5 12,7.605 12,6.5C12,5.395 12.895,4.5 14,4.5C15.105,4.5 16,5.395 16,6.5Z" style="fill:#548af7;"/>
+</svg>

resources/icons/expui/toolwindow/vcs_dark.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;">
+    <circle cx="4.5" cy="4" r="2" style="fill:none;stroke:#548af7;stroke-width:1px;"/>
+    <path d="M4.5,11.5L8.5,11.5C9.605,11.5 10.5,10.605 10.5,9.5L10.5,8" style="fill:none;fill-rule:nonzero;stroke:#548af7;stroke-width:1px;"/>
+    <path d="M4.5,6.5L4.5,14.5" style="fill:none;fill-rule:nonzero;stroke:#548af7;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;"/>
+    <circle cx="10.5" cy="6" r="2" style="fill:none;stroke:#548af7;stroke-width:1px;"/>
+</svg>

resources/icons/icons/com/jetbrains/python/pythonPackages.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13">
-    <path d="M6.5,0.375L12.625,3.778L6.5,7.181L0.375,3.778L6.5,0.375ZM11.4,5.819L12.625,6.5L6.5,9.903L0.375,6.5L1.6,5.819L6.5,8.542L11.4,5.819ZM11.4,8.542L12.625,9.222L6.5,12.625L0.375,9.222L1.6,8.542L6.5,11.264L11.4,8.542Z" style="fill:#389fd6;"/>
-</svg>

resources/icons/icons/com/jetbrains/python/pythonPackages_dark.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13">
-    <path d="M6.5,0.375L12.625,3.778L6.5,7.181L0.375,3.778L6.5,0.375ZM11.4,5.819L12.625,6.5L6.5,9.903L0.375,6.5L1.6,5.819L6.5,8.542L11.4,5.819ZM11.4,8.542L12.625,9.222L6.5,12.625L0.375,9.222L1.6,8.542L6.5,11.264L11.4,8.542Z" style="fill:#3592c4;"/>
-</svg>

resources/icons/rider/toolwindows/DotMemoryProfilingMonoTone.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13">
-    <path d="M5.687,3.25C3.459,3.25 1.625,5.084 1.625,7.312C1.625,9.54 3.459,11.374 5.687,11.374C7.915,11.374 9.749,9.54 9.749,7.312L8.937,7.312C8.937,9.095 7.47,10.562 5.687,10.562C3.904,10.562 2.437,9.095 2.437,7.312C2.437,5.529 3.904,4.062 5.687,4.062L5.687,3.25Z" style="fill:#59a869;"/>
-    <path d="M11.375,6.5C11.375,3.826 9.174,1.625 6.5,1.625L6.5,6.5L11.375,6.5Z" style="fill:#59a869;"/>
-</svg>

resources/icons/rider/toolwindows/DotMemoryProfilingMonoTone_dark.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13">
-    <path d="M5.688,3.25C5.687,3.25 5.687,3.25 5.686,3.25C3.457,3.25 1.623,5.084 1.623,7.313C1.623,9.542 3.457,11.376 5.686,11.376C7.915,11.376 9.749,9.542 9.749,7.313C9.749,7.313 9.749,7.312 9.749,7.312L8.937,7.312C8.937,9.095 7.47,10.562 5.687,10.562C3.904,10.562 2.437,9.095 2.437,7.312C2.437,5.529 3.904,4.062 5.687,4.062L5.687,3.25L5.688,3.25Z" style="fill:#499c54;"/>
-    <path d="M11.375,6.5C11.375,3.826 9.174,1.625 6.5,1.625L6.5,6.5L11.375,6.5Z" style="fill:#499c54;"/>
-</svg>

resources/icons/toolwindows/DotMemoryProfilingMonoTone.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13"><path fill="#6e6e6e" fill-rule="evenodd" d="M5.687 3.25a4.062 4.062 0 1 0 4.062 4.062h-.812a3.25 3.25 0 1 1-3.25-3.25V3.25Z"/><path fill="#6e6e6e" fill-rule="evenodd" d="M11.375 6.5A4.875 4.875 0 0 0 6.5 1.625V6.5h4.875Z"/></svg>

resources/icons/toolwindows/DotMemoryProfilingMonoTone_dark.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13"><path fill="#afb1b3" fill-rule="evenodd" d="M5.688 3.25a4.063 4.063 0 1 0 4.061 4.062h-.812a3.25 3.25 0 1 1-3.25-3.25V3.25Z"/><path fill="#afb1b3" fill-rule="evenodd" d="M11.375 6.5A4.875 4.875 0 0 0 6.5 1.625V6.5h4.875Z"/></svg>

resources/icons/toolwindows/toolWindowProfilerAndroid.svg

@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13">
-    <g>
-        <path d="M10.362,4.567l-1.239,0c-0.303,-1.894 -1.944,-3.341 -3.924,-3.341c-2.194,0 -3.973,1.779 -3.973,3.973c0,2.195 1.779,3.974 3.973,3.974c0.275,0 0.542,-0.028 0.801,-0.081l0,1.247c-0.261,0.04 -0.528,0.061 -0.8,0.061c-2.872,0 -5.2,-2.328 -5.2,-5.2c0,-2.872 2.328,-5.2 5.2,-5.2c2.657,0 4.849,1.994 5.162,4.567Z" style="fill:#6e6e6e;"/>
-        <rect x="4.992" y="2.77" width="1" height="2.724" style="fill:#6e6e6e;"/>
-        <path d="M5.284,4.787l0.706,0.707l-1.924,1.926l-0.706,-0.708l1.924,-1.925Z" style="fill:#6e6e6e;"/>
-        <path d="M7,4.767l6,4l-6,4l0,-8Z" style="fill:#59a869;"/>
-    </g>
-</svg>

resources/icons/toolwindows/toolWindowProfilerAndroid_dark.svg

@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13">
-    <g>
-        <path d="M10.362,4.567l-1.239,0c-0.303,-1.894 -1.944,-3.341 -3.924,-3.341c-2.194,0 -3.973,1.779 -3.973,3.973c0,2.195 1.779,3.974 3.973,3.974c0.275,0 0.542,-0.028 0.801,-0.081l0,1.247c-0.261,0.04 -0.528,0.061 -0.8,0.061c-2.872,0 -5.2,-2.328 -5.2,-5.2c0,-2.872 2.328,-5.2 5.2,-5.2c2.657,0 4.849,1.994 5.162,4.567Z" style="fill:#afb1b3;"/>
-        <rect x="4.992" y="2.77" width="1" height="2.724" style="fill:#afb1b3;"/>
-        <path d="M5.284,4.787l0.706,0.707l-1.924,1.926l-0.706,-0.708l1.924,-1.925Z" style="fill:#afb1b3;"/>
-        <path d="M7,4.767l6,4l-6,4l0,-8Z" style="fill:#499c54;"/>
-    </g>
-</svg>

resources/icons/toolwindows/toolWindowRunWithCoverage.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13">
-    <path d="M7.5,6L13,9.5L7.5,13L7.5,6Z" style="fill:#59a869;"/>
-    <path d="M6.5,0.2L1.5,1.2L1.5,6.9C1.764,9.874 6.498,12.2 6.498,12.2L6.5,12.199L6.5,1.978L9.722,2.606L9.722,6.229L11.434,7.318C11.465,7.18 11.488,7.041 11.5,6.9L11.5,1.2L6.5,0.2Z" style="fill:#6e6e6e;fill-rule:nonzero;"/>
-</svg>

resources/icons/toolwindows/toolWindowRunWithCoverage_dark.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13">
-    <path d="M7.5,6L13,9.5L7.5,13L7.5,6Z" style="fill:#499c54;"/>
-    <path d="M6.5,0.2L1.5,1.2L1.5,6.9C1.764,9.874 6.498,12.2 6.498,12.2L6.5,12.199L6.5,1.978L9.722,2.606L9.722,6.229L11.434,7.318C11.465,7.18 11.488,7.041 11.5,6.9L11.5,1.2L6.5,0.2Z" style="fill:#afb1b3;fill-rule:nonzero;"/>
-</svg>

src/com/chylex/intellij/coloredicons/IconPatcher.java

@@ -1,11 +1,11 @@
 package com.chylex.intellij.coloredicons;
+import com.chylex.intellij.coloredicons.sets.NewUI;
 import com.chylex.intellij.coloredicons.sets.OldUI;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.IconPathPatcher;
-import com.intellij.ui.NewUI;
+import com.intellij.ui.NewUiValue;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import java.util.Collections;
 import java.util.Map;
 
 public class IconPatcher extends IconPathPatcher {
@@ -13,7 +13,7 @@ public class IconPatcher extends IconPathPatcher {
 	private final Map<String, String> iconPaths;
 	
 	public IconPatcher() {
-		iconPaths = NewUI.isEnabled() ? Collections.emptyMap() : OldUI.getIconPaths();
+		iconPaths = NewUiValue.isEnabled() ? NewUI.getIconPaths() : OldUI.getIconPaths();
 		IconLoader.installPathPatcher(this);
 	}
 	

src/com/chylex/intellij/coloredicons/sets/NewUI.java

@@ -0,0 +1,33 @@
+package com.chylex.intellij.coloredicons.sets;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public final class NewUI {
+	
+	public static Map<String, String> getIconPaths() {
+		return new NewUI().getMap();
+	}
+	
+	private final Map<String, String> iconPaths = new HashMap<>();
+	
+	private NewUI() {
+		addPathWithDark("toolwindows/toolWindowChanges", "expui/toolwindow/vcs");
+		addPathWithDark("expui/toolwindow/vcs");
+		addPathWithDark("expui/toolwindow/vcs@20x20");
+	}
+	
+	private Map<String, String> getMap() {
+		return iconPaths;
+	}
+	
+	private void addPathWithDark(final String oldUiPath, final String newPath) {
+		iconPaths.put('/' + oldUiPath + ".svg", "icons/" + newPath + ".svg");
+		iconPaths.put('/' + oldUiPath + "_dark.svg", "icons/" + newPath + "_dark.svg");
+	}
+	
+	private void addPathWithDark(final String path) {
+		iconPaths.put('/' + path + ".svg", "icons/" + path + ".svg");
+		iconPaths.put('/' + path + "_dark.svg", "icons/" + path + "_dark.svg");
+	}
+}

src/com/chylex/intellij/coloredicons/sets/OldUI.java

@@ -99,7 +99,7 @@ public final class OldUI {
 		addPathWithDark("icons/toolWindowDatabase");
 		addPathWithDark("icons/toolwindowDatabaseChanges");
 		addPathWithDark("icons/toolWindowDsm");
-		addPathWithDark("icons/toolWindowEndpoints");
+		addPathWithDark("icons/toolwindowEndpoints");
 		addPathWithDark("icons/toolWindowGradle");
 		addPathWithDark("icons/toolWindowSQLGenerator");
 		addPathWithDark("icons/youTrack");
@@ -108,7 +108,6 @@ public final class OldUI {
 		addPathWithDark("icons/buildTools/npm/npm_13");
 		addPathWithDark("icons/com/jetbrains/python/DataView");
 		addPathWithDark("icons/com/jetbrains/python/pythonConsoleToolWindow");
-		addPathWithDark("icons/com/jetbrains/python/pythonPackages");
 		
 		addPathWithDark("images/toolWindowMaven");
 		addPathWithDark("images/transferToolWindow");
@@ -125,21 +124,17 @@ public final class OldUI {
 		addPathWithDark("objectBrowser/visibilitySort");
 		
 		addPathWithDark("org/jetbrains/plugins/github/pullRequestsToolWindow");
-		addPathWithDark("org/jetbrains/sbt/images/sbtShellToolwin");
+		addPathWithDark("org/jetbrains/plugins/scala/images/sbtShellToolwin");
-		addPathWithDark("org/jetbrains/sbt/images/sbtToolwin");
+		addPathWithDark("org/jetbrains/plugins/scala/images/sbtToolwin");
 		
 		addPathWithDark("resources/icons/bvToolWindow");
 		addPathWithDark("resources/icons/hibConsoleToolWindow");
 		
-		addPathWithDark("rider/toolwindows/DotMemoryProfilingMonoTone");
+		addPathWithDark("rider/toolWindows/toolWindowNuGet");
-		addPathWithDark("rider/toolwindows/toolWindowDPA");
+		addPathWithDark("rider/toolWindows/toolWindowSolutionWideAnalysis");
-		addPathWithDark("rider/toolwindows/toolWindowDotTrace");
+		addPathWithDark("rider/toolWindows/toolwindowStacktrace");
-		addPathWithDark("rider/toolwindows/toolWindowNuGet");
+		addPathWithDark("rider/toolWindows/toolWindowUnitTesting");
-		addPathWithDark("rider/toolwindows/toolWindowSolutionWideAnalysis");
+		addPathWithDark("rider/toolWindows/toolWindowWPFPreview");
-		addPathWithDark("rider/toolwindows/toolWindowUnitTesting");
-		addPathWithDark("rider/toolwindows/toolWindowWPFPreview");
-		addPathWithDark("rider/toolwindows/toolwindowStacktrace");
-		addPathWithDark("rider/toolwindows/toolwindowUnitTestCoverage");
 		
 		addPathWithDark("runConfigurations/scroll_down");
 		addPathWithDark("runConfigurations/showIgnored");
@@ -177,10 +172,8 @@ public final class OldUI {
 		addPathWithDark("toolwindows/toolWindowMessages");
 		addPathWithDark("toolwindows/toolWindowModuleDependencies");
 		addPathWithDark("toolwindows/toolWindowProfiler");
-		addPathWithDark("toolwindows/toolWindowProfilerAndroid");
 		addPathWithDark("toolwindows/toolWindowProject");
 		addPathWithDark("toolwindows/toolWindowRun");
-		addPathWithDark("toolwindows/toolWindowRunWithCoverage");
 		addPathWithDark("toolwindows/toolWindowServices");
 		addPathWithDark("toolwindows/toolWindowStructure");
 		addPathWithDark("toolwindows/toolWindowTodo");
@@ -189,6 +182,10 @@ public final class OldUI {
 		addPathWithDark("vcs/changelist");
 		addPathWithDark("vcs/history");
 		addPathWithDark("vcs/merge");
+		
+		addPathWithDark("toolWindowDotTrace");
+		addPathWithDark("toolWindowDPA");
+		addPathWithDark("toolwindowUnitTestCoverage");
 	}
 	
 	private Map<String, String> getMap() {