diff --git a/binaries/data/mods/public/gui/session/session.js b/binaries/data/mods/public/gui/session/session.js
index 6cc53f9d9c..3a8eed4d75 100644
--- a/binaries/data/mods/public/gui/session/session.js
+++ b/binaries/data/mods/public/gui/session/session.js
@@ -634,15 +634,15 @@ function updateHero()
 					attackLabel: attackLabel,
 					details: damageTypeDetails(heroState.attack),
 					rangeLabel: "[font=\"sans-bold-13\"]" + translate("Range:") + "[/font]",
-					range: Math.round(heroState.attack.maxRange/4)
+					range: Math.round(heroState.attack.maxRange) + " [font=\"sans-10\"][color=\"orange\"]" + translate("meters") + "[/color][/font]",
 				}
 			);
 		else
-			tooltip += "\n" + sprintf(translate("%(label)s %(details)s"), { label: attackLabel, details: damageTypeDetails(heroState.armour) });
+			tooltip += "\n" + sprintf(translate("%(label)s %(details)s"), { label: attackLabel, details: damageTypeDetails(heroState.attack) });
 	}
 
 	var armorLabel = "[font=\"sans-bold-13\"]" + translate("Armor:") + "[/font]";
-	tooltip += "\n" + sprintf(translate("%(label)s %(details)s"), { label: armorLabel, details: damageTypeDetails(heroState.attack) });
+	tooltip += "\n" + sprintf(translate("%(label)s %(details)s"), { label: armorLabel, details: damageTypeDetails(heroState.armour) });
 	tooltip += "\n" + template.tooltip;
 
 	heroButton.tooltip = tooltip;