use icon class for exp ui icons

GitOrigin-RevId: 2602687540cf5c26b086c54d198d7a6b05192050

java/idea-ui/src/com/intellij/ide/actions/NewProjectAction.java

@@ -1,7 +1,7 @@
 // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.ide.actions;
 
-import com.intellij.icons.AllIcons;
+import com.intellij.icons.ExpUiIcons;
 import com.intellij.ide.JavaUiBundle;
 import com.intellij.ide.impl.NewProjectUtil;
 import com.intellij.ide.projectWizard.NewProjectWizard;
@@ -15,7 +15,6 @@ import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
 import com.intellij.openapi.wm.impl.welcomeScreen.NewWelcomeScreen;
 import com.intellij.ui.ExperimentalUI;
-import com.intellij.ui.IconManager;
 import org.jetbrains.annotations.NotNull;
 
 public class NewProjectAction extends AnAction implements DumbAware, NewProjectOrModuleAction {
@@ -41,7 +40,7 @@ public class NewProjectAction extends AnAction implements DumbAware, NewProjectO
       NewWelcomeScreen.updateNewProjectIconIfWelcomeScreen(e);
     }
     else if (ExperimentalUI.isNewUI() && ActionPlaces.PROJECT_WIDGET_POPUP.equals(e.getPlace())) {
-      e.getPresentation().setIcon(IconManager.getInstance().getIcon("expui/general/add.svg", AllIcons.class));
+      e.getPresentation().setIcon(ExpUiIcons.General.Add);
     }
   }
 

platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IconsClassGenerator.kt

@@ -1,5 +1,6 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 @file:Suppress("ReplacePutWithAssignment", "ReplaceGetOrSet", "LiftReturnOrAssignment")
+
 package org.jetbrains.intellij.build.images
 
 import com.intellij.openapi.util.text.StringUtil
@@ -75,8 +76,26 @@ internal open class IconsClassGenerator(private val projectHome: Path,
         packageName = "com.intellij.icons"
         className = "AllIcons"
 
-        val dir = utilUi.getSourceRoots(JavaSourceRootType.SOURCE).first().file.absolutePath + "/com/intellij/icons"
-        outFile = Path.of(dir, "$className.java")
+        val dir = utilUi.getSourceRoots(JavaSourceRootType.SOURCE).first().path.toAbsolutePath().resolve("com/intellij/icons")
+        outFile = dir.resolve("$className.java")
+
+        val imageCollector = ImageCollector(projectHome = projectHome, moduleConfig = moduleConfig)
+        val images = imageCollector.collect(module = module, includePhantom = true)
+        imageCollector.printUsedIconRobots()
+
+        val (expUi, others) = images.partition { it.id.startsWith("/expui/") }
+        return listOf(
+          IconClassInfo(customLoad = true,
+                        packageName = packageName,
+                        className = className.toString(),
+                        outFile = outFile,
+                        images = others),
+          IconClassInfo(customLoad = true,
+                        packageName = packageName,
+                        className = "ExpUiIcons",
+                        outFile = dir.resolve("ExpUiIcons.java"),
+                        images = expUi.map { it.trimPrefix("/expui") }),
+        )
       }
       "intellij.android.artwork" -> {
         packageName = "icons"
@@ -170,7 +189,7 @@ internal open class IconsClassGenerator(private val projectHome: Path,
       }
 
       classCode.setLength(0)
-      val newText = writeClass(getCopyrightComment(oldText), iconClassInfo, classCode)
+      val newText = writeClass(copyrightComment = getCopyrightComment(oldText), info = iconClassInfo, result = classCode)
       if (newText.isNullOrEmpty()) {
         if (Files.exists(outFile)) {
           obsoleteClasses.add(outFile)
@@ -512,7 +531,7 @@ private fun generateIconFieldName(file: Path): CharSequence {
 }
 
 private fun getImageId(image: ImageInfo, depth: Int): String {
-  val path = image.id.removePrefix("/").split("/")
+  val path = image.id.removePrefix("/").split('/')
   if (path.size < depth) {
     throw IllegalArgumentException("Can't get image id - ${image.id}, $depth")
   }
@@ -608,7 +627,7 @@ private fun toCamelCaseJavaIdentifier(id: String, endIndex: Int): CharSequence {
   var upperCase = true
   while (index < endIndex) {
     val c = id[index]
-    if (c == '_' || c == '-')  {
+    if (c == '_' || c == '-') {
       upperCase = true
     }
     else if (if (index == 0) Character.isJavaIdentifierStart(c) else Character.isJavaIdentifierPart(c)) {
@@ -630,7 +649,8 @@ private fun toCamelCaseJavaIdentifier(id: String, endIndex: Int): CharSequence {
 }
 
 private fun capitalize(name: String): String {
-  return if (name.length == 2) name.uppercase(Locale.ENGLISH) else name.replaceFirstChar {
+  return if (name.length == 2) name.uppercase(Locale.ENGLISH)
+  else name.replaceFirstChar {
     if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString()
   }
 }
@@ -682,7 +702,8 @@ private fun getPluginPackageIfPossible(module: JpsModule): String? {
       // ok, any xml file
       try {
         pluginXml = Files.newDirectoryStream(root).use { files -> files.find { it.toString().endsWith(".xml") } } ?: break
-      } catch(e: NoSuchFileException) {
+      }
+      catch (e: NoSuchFileException) {
         println("Directory attempted to be used but did not exist ${e.message}")
       }
     }

platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/ImageCollector.kt

@@ -1,5 +1,5 @@
 // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-@file:Suppress("ReplacePutWithAssignment")
+@file:Suppress("ReplacePutWithAssignment", "LiftReturnOrAssignment")
 
 package org.jetbrains.intellij.build.images
 
@@ -8,7 +8,6 @@ import com.intellij.ui.icons.ImageDescriptor
 import org.jetbrains.jps.model.java.JavaResourceRootType
 import org.jetbrains.jps.model.module.JpsModule
 import org.jetbrains.jps.model.module.JpsModuleSourceRoot
-import org.jetbrains.jps.util.JpsPathUtil
 import java.io.File
 import java.io.IOException
 import java.nio.file.Files
@@ -26,15 +25,22 @@ internal const val ROBOTS_FILE_NAME = "icon-robots.txt"
 
 private val EMPTY_IMAGE_FLAGS = ImageFlags(used = false, deprecation = null)
 
-internal class ImageInfo(val id: String,
-                         val sourceRoot: JpsModuleSourceRoot,
-                         val phantom: Boolean) {
+internal class ImageInfo(@JvmField val id: String,
+                         @JvmField val sourceRoot: JpsModuleSourceRoot,
+                         @JvmField val phantom: Boolean) {
   private var flags = EMPTY_IMAGE_FLAGS
   private val images = ArrayList<Path>()
 
   val files: List<Path>
     get() = images
 
+  fun trimPrefix(prefix: String): ImageInfo {
+    val copy = ImageInfo(id = id.removePrefix(prefix), sourceRoot = sourceRoot, phantom = phantom)
+    copy.images.addAll(images)
+    copy.flags = flags
+    return copy
+  }
+
   @Synchronized
   fun addImage(file: Path, fileFlags: ImageFlags) {
     images.add(file)
@@ -108,14 +114,15 @@ internal class ImageCollector(private val projectHome: Path,
       if (sourceRoot.rootType != JavaResourceRootType.RESOURCE) {
         continue
       }
-      val rootDir = Path.of(JpsPathUtil.urlToPath(sourceRoot.url))
+
+      val rootDir = sourceRoot.path
 
       val iconDirectory = moduleConfig?.iconDirectory
       if (iconDirectory != null) {
         val rootRobotData = upToProjectHome(rootDir)
         val iconRoot = rootDir.resolve(iconDirectory).normalize()
-        processDirectory(iconRoot, rootDir, sourceRoot, rootRobotData, "", 0)
-        processPhantomIcons(iconRoot, sourceRoot, rootRobotData, "")
+        processDirectory(dir = iconRoot, rootDir = rootDir, sourceRoot = sourceRoot, robotData = rootRobotData, prefix = "", level = 0)
+        processPhantomIcons(root = iconRoot, sourceRoot = sourceRoot, robotData = rootRobotData, prefix = "")
         break
       }
 
@@ -141,8 +148,8 @@ internal class ImageCollector(private val projectHome: Path,
   }
 
   fun collectSubDir(sourceRoot: JpsModuleSourceRoot, name: String, includePhantom: Boolean = false): List<ImageInfo> {
-    processRoot(sourceRoot, Path.of(JpsPathUtil.urlToPath(sourceRoot.url)).resolve(name))
-    val result = ArrayList(icons.values)
+    processRoot(sourceRoot, sourceRoot.path.resolve(name))
+    val result = icons.values.toMutableList()
     if (includePhantom) {
       result.addAll(phantomIcons.values)
     }

platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/ImageSanityChecker.kt

@@ -52,8 +52,14 @@ abstract class ImageSanityCheckerBase(private val projectHome: Path, private val
     }
   }
 
+  private val excludedFromSizeCheck = setOf(
+    "/expui/run/rerun",
+    "/expui/toolbar/unknown@20x20",
+    "/expui/welcome/open",
+  )
+
   private fun checkHaveValidSize(images: List<ImageInfo>, module: JpsModule) {
-    process(images, Severity.WARNING, "icon with suspicious size", module) { image ->
+    process(images.filter { !excludedFromSizeCheck.contains(it.id) }, Severity.WARNING, "icon with suspicious size", module) { image ->
       if (!isIcon(image.basicFile!!)) {
         return@process true
       }

platform/icons/src/expui/icon-robots.txt

@@ -1 +0,0 @@
-skip: *

platform/lang-impl/src/com/intellij/find/FindAllAction.java

@@ -2,6 +2,7 @@
 package com.intellij.find;
 
 import com.intellij.icons.AllIcons;
+import com.intellij.icons.ExpUiIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.editor.Editor;
@@ -13,16 +14,15 @@ import com.intellij.openapi.wm.ToolWindowManager;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
 import com.intellij.ui.ExperimentalUI;
-import com.intellij.ui.IconManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 
 public final class FindAllAction extends AnAction implements ShortcutProvider, DumbAware {
-  private static final Icon FIND_ICON =
-    ExperimentalUI.isNewUI() ? IconManager.getInstance().getIcon("expui/general/openInToolWindow.svg", AllIcons.class)
-                             : AllIcons.General.Pin_tab;
+  private static Icon getFindIcon() {
+    return ExperimentalUI.isNewUI() ? ExpUiIcons.General.OpenInToolWindow : AllIcons.General.Pin_tab;
+  }
 
   public FindAllAction() {
     super(IdeBundle.messagePointer(ExperimentalUI.isNewUI() ? "show.in.find.window.button.name.newui" : "show.in.find.window.button.name"),
@@ -72,8 +72,8 @@ public final class FindAllAction extends AnAction implements ShortcutProvider, D
   private static @NotNull Icon getIcon(@Nullable Project project) {
     ToolWindowManager toolWindowManager = project != null ? ToolWindowManager.getInstance(project) : null;
     if (toolWindowManager != null) {
-      return toolWindowManager.getLocationIcon(ToolWindowId.FIND, FIND_ICON);
+      return toolWindowManager.getLocationIcon(ToolWindowId.FIND, getFindIcon());
     }
-    return FIND_ICON;
+    return getFindIcon();
   }
 }

platform/lang-impl/src/com/intellij/find/SearchReplaceComponent.java

@@ -3,6 +3,7 @@ package com.intellij.find;
 
 import com.intellij.find.editorHeaderActions.*;
 import com.intellij.icons.AllIcons;
+import com.intellij.icons.ExpUiIcons;
 import com.intellij.ide.DataManager;
 import com.intellij.ide.lightEdit.LightEditCompatible;
 import com.intellij.openapi.actionSystem.*;
@@ -627,15 +628,11 @@ public final class SearchReplaceComponent extends EditorHeaderComponent implemen
     return true;
   }
 
-  private static final Icon CLOSE_ICON = ExperimentalUI.isNewUI() ?
-                                         IconManager.getInstance().getIcon("expui/general/close.svg", AllIcons.class) :
-                                         AllIcons.Actions.Close;
-
   private class CloseAction extends DumbAwareAction implements LightEditCompatible, RightAlignedToolbarAction {
     private final ShortcutSet shortcut = KeymapUtil.getActiveKeymapShortcuts(IdeActions.ACTION_EDITOR_ESCAPE);
     private CloseAction() {
       getTemplatePresentation().setText(FindBundle.message("find.close.button.name"));
-      getTemplatePresentation().setIcon(CLOSE_ICON);
+      getTemplatePresentation().setIcon(ExperimentalUI.isNewUI() ? ExpUiIcons.General.Close : AllIcons.Actions.Close);
     }
 
     @Override

platform/lang-impl/src/com/intellij/find/SearchTextArea.java

@@ -3,6 +3,7 @@ package com.intellij.find;
 
 import com.intellij.find.editorHeaderActions.Utils;
 import com.intellij.icons.AllIcons;
+import com.intellij.icons.ExpUiIcons;
 import com.intellij.ide.DataManager;
 import com.intellij.ide.lightEdit.LightEditCompatible;
 import com.intellij.openapi.actionSystem.*;
@@ -22,7 +23,6 @@ import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.DocumentAdapter;
 import com.intellij.ui.ExperimentalUI;
-import com.intellij.ui.IconManager;
 import com.intellij.ui.JBColor;
 import com.intellij.ui.components.JBList;
 import com.intellij.ui.components.JBPanel;
@@ -63,14 +63,6 @@ public class SearchTextArea extends JBPanel<SearchTextArea> implements PropertyC
   public static final KeyStroke NEW_LINE_KEYSTROKE
     = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, (SystemInfo.isMac ? META_DOWN_MASK : CTRL_DOWN_MASK) | SHIFT_DOWN_MASK);
 
-  private static final Icon CLOSE_ICON = ExperimentalUI.isNewUI() ?
-                                         IconManager.getInstance().getIcon("expui/general/closeSmall.svg", AllIcons.class) :
-                                         AllIcons.Actions.Close;
-
-  private static final Icon CLOSE_HOVERED_ICON = ExperimentalUI.isNewUI() ?
-                                         IconManager.getInstance().getIcon("expui/general/closeSmallHovered.svg", AllIcons.class) :
-                                         AllIcons.Actions.CloseHovered;
-
   private static final ActionButtonLook FIELD_INPLACE_LOOK = new FieldInplaceActionButtonLook();
 
   private static final Border EMPTY_SCROLL_BORDER = JBUI.Borders.empty(2, 0, 2, 2);
@@ -360,8 +352,9 @@ public class SearchTextArea extends JBPanel<SearchTextArea> implements PropertyC
 
   private class ClearAction extends DumbAwareAction implements LightEditCompatible {
     ClearAction() {
-      super(CLOSE_ICON);
-      getTemplatePresentation().setHoveredIcon(CLOSE_HOVERED_ICON);
+      super(ExperimentalUI.isNewUI() ? ExpUiIcons.General.CloseSmall : AllIcons.Actions.Close);
+      getTemplatePresentation().setHoveredIcon(
+        ExperimentalUI.isNewUI() ? ExpUiIcons.General.CloseSmallHovered : AllIcons.Actions.CloseHovered);
     }
 
     @Override

platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java

@@ -7,14 +7,15 @@ import com.intellij.find.findUsages.PsiElement2UsageTargetAdapter;
 import com.intellij.find.impl.SearchEverywhereItem;
 import com.intellij.find.impl.TextSearchRightActionAction;
 import com.intellij.icons.AllIcons;
+import com.intellij.icons.ExpUiIcons;
 import com.intellij.ide.DataManager;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.SearchTopHitProvider;
 import com.intellij.ide.actions.BigPopupUI;
 import com.intellij.ide.actions.searcheverywhere.SearchEverywhereHeader.SETab;
-import com.intellij.ide.actions.searcheverywhere.statistics.SearchPerformanceTracker;
 import com.intellij.ide.actions.searcheverywhere.statistics.SearchEverywhereUsageTriggerCollector;
 import com.intellij.ide.actions.searcheverywhere.statistics.SearchFieldStatisticsCollector;
+import com.intellij.ide.actions.searcheverywhere.statistics.SearchPerformanceTracker;
 import com.intellij.ide.ui.UISettings;
 import com.intellij.ide.util.gotoByName.QuickSearchComponent;
 import com.intellij.ide.util.scopeChooser.ScopeDescriptor;
@@ -109,9 +110,9 @@ public final class SearchEverywhereUI extends BigPopupUI implements DataProvider
   public static final int SINGLE_CONTRIBUTOR_ELEMENTS_LIMIT = 30;
   public static final int MULTIPLE_CONTRIBUTORS_ELEMENTS_LIMIT = 15;
 
-  private static final Icon SHOW_IN_FIND_TOOL_WINDOW_ICON =
-    ExperimentalUI.isNewUI() ? IconManager.getInstance().getIcon("expui/general/openInToolWindow.svg", AllIcons.class)
-                             : AllIcons.General.Pin_tab;
+  private static final Icon getShowInFindToolWindowIcon() {
+    return ExperimentalUI.isNewUI() ? ExpUiIcons.General.OpenInToolWindow : AllIcons.General.Pin_tab;
+  }
 
   private final SEResultsListFactory myListFactory;
   private SearchListModel myListModel;
@@ -138,8 +139,6 @@ public final class SearchEverywhereUI extends BigPopupUI implements DataProvider
                     : new GroupedListFactory();
 
 
-
-
     Runnable scopeChangedCallback = () -> {
       updateSearchFieldAdvertisement();
       scheduleRebuildList(SearchRestartReason.SCOPE_CHANGED);
@@ -302,7 +301,10 @@ public final class SearchEverywhereUI extends BigPopupUI implements DataProvider
   @NotNull
   private List<AnAction> getRightActions(@NotNull List<? extends SearchEverywhereContributor<?>> contributors) {
     for (SearchEverywhereContributor<?> contributor : contributors) {
-      if (!Objects.equals(getSelectedTabID(), contributor.getSearchProviderId()) || !(contributor instanceof SearchFieldActionsContributor)) continue;
+      if (!Objects.equals(getSelectedTabID(), contributor.getSearchProviderId()) ||
+          !(contributor instanceof SearchFieldActionsContributor)) {
+        continue;
+      }
 
       return ((SearchFieldActionsContributor)contributor).createRightActions(() -> {
         scheduleRebuildList(SearchRestartReason.TEXT_SEARCH_OPTION_CHANGED);
@@ -388,11 +390,13 @@ public final class SearchEverywhereUI extends BigPopupUI implements DataProvider
 
   private static @Nullable Object getSlowData(@NotNull String dataId, @NotNull List<? extends SearchEverywhereFoundElementInfo> selection) {
     if (PlatformCoreDataKeys.PSI_ELEMENT_ARRAY.is(dataId)) {
-      List<PsiElement> list = ContainerUtil.mapNotNull(selection, o -> (PsiElement)getDataFromElementInfo(CommonDataKeys.PSI_ELEMENT.getName(), o));
+      List<PsiElement> list =
+        ContainerUtil.mapNotNull(selection, o -> (PsiElement)getDataFromElementInfo(CommonDataKeys.PSI_ELEMENT.getName(), o));
       return list.isEmpty() ? null : list.toArray(PsiElement.EMPTY_ARRAY);
     }
     else if (CommonDataKeys.VIRTUAL_FILE_ARRAY.is(dataId)) {
-      List<VirtualFile> list = ContainerUtil.mapNotNull(selection, o -> (VirtualFile)getDataFromElementInfo(CommonDataKeys.VIRTUAL_FILE.getName(), o));
+      List<VirtualFile> list =
+        ContainerUtil.mapNotNull(selection, o -> (VirtualFile)getDataFromElementInfo(CommonDataKeys.VIRTUAL_FILE.getName(), o));
       return list.isEmpty() ? null : list.toArray(VirtualFile.EMPTY_ARRAY);
     }
     else if (CommonDataKeys.NAVIGATABLE_ARRAY.is(dataId)) {
@@ -890,7 +894,7 @@ public final class SearchEverywhereUI extends BigPopupUI implements DataProvider
   }
 
   @ApiStatus.Experimental
-  public void selectFirst(){
+  public void selectFirst() {
     elementsSelected(new int[]{0}, 0);
   }
 
@@ -1043,7 +1047,7 @@ public final class SearchEverywhereUI extends BigPopupUI implements DataProvider
 
     ShowInFindToolWindowAction() {
       super(IdeBundle.messagePointer("show.in.find.window.button.name"),
-            IdeBundle.messagePointer("show.in.find.window.button.description"), SHOW_IN_FIND_TOOL_WINDOW_ICON);
+            IdeBundle.messagePointer("show.in.find.window.button.description"), getShowInFindToolWindowIcon());
     }
 
     @Override
@@ -1120,7 +1124,8 @@ public final class SearchEverywhereUI extends BigPopupUI implements DataProvider
               if (foundElements.size() + alreadyFoundCount >= UsageLimitUtil.USAGES_LIMIT &&
                   tooManyUsagesStatus.switchTooManyUsagesStatus()) {
                 UsageViewManagerImpl.showTooManyUsagesWarningLater(getProject(), tooManyUsagesStatus, progressIndicator, null,
-                                                                   () -> UsageViewBundle.message("find.excessive.usage.count.prompt"), null);
+                                                                   () -> UsageViewBundle.message("find.excessive.usage.count.prompt"),
+                                                                   null);
                 return !progressIndicator.isCanceled();
               }
               return true;
@@ -1150,7 +1155,9 @@ public final class SearchEverywhereUI extends BigPopupUI implements DataProvider
       sendStatisticsAndClose();
     }
 
-    private void fillUsages(Collection<Object> foundElements, Collection<? super Usage> usages, Collection<? super PsiElement> targets) {
+    private static void fillUsages(Collection<Object> foundElements,
+                                   Collection<? super Usage> usages,
+                                   Collection<? super PsiElement> targets) {
       for (Object element : foundElements) {
         // TODO this should be managed by the contributor !!!
         if (element instanceof UsageInfo2UsageAdapter) {
@@ -1193,7 +1200,8 @@ public final class SearchEverywhereUI extends BigPopupUI implements DataProvider
       boolean enabled = selectedTab == null || selectedTab.getContributors().stream().anyMatch(c -> c.showInFindResults());
       e.getPresentation().setEnabled(enabled);
       if (!ExperimentalUI.isNewUI()) {
-        e.getPresentation().setIcon(ToolWindowManager.getInstance(myProject).getLocationIcon(ToolWindowId.FIND, SHOW_IN_FIND_TOOL_WINDOW_ICON));
+        e.getPresentation()
+          .setIcon(ToolWindowManager.getInstance(myProject).getLocationIcon(ToolWindowId.FIND, getShowInFindToolWindowIcon()));
       }
     }
 

platform/lang-impl/src/com/intellij/ide/navbar/ui/NavBarItemComponent.kt

@@ -2,6 +2,7 @@
 package com.intellij.ide.navbar.ui
 
 import com.intellij.icons.AllIcons
+import com.intellij.icons.ExpUiIcons
 import com.intellij.ide.navbar.NavBarItemPresentation
 import com.intellij.ide.navbar.vm.NavBarItemVm
 import com.intellij.ide.navigationToolbar.ui.AbstractNavBarUI
@@ -169,7 +170,7 @@ internal class NavBarItemComponent(
     JBInsets.addTo(offsets, navBarItemPadding(isFloating))
     val newUI = ExperimentalUI.isNewUI()
     if (newUI) {
-      offsets.width += if (vm.isFirst) 0 else CHEVRON_ICON.iconWidth + Breadcrumbs.CHEVRON_INSET.get()
+      offsets.width += if (vm.isFirst) 0 else AllIcons.General.ChevronRight.iconWidth + Breadcrumbs.CHEVRON_INSET.get()
     }
     else {
       offsets.width += getDecorationOffset() + if (vm.isFirst) getFirstElementLeftOffset() else 0
@@ -207,7 +208,7 @@ internal class NavBarItemComponent(
 
   private fun effectiveIcon(presentation: NavBarItemPresentation): Icon? {
     return when {
-      ExperimentalUI.isNewUI() && vm.isModuleContentRoot -> MODULE_ICON
+      ExperimentalUI.isNewUI() && vm.isModuleContentRoot -> ExpUiIcons.Nodes.Module8x8
       Registry.`is`("navBar.show.icons") || vm.isLast || presentation.hasContainingFile -> presentation.icon
       else -> null
     }
@@ -227,8 +228,8 @@ internal class NavBarItemComponent(
       JBInsets.removeFrom(rect, paddings)
       var offset = rect.x
       if (!isFirst) {
-        CHEVRON_ICON.paintIcon(this, g, offset, rect.y + (rect.height - CHEVRON_ICON.iconHeight) / 2)
-        val delta = CHEVRON_ICON.iconWidth + Breadcrumbs.CHEVRON_INSET.get()
+        AllIcons.General.ChevronRight.paintIcon(this, g, offset, rect.y + (rect.height - AllIcons.General.ChevronRight.iconHeight) / 2)
+        val delta = AllIcons.General.ChevronRight.iconWidth + Breadcrumbs.CHEVRON_INSET.get()
         offset += delta
         rect.width -= delta
       }
@@ -243,7 +244,9 @@ internal class NavBarItemComponent(
       }
       else {
         offset += ipad.left
-        icon.paintIcon(this, g, offset, rect.y + (rect.height - icon.iconHeight) / 2 + if (icon == MODULE_ICON) JBUI.scale(1) else 0)
+        icon.paintIcon(this, g, offset, rect.y + (rect.height - icon.iconHeight) / 2 + if (icon == ExpUiIcons.Nodes.Module8x8) JBUI.scale(
+          1)
+        else 0)
         offset += icon.iconWidth
         offset += iconTextGap
       }
@@ -316,11 +319,6 @@ internal class NavBarItemComponent(
   }
 
   companion object {
-
-    private val CHEVRON_ICON = AllIcons.General.ChevronRight
-
-    private val MODULE_ICON = IconManager.getInstance().getIcon("expui/nodes/module8x8.svg", AllIcons::class.java)
-
     internal fun isItemComponentFocusable(): Boolean = ScreenReader.isActive()
   }
 }

platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarItem.java

@@ -2,6 +2,7 @@
 package com.intellij.ide.navigationToolbar;
 
 import com.intellij.icons.AllIcons;
+import com.intellij.icons.ExpUiIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.navigationToolbar.ui.NavBarUI;
 import com.intellij.ide.util.treeView.TreeAnchorizer;
@@ -49,7 +50,10 @@ public final class NavBarItem extends SimpleColoredComponent implements Disposab
   private final boolean myIsModule;
 
   public static final Icon CHEVRON_ICON = AllIcons.General.ChevronRight;
-  static final Icon MODULE_ICON = IconManager.getInstance().getIcon("expui/nodes/module8x8.svg", AllIcons.class);
+
+  public static Icon getModuleIcon() {
+    return ExpUiIcons.Nodes.Module8x8;
+  }
 
   public NavBarItem(NavBarPanel panel, Object object, int idx, Disposable parent) {
     this(panel, object, idx, parent, false);
@@ -67,7 +71,7 @@ public final class NavBarItem extends SimpleColoredComponent implements Disposab
       myText = presentation.getPresentableText(object, inPopup);
       myAttributes = presentation.getTextAttributes(object, false);
       myIsModule = presentation.isModule(object);
-      myIcon = ExperimentalUI.isNewUI() && myIsModule && !inPopup ? MODULE_ICON : presentation.getIcon(object);
+      myIcon = ExperimentalUI.isNewUI() && myIsModule && !inPopup ? getModuleIcon() : presentation.getIcon(object);
     }
     else {
       myText = IdeBundle.message("navigation.bar.item.sample");
@@ -349,7 +353,7 @@ public final class NavBarItem extends SimpleColoredComponent implements Disposab
       // The base will be first or last NavBarItem in the NavBarPanel
       NavBarItem focusBase = null;
       List<NavBarItem> items = myPanel.getItems();
-      if (items.size() > 0) {
+      if (!items.isEmpty()) {
         if (next) {
           focusBase = items.get(items.size() - 1);
         } else {

platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPresentation.java

@@ -71,7 +71,7 @@ public final class NavBarPresentation {
     }
 
     if (object instanceof Project) {
-      return ExperimentalUI.isNewUI() ? NavBarItem.MODULE_ICON : AllIcons.Nodes.Project;
+      return ExperimentalUI.isNewUI() ? NavBarItem.getModuleIcon() : AllIcons.Nodes.Project;
     }
     if (object instanceof Module) {
       return ModuleType.get(((Module)object)).getIcon();

platform/platform-api/src/com/intellij/ui/EditorNotificationPanel.java

@@ -4,6 +4,7 @@ package com.intellij.ui;
 import com.intellij.codeInsight.intention.*;
 import com.intellij.codeInspection.util.IntentionName;
 import com.intellij.icons.AllIcons;
+import com.intellij.icons.ExpUiIcons;
 import com.intellij.ide.DataManager;
 import com.intellij.ide.IdeBundle;
 import com.intellij.openapi.actionSystem.*;
@@ -307,7 +308,7 @@ public class EditorNotificationPanel extends JPanel implements IntentionActionPr
 
   private static @NotNull Icon getCloseIcon() {
     if (CLOSE_ICON == null) {
-      CLOSE_ICON = IconManager.getInstance().getIcon("expui/general/close.svg", AllIcons.class);
+      CLOSE_ICON = ExpUiIcons.General.Close;
     }
     return CLOSE_ICON;
   }

platform/platform-impl/src/com/intellij/ide/ui/experimental/meetNewUi/MeetNewUiToolWindow.kt

@@ -1,6 +1,7 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.ide.ui.experimental.meetNewUi
 
+import com.intellij.icons.ExpUiIcons
 import com.intellij.ide.IdeBundle
 import com.intellij.ide.actions.QuickChangeLookAndFeel
 import com.intellij.ide.ui.LafManager
@@ -47,14 +48,6 @@ internal class MeetNewUiToolWindow(private val project: Project, private val too
     private const val CUSTOM_THEME_INDEX = 0
 
     private val BANNER = IconLoader.getIcon("expui/meetNewUi/banner.png", MeetNewUiToolWindow::class.java.classLoader)
-    private val LIGHT = IconLoader.getIcon("expui/meetNewUi/lightTheme.svg", MeetNewUiToolWindow::class.java.classLoader)
-    private val LIGHT_SELECTED = IconLoader.getIcon("expui/meetNewUi/lightThemeSelected.svg", MeetNewUiToolWindow::class.java.classLoader)
-    private val DARK = IconLoader.getIcon("expui/meetNewUi/darkTheme.svg", MeetNewUiToolWindow::class.java.classLoader)
-    private val DARK_SELECTED = IconLoader.getIcon("expui/meetNewUi/darkThemeSelected.svg", MeetNewUiToolWindow::class.java.classLoader)
-    private val SYSTEM = IconLoader.getIcon("expui/meetNewUi/systemTheme.svg", MeetNewUiToolWindow::class.java.classLoader)
-    private val SYSTEM_SELECTED = IconLoader.getIcon("expui/meetNewUi/systemThemeSelected.svg", MeetNewUiToolWindow::class.java.classLoader)
-    private val CLEAN = IconLoader.getIcon("expui/meetNewUi/densityDefault.svg", MeetNewUiToolWindow::class.java.classLoader)
-    private val COMPACT = IconLoader.getIcon("expui/meetNewUi/densityCompact.svg", MeetNewUiToolWindow::class.java.classLoader)
 
     private val BANNER_BACKGROUND = Gray.x01
     private const val BANNER_HEIGHT = 231
@@ -81,7 +74,7 @@ internal class MeetNewUiToolWindow(private val project: Project, private val too
       }
       panel {
         row {
-          label(IdeBundle.message("meetnewui.toolwindow.title", ApplicationNamesInfo.getInstance().getFullProductName()))
+          label(IdeBundle.message("meetnewui.toolwindow.title", ApplicationNamesInfo.getInstance().fullProductName))
             .applyToComponent {
               font = JBFont.regular().biggerOn(7f).deriveFont(Font.PLAIN)
             }
@@ -92,12 +85,12 @@ internal class MeetNewUiToolWindow(private val project: Project, private val too
         row {
           themes += Theme(null, false, null, null)
           findLafReference("Light")?.let { lafReference ->
-            themes += Theme(lafReference, false, LIGHT, LIGHT_SELECTED)
+            themes += Theme(lafReference, false, ExpUiIcons.MeetNewUi.LightTheme, ExpUiIcons.MeetNewUi.LightThemeSelected)
           }
           findLafReference("Dark")?.let { lafReference ->
-            themes += Theme(lafReference, false, DARK, DARK_SELECTED)
+            themes += Theme(lafReference, false, ExpUiIcons.MeetNewUi.DarkTheme, ExpUiIcons.MeetNewUi.DarkThemeSelected)
           }
-          themes += Theme(null, true, SYSTEM, SYSTEM_SELECTED)
+          themes += Theme(null, true, ExpUiIcons.MeetNewUi.SystemTheme, ExpUiIcons.MeetNewUi.SystemThemeSelected)
 
           val gap = JBUI.scale(8)
           val themesPanel = JPanel(WrapLayout(FlowLayout.LEADING, gap, gap))
@@ -114,9 +107,10 @@ internal class MeetNewUiToolWindow(private val project: Project, private val too
           label(IdeBundle.message("meetnewui.toolwindow.density"))
         }.customize(JBVerticalGaps(bottom = 8))
         row {
-          cleanDensity = density(CLEAN, IdeBundle.message("meetnewui.toolwindow.clean"), JBGaps(right = 8), false)
+          cleanDensity = density(ExpUiIcons.MeetNewUi.DensityDefault, IdeBundle.message("meetnewui.toolwindow.clean"), JBGaps(right = 8),
+                                 false)
 
-          compactDensity = density(COMPACT, IdeBundle.message("meetnewui.toolwindow.compact"), Gaps.EMPTY, true)
+          compactDensity = density(ExpUiIcons.MeetNewUi.DensityCompact, IdeBundle.message("meetnewui.toolwindow.compact"), Gaps.EMPTY, true)
 
           cell() // Deny right component to shrink
         }.customize(JBVerticalGaps(bottom = 20))

platform/platform-impl/src/com/intellij/openapi/fileEditor/TextEditorWithPreview.java

@@ -3,6 +3,7 @@ package com.intellij.openapi.fileEditor;
 
 import com.intellij.codeHighlighting.BackgroundEditorHighlighter;
 import com.intellij.icons.AllIcons;
+import com.intellij.icons.ExpUiIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.structureView.StructureViewBuilder;
 import com.intellij.ide.ui.UISettings;
@@ -14,7 +15,10 @@ import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.editor.impl.EditorComponentImpl;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.*;
+import com.intellij.openapi.util.Disposer;
+import com.intellij.openapi.util.Key;
+import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.UserDataHolderBase;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.wm.IdeFocusManager;
@@ -494,10 +498,11 @@ public class TextEditorWithPreview extends UserDataHolderBase implements TextEdi
 
   public static Icon getEditorWithPreviewIcon(boolean isVerticalSplit) {
     if (ExperimentalUI.isNewUI()) {
-      return isVerticalSplit ? IconLoader.getIcon("expui/general/editorPreviewVertical.svg", AllIcons.class)
-                             : IconLoader.getIcon("expui/general/editorPreview.svg", AllIcons.class);
+      return isVerticalSplit ? ExpUiIcons.General.EditorPreviewVertical : ExpUiIcons.General.EditorPreview;
+    }
+    else {
+      return isVerticalSplit ? AllIcons.Actions.PreviewDetailsVertically : AllIcons.Actions.PreviewDetails;
     }
-    return isVerticalSplit ? AllIcons.Actions.PreviewDetailsVertically : AllIcons.Actions.PreviewDetails;
   }
 
   private class ChangeViewModeAction extends ToggleAction implements DumbAware {

platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/tabActions/CloseTab.kt

@@ -2,6 +2,7 @@
 package com.intellij.openapi.fileEditor.impl.tabActions
 
 import com.intellij.icons.AllIcons
+import com.intellij.icons.ExpUiIcons
 import com.intellij.ide.IdeBundle
 import com.intellij.ide.ui.UISettings
 import com.intellij.openapi.Disposable
@@ -14,12 +15,14 @@ import com.intellij.openapi.ui.popup.util.PopupUtil
 import com.intellij.openapi.util.registry.Registry
 import com.intellij.openapi.util.text.TextWithMnemonic
 import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.ui.*
+import com.intellij.ui.BadgeDotProvider
+import com.intellij.ui.BadgeIcon
+import com.intellij.ui.ComponentUtil
+import com.intellij.ui.ExperimentalUI
 import com.intellij.ui.scale.JBUIScale
 import com.intellij.ui.tabs.impl.MorePopupAware
 import com.intellij.ui.tabs.impl.TabLabel
 import com.intellij.util.BitUtil
-import com.intellij.util.ObjectUtils
 import com.intellij.util.ui.JBUI
 import java.awt.*
 import java.awt.event.InputEvent
@@ -55,7 +58,7 @@ internal class CloseTab(component: JComponent,
         e.presentation.text = TextWithMnemonic.parse(IdeBundle.message("action.unpin.tab")).dropMnemonic(true).text
       }
       else {
-        shortcutSet = ObjectUtils.notNull(KeymapUtil.getActiveKeymapShortcuts(IdeActions.ACTION_CLOSE), CustomShortcutSet.EMPTY)
+        shortcutSet = KeymapUtil.getActiveKeymapShortcuts(IdeActions.ACTION_CLOSE)
         e.presentation.setText(IdeBundle.messagePointer("action.presentation.EditorTabbedContainer.text"))
       }
     }
@@ -172,21 +175,7 @@ private class DotIcon(private val color: Color) : Icon {
  }
 
 private val CLOSE_ICON: Icon
-  get() {
-    return if (ExperimentalUI.isNewUI()) {
-      IconManager.getInstance().getIcon("expui/general/closeSmall.svg", AllIcons::class.java)
-    }
-    else {
-      AllIcons.Actions.Close
-    }
-  }
+  get() = if (ExperimentalUI.isNewUI()) ExpUiIcons.General.CloseSmall else AllIcons.Actions.Close
 
 private val CLOSE_HOVERED_ICON: Icon
-  get() {
-    return if (ExperimentalUI.isNewUI()) {
-      IconManager.getInstance().getIcon("expui/general/closeSmallHovered.svg", AllIcons::class.java)
-    }
-    else {
-      AllIcons.Actions.CloseHovered
-    }
-  }
+  get() = (if (ExperimentalUI.isNewUI()) ExpUiIcons.General.CloseSmallHovered else AllIcons.Actions.CloseHovered)

platform/platform-impl/src/com/intellij/openapi/wm/impl/customFrameDecorations/header/toolbar/MainMenuButton.kt

@@ -1,7 +1,7 @@
 // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.openapi.wm.impl.customFrameDecorations.header.toolbar
 
-import com.intellij.icons.AllIcons
+import com.intellij.icons.ExpUiIcons
 import com.intellij.ide.DataManager
 import com.intellij.ide.IdeBundle
 import com.intellij.ide.ui.UISettings.Companion.getInstance
@@ -18,7 +18,6 @@ import com.intellij.openapi.keymap.KeymapManagerListener
 import com.intellij.openapi.project.DumbAwareAction
 import com.intellij.openapi.ui.popup.JBPopupFactory
 import com.intellij.openapi.util.Disposer
-import com.intellij.ui.IconManager
 import com.intellij.ui.popup.PopupFactoryImpl
 import com.intellij.ui.popup.list.ListPopupImpl
 import com.intellij.ui.popup.util.PopupImplUtil
@@ -131,7 +130,7 @@ internal class MainMenuButton {
 
   private inner class ShowMenuAction : DumbAwareAction(
     IdeBundle.messagePointer("main.toolbar.menu.button"),
-    IconManager.getInstance().getIcon("expui/general/windowsMenu@20x20.svg", AllIcons::class.java)) {
+    ExpUiIcons.General.WindowsMenu_20x20) {
 
     override fun actionPerformed(e: AnActionEvent) = showPopup(e.dataContext)
 
@@ -140,7 +139,7 @@ internal class MainMenuButton {
       val popup = JBPopupFactory.getInstance()
         .createActionGroupPopup(null, mainMenu, context, JBPopupFactory.ActionSelectionAid.SPEEDSEARCH, true,
                                 ActionPlaces.MAIN_MENU)
-        .apply { setShowSubmenuOnHover(true) }
+        .apply { isShowSubmenuOnHover = true }
         .apply { setMinimumSize(Dimension(JBUI.CurrentTheme.CustomFrameDecorations.menuPopupMinWidth(), 0)) }
         as ListPopupImpl
       PopupImplUtil.setPopupToggleButton(popup, button)

platform/platform-impl/src/com/intellij/ui/mac/WindowTabsComponent.java

@@ -58,20 +58,11 @@ import java.util.*;
 /**
  * @author Alexander Lobas
  */
-public class WindowTabsComponent extends JBTabsImpl {
+public final class WindowTabsComponent extends JBTabsImpl {
   private static final String TITLE_LISTENER_KEY = "TitleListener";
 
   private static final int TAB_HEIGHT = 30;
 
-  private static final Icon CLOSE_ICON = ExperimentalUI.isNewUI() ?
-                                         IconManager.getInstance().getIcon("expui/general/closeSmall_dark.svg", AllIcons.class) :
-                                         AllIcons.Actions.Close;
-
-  private static final Icon CLOSE_HOVERED_ICON = ExperimentalUI.isNewUI() ?
-                                                 IconManager.getInstance()
-                                                   .getIcon("expui/general/closeSmallHovered_dark.svg", AllIcons.class) :
-                                                 AllIcons.Actions.CloseHovered;
-
   private static DockManagerImpl myDockManager;
 
   private final IdeFrameImpl myNativeWindow;
@@ -393,8 +384,14 @@ public class WindowTabsComponent extends JBTabsImpl {
     };
 
     Presentation presentation = closeAction.getTemplatePresentation();
-    presentation.setIcon(CLOSE_ICON);
-    presentation.setHoveredIcon(CLOSE_HOVERED_ICON);
+    boolean isNewUi = ExperimentalUI.isNewUI();
+    presentation.setIcon(isNewUi ?
+                         IconManager.getInstance().getIcon("expui/general/closeSmall_dark.svg", AllIcons.class.getClassLoader()) :
+                         AllIcons.Actions.Close);
+    presentation.setHoveredIcon(isNewUi
+                                ? IconManager.getInstance()
+                                  .getIcon("expui/general/closeSmallHovered_dark.svg", AllIcons.class.getClassLoader())
+                                : AllIcons.Actions.CloseHovered);
 
     DefaultActionGroup group = new DefaultActionGroup();
     group.add(closeAction);

platform/util/ui/src/com/intellij/icons/ExpUiIcons.java

@@ -0,0 +1,642 @@
+package com.intellij.icons;
+
+import com.intellij.ui.IconManager;
+import org.jetbrains.annotations.NotNull;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED
+ * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
+ */
+public final class ExpUiIcons {
+  private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) {
+    return IconManager.getInstance().loadRasterizedIcon(path, ExpUiIcons.class.getClassLoader(), cacheKey, flags);
+  }
+
+  public static final class Actions {
+    /** 16x16 */ public static final @NotNull Icon BuildAutoReloadChanges = load("expui/actions/buildAutoReloadChanges.svg", 55477524, 2);
+    /** 16x16 */ public static final @NotNull Icon Deploy = load("expui/actions/deploy.svg", 1698826458, 2);
+    /** 16x16 */ public static final @NotNull Icon Filterdups = load("expui/actions/filterdups.svg", -1490523882, 2);
+    /** 16x16 */ public static final @NotNull Icon Generated = load("expui/actions/generated.svg", -2083105322, 2);
+    /** 16x16 */ public static final @NotNull Icon GroupByMethod = load("expui/actions/groupByMethod.svg", -664024365, 2);
+    /** 16x16 */ public static final @NotNull Icon Install = load("expui/actions/install.svg", 1422701067, 2);
+    /** 16x16 */ public static final @NotNull Icon PlayBack = load("expui/actions/playBack.svg", -334635416, 2);
+    /** 16x16 */ public static final @NotNull Icon PlayFirst = load("expui/actions/playFirst.svg", -636691358, 2);
+    /** 16x16 */ public static final @NotNull Icon PlayForward = load("expui/actions/playForward.svg", 686262702, 2);
+    /** 16x16 */ public static final @NotNull Icon PlayLast = load("expui/actions/playLast.svg", -1501615980, 2);
+    /** 16x16 */ public static final @NotNull Icon ShowImportStatements = load("expui/actions/showImportStatements.svg", -11203087, 2);
+    /** 16x16 */ public static final @NotNull Icon ShowReadAccess = load("expui/actions/showReadAccess.svg", -1432236389, 2);
+    /** 16x16 */ public static final @NotNull Icon ShowWriteAccess = load("expui/actions/showWriteAccess.svg", 1434669140, 2);
+    /** 16x16 */ public static final @NotNull Icon ToggleVisibility = load("expui/actions/toggleVisibility.svg", 1969595122, 2);
+    /** 16x16 */ public static final @NotNull Icon Undeploy = load("expui/actions/undeploy.svg", 1208805374, 2);
+  }
+
+  public static final class Bookmarks {
+    /** 16x16 */ public static final @NotNull Icon AddBookmarksList = load("expui/bookmarks/addBookmarksList.svg", 1217959531, 2);
+    /** 16x16 */ public static final @NotNull Icon Bookmark = load("expui/bookmarks/bookmark.svg", 2009472700, 2);
+    /** 16x16 */ public static final @NotNull Icon BookmarksList = load("expui/bookmarks/bookmarksList.svg", -702190695, 2);
+    /** 16x16 */ public static final @NotNull Icon Mnemonic = load("expui/bookmarks/mnemonic.svg", 9161169, 2);
+  }
+
+  public static final class Breakpoints {
+    /** 12x12 */ public static final @NotNull Icon Breakpoint = load("expui/breakpoints/breakpoint.svg", -145484496, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointDependent = load("expui/breakpoints/breakpointDependent.svg", -1908831475, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointDisabled = load("expui/breakpoints/breakpointDisabled.svg", -1241062869, 2);
+    /** 13x13 */ public static final @NotNull Icon BreakpointException = load("expui/breakpoints/breakpointException.svg", 1502706492, 2);
+    /** 13x13 */ public static final @NotNull Icon BreakpointExceptionDisabled = load("expui/breakpoints/breakpointExceptionDisabled.svg", -1123133433, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointField = load("expui/breakpoints/breakpointField.svg", 864506395, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointFieldDependent = load("expui/breakpoints/breakpointFieldDependent.svg", 1092779939, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointFieldDisabled = load("expui/breakpoints/breakpointFieldDisabled.svg", -969266599, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointFieldMuted = load("expui/breakpoints/breakpointFieldMuted.svg", -1292101313, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointFieldMutedDependent = load("expui/breakpoints/breakpointFieldMutedDependent.svg", 1725662822, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointFieldMutedDisabled = load("expui/breakpoints/breakpointFieldMutedDisabled.svg", -2006774393, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointFieldUnsuspendent = load("expui/breakpoints/breakpointFieldUnsuspendent.svg", -1697110723, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointFieldUnsuspendentDisabled = load("expui/breakpoints/breakpointFieldUnsuspendentDisabled.svg", 1974638592, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointFieldUnsuspendentValid = load("expui/breakpoints/breakpointFieldUnsuspendentValid.svg", 14582361, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointFieldValid = load("expui/breakpoints/breakpointFieldValid.svg", -555709368, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointInvalid = load("expui/breakpoints/breakpointInvalid.svg", -716343411, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointLambda = load("expui/breakpoints/breakpointLambda.svg", -1652677215, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointMethod = load("expui/breakpoints/breakpointMethod.svg", -1017957103, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointMethodDependent = load("expui/breakpoints/breakpointMethodDependent.svg", 755263931, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointMethodDisabled = load("expui/breakpoints/breakpointMethodDisabled.svg", 358640964, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointMethodMuted = load("expui/breakpoints/breakpointMethodMuted.svg", 1684813897, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointMethodMutedDependent = load("expui/breakpoints/breakpointMethodMutedDependent.svg", -1341721435, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointMethodMutedDisabled = load("expui/breakpoints/breakpointMethodMutedDisabled.svg", 2070773646, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointMethodUnsuspendent = load("expui/breakpoints/breakpointMethodUnsuspendent.svg", -1348703419, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointMethodUnsuspendentDisabled = load("expui/breakpoints/breakpointMethodUnsuspendentDisabled.svg", 548207420, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointMethodUnsuspendentValid = load("expui/breakpoints/breakpointMethodUnsuspendentValid.svg", -905477757, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointMethodValid = load("expui/breakpoints/breakpointMethodValid.svg", -97680442, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointMuted = load("expui/breakpoints/breakpointMuted.svg", -1406816686, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointMutedDependent = load("expui/breakpoints/breakpointMutedDependent.svg", -1654822219, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointMutedDisabled = load("expui/breakpoints/breakpointMutedDisabled.svg", 620238058, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointObsolete = load("expui/breakpoints/breakpointObsolete.svg", -1128581056, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointUnsuspendent = load("expui/breakpoints/breakpointUnsuspendent.svg", 285657942, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointUnsuspendentDisabled = load("expui/breakpoints/breakpointUnsuspendentDisabled.svg", 996984091, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointUnsuspendentValid = load("expui/breakpoints/breakpointUnsuspendentValid.svg", -990373117, 2);
+    /** 12x12 */ public static final @NotNull Icon BreakpointValid = load("expui/breakpoints/breakpointValid.svg", -561492743, 2);
+    /** 12x12 */ public static final @NotNull Icon MultipleBreakpoints = load("expui/breakpoints/multipleBreakpoints.svg", -95777960, 2);
+    /** 7x10 */ public static final @NotNull Icon QuestionBadge = load("expui/breakpoints/questionBadge.svg", 356853847, 2);
+  }
+
+  public static final class Build {
+    /** 16x16 */ public static final @NotNull Icon Build = load("expui/build/build.svg", -603655032, 2);
+    /** 16x16 */ public static final @NotNull Icon DependencyAnalyzer = load("expui/build/dependencyAnalyzer.svg", 188952313, 2);
+    /** 16x16 */ public static final @NotNull Icon GradleLoadChanges = load("expui/build/gradleLoadChanges.svg", -1635086318, 2);
+    /** 16x16 */ public static final @NotNull Icon GradleNavigate = load("expui/build/gradleNavigate.svg", 1913062651, 2);
+    /** 16x16 */ public static final @NotNull Icon Task = load("expui/build/task.svg", 209590224, 2);
+    /** 16x16 */ public static final @NotNull Icon TaskGroup = load("expui/build/taskGroup.svg", 1524895611, 2);
+    /** 16x16 */ public static final @NotNull Icon ToggleOfflineMode = load("expui/build/toggleOfflineMode.svg", 1307320252, 2);
+    /** 16x16 */ public static final @NotNull Icon ToggleSkipTestsMode = load("expui/build/toggleSkipTestsMode.svg", 1261577164, 2);
+  }
+
+  public static final class Diff {
+    /** 16x16 */ public static final @NotNull Icon ApplyNotConflicts = load("expui/diff/applyNotConflicts.svg", -1187501383, 2);
+    /** 16x16 */ public static final @NotNull Icon ApplyNotConflictsLeft = load("expui/diff/applyNotConflictsLeft.svg", 1014858948, 2);
+    /** 16x16 */ public static final @NotNull Icon ApplyNotConflictsRight = load("expui/diff/applyNotConflictsRight.svg", 698686128, 2);
+    /** 14x14 */ public static final @NotNull Icon Arrow_14x14 = load("expui/diff/arrow@14x14.svg", -945999275, 2);
+    /** 14x14 */ public static final @NotNull Icon ArrowLeftDown_14x14 = load("expui/diff/arrowLeftDown@14x14.svg", -347433312, 2);
+    /** 16x16 */ public static final @NotNull Icon ArrowLeftRight = load("expui/diff/arrowLeftRight.svg", -25623827, 2);
+    /** 14x14 */ public static final @NotNull Icon ArrowRight_14x14 = load("expui/diff/arrowRight@14x14.svg", 961243479, 2);
+    /** 14x14 */ public static final @NotNull Icon ArrowRightDown_14x14 = load("expui/diff/arrowRightDown@14x14.svg", -284500252, 2);
+    /** 16x16 */ public static final @NotNull Icon Compare3LeftMiddle = load("expui/diff/compare3LeftMiddle.svg", 1701828992, 2);
+    /** 16x16 */ public static final @NotNull Icon Compare3LeftRight = load("expui/diff/compare3LeftRight.svg", -529571022, 2);
+    /** 16x16 */ public static final @NotNull Icon Compare3MiddleRight = load("expui/diff/compare3MiddleRight.svg", 118095446, 2);
+    /** 16x16 */ public static final @NotNull Icon Compare4LeftBottom = load("expui/diff/compare4LeftBottom.svg", 1004513313, 2);
+    /** 16x16 */ public static final @NotNull Icon Compare4LeftMiddle = load("expui/diff/compare4LeftMiddle.svg", -1420790316, 2);
+    /** 16x16 */ public static final @NotNull Icon Compare4LeftRight = load("expui/diff/compare4LeftRight.svg", -903097547, 2);
+    /** 16x16 */ public static final @NotNull Icon Compare4MiddleBottom = load("expui/diff/compare4MiddleBottom.svg", -1054345023, 2);
+    /** 16x16 */ public static final @NotNull Icon Compare4MiddleRight = load("expui/diff/compare4MiddleRight.svg", -536943464, 2);
+    /** 16x16 */ public static final @NotNull Icon Compare4RightBottom = load("expui/diff/compare4RightBottom.svg", -1438962541, 2);
+    /** 16x16 */ public static final @NotNull Icon DisableEditing = load("expui/diff/disableEditing.svg", -1398781399, 2);
+    /** 14x14 */ public static final @NotNull Icon GutterCheckBox_14x14 = load("expui/diff/gutterCheckBox@14x14.svg", -280408851, 2);
+    /** 14x14 */ public static final @NotNull Icon GutterCheckBoxIndeterminate_14x14 = load("expui/diff/gutterCheckBoxIndeterminate@14x14.svg", -611410655, 2);
+    /** 14x14 */ public static final @NotNull Icon GutterCheckBoxSelected_14x14 = load("expui/diff/gutterCheckBoxSelected@14x14.svg", 1607283738, 2);
+    /** 14x14 */ public static final @NotNull Icon MagicResolve_14x14 = load("expui/diff/magicResolve@14x14.svg", -168658395, 2);
+    /** 16x16 */ public static final @NotNull Icon MagicResolveToolbar = load("expui/diff/magicResolveToolbar.svg", 1379898608, 2);
+    /** 14x14 */ public static final @NotNull Icon Remove_14x14 = load("expui/diff/remove@14x14.svg", -2049268852, 2);
+    /** 14x14 */ public static final @NotNull Icon Revert_14x14 = load("expui/diff/revert@14x14.svg", -562655184, 2);
+  }
+
+  public static final class Editor {
+    /** 12x12 */ public static final @NotNull Icon InlayGlobe = load("expui/editor/inlayGlobe.svg", -14046732, 2);
+    /** 12x12 */ public static final @NotNull Icon InlayRenameInComments = load("expui/editor/inlayRenameInComments.svg", 453005154, 2);
+    /** 12x12 */ public static final @NotNull Icon InlayRenameInCommentsActive = load("expui/editor/inlayRenameInCommentsActive.svg", 1133881758, 2);
+    /** 12x12 */ public static final @NotNull Icon InlayRenameInNoCodeFiles = load("expui/editor/inlayRenameInNoCodeFiles.svg", -725153002, 2);
+    /** 12x12 */ public static final @NotNull Icon InlayRenameInNoCodeFilesActive = load("expui/editor/inlayRenameInNoCodeFilesActive.svg", 835253899, 2);
+    /** 12x12 */ public static final @NotNull Icon InlaySecuredShield = load("expui/editor/inlaySecuredShield.svg", 1724904783, 2);
+    /** 12x12 */ public static final @NotNull Icon InlaySettings = load("expui/editor/inlaySettings.svg", 850074943, 2);
+    /** 16x16 */ public static final @NotNull Icon IntentionBulb = load("expui/editor/intentionBulb.svg", -761243993, 2);
+    /** 16x16 */ public static final @NotNull Icon IntentionBulbGrey = load("expui/editor/intentionBulbGrey.svg", 410060409, 2);
+    /** 16x16 */ public static final @NotNull Icon QuickfixBulb = load("expui/editor/quickfixBulb.svg", -104566723, 2);
+    /** 16x16 */ public static final @NotNull Icon QuickfixOffBulb = load("expui/editor/quickfixOffBulb.svg", 687393006, 2);
+  }
+
+  /** 16x16 */ public static final @NotNull Icon Empty = load("expui/empty.svg", -1295837987, 0);
+
+  public static final class FileTypes {
+    /** 16x16 */ public static final @NotNull Icon ActionScript = load("expui/fileTypes/actionScript.svg", 79146464, 2);
+    /** 16x16 */ public static final @NotNull Icon AngularJS = load("expui/fileTypes/angularJS.svg", -1236954713, 0);
+    /** 16x16 */ public static final @NotNull Icon Archive = load("expui/fileTypes/archive.svg", 2067079477, 2);
+    /** 16x16 */ public static final @NotNull Icon AspectJ = load("expui/fileTypes/aspectJ.svg", 1830825124, 2);
+    /** 16x16 */ public static final @NotNull Icon Css = load("expui/fileTypes/css.svg", -201291022, 0);
+    /** 16x16 */ public static final @NotNull Icon Csv = load("expui/fileTypes/csv.svg", 1910690697, 2);
+    /** 16x16 */ public static final @NotNull Icon Cucumber = load("expui/fileTypes/cucumber.svg", -600415778, 0);
+    /** 16x16 */ public static final @NotNull Icon Diagram = load("expui/fileTypes/diagram.svg", -178270167, 2);
+    /** 16x16 */ public static final @NotNull Icon Docker = load("expui/fileTypes/docker.svg", -2121063743, 0);
+    /** 16x16 */ public static final @NotNull Icon Eclipse = load("expui/fileTypes/eclipse.svg", 1120686390, 0);
+    /** 16x16 */ public static final @NotNull Icon EditorConfig = load("expui/fileTypes/editorConfig.svg", 240655642, 2);
+    /** 16x16 */ public static final @NotNull Icon Font = load("expui/fileTypes/font.svg", 478546642, 2);
+    /** 16x16 */ public static final @NotNull Icon Freemaker = load("expui/fileTypes/freemaker.svg", -202049938, 2);
+    /** 16x16 */ public static final @NotNull Icon Gitignore = load("expui/fileTypes/gitignore.svg", -917451314, 0);
+    /** 16x16 */ public static final @NotNull Icon Gradle = load("expui/fileTypes/gradle.svg", 1456814636, 2);
+    /** 16x16 */ public static final @NotNull Icon Html = load("expui/fileTypes/html.svg", -993091848, 2);
+    /** 16x16 */ public static final @NotNull Icon IdeaModule = load("expui/fileTypes/ideaModule.svg", -1326193579, 2);
+    /** 16x16 */ public static final @NotNull Icon Idl = load("expui/fileTypes/idl.svg", -1825093426, 2);
+    /** 16x16 */ public static final @NotNull Icon Ignored = load("expui/fileTypes/ignored.svg", -761759532, 2);
+    /** 16x16 */ public static final @NotNull Icon Java = load("expui/fileTypes/java.svg", 1134450036, 2);
+    /** 16x16 */ public static final @NotNull Icon Javascript = load("expui/fileTypes/javascript.svg", -699718601, 2);
+    /** 16x16 */ public static final @NotNull Icon Jest = load("expui/fileTypes/jest.svg", 1606594406, 0);
+    /** 16x16 */ public static final @NotNull Icon Jfr = load("expui/fileTypes/jfr.svg", -1383678205, 2);
+    /** 16x16 */ public static final @NotNull Icon Jshint = load("expui/fileTypes/jshint.svg", -2137975221, 2);
+    /** 16x16 */ public static final @NotNull Icon Json = load("expui/fileTypes/json.svg", 1787157101, 2);
+    /** 16x16 */ public static final @NotNull Icon Jsp = load("expui/fileTypes/jsp.svg", 1184869391, 2);
+    /** 16x16 */ public static final @NotNull Icon Jspx = load("expui/fileTypes/jspx.svg", -363820549, 2);
+    /** 16x16 */ public static final @NotNull Icon Less = load("expui/fileTypes/less.svg", -786255153, 2);
+    /** 16x16 */ public static final @NotNull Icon Lombok = load("expui/fileTypes/lombok.svg", 2078060577, 2);
+    /** 16x16 */ public static final @NotNull Icon LombokConfig = load("expui/fileTypes/lombokConfig.svg", 112108457, 2);
+    /** 16x16 */ public static final @NotNull Icon Manifest = load("expui/fileTypes/manifest.svg", -1782711995, 2);
+    /** 16x16 */ public static final @NotNull Icon Maven = load("expui/fileTypes/maven.svg", -695384895, 2);
+    /** 13x13 */ public static final @NotNull Icon Modified = load("expui/fileTypes/modified.svg", -1075220704, 2);
+    /** 16x16 */ public static final @NotNull Icon Patch = load("expui/fileTypes/patch.svg", -146855827, 2);
+    /** 16x16 */ public static final @NotNull Icon Perl = load("expui/fileTypes/perl.svg", -309100353, 2);
+    /** 16x16 */ public static final @NotNull Icon Php = load("expui/fileTypes/php.svg", 1932147366, 2);
+    /** 16x16 */ public static final @NotNull Icon Properties = load("expui/fileTypes/properties.svg", -1802639038, 2);
+    /** 16x16 */ public static final @NotNull Icon Protobuf = load("expui/fileTypes/protobuf.svg", -2063488110, 0);
+    /** 16x16 */ public static final @NotNull Icon Python = load("expui/fileTypes/python.svg", -1676234959, 0);
+    /** 16x16 */ public static final @NotNull Icon React = load("expui/fileTypes/react.svg", 938050032, 2);
+    /** 16x16 */ public static final @NotNull Icon Ruby = load("expui/fileTypes/ruby.svg", -623761945, 2);
+    /** 16x16 */ public static final @NotNull Icon Sbt = load("expui/fileTypes/sbt.svg", 72283692, 2);
+    /** 16x16 */ public static final @NotNull Icon Scala = load("expui/fileTypes/scala.svg", 1476947170, 2);
+    /** 16x16 */ public static final @NotNull Icon Scratch = load("expui/fileTypes/scratch.svg", 1086457431, 2);
+    /** 16x16 */ public static final @NotNull Icon Scratches = load("expui/fileTypes/scratches.svg", 1237876408, 2);
+    /** 16x16 */ public static final @NotNull Icon Scss = load("expui/fileTypes/scss.svg", -1532568791, 0);
+    /** 16x16 */ public static final @NotNull Icon Shell = load("expui/fileTypes/shell.svg", 472984917, 2);
+    /** 16x16 */ public static final @NotNull Icon SourceMap = load("expui/fileTypes/sourceMap.svg", -2057527747, 2);
+    /** 16x16 */ public static final @NotNull Icon Sql = load("expui/fileTypes/sql.svg", -1827630402, 2);
+    /** 16x16 */ public static final @NotNull Icon Text = load("expui/fileTypes/text.svg", -1983399172, 2);
+    /** 16x16 */ public static final @NotNull Icon Typescript = load("expui/fileTypes/typescript.svg", 928891815, 2);
+    /** 16x16 */ public static final @NotNull Icon Unknown = load("expui/fileTypes/unknown.svg", 457271887, 2);
+    /** 16x16 */ public static final @NotNull Icon Velocity = load("expui/fileTypes/velocity.svg", 1868901396, 2);
+    /** 16x16 */ public static final @NotNull Icon VueJs = load("expui/fileTypes/vueJs.svg", -1305585615, 0);
+    /** 16x16 */ public static final @NotNull Icon Wsdl = load("expui/fileTypes/wsdl.svg", -1548454520, 2);
+    /** 16x16 */ public static final @NotNull Icon Xhtml = load("expui/fileTypes/xhtml.svg", 1957601586, 2);
+    /** 16x16 */ public static final @NotNull Icon Xml = load("expui/fileTypes/xml.svg", -1510800841, 2);
+    /** 16x16 */ public static final @NotNull Icon Xsd = load("expui/fileTypes/xsd.svg", 427504425, 2);
+    /** 16x16 */ public static final @NotNull Icon Yaml = load("expui/fileTypes/yaml.svg", -1068579513, 2);
+    /** 16x16 */ public static final @NotNull Icon Yarn = load("expui/fileTypes/yarn.svg", 2109599203, 0);
+  }
+
+  public static final class General {
+    /** 16x16 */ public static final @NotNull Icon Add = load("expui/general/add.svg", 2138731609, 2);
+    /** 16x16 */ public static final @NotNull Icon AddAccount = load("expui/general/addAccount.svg", 484949963, 2);
+    /** 20x20 */ public static final @NotNull Icon AddAccount_20x20 = load("expui/general/addAccount@20x20.svg", -1994243974, 2);
+    /** 16x16 */ public static final @NotNull Icon ChevronDown = load("expui/general/chevronDown.svg", 1796037843, 2);
+    /** 16x16 */ public static final @NotNull Icon ChevronDownLarge = load("expui/general/chevronDownLarge.svg", -919754914, 2);
+    /** 16x16 */ public static final @NotNull Icon ChevronDownLargeWhite = load("expui/general/chevronDownLargeWhite.svg", 427573164, 0);
+    /** 16x16 */ public static final @NotNull Icon ChevronLeft = load("expui/general/chevronLeft.svg", 1495437836, 2);
+    /** 16x16 */ public static final @NotNull Icon ChevronRight = load("expui/general/chevronRight.svg", 1566969796, 2);
+    /** 16x16 */ public static final @NotNull Icon ChevronUp = load("expui/general/chevronUp.svg", 2032632978, 2);
+    /** 16x16 */ public static final @NotNull Icon ChevronUpLarge = load("expui/general/chevronUpLarge.svg", 931499484, 2);
+    /** 16x16 */ public static final @NotNull Icon Close = load("expui/general/close.svg", -1117569699, 2);
+    /** 16x16 */ public static final @NotNull Icon CloseSmall = load("expui/general/closeSmall.svg", -1643260070, 2);
+    /** 16x16 */ public static final @NotNull Icon CloseSmallHovered = load("expui/general/closeSmallHovered.svg", -1723974831, 2);
+    /** 16x16 */ public static final @NotNull Icon CollapseAll = load("expui/general/collapseAll.svg", -1565444838, 2);
+    /** 16x16 */ public static final @NotNull Icon Copy = load("expui/general/copy.svg", 1727891053, 2);
+    /** 16x16 */ public static final @NotNull Icon Cut = load("expui/general/cut.svg", 41236062, 2);
+    /** 16x16 */ public static final @NotNull Icon Delete = load("expui/general/delete.svg", 269004522, 2);
+    /** 16x16 */ public static final @NotNull Icon Down = load("expui/general/down.svg", 579089403, 2);
+    /** 16x16 */ public static final @NotNull Icon Download = load("expui/general/download.svg", 1900349548, 2);
+    /** 16x16 */ public static final @NotNull Icon Dropdown = load("expui/general/dropdown.svg", -165232437, 2);
+    /** 13x13 */ public static final @NotNull Icon DropdownGutter = load("expui/general/dropdownGutter.svg", 1081305818, 2);
+    /** 16x16 */ public static final @NotNull Icon Edit = load("expui/general/edit.svg", 1051642233, 2);
+    /** 16x16 */ public static final @NotNull Icon EditorOnly = load("expui/general/editorOnly.svg", -680905206, 2);
+    /** 16x16 */ public static final @NotNull Icon EditorPreview = load("expui/general/editorPreview.svg", 400619099, 2);
+    /** 16x16 */ public static final @NotNull Icon EditorPreviewVertical = load("expui/general/editorPreviewVertical.svg", -662275668, 2);
+    /** 28x28 */ public static final @NotNull Icon ErrorDialog = load("expui/general/errorDialog.svg", 1289694103, 2);
+    /** 16x16 */ public static final @NotNull Icon Exit = load("expui/general/exit.svg", -388544585, 2);
+    /** 16x16 */ public static final @NotNull Icon ExpandAll = load("expui/general/expandAll.svg", 1017221795, 2);
+    /** 16x16 */ public static final @NotNull Icon Export = load("expui/general/export.svg", -1449009786, 2);
+    /** 16x16 */ public static final @NotNull Icon Filter = load("expui/general/filter.svg", -1559089420, 2);
+    /** 16x16 */ public static final @NotNull Icon Groups = load("expui/general/groups.svg", -1697135427, 2);
+    /** 16x16 */ public static final @NotNull Icon Help = load("expui/general/help.svg", -1533937878, 2);
+    /** 16x16 */ public static final @NotNull Icon Hide = load("expui/general/hide.svg", 1507935421, 2);
+    /** 16x16 */ public static final @NotNull Icon History = load("expui/general/history.svg", -1315246089, 2);
+    /** 16x16 */ public static final @NotNull Icon IdeUpdate = load("expui/general/ideUpdate.svg", 441803556, 2);
+    /** 16x16 */ public static final @NotNull Icon Import = load("expui/general/import.svg", 1639439433, 2);
+    /** 28x28 */ public static final @NotNull Icon InformationDialog = load("expui/general/informationDialog.svg", -322868084, 2);
+
+    public static final class Inspections {
+      /** 16x16 */ public static final @NotNull Icon InspectionsError = load("expui/general/inspections/inspectionsError.svg", 913985748, 0);
+      /** 16x16 */ public static final @NotNull Icon InspectionsErrorEmpty = load("expui/general/inspections/inspectionsErrorEmpty.svg", 803626091, 0);
+      /** 16x16 */ public static final @NotNull Icon InspectionsEye = load("expui/general/inspections/inspectionsEye.svg", 885249360, 2);
+      /** 16x16 */ public static final @NotNull Icon InspectionsMixed = load("expui/general/inspections/inspectionsMixed.svg", -970232525, 2);
+      /** 16x16 */ public static final @NotNull Icon InspectionsOK = load("expui/general/inspections/inspectionsOK.svg", -708448794, 2);
+      /** 16x16 */ public static final @NotNull Icon InspectionsOKEmpty = load("expui/general/inspections/inspectionsOKEmpty.svg", 580910449, 2);
+      /** 16x16 */ public static final @NotNull Icon InspectionsPause = load("expui/general/inspections/inspectionsPause.svg", 1602663282, 2);
+      /** 16x16 */ public static final @NotNull Icon InspectionsPowerSaveMode = load("expui/general/inspections/inspectionsPowerSaveMode.svg", -1453856841, 2);
+      /** 16x16 */ public static final @NotNull Icon InspectionsTrafficOff = load("expui/general/inspections/inspectionsTrafficOff.svg", -1061023121, 2);
+      /** 16x16 */ public static final @NotNull Icon InspectionsTypos = load("expui/general/inspections/inspectionsTypos.svg", -1005324057, 2);
+      /** 16x16 */ public static final @NotNull Icon InspectionsWarning = load("expui/general/inspections/inspectionsWarning.svg", -1779532795, 0);
+      /** 16x16 */ public static final @NotNull Icon InspectionsWarningEmpty = load("expui/general/inspections/inspectionsWarningEmpty.svg", -1101211942, 0);
+    }
+
+    /** 16x16 */ public static final @NotNull Icon Layout = load("expui/general/layout.svg", -617128059, 2);
+    /** 16x16 */ public static final @NotNull Icon Left = load("expui/general/left.svg", -528745728, 2);
+    /** 16x16 */ public static final @NotNull Icon ListFiles = load("expui/general/listFiles.svg", 1428697065, 2);
+    /** 16x16 */ public static final @NotNull Icon Locate = load("expui/general/locate.svg", 1924332631, 2);
+    /** 16x16 */ public static final @NotNull Icon Locked = load("expui/general/locked.svg", 1489567777, 2);
+    /** 16x16 */ public static final @NotNull Icon MoreHorizontal = load("expui/general/moreHorizontal.svg", -1612709602, 2);
+    /** 20x20 */ public static final @NotNull Icon MoreHorizontal_20x20 = load("expui/general/moreHorizontal@20x20.svg", 1423906923, 2);
+    /** 16x16 */ public static final @NotNull Icon MoreVertical = load("expui/general/moreVertical.svg", -3431568, 10);
+    /** 16x16 */ public static final @NotNull Icon MoveDown = load("expui/general/moveDown.svg", 104899674, 2);
+    /** 16x16 */ public static final @NotNull Icon MoveUp = load("expui/general/moveUp.svg", -1845744877, 2);
+    /** 16x16 */ public static final @NotNull Icon Open = load("expui/general/open.svg", 1032808113, 2);
+    /** 16x16 */ public static final @NotNull Icon OpenInToolWindow = load("expui/general/openInToolWindow.svg", 1697264958, 2);
+    /** 16x16 */ public static final @NotNull Icon OpenNewTab = load("expui/general/openNewTab.svg", -1116311177, 2);
+    /** 16x16 */ public static final @NotNull Icon Paste = load("expui/general/paste.svg", 1947637618, 2);
+    /** 16x16 */ public static final @NotNull Icon Pin = load("expui/general/pin.svg", -594888841, 2);
+    /** 16x16 */ public static final @NotNull Icon PluginUpdate = load("expui/general/pluginUpdate.svg", 1692056796, 2);
+    /** 16x16 */ public static final @NotNull Icon PreviewHorizontally = load("expui/general/previewHorizontally.svg", -1636166056, 2);
+    /** 16x16 */ public static final @NotNull Icon PreviewOnly = load("expui/general/previewOnly.svg", -1824800315, 2);
+    /** 16x16 */ public static final @NotNull Icon PreviewVertically = load("expui/general/previewVertically.svg", 1447275160, 2);
+    /** 16x16 */ public static final @NotNull Icon Print = load("expui/general/print.svg", 1812812161, 2);
+    /** 16x16 */ public static final @NotNull Icon ProjectStructure = load("expui/general/projectStructure.svg", -777753539, 2);
+    /** 16x16 */ public static final @NotNull Icon ProjectWideAnalysisOff = load("expui/general/projectWideAnalysisOff.svg", -438642246, 2);
+    /** 16x16 */ public static final @NotNull Icon ProjectWideAnalysisOn = load("expui/general/projectWideAnalysisOn.svg", -664163190, 2);
+    /** 28x28 */ public static final @NotNull Icon QuestionDialog = load("expui/general/questionDialog.svg", 1431895465, 2);
+    /** 16x16 */ public static final @NotNull Icon Redo = load("expui/general/redo.svg", 1204287923, 2);
+    /** 16x16 */ public static final @NotNull Icon Refresh = load("expui/general/refresh.svg", -42905027, 2);
+    /** 16x16 */ public static final @NotNull Icon Remove = load("expui/general/remove.svg", -1068196939, 2);
+    /** 16x16 */ public static final @NotNull Icon Reset = load("expui/general/reset.svg", -2079641000, 2);
+    /** 16x16 */ public static final @NotNull Icon Right = load("expui/general/right.svg", -964824429, 2);
+    /** 16x16 */ public static final @NotNull Icon RunAnything = load("expui/general/runAnything.svg", 744013373, 2);
+    /** 16x16 */ public static final @NotNull Icon Save = load("expui/general/save.svg", -1302605783, 2);
+    /** 16x16 */ public static final @NotNull Icon ScrollDown = load("expui/general/scrollDown.svg", 743211659, 2);
+    /** 16x16 */ public static final @NotNull Icon Search = load("expui/general/search.svg", 1772694430, 2);
+    /** 20x20 */ public static final @NotNull Icon Search_20x20 = load("expui/general/search@20x20.svg", 222263379, 2);
+    /** 16x16 */ public static final @NotNull Icon Settings = load("expui/general/settings.svg", -1284462229, 2);
+    /** 20x20 */ public static final @NotNull Icon Settings_20x20 = load("expui/general/settings@20x20.svg", -502688839, 2);
+    /** 16x16 */ public static final @NotNull Icon Show = load("expui/general/show.svg", -1326016674, 2);
+    /** 16x16 */ public static final @NotNull Icon ShowAsTree = load("expui/general/showAsTree.svg", -739978081, 2);
+    /** 16x16 */ public static final @NotNull Icon SoftWrap = load("expui/general/softWrap.svg", 1754608822, 2);
+    /** 16x16 */ public static final @NotNull Icon SplitHorizontally = load("expui/general/splitHorizontally.svg", -1212581861, 2);
+    /** 16x16 */ public static final @NotNull Icon SplitVertically = load("expui/general/splitVertically.svg", -242414234, 2);
+    /** 28x28 */ public static final @NotNull Icon SuccessDialog = load("expui/general/successDialog.svg", 1587908563, 2);
+    /** 48x48 */ public static final @NotNull Icon SuccessLogin = load("expui/general/successLogin.svg", 1941849412, 2);
+    /** 16x16 */ public static final @NotNull Icon Undo = load("expui/general/undo.svg", -1978008845, 2);
+    /** 16x16 */ public static final @NotNull Icon Unlocked = load("expui/general/unlocked.svg", 2140459951, 2);
+    /** 16x16 */ public static final @NotNull Icon UP = load("expui/general/up.svg", 1620326157, 2);
+    /** 16x16 */ public static final @NotNull Icon Upload = load("expui/general/upload.svg", 2093973843, 2);
+    /** 16x16 */ public static final @NotNull Icon User = load("expui/general/user.svg", 396421007, 2);
+    /** 16x16 */ public static final @NotNull Icon Vcs = load("expui/general/vcs.svg", 374496635, 2);
+    /** 28x28 */ public static final @NotNull Icon WarningDialog = load("expui/general/warningDialog.svg", 1482695517, 2);
+    /** 20x20 */ public static final @NotNull Icon WindowsMenu_20x20 = load("expui/general/windowsMenu@20x20.svg", 1537983593, 2);
+  }
+
+  public static final class Gutter {
+    /** 12x12 */ public static final @NotNull Icon Bookmark = load("expui/gutter/bookmark.svg", 1063335630, 2);
+    /** 12x12 */ public static final @NotNull Icon Colors = load("expui/gutter/colors.svg", -816210844, 2);
+    /** 12x12 */ public static final @NotNull Icon DataSchema = load("expui/gutter/dataSchema.svg", 1192739636, 2);
+    /** 12x12 */ public static final @NotNull Icon ExtAnnotation = load("expui/gutter/extAnnotation.svg", 1120015114, 2);
+    /** 9x9 */ public static final @NotNull Icon Fold = load("expui/gutter/fold.svg", 962552983, 2);
+    /** 9x9 */ public static final @NotNull Icon FoldBottom = load("expui/gutter/foldBottom.svg", 855599977, 2);
+    /** 12x12 */ public static final @NotNull Icon JavadocEdit = load("expui/gutter/javadocEdit.svg", 1083614215, 2);
+    /** 12x12 */ public static final @NotNull Icon JavadocRead = load("expui/gutter/javadocRead.svg", 965485291, 2);
+    /** 12x12 */ public static final @NotNull Icon Mnemonic = load("expui/gutter/mnemonic.svg", -476450915, 2);
+    /** 12x12 */ public static final @NotNull Icon ReadAccess = load("expui/gutter/readAccess.svg", -128665514, 2);
+    /** 12x12 */ public static final @NotNull Icon Rerun = load("expui/gutter/rerun.svg", 1259595407, 2);
+    /** 12x12 */ public static final @NotNull Icon Run = load("expui/gutter/run.svg", -606795149, 2);
+    /** 12x12 */ public static final @NotNull Icon RunError = load("expui/gutter/runError.svg", 1126102893, 2);
+    /** 12x12 */ public static final @NotNull Icon RunFailed = load("expui/gutter/runFailed.svg", -1868799828, 2);
+    /** 12x12 */ public static final @NotNull Icon RunSuccess = load("expui/gutter/runSuccess.svg", 439474958, 2);
+    /** 12x12 */ public static final @NotNull Icon SuggestedRefactoring = load("expui/gutter/suggestedRefactoring.svg", 1792933157, 2);
+    /** 12x12 */ public static final @NotNull Icon SuggestedRefactoringDisabled = load("expui/gutter/suggestedRefactoringDisabled.svg", 1078324408, 2);
+    /** 9x9 */ public static final @NotNull Icon Unfold = load("expui/gutter/unfold.svg", -1347957, 2);
+    /** 13x12 */ public static final @NotNull Icon WriteAccess = load("expui/gutter/writeAccess.svg", -402122580, 2);
+  }
+
+  public static final class Ide {
+    /** 32x32 */ public static final @NotNull Icon FeedbackRating = load("expui/ide/feedbackRating.svg", 1118640406, 2);
+    /** 32x32 */ public static final @NotNull Icon FeedbackRatingFocused = load("expui/ide/feedbackRatingFocused.svg", -1289005852, 2);
+    /** 32x32 */ public static final @NotNull Icon FeedbackRatingFocusedOn = load("expui/ide/feedbackRatingFocusedOn.svg", 1021943141, 2);
+    /** 32x32 */ public static final @NotNull Icon FeedbackRatingOn = load("expui/ide/feedbackRatingOn.svg", -1513716364, 2);
+  }
+
+  public static final class Image {
+    /** 16x16 */ public static final @NotNull Icon ActualZoom = load("expui/image/actualZoom.svg", -1477575664, 2);
+    /** 16x16 */ public static final @NotNull Icon ColorPicker = load("expui/image/colorPicker.svg", -1981678861, 2);
+    /** 16x16 */ public static final @NotNull Icon FitContent = load("expui/image/fitContent.svg", 2006176979, 2);
+    /** 16x16 */ public static final @NotNull Icon Grid = load("expui/image/grid.svg", 1610141577, 2);
+    /** 16x16 */ public static final @NotNull Icon ZoomIn = load("expui/image/zoomIn.svg", -446594093, 2);
+    /** 16x16 */ public static final @NotNull Icon ZoomOut = load("expui/image/zoomOut.svg", -1996988627, 2);
+  }
+
+  public static final class Inline {
+    /** 16x16 */ public static final @NotNull Icon Browse = load("expui/inline/browse.svg", -525910403, 2);
+    /** 16x16 */ public static final @NotNull Icon Collapse = load("expui/inline/collapse.svg", 1321740131, 2);
+    /** 16x16 */ public static final @NotNull Icon Copy = load("expui/inline/copy.svg", 1172753525, 2);
+    /** 16x16 */ public static final @NotNull Icon ExactWords = load("expui/inline/exactWords.svg", -786360977, 2);
+    /** 16x16 */ public static final @NotNull Icon Expand = load("expui/inline/expand.svg", -604488029, 2);
+    /** 16x16 */ public static final @NotNull Icon InlineAdd = load("expui/inline/inlineAdd.svg", 1450133276, 2);
+    /** 16x16 */ public static final @NotNull Icon InlineEdit = load("expui/inline/inlineEdit.svg", -893665063, 2);
+    /** 16x16 */ public static final @NotNull Icon InlineSettings = load("expui/inline/inlineSettings.svg", -1533301951, 2);
+    /** 16x16 */ public static final @NotNull Icon MatchCase = load("expui/inline/matchCase.svg", 1750975060, 2);
+    /** 16x16 */ public static final @NotNull Icon NewLine = load("expui/inline/newLine.svg", -909835684, 2);
+    /** 16x16 */ public static final @NotNull Icon PreserveCase = load("expui/inline/preserveCase.svg", -1993474533, 2);
+    /** 18x16 */ public static final @NotNull Icon Refresh = load("expui/inline/refresh.svg", -762621841, 2);
+    /** 16x16 */ public static final @NotNull Icon Regex = load("expui/inline/regex.svg", 262058796, 2);
+    /** 16x16 */ public static final @NotNull Icon SearchHistory = load("expui/inline/searchHistory.svg", -1728936093, 2);
+    /** 16x16 */ public static final @NotNull Icon Variables = load("expui/inline/variables.svg", -615543981, 2);
+  }
+
+  public static final class MeetNewUi {
+    /** 16x16 */ public static final @NotNull Icon DarkTheme = load("expui/meetNewUi/darkTheme.svg", 1564006136, 2);
+    /** 16x16 */ public static final @NotNull Icon DarkThemeSelected = load("expui/meetNewUi/darkThemeSelected.svg", 662181068, 2);
+    /** 88x48 */ public static final @NotNull Icon DensityCompact = load("expui/meetNewUi/densityCompact.svg", 1555942917, 2);
+    /** 88x48 */ public static final @NotNull Icon DensityDefault = load("expui/meetNewUi/densityDefault.svg", 1048829688, 2);
+    /** 16x16 */ public static final @NotNull Icon LightTheme = load("expui/meetNewUi/lightTheme.svg", -1336246811, 2);
+    /** 16x16 */ public static final @NotNull Icon LightThemeSelected = load("expui/meetNewUi/lightThemeSelected.svg", 85948739, 2);
+    /** 16x16 */ public static final @NotNull Icon SystemTheme = load("expui/meetNewUi/systemTheme.svg", 120268444, 2);
+    /** 16x16 */ public static final @NotNull Icon SystemThemeSelected = load("expui/meetNewUi/systemThemeSelected.svg", -112068948, 2);
+  }
+
+  public static final class Nodes {
+    /** 16x16 */ public static final @NotNull Icon AbstractException = load("expui/nodes/abstractException.svg", -1774282278, 2);
+    /** 16x16 */ public static final @NotNull Icon Alias = load("expui/nodes/alias.svg", 613552126, 2);
+    /** 16x16 */ public static final @NotNull Icon Annotation = load("expui/nodes/annotation.svg", -1363479915, 2);
+    /** 16x16 */ public static final @NotNull Icon AnnotationFolder = load("expui/nodes/annotationFolder.svg", 461437750, 2);
+    /** 16x16 */ public static final @NotNull Icon Class = load("expui/nodes/class.svg", 495823317, 2);
+    /** 16x16 */ public static final @NotNull Icon ClassAbstract = load("expui/nodes/classAbstract.svg", -1527461484, 2);
+    /** 16x16 */ public static final @NotNull Icon ClassAnonymous = load("expui/nodes/classAnonymous.svg", -451770747, 2);
+    /** 16x16 */ public static final @NotNull Icon ClassInitializer = load("expui/nodes/classInitializer.svg", 1085181017, 2);
+    /** 16x16 */ public static final @NotNull Icon Constant = load("expui/nodes/constant.svg", -1526396032, 2);
+    /** 16x16 */ public static final @NotNull Icon Controller = load("expui/nodes/controller.svg", 1361207250, 2);
+    /** 16x16 */ public static final @NotNull Icon DataColumn = load("expui/nodes/dataColumn.svg", -106987770, 2);
+    /** 16x16 */ public static final @NotNull Icon DataSchema = load("expui/nodes/dataSchema.svg", 638225327, 2);
+    /** 16x16 */ public static final @NotNull Icon EditFolder = load("expui/nodes/editFolder.svg", -876470027, 2);
+    /** 16x16 */ public static final @NotNull Icon Enum = load("expui/nodes/enum.svg", 1497390523, 2);
+    /** 16x16 */ public static final @NotNull Icon ErrorIntroduction = load("expui/nodes/errorIntroduction.svg", -1260704124, 2);
+    /** 16x16 */ public static final @NotNull Icon Exception = load("expui/nodes/exception.svg", 1117402312, 2);
+    /** 16x16 */ public static final @NotNull Icon ExcludedGenerated = load("expui/nodes/excludedGenerated.svg", -728058288, 2);
+    /** 16x16 */ public static final @NotNull Icon ExcludeRoot = load("expui/nodes/excludeRoot.svg", 695325372, 2);
+    /** 16x16 */ public static final @NotNull Icon Field = load("expui/nodes/field.svg", 108201114, 2);
+    /** 16x16 */ public static final @NotNull Icon Folder = load("expui/nodes/folder.svg", -2013244060, 2);
+    /** 16x16 */ public static final @NotNull Icon Function = load("expui/nodes/function.svg", 1512297110, 2);
+    /** 16x16 */ public static final @NotNull Icon Generated = load("expui/nodes/generated.svg", -2083105322, 2);
+    /** 16x16 */ public static final @NotNull Icon GeneratedSource = load("expui/nodes/generatedSource.svg", -618885451, 2);
+    /** 16x16 */ public static final @NotNull Icon GeneratedTestRoot = load("expui/nodes/generatedTestRoot.svg", -2038624716, 2);
+    /** 16x16 */ public static final @NotNull Icon Gvariable = load("expui/nodes/gvariable.svg", -855515130, 2);
+    /** 16x16 */ public static final @NotNull Icon Interface = load("expui/nodes/interface.svg", -1327685732, 2);
+    /** 16x16 */ public static final @NotNull Icon Jdk = load("expui/nodes/jdk.svg", -1209461259, 2);
+    /** 16x16 */ public static final @NotNull Icon Lambda = load("expui/nodes/lambda.svg", -585072607, 2);
+    /** 16x16 */ public static final @NotNull Icon Library = load("expui/nodes/library.svg", 387151649, 2);
+    /** 16x16 */ public static final @NotNull Icon LibraryFolder = load("expui/nodes/libraryFolder.svg", 449053715, 2);
+    /** 16x16 */ public static final @NotNull Icon Method = load("expui/nodes/method.svg", 288545391, 2);
+    /** 16x16 */ public static final @NotNull Icon MethodAbstract = load("expui/nodes/methodAbstract.svg", 1855411345, 2);
+    /** 16x16 */ public static final @NotNull Icon MethodReference = load("expui/nodes/methodReference.svg", 1075318800, 2);
+    /** 16x16 */ public static final @NotNull Icon ModelClass = load("expui/nodes/modelClass.svg", 431571136, 2);
+    /** 16x16 */ public static final @NotNull Icon Module = load("expui/nodes/module.svg", 737883273, 2);
+    /** 8x8 */ public static final @NotNull Icon Module8x8 = load("expui/nodes/module8x8.svg", -1845871922, 2);
+    /** 16x16 */ public static final @NotNull Icon ModuleGroup = load("expui/nodes/moduleGroup.svg", -1404475012, 2);
+    /** 16x16 */ public static final @NotNull Icon ModuleJava = load("expui/nodes/moduleJava.svg", -1985978859, 2);
+    /** 16x16 */ public static final @NotNull Icon Package = load("expui/nodes/package.svg", -1502444014, 2);
+    /** 16x16 */ public static final @NotNull Icon Parameter = load("expui/nodes/parameter.svg", -1812554134, 2);
+    /** 16x16 */ public static final @NotNull Icon Plugin = load("expui/nodes/plugin.svg", 501270636, 2);
+    /** 16x16 */ public static final @NotNull Icon Property = load("expui/nodes/property.svg", 4482036, 2);
+    /** 16x16 */ public static final @NotNull Icon Record = load("expui/nodes/record.svg", 1385033923, 2);
+    /** 16x16 */ public static final @NotNull Icon ResourcesRoot = load("expui/nodes/resourcesRoot.svg", -468116405, 2);
+    /** 16x16 */ public static final @NotNull Icon SourceRoot = load("expui/nodes/sourceRoot.svg", 1801414749, 2);
+    /** 16x16 */ public static final @NotNull Icon Star = load("expui/nodes/star.svg", -2069029348, 2);
+    /** 16x16 */ public static final @NotNull Icon StarEmpty = load("expui/nodes/starEmpty.svg", 216889407, 2);
+    /** 16x16 */ public static final @NotNull Icon Static = load("expui/nodes/static.svg", 454618117, 2);
+    /** 16x16 */ public static final @NotNull Icon Test = load("expui/nodes/test.svg", 19451922, 2);
+    /** 16x16 */ public static final @NotNull Icon TestIgnored = load("expui/nodes/testIgnored.svg", -1176904875, 2);
+    /** 16x16 */ public static final @NotNull Icon TestResources = load("expui/nodes/testResources.svg", 127897803, 2);
+    /** 16x16 */ public static final @NotNull Icon TestResourcesRoot = load("expui/nodes/testResourcesRoot.svg", 540000745, 2);
+    /** 16x16 */ public static final @NotNull Icon TestRoot = load("expui/nodes/testRoot.svg", -1805814151, 2);
+    /** 16x16 */ public static final @NotNull Icon TestSourceFolder = load("expui/nodes/testSourceFolder.svg", -206233346, 2);
+    /** 16x16 */ public static final @NotNull Icon Type = load("expui/nodes/type.svg", 882455057, 2);
+    /** 16x16 */ public static final @NotNull Icon UnloadedModule = load("expui/nodes/unloadedModule.svg", -999377918, 2);
+    /** 16x16 */ public static final @NotNull Icon Variable = load("expui/nodes/variable.svg", 2118389389, 2);
+    /** 16x16 */ public static final @NotNull Icon WarningIntroduction = load("expui/nodes/warningIntroduction.svg", 1544041499, 2);
+  }
+
+  public static final class Php {
+    /** 16x16 */ public static final @NotNull Icon PhpHttpRequest = load("expui/php/phpHttpRequest.svg", -965795954, 2);
+    /** 16x16 */ public static final @NotNull Icon PhpLocal = load("expui/php/phpLocal.svg", -1666093507, 2);
+    /** 16x16 */ public static final @NotNull Icon PhpRemote = load("expui/php/phpRemote.svg", -341955947, 2);
+    /** 16x16 */ public static final @NotNull Icon PhpWeb = load("expui/php/phpWeb.svg", -433485524, 2);
+  }
+
+  public static final class Profiler {
+    /** 9x9 */ public static final @NotNull Icon CollapseNode = load("expui/profiler/collapseNode.svg", 2090072817, 2);
+    /** 9x9 */ public static final @NotNull Icon ExpandNode = load("expui/profiler/expandNode.svg", -2070715679, 2);
+  }
+
+  public static final class Progress {
+    /** 16x16 */ public static final @NotNull Icon Pause = load("expui/progress/pause.svg", -768517919, 2);
+    /** 16x16 */ public static final @NotNull Icon PauseHovered = load("expui/progress/pauseHovered.svg", -2112229515, 2);
+    /** 16x16 */ public static final @NotNull Icon Resume = load("expui/progress/resume.svg", 791822803, 2);
+    /** 16x16 */ public static final @NotNull Icon ResumeHovered = load("expui/progress/resumeHovered.svg", 2105881584, 2);
+    /** 16x16 */ public static final @NotNull Icon Stop = load("expui/progress/stop.svg", -823634171, 2);
+    /** 16x16 */ public static final @NotNull Icon StopHovered = load("expui/progress/stopHovered.svg", -2004589542, 2);
+  }
+
+  public static final class Run {
+    /** 16x16 */ public static final @NotNull Icon AttachToProcess = load("expui/run/attachToProcess.svg", 696360181, 2);
+    /** 16x16 */ public static final @NotNull Icon Debug = load("expui/run/debug.svg", 717126399, 10);
+    /** 16x16 */ public static final @NotNull Icon DumpThreads = load("expui/run/dumpThreads.svg", 965186, 2);
+    /** 16x16 */ public static final @NotNull Icon EvaluateExpression = load("expui/run/evaluateExpression.svg", -864445958, 2);
+    /** 16x16 */ public static final @NotNull Icon ForceRunToCursor = load("expui/run/forceRunToCursor.svg", 879370946, 2);
+    /** 16x16 */ public static final @NotNull Icon ForceStepInto = load("expui/run/forceStepInto.svg", 279922614, 2);
+    /** 16x16 */ public static final @NotNull Icon ForceStepOver = load("expui/run/forceStepOver.svg", 264797388, 2);
+    /** 16x16 */ public static final @NotNull Icon KillProcess = load("expui/run/killProcess.svg", -1315457276, 2);
+    /** 16x16 */ public static final @NotNull Icon MuteBreakpoints = load("expui/run/muteBreakpoints.svg", -569963335, 2);
+    /** 16x16 */ public static final @NotNull Icon Pause = load("expui/run/pause.svg", 59569700, 2);
+    /** 17x16 */ public static final @NotNull Icon Profile = load("expui/run/profile.svg", 7587783, 2);
+    /** 17x16 */ public static final @NotNull Icon Rerun = load("expui/run/rerun.svg", -482494974, 10);
+    /** 16x16 */ public static final @NotNull Icon Restart = load("expui/run/restart.svg", 1912986747, 2);
+    /** 16x16 */ public static final @NotNull Icon RestartDebug = load("expui/run/restartDebug.svg", 1999164581, 10);
+    /** 16x16 */ public static final @NotNull Icon RestartFailedTests = load("expui/run/restartFailedTests.svg", 408311683, 2);
+    /** 16x16 */ public static final @NotNull Icon RestartFrame = load("expui/run/restartFrame.svg", 230449617, 2);
+    /** 16x16 */ public static final @NotNull Icon Resume = load("expui/run/resume.svg", -762794629, 2);
+    /** 16x16 */ public static final @NotNull Icon Run = load("expui/run/run.svg", 1172514979, 10);
+    /** 16x16 */ public static final @NotNull Icon RunToCursor = load("expui/run/runToCursor.svg", 1103454147, 2);
+    /** 16x16 */ public static final @NotNull Icon RunWithCoverage = load("expui/run/runWithCoverage.svg", 1091337665, 2);
+    /** 16x16 */ public static final @NotNull Icon ShowCurrentFrame = load("expui/run/showCurrentFrame.svg", 620170584, 2);
+    /** 16x16 */ public static final @NotNull Icon ShowIgnored = load("expui/run/showIgnored.svg", 1147642366, 2);
+    /** 16x16 */ public static final @NotNull Icon ShowPassed = load("expui/run/showPassed.svg", -479568315, 2);
+    /** 16x16 */ public static final @NotNull Icon SmartStepInto = load("expui/run/smartStepInto.svg", 683604662, 2);
+    /** 16x16 */ public static final @NotNull Icon StepInto = load("expui/run/stepInto.svg", 32771074, 2);
+    /** 16x16 */ public static final @NotNull Icon StepOut = load("expui/run/stepOut.svg", 1212416767, 2);
+    /** 16x16 */ public static final @NotNull Icon StepOutCodeBlock = load("expui/run/stepOutCodeBlock.svg", 1663685796, 2);
+    /** 16x16 */ public static final @NotNull Icon StepOver = load("expui/run/stepOver.svg", -404768119, 2);
+    /** 16x16 */ public static final @NotNull Icon Stop = load("expui/run/stop.svg", 1320774136, 10);
+    /** 16x16 */ public static final @NotNull Icon TestCustom = load("expui/run/testCustom.svg", -448649996, 2);
+    /** 16x16 */ public static final @NotNull Icon TestError = load("expui/run/testError.svg", 185889990, 2);
+    /** 16x16 */ public static final @NotNull Icon TestFailed = load("expui/run/testFailed.svg", 422337324, 2);
+    /** 16x16 */ public static final @NotNull Icon TestIgnored = load("expui/run/testIgnored.svg", 1717121580, 2);
+    /** 16x16 */ public static final @NotNull Icon TestNotRunYet = load("expui/run/testNotRunYet.svg", 736894804, 2);
+    /** 16x16 */ public static final @NotNull Icon TestPassed = load("expui/run/testPassed.svg", 1173084002, 2);
+    /** 16x16 */ public static final @NotNull Icon TestPassedIgnored = load("expui/run/testPassedIgnored.svg", 711459164, 2);
+    /** 16x16 */ public static final @NotNull Icon TestPaused = load("expui/run/testPaused.svg", -347228156, 2);
+    /** 16x16 */ public static final @NotNull Icon TestSkipped = load("expui/run/testSkipped.svg", 97380223, 2);
+    /** 16x16 */ public static final @NotNull Icon TestTerminated = load("expui/run/testTerminated.svg", 389663270, 2);
+    /** 16x16 */ public static final @NotNull Icon TestUnknown = load("expui/run/testUnknown.svg", 2108645044, 2);
+    /** 16x16 */ public static final @NotNull Icon ViewBreakpoints = load("expui/run/viewBreakpoints.svg", 1063462579, 2);
+
+    public static final class Widget {
+      /** 16x16 */ public static final @NotNull Icon Build = load("expui/run/widget/build.svg", -18374055, 2);
+      /** 16x16 */ public static final @NotNull Icon Restart = load("expui/run/widget/restart.svg", 1308220637, 2);
+    }
+  }
+
+  public static final class RunConfigurations {
+    /** 16x16 */ public static final @NotNull Icon Application = load("expui/runConfigurations/application.svg", -762854924, 2);
+    /** 16x16 */ public static final @NotNull Icon ApplicationRemote = load("expui/runConfigurations/applicationRemote.svg", 304824343, 2);
+    /** 16x16 */ public static final @NotNull Icon Compound = load("expui/runConfigurations/compound.svg", 1727190739, 2);
+    /** 16x16 */ public static final @NotNull Icon InvalidConfigurationLayer = load("expui/runConfigurations/invalidConfigurationLayer.svg", -1487868121, 2);
+    /** 16x16 */ public static final @NotNull Icon JavaScriptRemote = load("expui/runConfigurations/javaScriptRemote.svg", -1346919924, 2);
+    /** 16x16 */ public static final @NotNull Icon Junit = load("expui/runConfigurations/junit.svg", -1427905959, 2);
+    /** 16x16 */ public static final @NotNull Icon JunitTestMark = load("expui/runConfigurations/junitTestMark.svg", 1580528729, 2);
+    /** 16x16 */ public static final @NotNull Icon WebApp = load("expui/runConfigurations/webApp.svg", 1006028123, 2);
+  }
+
+  public static final class Status {
+    /** 16x16 */ public static final @NotNull Icon Error = load("expui/status/error.svg", -478707676, 2);
+    /** 16x16 */ public static final @NotNull Icon ErrorOutline = load("expui/status/errorOutline.svg", 282005856, 2);
+    /** 16x16 */ public static final @NotNull Icon FailedInProgress = load("expui/status/failedInProgress.svg", 37017173, 2);
+    /** 16x16 */ public static final @NotNull Icon Info = load("expui/status/info.svg", -1763655089, 2);
+    /** 16x16 */ public static final @NotNull Icon InfoOutline = load("expui/status/infoOutline.svg", 648503782, 2);
+    /** 16x16 */ public static final @NotNull Icon Success = load("expui/status/success.svg", 1142570405, 2);
+    /** 16x16 */ public static final @NotNull Icon Warning = load("expui/status/warning.svg", -922696203, 2);
+    /** 16x16 */ public static final @NotNull Icon WarningOutline = load("expui/status/warningOutline.svg", -1436087844, 2);
+  }
+
+  /** 16x16 */ public static final @NotNull Icon Stub = load("expui/stub.svg", 1413812752, 2);
+  /** 20x20 */ public static final @NotNull Icon Stub_20x20 = load("expui/stub@20x20.svg", -26233374, 2);
+
+  public static final class Table {
+    /** 16x16 */ public static final @NotNull Icon Pagination = load("expui/table/pagination.svg", 60392199, 2);
+  }
+
+  public static final class Toolbar {
+    /** 16x16 */ public static final @NotNull Icon Unknown = load("expui/toolbar/unknown.svg", -582164835, 2);
+    /** 20x20 */ public static final @NotNull Icon Unknown_20x20 = load("expui/toolbar/unknown@20x20.svg", 1242791220, 2);
+  }
+
+  public static final class Toolwindow {
+    /** 16x16 */ public static final @NotNull Icon Ant = load("expui/toolwindow/ant.svg", 710121318, 2);
+    /** 20x20 */ public static final @NotNull Icon Ant_20x20 = load("expui/toolwindow/ant@20x20.svg", 641791383, 2);
+    /** 16x16 */ public static final @NotNull Icon Bookmarks = load("expui/toolwindow/bookmarks.svg", 282455255, 2);
+    /** 20x20 */ public static final @NotNull Icon Bookmarks_20x20 = load("expui/toolwindow/bookmarks@20x20.svg", -1840200824, 2);
+    /** 16x16 */ public static final @NotNull Icon Build = load("expui/toolwindow/build.svg", -603655032, 2);
+    /** 20x20 */ public static final @NotNull Icon Build_20x20 = load("expui/toolwindow/build@20x20.svg", 1917257698, 2);
+    /** 16x16 */ public static final @NotNull Icon Changes = load("expui/toolwindow/changes.svg", 972532521, 2);
+    /** 20x20 */ public static final @NotNull Icon Changes_20x20 = load("expui/toolwindow/changes@20x20.svg", 895368692, 2);
+    /** 16x16 */ public static final @NotNull Icon Commit = load("expui/toolwindow/commit.svg", 1685509621, 2);
+    /** 20x20 */ public static final @NotNull Icon Commit_20x20 = load("expui/toolwindow/commit@20x20.svg", 107497409, 2);
+    /** 16x16 */ public static final @NotNull Icon Coverage = load("expui/toolwindow/coverage.svg", -1187512369, 2);
+    /** 20x20 */ public static final @NotNull Icon Coverage_20x20 = load("expui/toolwindow/coverage@20x20.svg", -93110461, 2);
+    /** 16x16 */ public static final @NotNull Icon Debug = load("expui/toolwindow/debug.svg", 1354048897, 2);
+    /** 20x20 */ public static final @NotNull Icon Debug_20x20 = load("expui/toolwindow/debug@20x20.svg", -1944001172, 2);
+    /** 16x16 */ public static final @NotNull Icon Dependencies = load("expui/toolwindow/dependencies.svg", 541379824, 2);
+    /** 20x20 */ public static final @NotNull Icon Dependencies_20x20 = load("expui/toolwindow/dependencies@20x20.svg", -949808525, 2);
+    /** 16x16 */ public static final @NotNull Icon Documentation = load("expui/toolwindow/documentation.svg", -521001062, 2);
+    /** 20x20 */ public static final @NotNull Icon Documentation_20x20 = load("expui/toolwindow/documentation@20x20.svg", -1277772018, 2);
+    /** 16x16 */ public static final @NotNull Icon Find = load("expui/toolwindow/find.svg", 657912135, 2);
+    /** 20x20 */ public static final @NotNull Icon Find_20x20 = load("expui/toolwindow/find@20x20.svg", -1107444403, 2);
+    /** 16x16 */ public static final @NotNull Icon Gradle = load("expui/toolwindow/gradle.svg", 1456814636, 2);
+    /** 20x20 */ public static final @NotNull Icon Gradle_20x20 = load("expui/toolwindow/gradle@20x20.svg", -1214440060, 2);
+    /** 16x16 */ public static final @NotNull Icon Hierarchy = load("expui/toolwindow/hierarchy.svg", -1163838802, 2);
+    /** 20x20 */ public static final @NotNull Icon Hierarchy_20x20 = load("expui/toolwindow/hierarchy@20x20.svg", -131394163, 2);
+    /** 16x16 */ public static final @NotNull Icon MeetNewUi = load("expui/toolwindow/meetNewUi.svg", 1873596656, 2);
+    /** 20x20 */ public static final @NotNull Icon MeetNewUi_20x20 = load("expui/toolwindow/meetNewUi@20x20.svg", -74917123, 2);
+    /** 16x16 */ public static final @NotNull Icon Messages = load("expui/toolwindow/messages.svg", 1239512279, 2);
+    /** 20x20 */ public static final @NotNull Icon Messages_20x20 = load("expui/toolwindow/messages@20x20.svg", 1823365646, 2);
+    /** 16x16 */ public static final @NotNull Icon Notifications = load("expui/toolwindow/notifications.svg", -747686149, 2);
+    /** 20x20 */ public static final @NotNull Icon Notifications_20x20 = load("expui/toolwindow/notifications@20x20.svg", 328982059, 2);
+    /** 16x16 */ public static final @NotNull Icon Problems = load("expui/toolwindow/problems.svg", -730621594, 2);
+    /** 20x20 */ public static final @NotNull Icon Problems_20x20 = load("expui/toolwindow/problems@20x20.svg", 867030312, 2);
+    /** 16x16 */ public static final @NotNull Icon Profiler = load("expui/toolwindow/profiler.svg", 1797772206, 2);
+    /** 20x20 */ public static final @NotNull Icon Profiler_20x20 = load("expui/toolwindow/profiler@20x20.svg", -674008247, 2);
+    /** 16x16 */ public static final @NotNull Icon Project = load("expui/toolwindow/project.svg", -1162287118, 2);
+    /** 20x20 */ public static final @NotNull Icon Project_20x20 = load("expui/toolwindow/project@20x20.svg", -32073890, 2);
+    /** 16x16 */ public static final @NotNull Icon Repositories = load("expui/toolwindow/repositories.svg", -1355583455, 2);
+    /** 20x20 */ public static final @NotNull Icon Repositories_20x20 = load("expui/toolwindow/repositories@20x20.svg", 671426797, 2);
+    /** 16x16 */ public static final @NotNull Icon Run = load("expui/toolwindow/run.svg", 1475530273, 2);
+    /** 20x20 */ public static final @NotNull Icon Run_20x20 = load("expui/toolwindow/run@20x20.svg", 695450088, 2);
+    /** 16x16 */ public static final @NotNull Icon Services = load("expui/toolwindow/services.svg", -1857297648, 2);
+    /** 20x20 */ public static final @NotNull Icon Services_20x20 = load("expui/toolwindow/services@20x20.svg", -58936400, 2);
+    /** 18x16 */ public static final @NotNull Icon SettingSync = load("expui/toolwindow/settingSync.svg", -65012350, 2);
+    /** 20x20 */ public static final @NotNull Icon SettingSync_20x20 = load("expui/toolwindow/settingSync@20x20.svg", -302510151, 2);
+    /** 16x16 */ public static final @NotNull Icon Structure = load("expui/toolwindow/structure.svg", -1788511870, 2);
+    /** 20x20 */ public static final @NotNull Icon Structure_20x20 = load("expui/toolwindow/structure@20x20.svg", -552982849, 2);
+    /** 16x16 */ public static final @NotNull Icon Task = load("expui/toolwindow/task.svg", -1238920466, 2);
+    /** 20x20 */ public static final @NotNull Icon Task_20x20 = load("expui/toolwindow/task@20x20.svg", -667556724, 2);
+    /** 16x16 */ public static final @NotNull Icon Todo = load("expui/toolwindow/todo.svg", -601659879, 2);
+    /** 20x20 */ public static final @NotNull Icon Todo_20x20 = load("expui/toolwindow/todo@20x20.svg", -919495316, 2);
+    /** 16x16 */ public static final @NotNull Icon Vcs = load("expui/toolwindow/vcs.svg", 134433062, 2);
+    /** 20x20 */ public static final @NotNull Icon Vcs_20x20 = load("expui/toolwindow/vcs@20x20.svg", 1702147209, 2);
+    /** 16x16 */ public static final @NotNull Icon Web = load("expui/toolwindow/web.svg", -1794224119, 2);
+    /** 20x20 */ public static final @NotNull Icon Web_20x20 = load("expui/toolwindow/web@20x20.svg", -1342100827, 2);
+  }
+
+  public static final class Vcs {
+    /** 16x16 */ public static final @NotNull Icon Changelist = load("expui/vcs/changelist.svg", -1525702415, 2);
+    /** 16x16 */ public static final @NotNull Icon Changes = load("expui/vcs/changes.svg", 662894871, 2);
+    /** 12x12 */ public static final @NotNull Icon ChangesPush_12x12 = load("expui/vcs/changesPush@12x12.svg", -1016151228, 2);
+    /** 12x12 */ public static final @NotNull Icon ChangesUpdate_12x12 = load("expui/vcs/changesUpdate@12x12.svg", -697433562, 2);
+    /** 16x16 */ public static final @NotNull Icon CherryPick = load("expui/vcs/cherryPick.svg", -859521689, 2);
+    /** 16x16 */ public static final @NotNull Icon Commit = load("expui/vcs/commit.svg", 1685509621, 2);
+    /** 16x16 */ public static final @NotNull Icon CurrentBranch = load("expui/vcs/currentBranch.svg", -912319858, 2);
+    /** 16x16 */ public static final @NotNull Icon CurrentBranchFavorite = load("expui/vcs/currentBranchFavorite.svg", 74180181, 2);
+    /** 16x16 */ public static final @NotNull Icon Diff = load("expui/vcs/diff.svg", -7567127, 2);
+    /** 16x16 */ public static final @NotNull Icon Fetch = load("expui/vcs/fetch.svg", 478283065, 2);
+    /** 16x16 */ public static final @NotNull Icon IntelliSort = load("expui/vcs/intelliSort.svg", 1662148555, 2);
+    /** 16x17 */ public static final @NotNull Icon Merge = load("expui/vcs/merge.svg", -1464121208, 2);
+    /** 16x16 */ public static final @NotNull Icon Patch = load("expui/vcs/patch.svg", -146855827, 2);
+    /** 16x16 */ public static final @NotNull Icon Push = load("expui/vcs/push.svg", 686739599, 2);
+    /** 16x16 */ public static final @NotNull Icon Revert = load("expui/vcs/revert.svg", 430758831, 2);
+    /** 16x16 */ public static final @NotNull Icon Stash = load("expui/vcs/stash.svg", 779943365, 2);
+    /** 16x16 */ public static final @NotNull Icon Unshelve = load("expui/vcs/unshelve.svg", -600876249, 2);
+    /** 16x16 */ public static final @NotNull Icon Update = load("expui/vcs/update.svg", -106528319, 2);
+    /** 16x16 */ public static final @NotNull Icon Vcs = load("expui/vcs/vcs.svg", 134433062, 2);
+  }
+
+  public static final class Welcome {
+    /** 20x20 */ public static final @NotNull Icon CreateNewProjectTab = load("expui/welcome/createNewProjectTab.svg", 637205153, 2);
+    /** 20x20 */ public static final @NotNull Icon FromVCSTab = load("expui/welcome/fromVCSTab.svg", 1190175067, 2);
+    /** 20x20 */ public static final @NotNull Icon Open = load("expui/welcome/open.svg", 1405942976, 2);
+  }
+
+  public static final class Windows {
+    /** 16x16 */ public static final @NotNull Icon Close = load("expui/windows/close.svg", -947741270, 2);
+    /** 16x16 */ public static final @NotNull Icon CloseActive = load("expui/windows/closeActive.svg", -42197335, 0);
+    /** 16x16 */ public static final @NotNull Icon CloseInactive = load("expui/windows/closeInactive.svg", 769623894, 2);
+    /** 16x16 */ public static final @NotNull Icon CloseSmall = load("expui/windows/closeSmall.svg", 317608735, 2);
+    /** 16x16 */ public static final @NotNull Icon Collapse = load("expui/windows/collapse.svg", -902458879, 2);
+    /** 16x16 */ public static final @NotNull Icon Help = load("expui/windows/help.svg", -58943842, 2);
+    /** 16x16 */ public static final @NotNull Icon HelpInactive = load("expui/windows/helpInactive.svg", 854474181, 2);
+    /** 16x16 */ public static final @NotNull Icon Maximize = load("expui/windows/maximize.svg", -1240832345, 2);
+    /** 16x16 */ public static final @NotNull Icon MaximizeInactive = load("expui/windows/maximizeInactive.svg", 1539093121, 2);
+    /** 16x16 */ public static final @NotNull Icon MaximizeSmall = load("expui/windows/maximizeSmall.svg", -1153851204, 2);
+    /** 16x16 */ public static final @NotNull Icon Minimize = load("expui/windows/minimize.svg", -563414751, 2);
+    /** 16x16 */ public static final @NotNull Icon MinimizeInactive = load("expui/windows/minimizeInactive.svg", 590281779, 2);
+    /** 16x16 */ public static final @NotNull Icon MinimizeSmall = load("expui/windows/minimizeSmall.svg", -69047565, 2);
+    /** 16x16 */ public static final @NotNull Icon Restore = load("expui/windows/restore.svg", 824832035, 2);
+    /** 16x16 */ public static final @NotNull Icon RestoreInactive = load("expui/windows/restoreInactive.svg", 1273186233, 2);
+    /** 16x16 */ public static final @NotNull Icon RestoreSmall = load("expui/windows/restoreSmall.svg", 1810792792, 2);
+  }
+}

platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ChangesBrowserToolWindow.kt

@@ -1,11 +1,10 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.openapi.vcs.impl
 
-import com.intellij.icons.AllIcons
+import com.intellij.icons.ExpUiIcons
 import com.intellij.ide.impl.ContentManagerWatcher
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.util.IconLoader
 import com.intellij.openapi.vcs.VcsBundle
 import com.intellij.openapi.vcs.changes.DiffPreview
 import com.intellij.openapi.vcs.changes.ui.ChangesBrowserBase
@@ -68,8 +67,5 @@ object ChangesBrowserToolWindow {
     return toolWindow
   }
 
-  private fun getIcon(): Icon? = when {
-    ExperimentalUI.isNewUI() -> IconLoader.getIcon("expui/toolwindow/changes.svg", AllIcons::class.java)
-    else -> null
-  }
+  private fun getIcon(): Icon? = if (ExperimentalUI.isNewUI()) ExpUiIcons.Toolwindow.Changes else null
 }

platform/vcs-impl/src/com/intellij/openapi/vcs/impl/RepositoryBrowser.kt

@@ -1,7 +1,7 @@
 // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.openapi.vcs.impl
 
-import com.intellij.icons.AllIcons
+import com.intellij.icons.ExpUiIcons
 import com.intellij.ide.impl.ContentManagerWatcher
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.ListSelection
@@ -14,7 +14,6 @@ import com.intellij.openapi.fileEditor.impl.LoadTextUtil
 import com.intellij.openapi.fileTypes.FileTypeManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Disposer
-import com.intellij.openapi.util.IconLoader
 import com.intellij.openapi.util.NlsContexts
 import com.intellij.openapi.vcs.FilePath
 import com.intellij.openapi.vcs.RemoteFilePath
@@ -77,10 +76,7 @@ object RepositoryBrowser {
     return toolWindow
   }
 
-  private fun getIcon(): Icon? = when {
-    ExperimentalUI.isNewUI() -> IconLoader.getIcon("expui/toolwindow/repositories.svg", AllIcons::class.java)
-    else -> null
-  }
+  private fun getIcon(): Icon? = if (ExperimentalUI.isNewUI()) ExpUiIcons.Toolwindow.Repositories else null
 }
 
 class RepositoryBrowserPanel(

platform/vcs-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/GetFromVersionControlAction.kt

@@ -2,6 +2,7 @@
 package com.intellij.openapi.wm.impl.welcomeScreen
 
 import com.intellij.icons.AllIcons
+import com.intellij.icons.ExpUiIcons
 import com.intellij.idea.ActionsBundle
 import com.intellij.openapi.actionSystem.ActionPlaces
 import com.intellij.openapi.actionSystem.ActionUpdateThread
@@ -12,7 +13,6 @@ import com.intellij.openapi.project.ProjectManager
 import com.intellij.openapi.vcs.CheckoutProvider
 import com.intellij.openapi.vcs.ProjectLevelVcsManager
 import com.intellij.ui.ExperimentalUI
-import com.intellij.ui.IconManager
 import com.intellij.util.ui.cloneDialog.VcsCloneDialog
 
 open class GetFromVersionControlAction : DumbAwareAction() {
@@ -35,15 +35,11 @@ open class GetFromVersionControlAction : DumbAwareAction() {
       }
     }
     else {
-      presentation.icon =
-        if (ExperimentalUI.isNewUI() && (ActionPlaces.PROJECT_WIDGET_POPUP == e.place)) IconManager.getInstance().getIcon("expui/vcs/vcs.svg", AllIcons::class.java)
-        else null
+      presentation.icon = if (ExperimentalUI.isNewUI() && (ActionPlaces.PROJECT_WIDGET_POPUP == e.place)) ExpUiIcons.Vcs.Vcs else null
     }
   }
 
-  override fun getActionUpdateThread(): ActionUpdateThread {
-    return ActionUpdateThread.BGT
-  }
+  override fun getActionUpdateThread(): ActionUpdateThread = ActionUpdateThread.BGT
 
   override fun actionPerformed(e: AnActionEvent) {
     val project = e.getData(CommonDataKeys.PROJECT) ?: ProjectManager.getInstance().defaultProject

plugins/git4idea/src/git4idea/ui/toolbar/GitToolbarWidgetAction.kt

@@ -4,13 +4,13 @@ package git4idea.ui.toolbar
 import com.intellij.dvcs.repo.Repository
 import com.intellij.dvcs.ui.DvcsBundle
 import com.intellij.icons.AllIcons
+import com.intellij.icons.ExpUiIcons
 import com.intellij.ide.ui.laf.darcula.ui.ToolbarComboWidgetUI
 import com.intellij.ide.util.PropertiesComponent
 import com.intellij.openapi.actionSystem.*
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.popup.JBPopup
 import com.intellij.openapi.ui.popup.JBPopupFactory
-import com.intellij.openapi.util.IconLoader
 import com.intellij.openapi.util.Key
 import com.intellij.openapi.util.NlsContexts.Tooltip
 import com.intellij.openapi.util.NlsSafe
@@ -38,7 +38,7 @@ private val repositoryKey = Key.create<GitRepository>("git-widget-repository")
 private val changesKey = Key.create<MyRepoChanges>("git-widget-changes")
 
 internal class GitToolbarWidgetAction : ExpandableComboAction() {
-  private val widgetIcon = IconLoader.getIcon("expui/general/vcs.svg", AllIcons::class.java)
+  private val widgetIcon = ExpUiIcons.General.Vcs
 
   override fun getActionUpdateThread(): ActionUpdateThread = ActionUpdateThread.BGT