diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/args/ArgType.java b/jadx-core/src/main/java/jadx/core/dex/instructions/args/ArgType.java
index 061aa95d6e73965bf672b6109867d3b2d85ce8b4..9d7025c092e828892172edbc8d3fcb3e1fb5c5d2 100644
--- a/jadx-core/src/main/java/jadx/core/dex/instructions/args/ArgType.java
+++ b/jadx-core/src/main/java/jadx/core/dex/instructions/args/ArgType.java
@@ -12,9 +12,9 @@ import org.jetbrains.annotations.TestOnly;
 
 import jadx.core.Consts;
 import jadx.core.dex.info.ClassInfo;
-import jadx.core.dex.nodes.ClassNode;
 import jadx.core.dex.nodes.RootNode;
 import jadx.core.dex.visitors.typeinference.TypeCompareEnum;
+import jadx.core.utils.ListUtils;
 import jadx.core.utils.Utils;
 import jadx.core.utils.exceptions.JadxRuntimeException;
 
@@ -874,28 +874,37 @@ public abstract class ArgType {
 	}
 
 	public static ArgType tryToResolveClassAlias(RootNode root, ArgType type) {
-		if (!type.isObject() || type.isGenericType()) {
+		if (type.isGenericType()) {
 			return type;
 		}
-
-		ClassNode cls = root.resolveClass(type);
-		if (cls == null) {
-			return type;
-		}
-		ClassInfo clsInfo = cls.getClassInfo();
-		if (!clsInfo.hasAlias()) {
-			return type;
+		if (type.isArray()) {
+			ArgType rootType = type.getArrayRootElement();
+			ArgType aliasType = tryToResolveClassAlias(root, rootType);
+			if (aliasType == rootType) {
+				return type;
+			}
+			return ArgType.array(aliasType, type.getArrayDimension());
 		}
-		String aliasFullName = clsInfo.getAliasFullName();
-		if (type.isGeneric()) {
-			if (type instanceof GenericObject) {
-				return new GenericObject(aliasFullName, type.getGenericTypes());
+		if (type.isObject()) {
+			ArgType wildcardType = type.getWildcardType();
+			if (wildcardType != null) {
+				return new WildcardType(tryToResolveClassAlias(root, wildcardType), type.getWildcardBound());
 			}
-			if (type instanceof WildcardType) {
-				return new WildcardType(ArgType.object(aliasFullName), type.getWildcardBound());
+			ClassInfo clsInfo = ClassInfo.fromName(root, type.getObject());
+			ArgType baseType = clsInfo.hasAlias() ? ArgType.object(clsInfo.getAliasFullName()) : type;
+			if (!type.isGeneric()) {
+				return baseType;
+			}
+			List<ArgType> genericTypes = type.getGenericTypes();
+			if (genericTypes != null) {
+				return new GenericObject(baseType.getObject(), tryToResolveClassAlias(root, genericTypes));
 			}
 		}
-		return ArgType.object(aliasFullName);
+		return type;
+	}
+
+	public static List<ArgType> tryToResolveClassAlias(RootNode root, List<ArgType> types) {
+		return ListUtils.map(types, t -> tryToResolveClassAlias(root, t));
 	}
 
 	@Override
diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JNode.java b/jadx-gui/src/main/java/jadx/gui/treemodel/JNode.java
index f0e646a833116384a67d2b608c461dead92203be..f974e5e74f96a08df7944047c62057489200e95c 100644
--- a/jadx-gui/src/main/java/jadx/gui/treemodel/JNode.java
+++ b/jadx-gui/src/main/java/jadx/gui/treemodel/JNode.java
@@ -90,7 +90,7 @@ public abstract class JNode extends DefaultMutableTreeNode implements Comparable
 	}
 
 	public String getTooltip() {
-		return null;
+		return makeLongStringHtml();
 	}
 
 	private static final Comparator<JNode> COMPARATOR = Comparator
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/MouseHoverHighlighter.java b/jadx-gui/src/main/java/jadx/gui/ui/codearea/MouseHoverHighlighter.java
index e3d51282311449c3bba33de8a1eb4ea280ac43f7..a18571bb5f7cfe46d953abc59497438ae8c2b36a 100644
--- a/jadx-gui/src/main/java/jadx/gui/ui/codearea/MouseHoverHighlighter.java
+++ b/jadx-gui/src/main/java/jadx/gui/ui/codearea/MouseHoverHighlighter.java
@@ -83,6 +83,6 @@ class MouseHoverHighlighter extends MouseMotionAdapter {
 		}
 		JNodeCache nodeCache = codeArea.getMainWindow().getCacheObject().getNodeCache();
 		JNode jNode = nodeCache.makeFrom(node);
-		codeArea.setToolTipText(jNode.makeLongString());
+		codeArea.setToolTipText(jNode.getTooltip());
 	}
 }