diff --git a/src/main/java/com/intellij/plugins/haxe/HaxeComponentType.java b/src/main/java/com/intellij/plugins/haxe/HaxeComponentType.java
index 2bae3d895..1407a86d6 100644
--- a/src/main/java/com/intellij/plugins/haxe/HaxeComponentType.java
+++ b/src/main/java/com/intellij/plugins/haxe/HaxeComponentType.java
@@ -71,7 +71,7 @@ public Icon getIcon() {
   }, VARIABLE(5) {
     @Override
     public Icon getIcon() {
-      return AllIcons.Nodes.Variable;
+      return HaxeIcons.Variable;
     }
   }, FIELD(6) {
     @Override
@@ -81,7 +81,7 @@ public Icon getIcon() {
   }, PARAMETER(7) {
     @Override
     public Icon getIcon() {
-      return AllIcons.Nodes.Parameter;
+      return HaxeIcons.Parameter;
     }
   }, TYPEDEF(8) {
     @Override
@@ -95,11 +95,11 @@ public Icon getIcon() {
     }
   }, TYPE_PARAMETER(10) {
     public Icon getIcon() {
-      return icons.HaxeIcons.Class;
+      return HaxeIcons.Class;
     }
   }, MODULE(11) {
     public Icon getIcon() {
-      return HaxeIcons.Class; // TODO icon for module
+      return HaxeIcons.MultiDefinition;
     }
   };
 
diff --git a/src/main/java/com/intellij/plugins/haxe/ide/HaxeIconProvider.java b/src/main/java/com/intellij/plugins/haxe/ide/HaxeIconProvider.java
index 43882a8da..be9380e88 100644
--- a/src/main/java/com/intellij/plugins/haxe/ide/HaxeIconProvider.java
+++ b/src/main/java/com/intellij/plugins/haxe/ide/HaxeIconProvider.java
@@ -20,14 +20,17 @@
 import com.intellij.ide.IconProvider;
 import com.intellij.openapi.util.Iconable;
 import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.plugins.haxe.lang.psi.HaxeClass;
 import com.intellij.plugins.haxe.lang.psi.HaxeComponent;
 import com.intellij.plugins.haxe.lang.psi.HaxeFile;
 import com.intellij.plugins.haxe.util.HaxeResolveUtil;
 import com.intellij.psi.PsiElement;
+import icons.HaxeIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
+import java.util.List;
 
 /**
  * @author: Fedor.Korotkov
@@ -44,11 +47,15 @@ public Icon getIcon(@NotNull PsiElement element, @Iconable.IconFlags int flags)
   @Nullable
   private static Icon getHaxeFileIcon(HaxeFile file, @Iconable.IconFlags int flags) {
     final String fileName = FileUtil.getNameWithoutExtension(file.getName());
-    for (HaxeComponent component : HaxeResolveUtil.findComponentDeclarations(file)) {
+    List<HaxeClass> declarations = HaxeResolveUtil.findComponentDeclarations(file);
+    for (HaxeComponent component : declarations) {
       if (fileName.equals(component.getName())) {
         return component.getIcon(flags);
       }
     }
+    if (!declarations.isEmpty()) {
+      return HaxeIcons.MultiDefinition;
+    }
     return null;
   }
 }
diff --git a/src/main/java/icons/HaxeIcons.java b/src/main/java/icons/HaxeIcons.java
index 8c3517e2b..9571bf634 100644
--- a/src/main/java/icons/HaxeIcons.java
+++ b/src/main/java/icons/HaxeIcons.java
@@ -27,15 +27,19 @@ private static Icon load(String path) {
     return IconLoader.getIcon(path, HaxeIcons.class);
   }
 
-  public static final Icon Class = load("/icons/class.svg");
-  public static final Icon Enum = load("/icons/enum.svg");
-  public static final Icon Typedef = load("/icons/typedef.svg");
-  public static final Icon Interface = load("/icons/interface.svg");
-  public static final Icon Method = load("/icons/method.svg");
-  public static final Icon Field = load("/icons/field.svg");
+  public static final Icon Class = load("/icons/nodes/class.svg");
+  public static final Icon Enum = load("/icons/nodes/enum.svg");
+  public static final Icon Typedef = load("/icons/nodes/typedef.svg");
+  public static final Icon Interface = load("/icons/nodes/interface.svg");
+  public static final Icon Method = load("/icons/nodes/method.svg");
+  public static final Icon Field = load("/icons/nodes/field.svg");
+  public static final Icon Parameter = load("/icons/nodes/parameter.svg");
+  public static final Icon Variable = load("/icons/nodes/variable.svg");
+  public static final Icon MultiDefinition = load("/icons/nodes/module.svg");
 
+  public static final Icon TYPEDEF_GUTTER = load("/icons/nodes/typedefGutter.svg");
 
-  public static final Icon HAXELIB_JSON = load("/icons/file.svg");
+  public static final Icon HAXELIB_JSON = load("/icons/nodes/file.svg");
 
   public static final Icon HAXE_LOGO = load("/icons/Haxe_logo.svg");
   public static final Icon NMML_LOGO = load("/icons/buildsystem/nme.svg");
@@ -45,7 +49,7 @@ private static Icon load(String path) {
   public static final Icon HAXE_RELOAD = load("/icons/Haxe_reload.svg");
 
 
-  public static final Icon TYPEDEF_GUTTER = load("/icons/typedef_gutter.svg");
+
 
 
 }
diff --git a/src/main/resources/HaxeIconMappings.json b/src/main/resources/HaxeIconMappings.json
new file mode 100644
index 000000000..e371d0ef3
--- /dev/null
+++ b/src/main/resources/HaxeIconMappings.json
@@ -0,0 +1,18 @@
+{
+  "icons": {
+    "expui": {
+      "nodes": {
+        "class.svg": "icons/nodes/class.svg",
+        "enum.svg": "icons/nodes/enum.svg",
+        "field.svg": "icons/nodes/field.svg",
+        "parameter.svg": "icons/nodes/parameter.svg",
+        "file.svg": "icons/nodes/file.svg",
+        "interface.svg": "icons/nodes/interface.svg",
+        "method.svg": "icons/nodes/method.svg",
+        "typedef.svg": "icons/nodes/typedef.svg",
+        "typedefGutter.svg": "icons/nodes/typedefGutter.svg",
+        "module.svg": "icons/nodes/module.svg"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index ba94fd0e0..e1004fec1 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -44,6 +44,7 @@
   </extensions>>
 
   <extensions defaultExtensionNs="com.intellij">
+    <iconMapper mappingFile="HaxeIconMappings.json"/>
     <compileServer.plugin  classpath="jps-plugin.jar;common.jar"/>
     <testFinder implementation="com.intellij.plugins.haxe.ide.HaxeTestFinder"/>
 
diff --git a/src/main/resources/icons/expui/nodes/class.svg b/src/main/resources/icons/expui/nodes/class.svg
new file mode 100644
index 000000000..b5c54836b
--- /dev/null
+++ b/src/main/resources/icons/expui/nodes/class.svg
@@ -0,0 +1,12 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8" cy="8" r="6.5" fill="#E7EFFD" stroke="#3574F0"/>
+<path d="M8.13295 11.5C9.61223 11.5 10.8836 10.6105 11.2075 9.33909H10.2213C9.90229 10.0739 9.11914 10.6057 8.13295 10.6057C6.77936 10.6057 5.80284 9.51796 5.80284 8C5.80284 6.48204 6.77936 5.39434 8.13295 5.39434C9.11914 5.39434 9.90229 5.92611 10.2213 6.66091H11.2075C10.8836 5.3895 9.61223 4.5 8.13295 4.5C6.21859 4.5 4.79248 5.99378 4.79248 8C4.79248 10.0062 6.21859 11.5 8.13295 11.5Z" fill="#3574F0"/>
+  <g>
+    <rect x="11" y="11" width="4" height="4" fill="#f7941e" />
+    <path d="M11,13 l-1,-1.5 l0,-1.5 l1.5,0 l1.5,1 Z" fill="#fdb813" />
+    <path d="M11,13 l-1,1.5 l0,1.5 l1.5,0 l1.5,-1 Z" fill="#fdb813" />
+    <path d="M15,13 l1,-1.5 l0,-1.5 l-1.5,0 l-1.5,1 Z" fill="#f58220" />
+    <path d="M15,13 l1,1.5 l0,1.5 l-1.5,0 l-1.5,-1 Z" fill="#f58220" />
+  </g>
+</svg>
diff --git a/src/main/resources/icons/expui/nodes/class_dark.svg b/src/main/resources/icons/expui/nodes/class_dark.svg
new file mode 100644
index 000000000..42854769e
--- /dev/null
+++ b/src/main/resources/icons/expui/nodes/class_dark.svg
@@ -0,0 +1,12 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8" cy="8" r="6.5" fill="#25324D" stroke="#548AF7"/>
+<path d="M8.13295 11.5C9.61223 11.5 10.8836 10.6105 11.2075 9.33909H10.2213C9.90229 10.0739 9.11914 10.6057 8.13295 10.6057C6.77936 10.6057 5.80284 9.51796 5.80284 8C5.80284 6.48204 6.77936 5.39434 8.13295 5.39434C9.11914 5.39434 9.90229 5.92611 10.2213 6.66091H11.2075C10.8836 5.3895 9.61223 4.5 8.13295 4.5C6.21859 4.5 4.79248 5.99378 4.79248 8C4.79248 10.0062 6.21859 11.5 8.13295 11.5Z" fill="#548AF7"/>
+  <g>
+    <rect x="11" y="11" width="4" height="4" fill="#f7941e" />
+    <path d="M11,13 l-1,-1.5 l0,-1.5 l1.5,0 l1.5,1 Z" fill="#fdb813" />
+    <path d="M11,13 l-1,1.5 l0,1.5 l1.5,0 l1.5,-1 Z" fill="#fdb813" />
+    <path d="M15,13 l1,-1.5 l0,-1.5 l-1.5,0 l-1.5,1 Z" fill="#f58220" />
+    <path d="M15,13 l1,1.5 l0,1.5 l-1.5,0 l-1.5,-1 Z" fill="#f58220" />
+  </g>
+</svg>
diff --git a/src/main/resources/icons/expui/nodes/enum.svg b/src/main/resources/icons/expui/nodes/enum.svg
new file mode 100644
index 000000000..5fddcd7bc
--- /dev/null
+++ b/src/main/resources/icons/expui/nodes/enum.svg
@@ -0,0 +1,12 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8" cy="8" r="6.5" fill="#E7EFFD" stroke="#3574F0"/>
+<path d="M5.48999 11.5H10.51V10.585H6.47999V8.435H10.07V7.515H6.47999V5.415H10.41V4.5H5.48999V11.5Z" fill="#3574F0"/>
+  <g>
+    <rect x="11" y="11" width="4" height="4" fill="#f7941e" />
+    <path d="M11,13 l-1,-1.5 l0,-1.5 l1.5,0 l1.5,1 Z" fill="#fdb813" />
+    <path d="M11,13 l-1,1.5 l0,1.5 l1.5,0 l1.5,-1 Z" fill="#fdb813" />
+    <path d="M15,13 l1,-1.5 l0,-1.5 l-1.5,0 l-1.5,1 Z" fill="#f58220" />
+    <path d="M15,13 l1,1.5 l0,1.5 l-1.5,0 l-1.5,-1 Z" fill="#f58220" />
+  </g>
+</svg>
diff --git a/src/main/resources/icons/expui/nodes/enum_dark.svg b/src/main/resources/icons/expui/nodes/enum_dark.svg
new file mode 100644
index 000000000..820ab4db9
--- /dev/null
+++ b/src/main/resources/icons/expui/nodes/enum_dark.svg
@@ -0,0 +1,12 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8" cy="8" r="6.5" fill="#25324D" stroke="#548AF7"/>
+<path d="M5.48999 11.5H10.51V10.585H6.47999V8.435H10.07V7.515H6.47999V5.415H10.41V4.5H5.48999V11.5Z" fill="#548AF7"/>
+  <g>
+    <rect x="11" y="11" width="4" height="4" fill="#f7941e" />
+    <path d="M11,13 l-1,-1.5 l0,-1.5 l1.5,0 l1.5,1 Z" fill="#fdb813" />
+    <path d="M11,13 l-1,1.5 l0,1.5 l1.5,0 l1.5,-1 Z" fill="#fdb813" />
+    <path d="M15,13 l1,-1.5 l0,-1.5 l-1.5,0 l-1.5,1 Z" fill="#f58220" />
+    <path d="M15,13 l1,1.5 l0,1.5 l-1.5,0 l-1.5,-1 Z" fill="#f58220" />
+  </g>
+</svg>
diff --git a/src/main/resources/icons/expui/nodes/field.svg b/src/main/resources/icons/expui/nodes/field.svg
new file mode 100644
index 000000000..2cc928b46
--- /dev/null
+++ b/src/main/resources/icons/expui/nodes/field.svg
@@ -0,0 +1,12 @@
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8" cy="8" r="6.5" fill="#FFF4EB" stroke="#E66D17"/>
+<path d="M7.25726 12H8.2744V7.32741H9.82869V6.43027H8.2744V5.48C8.2744 5.12 8.52012 4.87429 8.8744 4.87429H9.88012V4H8.77726C7.8744 4 7.25726 4.57143 7.25726 5.40571V6.43027H6.12012V7.32741H7.25726V12Z" fill="#E66D17"/>
+  <g>
+    <rect x="11" y="11" width="4" height="4" fill="#f7941e" />
+    <path d="M11,13 l-1,-1.5 l0,-1.5 l1.5,0 l1.5,1 Z" fill="#fdb813" />
+    <path d="M11,13 l-1,1.5 l0,1.5 l1.5,0 l1.5,-1 Z" fill="#fdb813" />
+    <path d="M15,13 l1,-1.5 l0,-1.5 l-1.5,0 l-1.5,1 Z" fill="#f58220" />
+    <path d="M15,13 l1,1.5 l0,1.5 l-1.5,0 l-1.5,-1 Z" fill="#f58220" />
+  </g>
+</svg>
diff --git a/src/main/resources/icons/expui/nodes/field_dark.svg b/src/main/resources/icons/expui/nodes/field_dark.svg
new file mode 100644
index 000000000..dce460bb6
--- /dev/null
+++ b/src/main/resources/icons/expui/nodes/field_dark.svg
@@ -0,0 +1,12 @@
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8" cy="8" r="6.5" fill="#45322B" stroke="#C77D55"/>
+<path d="M7.25726 12H8.2744V7.32741H9.82869V6.43027H8.2744V5.48C8.2744 5.12 8.52012 4.87429 8.8744 4.87429H9.88012V4H8.77726C7.8744 4 7.25726 4.57143 7.25726 5.40571V6.43027H6.12012V7.32741H7.25726V12Z" fill="#C77D55"/>
+  <g>
+    <rect x="11" y="11" width="4" height="4" fill="#f7941e" />
+    <path d="M11,13 l-1,-1.5 l0,-1.5 l1.5,0 l1.5,1 Z" fill="#fdb813" />
+    <path d="M11,13 l-1,1.5 l0,1.5 l1.5,0 l1.5,-1 Z" fill="#fdb813" />
+    <path d="M15,13 l1,-1.5 l0,-1.5 l-1.5,0 l-1.5,1 Z" fill="#f58220" />
+    <path d="M15,13 l1,1.5 l0,1.5 l-1.5,0 l-1.5,-1 Z" fill="#f58220" />
+  </g>
+</svg>
diff --git a/src/main/resources/icons/expui/nodes/function.svg b/src/main/resources/icons/expui/nodes/function.svg
new file mode 100644
index 000000000..7a14d9e3f
--- /dev/null
+++ b/src/main/resources/icons/expui/nodes/function.svg
@@ -0,0 +1,12 @@
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8" cy="8" r="6.5" fill="#FFF7F7" stroke="#DB3B4B"/>
+<path d="M7.25726 12H8.2744V7.32741H9.82869V6.43027H8.2744V5.48C8.2744 5.12 8.52012 4.87429 8.8744 4.87429H9.88012V4H8.77726C7.8744 4 7.25726 4.57143 7.25726 5.40571V6.43027H6.12012V7.32741H7.25726V12Z" fill="#DB3B4B"/>
+  <g>
+    <rect x="11" y="11" width="4" height="4" fill="#f7941e" />
+    <path d="M11,13 l-1,-1.5 l0,-1.5 l1.5,0 l1.5,1 Z" fill="#fdb813" />
+    <path d="M11,13 l-1,1.5 l0,1.5 l1.5,0 l1.5,-1 Z" fill="#fdb813" />
+    <path d="M15,13 l1,-1.5 l0,-1.5 l-1.5,0 l-1.5,1 Z" fill="#f58220" />
+    <path d="M15,13 l1,1.5 l0,1.5 l-1.5,0 l-1.5,-1 Z" fill="#f58220" />
+  </g>
+</svg>
diff --git a/src/main/resources/icons/expui/nodes/function_dark.svg b/src/main/resources/icons/expui/nodes/function_dark.svg
new file mode 100644
index 000000000..41448b63e
--- /dev/null
+++ b/src/main/resources/icons/expui/nodes/function_dark.svg
@@ -0,0 +1,12 @@
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8" cy="8" r="6.5" fill="#402929" stroke="#DB5C5C"/>
+<path d="M7.25726 12H8.2744V7.32741H9.82869V6.43027H8.2744V5.48C8.2744 5.12 8.52012 4.87429 8.8744 4.87429H9.88012V4H8.77726C7.8744 4 7.25726 4.57143 7.25726 5.40571V6.43027H6.12012V7.32741H7.25726V12Z" fill="#DB5C5C"/>
+  <g>
+    <rect x="11" y="11" width="4" height="4" fill="#f7941e" />
+    <path d="M11,13 l-1,-1.5 l0,-1.5 l1.5,0 l1.5,1 Z" fill="#fdb813" />
+    <path d="M11,13 l-1,1.5 l0,1.5 l1.5,0 l1.5,-1 Z" fill="#fdb813" />
+    <path d="M15,13 l1,-1.5 l0,-1.5 l-1.5,0 l-1.5,1 Z" fill="#f58220" />
+    <path d="M15,13 l1,1.5 l0,1.5 l-1.5,0 l-1.5,-1 Z" fill="#f58220" />
+  </g>
+</svg>
diff --git a/src/main/resources/icons/expui/nodes/interface.svg b/src/main/resources/icons/expui/nodes/interface.svg
new file mode 100644
index 000000000..02bfcbb16
--- /dev/null
+++ b/src/main/resources/icons/expui/nodes/interface.svg
@@ -0,0 +1,12 @@
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8" cy="8" r="6.5" fill="#F2FCF3" stroke="#208A3C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 4.5V5.5L8.5 5.5V10.5H10V11.5L8.5 11.5H7.5L6 11.5V10.5H7.5V5.5L6 5.5V4.5H7.5H8.5H10Z" fill="#208A3C"/>
+  <g>
+    <rect x="11" y="11" width="4" height="4" fill="#f7941e" />
+    <path d="M11,13 l-1,-1.5 l0,-1.5 l1.5,0 l1.5,1 Z" fill="#fdb813" />
+    <path d="M11,13 l-1,1.5 l0,1.5 l1.5,0 l1.5,-1 Z" fill="#fdb813" />
+    <path d="M15,13 l1,-1.5 l0,-1.5 l-1.5,0 l-1.5,1 Z" fill="#f58220" />
+    <path d="M15,13 l1,1.5 l0,1.5 l-1.5,0 l-1.5,-1 Z" fill="#f58220" />
+  </g>
+</svg>
diff --git a/src/main/resources/icons/expui/nodes/interface_dark.svg b/src/main/resources/icons/expui/nodes/interface_dark.svg
new file mode 100644
index 000000000..a68e8aef3
--- /dev/null
+++ b/src/main/resources/icons/expui/nodes/interface_dark.svg
@@ -0,0 +1,12 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8" cy="8" r="6.5" fill="#253627" stroke="#57965C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 4.5V5.5L8.5 5.5V10.5H10V11.5L8.5 11.5H7.5L6 11.5V10.5H7.5V5.5L6 5.5V4.5H7.5H8.5H10Z" fill="#57965C"/>
+  <g>
+    <rect x="11" y="11" width="4" height="4" fill="#f7941e" />
+    <path d="M11,13 l-1,-1.5 l0,-1.5 l1.5,0 l1.5,1 Z" fill="#fdb813" />
+    <path d="M11,13 l-1,1.5 l0,1.5 l1.5,0 l1.5,-1 Z" fill="#fdb813" />
+    <path d="M15,13 l1,-1.5 l0,-1.5 l-1.5,0 l-1.5,1 Z" fill="#f58220" />
+    <path d="M15,13 l1,1.5 l0,1.5 l-1.5,0 l-1.5,-1 Z" fill="#f58220" />
+  </g>
+</svg>
diff --git a/src/main/resources/icons/expui/nodes/method.svg b/src/main/resources/icons/expui/nodes/method.svg
new file mode 100644
index 000000000..9ce6c22c7
--- /dev/null
+++ b/src/main/resources/icons/expui/nodes/method.svg
@@ -0,0 +1,12 @@
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8" cy="8" r="6.5" fill="#FFF7F7" stroke="#DB3B4B"/>
+<path d="M10.0657 5.24573C9.25361 5.24573 8.636 5.6473 8.29593 6.31537C8.00368 5.64257 7.40552 5.24573 6.6071 5.24573C5.84915 5.24573 5.28147 5.60946 4.96189 6.24862V5.37188H4V10.7543H4.99869V7.59001C4.99869 6.68068 5.5138 6.10775 6.32852 6.10775C7.0749 6.10775 7.50591 6.61761 7.50591 7.43758V10.7543H8.49409V7.59001C8.49409 6.68068 9.01971 6.10775 9.82392 6.10775C10.5756 6.10775 11.0013 6.61761 11.0013 7.43758V10.7543H12V7.35874C12 6.07096 11.2168 5.24573 10.0657 5.24573Z" fill="#DB3B4B"/>
+  <g>
+    <rect x="11" y="11" width="4" height="4" fill="#f7941e" />
+    <path d="M11,13 l-1,-1.5 l0,-1.5 l1.5,0 l1.5,1 Z" fill="#fdb813" />
+    <path d="M11,13 l-1,1.5 l0,1.5 l1.5,0 l1.5,-1 Z" fill="#fdb813" />
+    <path d="M15,13 l1,-1.5 l0,-1.5 l-1.5,0 l-1.5,1 Z" fill="#f58220" />
+    <path d="M15,13 l1,1.5 l0,1.5 l-1.5,0 l-1.5,-1 Z" fill="#f58220" />
+  </g>
+</svg>
diff --git a/src/main/resources/icons/expui/nodes/method_dark.svg b/src/main/resources/icons/expui/nodes/method_dark.svg
new file mode 100644
index 000000000..cdc89679c
--- /dev/null
+++ b/src/main/resources/icons/expui/nodes/method_dark.svg
@@ -0,0 +1,12 @@
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8" cy="8" r="6.5" fill="#402929" stroke="#DB5C5C"/>
+<path d="M10.0657 5.24573C9.25361 5.24573 8.636 5.6473 8.29593 6.31537C8.00368 5.64257 7.40552 5.24573 6.6071 5.24573C5.84915 5.24573 5.28147 5.60946 4.96189 6.24862V5.37188H4V10.7543H4.99869V7.59001C4.99869 6.68068 5.5138 6.10775 6.32852 6.10775C7.0749 6.10775 7.50591 6.61761 7.50591 7.43758V10.7543H8.49409V7.59001C8.49409 6.68068 9.01971 6.10775 9.82392 6.10775C10.5756 6.10775 11.0013 6.61761 11.0013 7.43758V10.7543H12V7.35874C12 6.07096 11.2168 5.24573 10.0657 5.24573Z" fill="#DB5C5C"/>
+  <g>
+    <rect x="11" y="11" width="4" height="4" fill="#f7941e" />
+    <path d="M11,13 l-1,-1.5 l0,-1.5 l1.5,0 l1.5,1 Z" fill="#fdb813" />
+    <path d="M11,13 l-1,1.5 l0,1.5 l1.5,0 l1.5,-1 Z" fill="#fdb813" />
+    <path d="M15,13 l1,-1.5 l0,-1.5 l-1.5,0 l-1.5,1 Z" fill="#f58220" />
+    <path d="M15,13 l1,1.5 l0,1.5 l-1.5,0 l-1.5,-1 Z" fill="#f58220" />
+  </g>
+</svg>
diff --git a/src/main/resources/icons/expui/nodes/module.svg b/src/main/resources/icons/expui/nodes/module.svg
new file mode 100644
index 000000000..faa5a166a
--- /dev/null
+++ b/src/main/resources/icons/expui/nodes/module.svg
@@ -0,0 +1,15 @@
+<!-- Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-opacity=".6" fill-rule="evenodd" transform="matrix(-1 0 0 1 15 1)">
+    <path fill="#40B6E0" d="M14,9.5 C14,11.9852857 11.9852857,14 9.5,14 C7.01471429,14 5,11.9852857 5,9.5 C5,7.01471429 7.01471429,5 9.5,5 C11.9852857,5 14,7.01471429 14,9.5"/>
+    <path fill="#F4AF3D" d="M4.076839,10.4213905 C3.11172891,9.59603947 2.49999951,8.36945974 2.49999951,7 C2.49999951,4.51471429 4.5147138,2.5 6.99999951,2.5 C8.36945925,2.5 9.59603898,3.1117294 10.42139,4.07683949 C10.1217939,4.02630787 9.81396903,4 9.49999951,4 C6.46242808,4 3.99999951,6.46242857 3.99999951,9.5 C3.99999951,9.81396952 4.02630738,10.1217944 4.076839,10.4213905 Z"/>
+    <path fill="#62B543" d="M1.576839,7.92139049 C0.611728913,7.09603947 -4.89840772e-07,5.86945974 -4.89840772e-07,4.5 C-4.89840772e-07,2.01471429 2.0147138,0 4.49999951,0 C5.86945925,0 7.09603898,0.611729403 7.92139,1.57683949 C7.6217939,1.52630787 7.31396903,1.5 6.99999951,1.5 C3.96242808,1.5 1.49999951,3.96242857 1.49999951,7 C1.49999951,7.31396952 1.52630738,7.62179439 1.576839,7.92139049 Z"/>
+  </g>
+  <g>
+    <rect x="11" y="11" width="4" height="4" fill="#f7941e" />
+    <path d="M11,13 l-1,-1.5 l0,-1.5 l1.5,0 l1.5,1 Z" fill="#fdb813" />
+    <path d="M11,13 l-1,1.5 l0,1.5 l1.5,0 l1.5,-1 Z" fill="#fdb813" />
+    <path d="M15,13 l1,-1.5 l0,-1.5 l-1.5,0 l-1.5,1 Z" fill="#f58220" />
+    <path d="M15,13 l1,1.5 l0,1.5 l-1.5,0 l-1.5,-1 Z" fill="#f58220" />
+  </g>
+</svg>
diff --git a/src/main/resources/icons/expui/nodes/module_dark.svg b/src/main/resources/icons/expui/nodes/module_dark.svg
new file mode 100644
index 000000000..402f4a585
--- /dev/null
+++ b/src/main/resources/icons/expui/nodes/module_dark.svg
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg7"
+   sodipodi:docname="multipleDefinitions.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs7" />
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="9.2265625"
+     inkscape:cx="49.151566"
+     inkscape:cy="56.955123"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="-7"
+     inkscape:window-y="1432"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g3" />
+  <g
+     fill="none"
+     fill-opacity=".6"
+     fill-rule="evenodd"
+     transform="matrix(-1 0 0 1 15 1)"
+     id="g3">
+    <path
+       fill="#40B6E0"
+       d="m 14.338696,9.8522439 c 0,2.4852861 -2.014714,4.5000001 -4.5,4.5000001 -2.4852857,0 -4.5,-2.014714 -4.5,-4.5000001 0,-2.4852857 2.0147143,-4.5 4.5,-4.5 2.485286,0 4.5,2.0147143 4.5,4.5"
+       id="path1"
+       style="fill:none;stroke:#3fb6df;stroke-opacity:0.6" />
+    <path
+       fill="#F4AF3D"
+       d="M 4.2936045,10.543321 C 3.3284944,9.71797 2.716765,8.4913903 2.716765,7.1219306 c 0,-2.4852857 2.0147143,-4.5 4.5,-4.5 1.3694597,0 2.5960394,0.6117294 3.42139,1.5768395 -0.299596,-0.050532 -0.607421,-0.07684 -0.92139,-0.07684 -2.9900944,0 -5.5,2.4224343 -5.5,5.5 0,0.3139695 0.026308,0.6217949 0.07684,0.9213909 z"
+       id="path2"
+       style="fill:none;stroke:#f3af3c;stroke-opacity:0.6"
+       sodipodi:nodetypes="csscssc" />
+    <path
+       fill="#62B543"
+       d="M 1.576839,7.9213905 C 0.61172891,7.0960395 -4.8984077e-7,5.8694597 -4.8984077e-7,4.5 -4.8984077e-7,2.0147143 2.0147138,0 4.4999995,0 5.8694592,0 7.096039,0.6117294 7.92139,1.5768395 7.6217939,1.5263079 7.313969,1.5 6.9999995,1.5 c -3.0375714,0 -5.5,2.4624286 -5.5,5.5 0,0.3139695 0.026308,0.6217944 0.07684,0.9213905 z"
+       id="path3"
+       style="fill:none;stroke:#62b643;stroke-opacity:0.6" />
+  </g>
+  <g
+     id="g7">
+    <rect
+       x="11"
+       y="11"
+       width="4"
+       height="4"
+       fill="#f7941e"
+       id="rect3" />
+    <path
+       d="M11,13 l-1,-1.5 l0,-1.5 l1.5,0 l1.5,1 Z"
+       fill="#fdb813"
+       id="path4" />
+    <path
+       d="M11,13 l-1,1.5 l0,1.5 l1.5,0 l1.5,-1 Z"
+       fill="#fdb813"
+       id="path5" />
+    <path
+       d="M15,13 l1,-1.5 l0,-1.5 l-1.5,0 l-1.5,1 Z"
+       fill="#f58220"
+       id="path6" />
+    <path
+       d="M15,13 l1,1.5 l0,1.5 l-1.5,0 l-1.5,-1 Z"
+       fill="#f58220"
+       id="path7" />
+  </g>
+</svg>
diff --git a/src/main/resources/icons/expui/nodes/parameter.svg b/src/main/resources/icons/expui/nodes/parameter.svg
new file mode 100644
index 000000000..c0c635852
--- /dev/null
+++ b/src/main/resources/icons/expui/nodes/parameter.svg
@@ -0,0 +1,12 @@
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8" cy="8" r="6.5" fill="#FFF4EB" stroke="#E66D17"/>
+<path d="M8.57081 5C7.72702 5 7.06335 5.37098 6.68265 5.99832V5.12281H5.7002V12H6.70312V9.52032C7.08689 10.1272 7.74186 10.4854 8.57081 10.4854C10.0291 10.4854 11.0474 9.36988 11.0474 7.74269C11.0474 6.1155 10.0291 5 8.57081 5ZM8.36101 9.5848C7.38367 9.5848 6.70312 8.8326 6.70312 7.74269C6.70312 6.65278 7.38367 5.90058 8.36101 5.90058C9.33324 5.90058 10.0036 6.65278 10.0036 7.74269C10.0036 8.8326 9.33324 9.5848 8.36101 9.5848Z" fill="#E66D17"/>
+  <g>
+    <rect x="11" y="11" width="4" height="4" fill="#f7941e" />
+    <path d="M11,13 l-1,-1.5 l0,-1.5 l1.5,0 l1.5,1 Z" fill="#fdb813" />
+    <path d="M11,13 l-1,1.5 l0,1.5 l1.5,0 l1.5,-1 Z" fill="#fdb813" />
+    <path d="M15,13 l1,-1.5 l0,-1.5 l-1.5,0 l-1.5,1 Z" fill="#f58220" />
+    <path d="M15,13 l1,1.5 l0,1.5 l-1.5,0 l-1.5,-1 Z" fill="#f58220" />
+  </g>
+</svg>
diff --git a/src/main/resources/icons/expui/nodes/parameter_dark.svg b/src/main/resources/icons/expui/nodes/parameter_dark.svg
new file mode 100644
index 000000000..1279168f9
--- /dev/null
+++ b/src/main/resources/icons/expui/nodes/parameter_dark.svg
@@ -0,0 +1,12 @@
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8" cy="8" r="6.5" fill="#45322B" stroke="#C77D55"/>
+<path d="M8.57081 5C7.72702 5 7.06335 5.37098 6.68265 5.99832V5.12281H5.7002V12H6.70312V9.52032C7.08689 10.1272 7.74186 10.4854 8.57081 10.4854C10.0291 10.4854 11.0474 9.36988 11.0474 7.74269C11.0474 6.1155 10.0291 5 8.57081 5ZM8.36101 9.5848C7.38367 9.5848 6.70312 8.8326 6.70312 7.74269C6.70312 6.65278 7.38367 5.90058 8.36101 5.90058C9.33324 5.90058 10.0036 6.65278 10.0036 7.74269C10.0036 8.8326 9.33324 9.5848 8.36101 9.5848Z" fill="#C77D55"/>
+  <g>
+    <rect x="11" y="11" width="4" height="4" fill="#f7941e" />
+    <path d="M11,13 l-1,-1.5 l0,-1.5 l1.5,0 l1.5,1 Z" fill="#fdb813" />
+    <path d="M11,13 l-1,1.5 l0,1.5 l1.5,0 l1.5,-1 Z" fill="#fdb813" />
+    <path d="M15,13 l1,-1.5 l0,-1.5 l-1.5,0 l-1.5,1 Z" fill="#f58220" />
+    <path d="M15,13 l1,1.5 l0,1.5 l-1.5,0 l-1.5,-1 Z" fill="#f58220" />
+  </g>
+</svg>
diff --git a/src/main/resources/icons/expui/nodes/typedef.svg b/src/main/resources/icons/expui/nodes/typedef.svg
new file mode 100644
index 000000000..c77e1bdb4
--- /dev/null
+++ b/src/main/resources/icons/expui/nodes/typedef.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd" mask="url(#outline)">
+    <circle cx="8" cy="8" r="6.5" fill="#F2FCF3" stroke="#7C9E1A"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M7.5 6H5V5H11V6H8.5V12H7.5V6Z" fill="#7C9E1A"/>
+  </g>
+  <g>
+    <rect x="11" y="11" width="4" height="4" fill="#f7941e" />
+    <path d="M11,13 l-1,-1.5 l0,-1.5 l1.5,0 l1.5,1 Z" fill="#fdb813" />
+    <path d="M11,13 l-1,1.5 l0,1.5 l1.5,0 l1.5,-1 Z" fill="#fdb813" />
+    <path d="M15,13 l1,-1.5 l0,-1.5 l-1.5,0 l-1.5,1 Z" fill="#f58220" />
+    <path d="M15,13 l1,1.5 l0,1.5 l-1.5,0 l-1.5,-1 Z" fill="#f58220" />
+  </g>
+</svg>
diff --git a/src/main/resources/icons/expui/nodes/typedefGutter.svg b/src/main/resources/icons/expui/nodes/typedefGutter.svg
new file mode 100644
index 000000000..0470ba2eb
--- /dev/null
+++ b/src/main/resources/icons/expui/nodes/typedefGutter.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="12"
+   height="12"
+   viewBox="0 0 12 12"
+   version="1.1"
+   id="svg332"
+   sodipodi:docname="typedef_gutter.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="98.416667"
+     inkscape:cx="5.9949196"
+     inkscape:cy="6"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="-7"
+     inkscape:window-y="1432"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg332" />
+  <circle
+     cx="4"
+     cy="6"
+     r="3.5"
+     fill="#F2FCF3"
+     stroke="#7C9E1A"
+     id="circle1" />
+  <path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="m 3.6567739,4.626376 h -1.75 v -0.7 h 4.2 v 0.7 h -1.75 v 4.2 h -0.7 z"
+     fill="#7c9e1a"
+     id="path1"
+     style="stroke-width:0.7" />
+  <g
+     fill="none"
+     fill-rule="evenodd"
+     id="g330">
+    <path
+       fill="#6E6E6E"
+       d="M10,9 L12,9 L9.5,12 L7,9 L9,9 L9,0 L10,0 L10,9 Z"
+       id="path328" />
+  </g>
+</svg>
diff --git a/src/main/resources/icons/expui/nodes/typedefGutter_dark.svg b/src/main/resources/icons/expui/nodes/typedefGutter_dark.svg
new file mode 100644
index 000000000..ed331c7f1
--- /dev/null
+++ b/src/main/resources/icons/expui/nodes/typedefGutter_dark.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+    width="12"
+    height="12"
+    viewBox="0 0 12 12"
+    version="1.1"
+    id="svg332"
+    xmlns="http://www.w3.org/2000/svg"
+>
+  <defs
+      id="defs1"/>
+  <circle
+      cx="4"
+      cy="6"
+      r="3.5"
+      fill="#253627"
+      stroke="#8AAF1D"
+      id="circle1"/>
+  <path
+      fill-rule="evenodd"
+      clip-rule="evenodd"
+      d="m 3.6567739,4.626376 h -1.75 v -0.7 h 4.2 v 0.7 h -1.75 v 4.2 h -0.7 z"
+      fill="#7c9e1a"
+      id="path1"
+      style="stroke-width:0.7"/>
+  <g
+      fill="none"
+      fill-rule="evenodd"
+      id="g330">
+    <path
+        fill="#6E6E6E"
+        d="M10,9 L12,9 L9.5,12 L7,9 L9,9 L9,0 L10,0 L10,9 Z"
+        id="path328"/>
+  </g>
+</svg>
diff --git a/src/main/resources/icons/expui/nodes/typedef_dark.svg b/src/main/resources/icons/expui/nodes/typedef_dark.svg
new file mode 100644
index 000000000..ae06e8b44
--- /dev/null
+++ b/src/main/resources/icons/expui/nodes/typedef_dark.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd" mask="url(#outline)">
+    <circle cx="8" cy="8" r="6.5" fill="#253627" stroke="#8AAF1D"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M7.5 6H5V5H11V6H8.5V12H7.5V6Z" fill="#8AAF1D"/>
+  </g>
+  <g>
+    <rect x="11" y="11" width="4" height="4" fill="#f7941e" />
+    <path d="M11,13 l-1,-1.5 l0,-1.5 l1.5,0 l1.5,1 Z" fill="#fdb813" />
+    <path d="M11,13 l-1,1.5 l0,1.5 l1.5,0 l1.5,-1 Z" fill="#fdb813" />
+    <path d="M15,13 l1,-1.5 l0,-1.5 l-1.5,0 l-1.5,1 Z" fill="#f58220" />
+    <path d="M15,13 l1,1.5 l0,1.5 l-1.5,0 l-1.5,-1 Z" fill="#f58220" />
+  </g>
+</svg>
diff --git a/src/main/resources/icons/expui/nodes/variable.svg b/src/main/resources/icons/expui/nodes/variable.svg
new file mode 100644
index 000000000..84dd22741
--- /dev/null
+++ b/src/main/resources/icons/expui/nodes/variable.svg
@@ -0,0 +1,12 @@
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8" cy="8" r="6.5" fill="#FFF4EB" stroke="#E66D17"/>
+<path d="M7.5459 11.4H8.46582L10.8213 5.40002H9.79004L8.04395 10.1051L6.23926 5.40002H5.17871L7.5459 11.4Z" fill="#E66D17"/>
+  <g>
+    <rect x="11" y="11" width="4" height="4" fill="#f7941e" />
+    <path d="M11,13 l-1,-1.5 l0,-1.5 l1.5,0 l1.5,1 Z" fill="#fdb813" />
+    <path d="M11,13 l-1,1.5 l0,1.5 l1.5,0 l1.5,-1 Z" fill="#fdb813" />
+    <path d="M15,13 l1,-1.5 l0,-1.5 l-1.5,0 l-1.5,1 Z" fill="#f58220" />
+    <path d="M15,13 l1,1.5 l0,1.5 l-1.5,0 l-1.5,-1 Z" fill="#f58220" />
+  </g>
+</svg>
diff --git a/src/main/resources/icons/expui/nodes/variable_dark.svg b/src/main/resources/icons/expui/nodes/variable_dark.svg
new file mode 100644
index 000000000..bcfd00f6a
--- /dev/null
+++ b/src/main/resources/icons/expui/nodes/variable_dark.svg
@@ -0,0 +1,12 @@
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8" cy="8" r="6.5" fill="#45322B" stroke="#C77D55"/>
+<path d="M7.5459 11.4H8.46582L10.8213 5.40002H9.79004L8.04395 10.1051L6.23926 5.40002H5.17871L7.5459 11.4Z" fill="#C77D55"/>
+  <g>
+    <rect x="11" y="11" width="4" height="4" fill="#f7941e" />
+    <path d="M11,13 l-1,-1.5 l0,-1.5 l1.5,0 l1.5,1 Z" fill="#fdb813" />
+    <path d="M11,13 l-1,1.5 l0,1.5 l1.5,0 l1.5,-1 Z" fill="#fdb813" />
+    <path d="M15,13 l1,-1.5 l0,-1.5 l-1.5,0 l-1.5,1 Z" fill="#f58220" />
+    <path d="M15,13 l1,1.5 l0,1.5 l-1.5,0 l-1.5,-1 Z" fill="#f58220" />
+  </g>
+</svg>
diff --git a/src/main/resources/icons/legacy/C_Logo.png b/src/main/resources/icons/legacy/C_Logo.png
deleted file mode 100644
index 591a8447f..000000000
Binary files a/src/main/resources/icons/legacy/C_Logo.png and /dev/null differ
diff --git a/src/main/resources/icons/legacy/C_haXe.png b/src/main/resources/icons/legacy/C_haXe.png
deleted file mode 100644
index f838b1371..000000000
Binary files a/src/main/resources/icons/legacy/C_haXe.png and /dev/null differ
diff --git a/src/main/resources/icons/legacy/E_Logo.png b/src/main/resources/icons/legacy/E_Logo.png
deleted file mode 100644
index 516316f37..000000000
Binary files a/src/main/resources/icons/legacy/E_Logo.png and /dev/null differ
diff --git a/src/main/resources/icons/legacy/E_haXe.png b/src/main/resources/icons/legacy/E_haXe.png
deleted file mode 100644
index cdbc765bc..000000000
Binary files a/src/main/resources/icons/legacy/E_haXe.png and /dev/null differ
diff --git a/src/main/resources/icons/legacy/HaxeLogo.svg b/src/main/resources/icons/legacy/HaxeLogo.svg
deleted file mode 100644
index 53c9f0c57..000000000
--- a/src/main/resources/icons/legacy/HaxeLogo.svg
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="58.208332mm"
-   height="58.208332mm"
-   viewBox="0 0 58.208332 58.208332"
-   version="1.1"
-   id="svg3922"
-   inkscape:version="0.92.0 r15299"
-   sodipodi:docname="HaxeLogo.svg"
-   inkscape:export-filename="F:\linux\sandbox\github\HaxeFoundation\intellij-haxe\resources\icons\HaxeLogo15.png"
-   inkscape:export-xdpi="6.5454545"
-   inkscape:export-ydpi="6.5454545">
-  <defs
-     id="defs3916" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
-     inkscape:cx="-180.13018"
-     inkscape:cy="145.50399"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:pagecheckerboard="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1819"
-     inkscape:window-height="1057"
-     inkscape:window-x="93"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3961"
-       originx="-113.77083"
-       originy="-171.97917" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3919">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Logo Foreground"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-113.77083,-66.812492)">
-    <g
-       inkscape:groupmode="layer"
-       id="layer2"
-       inkscape:label="LogoBackground" />
-    <g
-       id="g3983">
-      <rect
-         style="stroke-width:0.27718252"
-         y="66.812492"
-         x="113.77083"
-         height="58.208332"
-         width="58.208332"
-         id="rect3963"
-         transform="translate(-6.8749998e-7,1.2708334e-6)" />
-      <g
-         inkscape:label="Logo"
-         id="Layer_1"
-         transform="matrix(0.27669793,0,0,0.27670588,-1.4883681,-1.2128743)">
-        <g
-           transform="translate(408.10163,-793.97636)"
-           id="layer1_1_">
-          <g
-             transform="matrix(0.24008588,0,0,0.24008588,-2.2890548,790.44159)"
-             id="g3332_1_">
-            <path
-               d="m 482.8347,1207.9542 -200.813,-18.3507 -157.6319,-71.2595 h 179.2184 l 179.2266,89.5228"
-               id="path24_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#fbc712" />
-            <path
-               d="m 482.8347,1207.9542 212.8266,-24.6514 145.6346,-64.9589 H 662.0552 l -179.2204,89.5228"
-               id="path26_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#fbc712" />
-            <path
-               d="m 482.8347,1745.6257 179.2204,21.3342 179.2408,68.2698 H 662.0552 l -179.2204,-89.7058"
-               id="path28_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#f6871f" />
-            <path
-               d="m 482.8347,1745.6257 -179.2266,19.2639 -179.2184,70.3401 h 179.2184 l 179.2266,-89.7058"
-               id="path30_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#f15e22" />
-            <path
-               d="m 213.998,1476.7889 -26.4513,210.4268 -63.1569,148.014 v -179.2122 l 89.6082,-179.3303"
-               id="path32_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#fcee23" />
-            <path
-               d="M 213.998,1476.7889 193.8473,1284.0785 124.3898,1118.344 v 179.2205 l 89.6082,179.1228"
-               id="path34_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#fcee23" />
-            <path
-               d="m 751.6715,1476.7889 25.8615,-194.8114 63.7487,-163.6335 v 179.2205 l -89.6102,179.1228"
-               id="path36_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#f04923" />
-            <path
-               d="m 751.6715,1476.7889 17.4824,197.8254 72.1279,160.6154 v -179.2122 l -89.6102,-179.3303"
-               id="path38_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#f04923" />
-            <path
-               d="m 124.3898,1118.344 358.4449,89.6102 v 268.6842 H 213.998 l -89.6082,-358.1113"
-               id="path16_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#f8b218" />
-            <path
-               d="m 124.3898,1835.2297 89.6082,-358.4408 268.8368,-0.1505 v 268.7839 l -358.4449,89.4414"
-               id="path22_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#f89d1c" />
-            <path
-               d="m 841.296,1118.344 -89.6245,358.4327 -268.8368,-0.1383 v -268.6985 l 358.4612,-89.4128"
-               id="path18_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#f37321" />
-            <path
-               d="m 841.296,1835.2297 -358.4612,-89.604 v -268.9873 l 268.8368,0.1505 89.6245,358.0748"
-               id="path20_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#f15e22" />
-            <path
-               d="M 482.8347,1207.9542 213.998,1476.7889 482.8348,1745.6257 751.6716,1476.7767 482.8348,1207.8668"
-               id="path14_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#f6871f" />
-          </g>
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/src/main/resources/icons/legacy/HaxeLogo_15.png b/src/main/resources/icons/legacy/HaxeLogo_15.png
deleted file mode 100644
index b0b55ff57..000000000
Binary files a/src/main/resources/icons/legacy/HaxeLogo_15.png and /dev/null differ
diff --git a/src/main/resources/icons/legacy/HaxeLogo_16.png b/src/main/resources/icons/legacy/HaxeLogo_16.png
deleted file mode 100644
index c0e2937b0..000000000
Binary files a/src/main/resources/icons/legacy/HaxeLogo_16.png and /dev/null differ
diff --git a/src/main/resources/icons/legacy/HaxeLogo_24.png b/src/main/resources/icons/legacy/HaxeLogo_24.png
deleted file mode 100644
index fbd091f9b..000000000
Binary files a/src/main/resources/icons/legacy/HaxeLogo_24.png and /dev/null differ
diff --git a/src/main/resources/icons/legacy/HaxeLogo_8.png b/src/main/resources/icons/legacy/HaxeLogo_8.png
deleted file mode 100644
index faecc61f6..000000000
Binary files a/src/main/resources/icons/legacy/HaxeLogo_8.png and /dev/null differ
diff --git a/src/main/resources/icons/legacy/I_Logo.png b/src/main/resources/icons/legacy/I_Logo.png
deleted file mode 100644
index 0aa904d41..000000000
Binary files a/src/main/resources/icons/legacy/I_Logo.png and /dev/null differ
diff --git a/src/main/resources/icons/legacy/I_haXe.png b/src/main/resources/icons/legacy/I_haXe.png
deleted file mode 100644
index 8ec408364..000000000
Binary files a/src/main/resources/icons/legacy/I_haXe.png and /dev/null differ
diff --git a/src/main/resources/icons/legacy/field-logo.png b/src/main/resources/icons/legacy/field-logo.png
deleted file mode 100644
index 5ae44bb44..000000000
Binary files a/src/main/resources/icons/legacy/field-logo.png and /dev/null differ
diff --git a/src/main/resources/icons/legacy/field-logo.svg b/src/main/resources/icons/legacy/field-logo.svg
deleted file mode 100644
index ab7a5fae2..000000000
--- a/src/main/resources/icons/legacy/field-logo.svg
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="Layer_1"
-   data-name="Layer 1"
-   viewBox="0 0 16 16"
-   version="1.1"
-   sodipodi:docname="field-haxe.svg"
-   inkscape:version="0.92.0 r15299"
-   inkscape:export-filename="F:\linux\sandbox\github\HaxeFoundation\intellij-haxe\resources\icons\field-haxe.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96">
-  <metadata
-     id="metadata3830">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>field</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3828" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1416"
-     inkscape:window-height="886"
-     id="namedview3826"
-     showgrid="false"
-     inkscape:zoom="24.825966"
-     inkscape:cx="4.4018519"
-     inkscape:cy="10.176421"
-     inkscape:window-x="1940"
-     inkscape:window-y="75"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="layer8"
-     inkscape:pagecheckerboard="true" />
-  <title
-     id="title3806">field</title>
-  <g
-     inkscape:groupmode="layer"
-     id="layer7"
-     inkscape:label="BaseIcon">
-    <g
-       data-name="&lt;Group&gt;"
-       id="_Group_">
-      <circle
-         style="fill:#f4af3d"
-         id="circle3808"
-         r="7"
-         cy="8"
-         cx="8" />
-    </g>
-    <g
-       id="g4190"
-       transform="translate(-1.5910761,0.96672977)">
-      <g
-         style="opacity:0.6"
-         id="g3815">
-        <path
-           style="fill:#231f20"
-           inkscape:connector-curvature="0"
-           id="path3813"
-           d="m 8.209,7 v 5 H 7.13672 V 7 L 6,7.01037 7.13672,6.62486 V 6.08061 A 3.25979,3.25979 0 0 1 7.26856,5.07432 1.52286,1.52286 0 0 1 7.64942,4.43653 1.40351,1.40351 0 0 1 8.26172,4.09921 3.11677,3.11677 0 0 1 9.082,4 2.89979,2.89979 0 0 1 9.71774,4.0652 4.79312,4.79312 0 0 1 10.23629,4.20977 L 9.9609,5.00913 A 3.77572,3.77572 0 0 0 9.56539,4.89858 2.03388,2.03388 0 0 0 9.11715,4.85039 1.34512,1.34512 0 0 0 8.71285,4.90425 0.58323,0.58323 0 0 0 8.4316,5.09417 0.91163,0.91163 0 0 0 8.2646,5.46551 2.69543,2.69543 0 0 0 8.20894,6.06928 v 0.5896 h 1.43559 z" />
-      </g>
-      <polygon
-         points="6.722,6 6,7 7,7 7,6 "
-         id="polygon3819"
-         style="opacity:0.6;fill:#231f20" />
-      <polygon
-         points="8.722,6 8,7 9,7 10,6 "
-         id="polygon3821"
-         style="opacity:0.6;fill:#231f20" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer8"
-     inkscape:label="HaxeLogo">
-    <g
-       transform="matrix(0.1202577,0,0,0.1202577,-4.881818,-7.834717)"
-       id="g3983">
-      <rect
-         style="stroke-width:0.27718252"
-         y="66.812492"
-         x="113.77083"
-         height="58.208332"
-         width="58.208332"
-         id="rect3963"
-         transform="translate(-6.8749998e-7,1.2708334e-6)" />
-      <g
-         inkscape:label="Logo"
-         id="Layer_1-1"
-         transform="matrix(0.27669793,0,0,0.27670588,-1.4883681,-1.2128743)">
-        <g
-           transform="translate(408.10163,-793.97636)"
-           id="layer1_1_">
-          <g
-             transform="matrix(0.24008588,0,0,0.24008588,-2.2890548,790.44159)"
-             id="g3332_1_">
-            <path
-               d="m 482.8347,1207.9542 -200.813,-18.3507 -157.6319,-71.2595 h 179.2184 l 179.2266,89.5228"
-               id="path24_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#fbc712" />
-            <path
-               d="m 482.8347,1207.9542 212.8266,-24.6514 145.6346,-64.9589 H 662.0552 l -179.2204,89.5228"
-               id="path26_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#fbc712" />
-            <path
-               d="m 482.8347,1745.6257 179.2204,21.3342 179.2408,68.2698 H 662.0552 l -179.2204,-89.7058"
-               id="path28_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#f6871f" />
-            <path
-               d="m 482.8347,1745.6257 -179.2266,19.2639 -179.2184,70.3401 h 179.2184 l 179.2266,-89.7058"
-               id="path30_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#f15e22" />
-            <path
-               d="m 213.998,1476.7889 -26.4513,210.4268 -63.1569,148.014 v -179.2122 l 89.6082,-179.3303"
-               id="path32_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#fcee23" />
-            <path
-               d="M 213.998,1476.7889 193.8473,1284.0785 124.3898,1118.344 v 179.2205 l 89.6082,179.1228"
-               id="path34_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#fcee23" />
-            <path
-               d="m 751.6715,1476.7889 25.8615,-194.8114 63.7487,-163.6335 v 179.2205 l -89.6102,179.1228"
-               id="path36_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#f04923" />
-            <path
-               d="m 751.6715,1476.7889 17.4824,197.8254 72.1279,160.6154 v -179.2122 l -89.6102,-179.3303"
-               id="path38_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#f04923" />
-            <path
-               d="m 124.3898,1118.344 358.4449,89.6102 v 268.6842 H 213.998 l -89.6082,-358.1113"
-               id="path16_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#f8b218" />
-            <path
-               d="m 124.3898,1835.2297 89.6082,-358.4408 268.8368,-0.1505 v 268.7839 l -358.4449,89.4414"
-               id="path22_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#f89d1c" />
-            <path
-               d="m 841.296,1118.344 -89.6245,358.4327 -268.8368,-0.1383 v -268.6985 l 358.4612,-89.4128"
-               id="path18_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#f37321" />
-            <path
-               d="m 841.296,1835.2297 -358.4612,-89.604 v -268.9873 l 268.8368,0.1505 89.6245,358.0748"
-               id="path20_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#f15e22" />
-            <path
-               d="M 482.8347,1207.9542 213.998,1476.7889 482.8348,1745.6257 751.6716,1476.7767 482.8348,1207.8668"
-               id="path14_1_"
-               inkscape:connector-curvature="0"
-               style="fill:#f6871f" />
-          </g>
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/src/main/resources/icons/legacy/haXe_16.png b/src/main/resources/icons/legacy/haXe_16.png
deleted file mode 100644
index 78c35aab5..000000000
Binary files a/src/main/resources/icons/legacy/haXe_16.png and /dev/null differ
diff --git a/src/main/resources/icons/legacy/haXe_24.png b/src/main/resources/icons/legacy/haXe_24.png
deleted file mode 100644
index fa2ffdc37..000000000
Binary files a/src/main/resources/icons/legacy/haXe_24.png and /dev/null differ
diff --git a/src/main/resources/icons/legacy/method-logo.png b/src/main/resources/icons/legacy/method-logo.png
deleted file mode 100644
index 2688bcc3b..000000000
Binary files a/src/main/resources/icons/legacy/method-logo.png and /dev/null differ
diff --git a/src/main/resources/icons/legacy/method-logo.svg b/src/main/resources/icons/legacy/method-logo.svg
deleted file mode 100644
index 129f96da4..000000000
--- a/src/main/resources/icons/legacy/method-logo.svg
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="Layer_1"
-   data-name="Layer 1"
-   viewBox="0 0 16 16"
-   version="1.1"
-   sodipodi:docname="method-haxe.svg"
-   inkscape:version="0.92.0 r15299"
-   inkscape:export-filename="F:\linux\sandbox\github\HaxeFoundation\intellij-haxe\resources\icons\method-haxe.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96">
-  <metadata
-     id="metadata3744">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>method</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3742" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1819"
-     inkscape:window-height="1057"
-     id="namedview3740"
-     showgrid="false"
-     inkscape:zoom="41.7193"
-     inkscape:cx="4.2470698"
-     inkscape:cy="8.8433545"
-     inkscape:window-x="93"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer3"
-     showguides="true"
-     inkscape:pagecheckerboard="true" />
-  <title
-     id="title3728">method</title>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="Logo shade" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Icon">
-    <g
-       style="opacity:0.5"
-       id="g3733">
-      <g
-         data-name=" Group "
-         id="_Group_">
-        <circle
-           style="fill:#f98b9e"
-           id="circle3730"
-           r="7"
-           cy="7.99999"
-           cx="8" />
-      </g>
-    </g>
-    <path
-       inkscape:connector-curvature="0"
-       id="path3735"
-       style="opacity:0.6;isolation:isolate;fill:#231f20"
-       d="m 10.356398,11.83894 -0.0051,-2.7935798 a 1.6974,1.6974 0 0 0 -0.26856,-1.04232 0.97992,0.97992 0 0 0 -0.8286502,-0.34743 1.57461,1.57461 0 0 0 -0.66238,0.12562 1.10769,1.10769 0 0 0 -0.44565,0.36882 1.63819,1.63819 0 0 0 -0.253,0.604 3.85687,3.85687 0 0 0 -0.079,0.83118 l 0.00436,2.2537098 h -0.97779 l -0.00511,-2.7935598 a 1.71028,1.71028 0 0 0 -0.26589,-1.04232 0.97232,0.97232 0 0 0 -0.826,-0.34743 1.53106,1.53106 0 0 0 -0.68908,0.139 1.08739,1.08739 0 0 0 -0.44559,0.41159 1.91587,1.91587 0 0 0 -0.23954,0.66815 5.10521,5.10521 0 0 0 -0.0709,0.90869 l 0.03096,2.0558798 h -0.99929 l -7.1e-4,-4.9999998 h 1 l -0.07645,0.90757 h 0.05344 a 1.66916,1.66916 0 0 1 0.304,-0.39822 1.74285,1.74285 0 0 1 0.387,-0.28063 1.78253,1.78253 0 0 1 0.4486,-0.1657 2.1969,2.1969 0 0 1 0.48348,-0.05348 2.18147,2.18147 0 0 1 1.0663,0.23519 1.41565,1.41565 0 0 1 0.62881,0.73764 h 0.04273 a 1.72786,1.72786 0 0 1 0.33336,-0.433 1.91323,1.91323 0 0 1 0.427,-0.302 2.05956,2.05956 0 0 1 0.4887,-0.179 2.33471,2.33471 0 0 1 0.52355,-0.0588 1.829,1.829 0 0 1 1.4086002,0.51046 2.3559,2.3559 0 0 1 0.47507,1.633 l 0.0052,2.8469698 z" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="HaxeLogo">
-    <g
-       transform="matrix(0.1202577,0,0,0.1202577,-4.8637484,-7.7973454)"
-       id="g3983"
-       inkscape:export-xdpi="96"
-       inkscape:export-ydpi="96">
-      <g
-         id="g4087">
-        <rect
-           transform="translate(-6.8749998e-7,1.2708334e-6)"
-           id="rect3963"
-           width="58.208332"
-           height="58.208332"
-           x="113.77083"
-           y="66.812492"
-           style="stroke-width:0.27718252" />
-        <g
-           transform="matrix(0.27669793,0,0,0.27670588,-1.4883681,-1.2128743)"
-           id="Layer_1-0"
-           inkscape:label="Logo">
-          <g
-             id="layer1_1_"
-             transform="translate(408.10163,-793.97636)">
-            <g
-               id="g3332_1_"
-               transform="matrix(0.24008588,0,0,0.24008588,-2.2890548,790.44159)">
-              <path
-                 style="fill:#fbc712"
-                 inkscape:connector-curvature="0"
-                 id="path24_1_"
-                 d="m 482.8347,1207.9542 -200.813,-18.3507 -157.6319,-71.2595 h 179.2184 l 179.2266,89.5228" />
-              <path
-                 style="fill:#fbc712"
-                 inkscape:connector-curvature="0"
-                 id="path26_1_"
-                 d="m 482.8347,1207.9542 212.8266,-24.6514 145.6346,-64.9589 H 662.0552 l -179.2204,89.5228" />
-              <path
-                 style="fill:#f6871f"
-                 inkscape:connector-curvature="0"
-                 id="path28_1_"
-                 d="m 482.8347,1745.6257 179.2204,21.3342 179.2408,68.2698 H 662.0552 l -179.2204,-89.7058" />
-              <path
-                 style="fill:#f15e22"
-                 inkscape:connector-curvature="0"
-                 id="path30_1_"
-                 d="m 482.8347,1745.6257 -179.2266,19.2639 -179.2184,70.3401 h 179.2184 l 179.2266,-89.7058" />
-              <path
-                 style="fill:#fcee23"
-                 inkscape:connector-curvature="0"
-                 id="path32_1_"
-                 d="m 213.998,1476.7889 -26.4513,210.4268 -63.1569,148.014 v -179.2122 l 89.6082,-179.3303" />
-              <path
-                 style="fill:#fcee23"
-                 inkscape:connector-curvature="0"
-                 id="path34_1_"
-                 d="M 213.998,1476.7889 193.8473,1284.0785 124.3898,1118.344 v 179.2205 l 89.6082,179.1228" />
-              <path
-                 style="fill:#f04923"
-                 inkscape:connector-curvature="0"
-                 id="path36_1_"
-                 d="m 751.6715,1476.7889 25.8615,-194.8114 63.7487,-163.6335 v 179.2205 l -89.6102,179.1228" />
-              <path
-                 style="fill:#f04923"
-                 inkscape:connector-curvature="0"
-                 id="path38_1_"
-                 d="m 751.6715,1476.7889 17.4824,197.8254 72.1279,160.6154 v -179.2122 l -89.6102,-179.3303" />
-              <path
-                 style="fill:#f8b218"
-                 inkscape:connector-curvature="0"
-                 id="path16_1_"
-                 d="m 124.3898,1118.344 358.4449,89.6102 v 268.6842 H 213.998 l -89.6082,-358.1113" />
-              <path
-                 style="fill:#f89d1c"
-                 inkscape:connector-curvature="0"
-                 id="path22_1_"
-                 d="m 124.3898,1835.2297 89.6082,-358.4408 268.8368,-0.1505 v 268.7839 l -358.4449,89.4414" />
-              <path
-                 style="fill:#f37321"
-                 inkscape:connector-curvature="0"
-                 id="path18_1_"
-                 d="m 841.296,1118.344 -89.6245,358.4327 -268.8368,-0.1383 v -268.6985 l 358.4612,-89.4128" />
-              <path
-                 style="fill:#f15e22"
-                 inkscape:connector-curvature="0"
-                 id="path20_1_"
-                 d="m 841.296,1835.2297 -358.4612,-89.604 v -268.9873 l 268.8368,0.1505 89.6245,358.0748" />
-              <path
-                 style="fill:#f6871f"
-                 inkscape:connector-curvature="0"
-                 id="path14_1_"
-                 d="M 482.8347,1207.9542 213.998,1476.7889 482.8348,1745.6257 751.6716,1476.7767 482.8348,1207.8668" />
-            </g>
-          </g>
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/src/main/resources/icons/legacy/nmml_16.png b/src/main/resources/icons/legacy/nmml_16.png
deleted file mode 100644
index b03e61243..000000000
Binary files a/src/main/resources/icons/legacy/nmml_16.png and /dev/null differ
diff --git a/src/main/resources/icons/class.svg b/src/main/resources/icons/nodes/class.svg
similarity index 88%
rename from src/main/resources/icons/class.svg
rename to src/main/resources/icons/nodes/class.svg
index 69d8293e8..ceee55f2a 100644
--- a/src/main/resources/icons/class.svg
+++ b/src/main/resources/icons/nodes/class.svg
@@ -1,8 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-  <mask id="outline">
-    <rect x="0" y="0" width="16" height="16" fill="white" />
-    <rect x="9" y="9" width="7" height="7" fill="black" />
-  </mask>
   <g fill="none" fill-rule="evenodd" mask="url(#outline)">
     <path fill="#40B6E0" fill-opacity=".6" d="M15,8 C15,11.866 11.866,15 8,15 C4.134,15 1,11.866 1,8 C1,4.134 4.134,1 8,1 C11.866,1 15,4.134 15,8"/>
     <path fill="#231F20" fill-opacity=".7" d="M5,4.28253174 C4.53,4.74153174 4.028,4.978 3.1,5 C2.061,5.022 1,4.2794 1,3.0004 C1,1.7124 1.971,1 3.1,1 C3.94833171,1 4.54833171,1.18475342 4.9,1.55426025 L5.5162,0.836730957 C4.8293999,0.270175195 4.28826904,0.0004 3.0982,0.0004 C1.3402,0.0004 0.0002,1.3584 0.0002,3.0004 C0.0002,4.6824 1.3642,6.0004 3.0022,6.0004 C4.29284668,6.0004 5.0232,5.5934 5.6162,4.9814 C5.2054,4.51548783 5,4.28253174 5,4.28253174 Z" transform="translate(5 5)"/>
diff --git a/src/main/resources/icons/enum.svg b/src/main/resources/icons/nodes/enum.svg
similarity index 83%
rename from src/main/resources/icons/enum.svg
rename to src/main/resources/icons/nodes/enum.svg
index b34e0958f..0b0df276c 100644
--- a/src/main/resources/icons/enum.svg
+++ b/src/main/resources/icons/nodes/enum.svg
@@ -1,8 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-  <mask id="outline">
-    <rect x="0" y="0" width="16" height="16" fill="white" />
-    <rect x="9" y="9" width="7" height="7" fill="black" />
-  </mask>
   <g fill="none" fill-rule="evenodd" mask="url(#outline)">
     <path fill="#24DAAC" fill-opacity=".6" d="M15,8 C15,11.866 11.866,15 8,15 C4.134,15 1,11.866 1,8 C1,4.134 4.134,1 8,1 C11.866,1 15,4.134 15,8"/>
     <polygon fill="#231F20" fill-opacity=".7" points="4 6 0 6 0 0 4 0 4 1 1 1 1 2 3.5 2 3.5 3 1 3 1 5 4 5" transform="translate(6 5)"/>
diff --git a/src/main/resources/icons/field.svg b/src/main/resources/icons/nodes/field.svg
similarity index 89%
rename from src/main/resources/icons/field.svg
rename to src/main/resources/icons/nodes/field.svg
index 296aa461f..d37d8136a 100644
--- a/src/main/resources/icons/field.svg
+++ b/src/main/resources/icons/nodes/field.svg
@@ -1,8 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-  <mask id="outline">
-    <rect x="0" y="0" width="16" height="16" fill="white" />
-    <rect x="9" y="9" width="7" height="7" fill="black" />
-  </mask>
   <g fill="none" fill-rule="evenodd" mask="url(#outline)">
     <path fill="#F4AF3D" fill-opacity=".6" d="M15,8 C15,11.866 11.866,15 8,15 C4.134,15 1,11.866 1,8 C1,4.134 4.134,1 8,1 C11.866,1 15,4.134 15,8"/>
     <path fill="#231F20" fill-opacity=".7" d="M1,8 L2,8 L2,4 L3.5,4 L3.5,3 L2,3 C1.99687783,2.36169171 1.99509925,2.02835838 1.99466424,2 C1.98704681,1.50341351 2.13289549,1.0728225 2.43221029,0.972167969 C2.91964141,0.808253079 3.56884985,1.02114795 3.68984985,1.06414795 L3.98519897,0.226043701 C3.90948298,0.198825534 3.4559021,0 2.81140137,0 C2.16690063,1.40512602e-16 1.81677246,0.0614013672 1.4818929,0.388793945 C1.16513106,0.698473875 1.01614114,1.22015248 1.00124609,2 C1.00039414,2.04460465 0.999980878,2.95274463 1,3 C1.00000736,3.01819872 0.666674031,3.01819872 0,3 L0,3.972 L1,3.972 L1,8 Z" transform="translate(6 4)"/>
diff --git a/src/main/resources/icons/file.svg b/src/main/resources/icons/nodes/file.svg
similarity index 80%
rename from src/main/resources/icons/file.svg
rename to src/main/resources/icons/nodes/file.svg
index 5d0b45f2c..a84a0e86c 100644
--- a/src/main/resources/icons/file.svg
+++ b/src/main/resources/icons/nodes/file.svg
@@ -1,8 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-  <mask id="outline">
-    <rect x="0" y="0" width="16" height="16" fill="white" />
-    <rect x="7" y="9" width="11" height="7" fill="black" />
-  </mask>
   <g fill="none" fill-opacity=".8" fill-rule="evenodd" mask="url(#outline)">
     <polygon fill="#9AA7B0" points="7 1 3 5 7 5"/>
     <polygon fill="#9AA7B0" points="8 1 8 6 3 6 3 15 13 15 13 1"/>
diff --git a/src/main/resources/icons/interface.svg b/src/main/resources/icons/nodes/interface.svg
similarity index 83%
rename from src/main/resources/icons/interface.svg
rename to src/main/resources/icons/nodes/interface.svg
index d2bbb294c..a1d2aba45 100644
--- a/src/main/resources/icons/interface.svg
+++ b/src/main/resources/icons/nodes/interface.svg
@@ -1,8 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-  <mask id="outline">
-    <rect x="0" y="0" width="16" height="16" fill="white" />
-    <rect x="9" y="9" width="7" height="7" fill="black" />
-  </mask>
   <g fill="none" fill-rule="evenodd" mask="url(#outline)">
     <path fill="#62B543" fill-opacity=".6" d="M15,8 C15,11.866 11.866,15 8,15 C4.134,15 1,11.866 1,8 C1,4.134 4.134,1 8,1 C11.866,1 15,4.134 15,8"/>
     <polygon fill="#231F20" fill-rule="nonzero" points="8.6 10 8.6 6 10 6 10 5 6 5 6 6 7.4 6 7.4 10 6 10.007 6 11 10 11 10 10" opacity=".7"/>
diff --git a/src/main/resources/icons/method.svg b/src/main/resources/icons/nodes/method.svg
similarity index 89%
rename from src/main/resources/icons/method.svg
rename to src/main/resources/icons/nodes/method.svg
index bc8743963..a0962177b 100644
--- a/src/main/resources/icons/method.svg
+++ b/src/main/resources/icons/nodes/method.svg
@@ -1,8 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-  <mask id="outline">
-    <rect x="0" y="0" width="16" height="16" fill="white" />
-    <rect x="9" y="9" width="7" height="7" fill="black" />
-  </mask>
   <g fill="none" fill-rule="evenodd" mask="url(#outline)">
     <path fill="#F98B9E" fill-opacity=".6" d="M15,8 C15,11.866 11.866,15 8,15 C4.134,15 1,11.866 1,8 C1,4.134 4.134,1 8,1 C11.866,1 15,4.134 15,8"/>
     <path fill="#231F20" fill-opacity=".7" d="M6.9922,2 C6.9912,1.251 6.63513184,0.0003 4.98162842,0.0003 C4.11224365,0.0003 3.6576,0.502 3.5986,0.6 C3.28363037,0.194116211 2.94411621,0.0003 2.1,0.0003 C1.63194173,0.0003 1.26527507,0.0999436667 1,0.299231 L1,0.0003 L0,0.0003 L0,5.0003 L1,5.0003 C0.966666667,3.1563 0.966666667,2.1562 1,2 C1.05,1.7657 1.05,1 2,1 C2.95,1 2.999,1.537 3,2 L3,5.0003 L4,5.0003 L4,2 C4,1.686 3.95911952,1 4.98162842,1 C6.00413731,1 6.00413731,1.73961181 6.00469971,2 C6.00469971,2.79041884 6.00469971,3.38323296 6.00469971,3.77844238 C6.00469971,4.0499663 6.00469971,4.45725217 6.00469971,5.0003 L6.9972,5.0003 L6.9922,2 Z" transform="translate(5 6)"/>
diff --git a/src/main/resources/icons/nodes/module.svg b/src/main/resources/icons/nodes/module.svg
new file mode 100644
index 000000000..faa5a166a
--- /dev/null
+++ b/src/main/resources/icons/nodes/module.svg
@@ -0,0 +1,15 @@
+<!-- Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-opacity=".6" fill-rule="evenodd" transform="matrix(-1 0 0 1 15 1)">
+    <path fill="#40B6E0" d="M14,9.5 C14,11.9852857 11.9852857,14 9.5,14 C7.01471429,14 5,11.9852857 5,9.5 C5,7.01471429 7.01471429,5 9.5,5 C11.9852857,5 14,7.01471429 14,9.5"/>
+    <path fill="#F4AF3D" d="M4.076839,10.4213905 C3.11172891,9.59603947 2.49999951,8.36945974 2.49999951,7 C2.49999951,4.51471429 4.5147138,2.5 6.99999951,2.5 C8.36945925,2.5 9.59603898,3.1117294 10.42139,4.07683949 C10.1217939,4.02630787 9.81396903,4 9.49999951,4 C6.46242808,4 3.99999951,6.46242857 3.99999951,9.5 C3.99999951,9.81396952 4.02630738,10.1217944 4.076839,10.4213905 Z"/>
+    <path fill="#62B543" d="M1.576839,7.92139049 C0.611728913,7.09603947 -4.89840772e-07,5.86945974 -4.89840772e-07,4.5 C-4.89840772e-07,2.01471429 2.0147138,0 4.49999951,0 C5.86945925,0 7.09603898,0.611729403 7.92139,1.57683949 C7.6217939,1.52630787 7.31396903,1.5 6.99999951,1.5 C3.96242808,1.5 1.49999951,3.96242857 1.49999951,7 C1.49999951,7.31396952 1.52630738,7.62179439 1.576839,7.92139049 Z"/>
+  </g>
+  <g>
+    <rect x="11" y="11" width="4" height="4" fill="#f7941e" />
+    <path d="M11,13 l-1,-1.5 l0,-1.5 l1.5,0 l1.5,1 Z" fill="#fdb813" />
+    <path d="M11,13 l-1,1.5 l0,1.5 l1.5,0 l1.5,-1 Z" fill="#fdb813" />
+    <path d="M15,13 l1,-1.5 l0,-1.5 l-1.5,0 l-1.5,1 Z" fill="#f58220" />
+    <path d="M15,13 l1,1.5 l0,1.5 l-1.5,0 l-1.5,-1 Z" fill="#f58220" />
+  </g>
+</svg>
diff --git a/src/main/resources/icons/nodes/parameter.svg b/src/main/resources/icons/nodes/parameter.svg
new file mode 100644
index 000000000..4ce0c054e
--- /dev/null
+++ b/src/main/resources/icons/nodes/parameter.svg
@@ -0,0 +1,14 @@
+<!-- Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#F4AF3D" fill-opacity=".6" d="M15,8 C15,11.866 11.866,15 8,15 C4.134,15 1,11.866 1,8 C1,4.134 4.134,1 8,1 C11.866,1 15,4.134 15,8"/>
+    <path fill="#231F20" fill-opacity=".7" d="M0.9974,2.8021 C0.9974,3.83569336 1.23855513,4.8771 2.5354,4.8771 C3.83224487,4.8771 4,3.4641 4,2.7921 C4,2.1061 3.90228271,0.7461 2.5244,0.7461 C1.14651729,0.7461 0.9974,1.76850664 0.9974,2.8021 Z M1,5 C1.008,5.074 1.00713333,6.074 0.9974,8 L0.0004,8 L0.0004,0.0001 L0.9974,0.0001 L0.9974,0.7461 C1.36693099,0.248766667 1.93993099,0.0001 2.7164,0.0001 C3.88110352,0.0001 5.0004,0.578186035 5.0004,2.8021 C5.0004,5.02601396 3.65454102,5.6231 2.7164,5.6231 C2.09097266,5.6231 1.51883932,5.4154 1,5 Z" transform="translate(6 5)"/>
+  </g>
+  <g>
+    <rect x="11" y="11" width="4" height="4" fill="#f7941e" />
+    <path d="M11,13 l-1,-1.5 l0,-1.5 l1.5,0 l1.5,1 Z" fill="#fdb813" />
+    <path d="M11,13 l-1,1.5 l0,1.5 l1.5,0 l1.5,-1 Z" fill="#fdb813" />
+    <path d="M15,13 l1,-1.5 l0,-1.5 l-1.5,0 l-1.5,1 Z" fill="#f58220" />
+    <path d="M15,13 l1,1.5 l0,1.5 l-1.5,0 l-1.5,-1 Z" fill="#f58220" />
+  </g>
+</svg>
diff --git a/src/main/resources/icons/typedef.svg b/src/main/resources/icons/nodes/typedef.svg
similarity index 83%
rename from src/main/resources/icons/typedef.svg
rename to src/main/resources/icons/nodes/typedef.svg
index 7e9e621f8..e492f637b 100644
--- a/src/main/resources/icons/typedef.svg
+++ b/src/main/resources/icons/nodes/typedef.svg
@@ -1,8 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-  <mask id="outline">
-    <rect x="0" y="0" width="16" height="16" fill="white" />
-    <rect x="9" y="9" width="7" height="7" fill="black" />
-  </mask>
   <g fill="none" fill-rule="evenodd" mask="url(#outline)">
     <path fill="#ACDA24" fill-opacity=".6" d="M15,8 C15,11.866 11.866,15 8,15 C4.134,15 1,11.866 1,8 C1,4.134 4.134,1 8,1 C11.866,1 15,4.134 15,8"/>
     <polygon fill="#231F20" fill-opacity=".7" points="5.5 1 5.5 0 .5 0 .5 1 2.5 1 2.5 6 3.5 6 3.5 1" transform="translate(5 5)"/>
diff --git a/src/main/resources/icons/typedef_gutter.svg b/src/main/resources/icons/nodes/typedefGutter.svg
similarity index 100%
rename from src/main/resources/icons/typedef_gutter.svg
rename to src/main/resources/icons/nodes/typedefGutter.svg
diff --git a/src/main/resources/icons/nodes/variable.svg b/src/main/resources/icons/nodes/variable.svg
new file mode 100644
index 000000000..00bb8d0c1
--- /dev/null
+++ b/src/main/resources/icons/nodes/variable.svg
@@ -0,0 +1,14 @@
+<!-- Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#F4AF3D" fill-opacity=".6" d="M15,8 C15,11.866 11.866,15 8,15 C4.134,15 1,11.866 1,8 C1,4.134 4.134,1 8,1 C11.866,1 15,4.134 15,8"/>
+    <path fill="#231F20" fill-opacity=".7" d="M2.2939,6 L-0.0001,0 L1.2,0 C2.3886,3.13933333 2.98856667,4.73933333 2.9999,4.8 L4.8,0 L5.9999,0 L3.7059,6 L2.2939,6 Z" transform="translate(5 5)"/>
+  </g>
+  <g>
+    <rect x="11" y="11" width="4" height="4" fill="#f7941e" />
+    <path d="M11,13 l-1,-1.5 l0,-1.5 l1.5,0 l1.5,1 Z" fill="#fdb813" />
+    <path d="M11,13 l-1,1.5 l0,1.5 l1.5,0 l1.5,-1 Z" fill="#fdb813" />
+    <path d="M15,13 l1,-1.5 l0,-1.5 l-1.5,0 l-1.5,1 Z" fill="#f58220" />
+    <path d="M15,13 l1,1.5 l0,1.5 l-1.5,0 l-1.5,-1 Z" fill="#f58220" />
+  </g>
+</svg>