diff --git a/data/tools/unit_tree/html_output.py b/data/tools/unit_tree/html_output.py
index f00bb5e27d9b..a67bfcbb1c63 100644
--- a/data/tools/unit_tree/html_output.py
+++ b/data/tools/unit_tree/html_output.py
@@ -704,10 +704,16 @@ def uval(name):
 
                         write('</a>\n</div>\n')
                         write("<div class=\"attributes\">")
-                        write("%s%s<br />" % (_("Cost: ", "wesnoth-help"), cost))
-                        write("%s%s<br />" % (_("HP: "), hp))
-                        write("%s%s<br />" % (_("MP: "), mp))
-                        write("%s%s<br />" % (_("XP: "), xp))
+
+                        attributes = (
+                            (_("Cost: ", "wesnoth-help"), cost),
+                            (_("HP: "), hp),
+                            (_("XP: "), xp),
+                            (_("MP: "), mp),
+                        )
+
+                        for attr_label, attr_value in attributes:
+                            write('<span class="attribute-label">%s</span> <span class="attribute-value">%s</span><br />' % (attr_label.strip(), attr_value))
 
                         # Write info about abilities.
                         anames = self.get_abilities(u)