diff --git a/plugins/devkit/resources/org/jetbrains/idea/devkit/DevKitBundle.properties b/plugins/devkit/resources/org/jetbrains/idea/devkit/DevKitBundle.properties
index fe46e8d3aecb..5ff700a51792 100644
--- a/plugins/devkit/resources/org/jetbrains/idea/devkit/DevKitBundle.properties
+++ b/plugins/devkit/resources/org/jetbrains/idea/devkit/DevKitBundle.properties
@@ -165,5 +165,5 @@ serialization.only.member.used.explicitly=Serialization-only member used explici
 implemented.at.runtime.dom=DOM Element implemented at runtime
 implemented.at.runtime.jamElement=JAM Element implemented at runtime
 
-line.marker.tooltip.extension.declaration=<a href="#navigation/{0}:{1}">{2}</a> extension declaration in <a href="#navigation/{3}:0">{4}</a>
-line.marker.tooltip.extension.point.declaration=<a href="#navigation/{0}:{1}">{2}</a> extension point declaration in <a href="#navigation/{3}:0">{4}</a>
+line.marker.tooltip.extension.declaration=<a href="#navigation/{0}:{1}">{2}</a> declaration in {3}
+line.marker.tooltip.extension.point.declaration=<a href="#navigation/{0}:{1}">{2}</a> EP declaration in {3}
diff --git a/plugins/devkit/src/navigation/LineMarkerInfoHelper.java b/plugins/devkit/src/navigation/LineMarkerInfoHelper.java
index be76c96eda8c..8f135cada882 100644
--- a/plugins/devkit/src/navigation/LineMarkerInfoHelper.java
+++ b/plugins/devkit/src/navigation/LineMarkerInfoHelper.java
@@ -20,16 +20,21 @@ import com.intellij.codeInsight.navigation.NavigationGutterIconBuilder;
 import com.intellij.icons.AllIcons;
 import com.intellij.navigation.GotoRelatedItem;
 import com.intellij.openapi.editor.markup.GutterIconRenderer;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.xml.XmlTag;
+import com.intellij.ui.ColorUtil;
 import com.intellij.util.NotNullFunction;
 import com.intellij.util.NullableFunction;
+import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.idea.devkit.DevKitBundle;
 import org.jetbrains.idea.devkit.util.PointableCandidate;
 
+import java.text.MessageFormat;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -54,6 +59,8 @@ class LineMarkerInfoHelper {
       return name;
     });
 
+  private static final String MODULE_SUFFIX_PATTERN = " <font color='" + ColorUtil.toHex(UIUtil.getInactiveTextColor()) + "'>[{0}]</font>";
+
 
   private LineMarkerInfoHelper() {
   }
@@ -96,9 +103,16 @@ class LineMarkerInfoHelper {
 
       PsiFile file = tag.getContainingFile();
       String path = file.getVirtualFile().getPath();
+
+      String fileDisplayName = file.getName();
+      Module module = ModuleUtilCore.findModuleForPsiElement(file);
+      if (module != null) {
+        fileDisplayName += MessageFormat.format(MODULE_SUFFIX_PATTERN, module.getName());
+      }
+
       return DevKitBundle.message(tooltipPatternPropertyName,
-                                         path, String.valueOf(tag.getTextRange().getStartOffset()), nameProvider.fun(tag),
-                                         path, file.getName());
+                                  path, String.valueOf(tag.getTextRange().getStartOffset()), nameProvider.fun(tag),
+                                  fileDisplayName);
     };
   }
 }