diff --git a/src/main/java/com/redhat/devtools/intellij/microprofile/lang/MicroProfileServerIconProvider.java b/src/main/java/com/redhat/devtools/intellij/microprofile/lang/MicroProfileServerIconProvider.java
deleted file mode 100644
index b7ab0555d..000000000
--- a/src/main/java/com/redhat/devtools/intellij/microprofile/lang/MicroProfileServerIconProvider.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2023 Red Hat Inc. and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
- * which is available at https://www.apache.org/licenses/LICENSE-2.0.
- *
- * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
- *
- * Contributors:
- * Red Hat Inc. - initial API and implementation
- *******************************************************************************/
-package com.redhat.devtools.intellij.microprofile.lang;
-
-import com.redhat.devtools.lsp4ij.ServerIconProvider;
-
-import javax.swing.*;
-
-/**
- * MicroProfile icon provider for MicroProfile LS.
- */
-public class MicroProfileServerIconProvider implements ServerIconProvider {
-
- @Override
- public Icon getIcon() {
- return MicroProfileIcons.MicroProfile;
- }
-}
diff --git a/src/main/java/com/redhat/devtools/intellij/quarkus/lang/QuarkusIconProvider.java b/src/main/java/com/redhat/devtools/intellij/quarkus/lang/QuarkusIconProvider.java
index 1d089b9a7..15b6249d2 100644
--- a/src/main/java/com/redhat/devtools/intellij/quarkus/lang/QuarkusIconProvider.java
+++ b/src/main/java/com/redhat/devtools/intellij/quarkus/lang/QuarkusIconProvider.java
@@ -24,7 +24,7 @@
* Quarkus icon provider.
*/
public class QuarkusIconProvider extends IconProvider {
- public static final Icon QUARKUS_ICON = IconLoader.findIcon("/quarkus_icon_rgb_16px_default.png", QuarkusIconProvider.class);
+ public static final Icon QUARKUS_ICON = QuarkusIcons.Quarkus;
@Nullable
@Override
diff --git a/src/main/java/com/redhat/devtools/intellij/quarkus/lang/QuarkusIcons.java b/src/main/java/com/redhat/devtools/intellij/quarkus/lang/QuarkusIcons.java
new file mode 100644
index 000000000..6a64f719d
--- /dev/null
+++ b/src/main/java/com/redhat/devtools/intellij/quarkus/lang/QuarkusIcons.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2023 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution,
+ * and is available at https://www.eclipse.org/legal/epl-v20.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package com.redhat.devtools.intellij.quarkus.lang;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * Quarkus icons.
+ */
+public class QuarkusIcons {
+
+ public static final Icon Quarkus = IconLoader.findIcon("/quarkus_icon_rgb_16px_default.png", QuarkusIcons.class);
+
+}
diff --git a/src/main/java/com/redhat/devtools/intellij/quarkus/lang/QuarkusServerIconProvider.java b/src/main/java/com/redhat/devtools/intellij/quarkus/lang/QuarkusServerIconProvider.java
deleted file mode 100644
index 03c3e9727..000000000
--- a/src/main/java/com/redhat/devtools/intellij/quarkus/lang/QuarkusServerIconProvider.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2023 Red Hat Inc. and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
- * which is available at https://www.apache.org/licenses/LICENSE-2.0.
- *
- * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
- *
- * Contributors:
- * Red Hat Inc. - initial API and implementation
- *******************************************************************************/
-package com.redhat.devtools.intellij.quarkus.lang;
-
-import com.redhat.devtools.lsp4ij.ServerIconProvider;
-
-import javax.swing.*;
-
-/**
- * Quarkus server icon provider used by Qute LS.
- */
-public class QuarkusServerIconProvider implements ServerIconProvider {
-
- @Override
- public Icon getIcon() {
- return QuarkusIconProvider.QUARKUS_ICON;
- }
-}
diff --git a/src/main/java/com/redhat/devtools/intellij/qute/lang/QuteLanguageSubstitutor.java b/src/main/java/com/redhat/devtools/intellij/qute/lang/QuteLanguageSubstitutor.java
index 151197f1f..e2a3a1a6d 100644
--- a/src/main/java/com/redhat/devtools/intellij/qute/lang/QuteLanguageSubstitutor.java
+++ b/src/main/java/com/redhat/devtools/intellij/qute/lang/QuteLanguageSubstitutor.java
@@ -58,17 +58,6 @@ public static boolean isQuteLibrary(@NotNull LibraryOrderEntry libraryOrderEntry
libraryOrderEntry.getLibraryName().contains("io.quarkus.qute:qute-core:");
}
- private Module findModule(VirtualFile file) {
- for (Project project : ProjectManager.getInstance().getOpenProjects()) {
- for (Module module : ModuleManager.getInstance(project).getModules()) {
- if (ModuleUtilCore.moduleContainsFile(module, file, false)) {
- return module;
- }
- }
- }
- return null;
- }
-
@Override
public @Nullable Language getLanguage(@NotNull VirtualFile file, @NotNull Project project) {
Module module = LSPIJUtils.getModule(file, project);
diff --git a/src/main/resources/META-INF/lsp4ij-quarkus.xml b/src/main/resources/META-INF/lsp4ij-quarkus.xml
index e83e63180..6784893da 100644
--- a/src/main/resources/META-INF/lsp4ij-quarkus.xml
+++ b/src/main/resources/META-INF/lsp4ij-quarkus.xml
@@ -3,6 +3,7 @@
-
diff --git a/src/main/resources/META-INF/lsp4ij-qute.xml b/src/main/resources/META-INF/lsp4ij-qute.xml
index 991403b58..ea8496778 100644
--- a/src/main/resources/META-INF/lsp4ij-qute.xml
+++ b/src/main/resources/META-INF/lsp4ij-qute.xml
@@ -4,6 +4,7 @@
-