Use flat scalable icons. Support dark theme and retina.

graph-database-support-plugin/src/main/resources/META-INF/plugin.xml

@@ -112,12 +112,12 @@
                     anchor="bottom"
                     secondary="false"
                     factoryClass="com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.ConsoleToolWindow"
-                    icon="/graphdb/icons/window/graph_13x13.png"/>
+                    icon="GraphIcons.Window.GRAPH"/>
         <toolWindow id="Graph Database"
                     anchor="right"
                     secondary="false"
                     factoryClass="com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.DataSourcesToolWindow"
-                    icon="/graphdb/icons/window/graph_13x13.png"/>
+                    icon="GraphIcons.Window.GRAPH"/>
         <actionPromoter implementation="com.neueda.jetbrains.plugin.graphdb.jetbrains.actions.execute.ExecuteQueryActionPromoter"/>
         <applicationService serviceInterface="com.neueda.jetbrains.plugin.graphdb.visualization.services.LookAndFeelService"
                             serviceImplementation="com.neueda.jetbrains.plugin.graphdb.jetbrains.services.IdeaLookAndFeelService"/>
@@ -179,26 +179,26 @@
         <!-- Graph Database support -->
         <group id="GraphDatabaseActionGroup"
                text="Graph Database" description="Execute graph database queries"
-               icon="/graphdb/icons/window/graph_13x13.png" popup="true">
+               icon="GraphIcons.Window.GRAPH" popup="true">
 
             <action id="GraphDatabaseActionGroup.ExecuteQuery"
                     class="com.neueda.jetbrains.plugin.graphdb.jetbrains.actions.execute.ExecuteQueryAction"
                     text="Execute query"
-                    icon="/general/run.png"
+                    icon="AllIcons.RunConfigurations.TestState.Run"
                     description="Execute query">
                 <keyboard-shortcut first-keystroke="ctrl ENTER"
                                    keymap="$default"/>
             </action>
             <action id="GraphDatabaseActionGroup.ExplainQuery"
                     class="com.neueda.jetbrains.plugin.graphdb.jetbrains.actions.execute.ExplainQueryAction"
                     text="Explain query"
-                    icon="/general/run.png"
+                    icon="AllIcons.RunConfigurations.TestState.Run"
                     description="Explain query">
             </action>
             <action id="GraphDatabaseActionGroup.ProfileQuery"
                     class="com.neueda.jetbrains.plugin.graphdb.jetbrains.actions.execute.ProfileQueryAction"
                     text="Profile query"
-                    icon="/general/run.png"
+                    icon="AllIcons.RunConfigurations.TestState.Run"
                     description="Profile query">
             </action>
             <add-to-group group-id="EditorPopupMenu"/>
@@ -210,30 +210,30 @@
             <action id="GraphDatabaseConsoleToolWindowActions.ExecuteQuery"
                     class="com.neueda.jetbrains.plugin.graphdb.jetbrains.actions.execute.ExecuteQueryAction"
                     text="Execute query"
-                    icon="/toolwindows/toolWindowRun.png"
+                    icon="AllIcons.Toolwindows.ToolWindowRun"
                     description="Execute query">
             </action>
             <action id="GraphDatabaseConsoleToolWindowActions.CleanCanvas"
                     class="com.neueda.jetbrains.plugin.graphdb.jetbrains.actions.ui.console.CleanCanvasAction"
                     text="Clean canvas"
-                    icon="/actions/refresh.png"
+                    icon="AllIcons.Actions.Refresh"
                     description="Clean canvas">
             </action>
             <action id="GraphDatabaseConsoleToolWindowActions.CopyQueryOutput"
                     class="com.neueda.jetbrains.plugin.graphdb.jetbrains.actions.ui.console.CopyQueryOutputAction"
                     text="Copy query result to clipboard"
-                    icon="/actions/copy.png"
+                    icon="AllIcons.Actions.Copy"
                     description="Copy query result to clipboard">
             </action>
         </group>
 
         <group id="GraphDatabaseFileActions"
                text="Graph Database File Actions" description="Graph Database File Actions"
-               icon="/graphdb/icons/window/graph_13x13.png" popup="true">
+               icon="GraphIcons.Window.GRAPH" popup="true">
             <action id="GraphDatabaseFileActions.ExecuteAll"
                     class="com.neueda.jetbrains.plugin.graphdb.jetbrains.actions.execute.ExecuteAllAction"
                     text="Execute All"
-                    icon="/general/run.png">
+                    icon="AllIcons.RunConfigurations.TestState.Run">
             </action>
             <add-to-group group-id="ProjectViewPopupMenu"/>
         </group>

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/CypherIcons.java

@@ -1,6 +1,6 @@
 package com.neueda.jetbrains.plugin.graphdb.language.cypher;
 
-import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
+import icons.GraphIcons;
 
 import javax.swing.Icon;
 

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/completion/metadata/elements/CypherBuiltInFunctionElement.java

@@ -3,7 +3,7 @@
 import com.intellij.codeInsight.completion.util.ParenthesesInsertHandler;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
-import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
+import icons.GraphIcons;
 
 public class CypherBuiltInFunctionElement implements CypherElement {
 

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/completion/metadata/elements/CypherLabelElement.java

@@ -2,7 +2,7 @@
 
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
-import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
+import icons.GraphIcons;
 
 public class CypherLabelElement implements CypherElement {
 

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/completion/metadata/elements/CypherProcedureElement.java

@@ -3,7 +3,7 @@
 import com.intellij.codeInsight.completion.util.ParenthesesInsertHandler;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
-import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
+import icons.GraphIcons;
 import org.jetbrains.annotations.Nullable;
 
 public class CypherProcedureElement implements

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/completion/metadata/elements/CypherPropertyKeyElement.java

@@ -2,7 +2,7 @@
 
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
-import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
+import icons.GraphIcons;
 
 public class CypherPropertyKeyElement implements CypherElement {
 

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/completion/metadata/elements/CypherRelationshipTypeElement.java

@@ -2,7 +2,7 @@
 
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
-import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
+import icons.GraphIcons;
 
 public class CypherRelationshipTypeElement implements CypherElement {
 

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/completion/metadata/elements/CypherUserFunctionElement.java

@@ -3,7 +3,7 @@
 import com.intellij.codeInsight.completion.util.ParenthesesInsertHandler;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
-import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
+import icons.GraphIcons;
 import org.jetbrains.annotations.Nullable;
 
 public class CypherUserFunctionElement implements

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/references/impl/CypherLabelNameReference.java

@@ -7,7 +7,7 @@
 import com.neueda.jetbrains.plugin.graphdb.language.cypher.psi.CypherTypes;
 import com.neueda.jetbrains.plugin.graphdb.language.cypher.references.CypherReferenceBase;
 import com.neueda.jetbrains.plugin.graphdb.language.cypher.util.CypherUtil;
-import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
+import icons.GraphIcons;
 import org.jetbrains.annotations.NotNull;
 
 /**

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/references/impl/CypherPropertyKeyNameReference.java

@@ -7,7 +7,7 @@
 import com.neueda.jetbrains.plugin.graphdb.language.cypher.psi.CypherTypes;
 import com.neueda.jetbrains.plugin.graphdb.language.cypher.references.CypherReferenceBase;
 import com.neueda.jetbrains.plugin.graphdb.language.cypher.util.CypherUtil;
-import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
+import icons.GraphIcons;
 import org.jetbrains.annotations.NotNull;
 
 public class CypherPropertyKeyNameReference extends CypherReferenceBase {

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/references/impl/CypherRelTypeNameReference.java

@@ -7,7 +7,7 @@
 import com.neueda.jetbrains.plugin.graphdb.language.cypher.psi.CypherTypes;
 import com.neueda.jetbrains.plugin.graphdb.language.cypher.references.CypherReferenceBase;
 import com.neueda.jetbrains.plugin.graphdb.language.cypher.util.CypherUtil;
-import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
+import icons.GraphIcons;
 import org.jetbrains.annotations.NotNull;
 
 /**

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/references/impl/CypherVariableReference.java

@@ -9,7 +9,7 @@
 import com.neueda.jetbrains.plugin.graphdb.language.cypher.references.CypherReferenceBase;
 import com.neueda.jetbrains.plugin.graphdb.language.cypher.util.CypherUtil;
 import com.neueda.jetbrains.plugin.graphdb.language.cypher.util.PsiTraversalUtilities;
-import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
+import icons.GraphIcons;
 import org.jetbrains.annotations.NotNull;
 
 /**

platform/src/main/java/com/neueda/jetbrains/plugin/graphdb/platform/GraphIcons.java → platform/src/main/java/icons/GraphIcons.java

@@ -1,4 +1,4 @@
-package com.neueda.jetbrains.plugin.graphdb.platform;
+package icons;
 
 import com.intellij.icons.AllIcons;
 
@@ -8,18 +8,16 @@
 
 public final class GraphIcons {
     public static final class Database {
-        public static final Icon UNKNOWN = getIcon("/graphdb/icons/database/unknown_16x16.png");
-        public static final Icon NEO4J = getIcon("/graphdb/icons/database/neo4j_16x16.png");
-        public static final Icon ORIENTDB = getIcon("/graphdb/icons/database/orientdb_16x16.png");
+        public static final Icon UNKNOWN = AllIcons.FileTypes.Unknown;
+        public static final Icon NEO4J = getIcon("/graphdb/icons/database/neo4j.svg");
     }
 
     public static final class Language {
-        public static final Icon CYPHER = getIcon("/graphdb/icons/language/cypher_16x16.png");
+        public static final Icon CYPHER = getIcon("/graphdb/icons/language/cypher.svg");
     }
 
     public static final class Window {
-        public static final Icon DATABASE = getIcon("/graphdb/icons/window/database_12x16.png");
-        public static final Icon GRAPH = getIcon("/graphdb/icons/window/graph_13x13.png");
+        public static final Icon GRAPH = getIcon("/META-INF/pluginIcon.svg");
     }
 
     public static final class Nodes {

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/component/datasource/DataSourceDescription.java

@@ -1,6 +1,6 @@
 package com.neueda.jetbrains.plugin.graphdb.jetbrains.component.datasource;
 
-import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
+import icons.GraphIcons;
 
 import javax.swing.Icon;
 

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/datasource/interactions/NewDataSourceActionGroup.java

@@ -6,7 +6,7 @@
 import com.intellij.openapi.project.Project;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.DataSourcesView;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.interactions.neo4j.bolt.Neo4jBoltDataSourceDialog;
-import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
+import icons.GraphIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;