Index: binaries/data/mods/public/gui/common/tooltips.js
===================================================================
--- binaries/data/mods/public/gui/common/tooltips.js
+++ binaries/data/mods/public/gui/common/tooltips.js
@@ -154,6 +154,18 @@
 	});
 }
 
+function getCurrentCaptureTooltip(entState, label)
+{
+	if (!entState.maxCapturePoints)
+		return "";
+
+	return sprintf(translate("%(captureLabel)s %(current)s / %(max)s"), {
+		"captureLabel": headerFont(label || translate("Capture points:")),
+		"current": Math.round(entState.capturePoints[entState.player]),
+		"max": Math.round(entState.maxCapturePoints)
+	});
+}
+
 /**
  * Converts an armor level into the actual reduction percentage
  */
Index: binaries/data/mods/public/gui/session/PanelEntities.xml
===================================================================
--- binaries/data/mods/public/gui/session/PanelEntities.xml
+++ binaries/data/mods/public/gui/session/PanelEntities.xml
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<object name="panelEntityButtons" size="0 36 50 93">
+<object name="panelEntityButtons" size="2 38 50 93">
 	<!-- Displays buttons for the most important units like heroes and relics -->
 	<repeat count="19" var="n">
 		<object name="panelEntityButton[n]" size="0 0 50 50" type="button" hidden="true" style="iconButton" tooltip_style="sessionToolTip">
 
+			<!-- Placeholders storing the position for the bars -->
+			<object size="3 100%-5 100%-3 100%-2" name="panelEntitySectionPosTop[n]" hidden="true"/>
+			<object size="3 100% 100%-3 100%+5" name="panelEntitySectionPosBottom[n]" hidden="true"/>
+
+			<object name="panelEntityBackground[n]" type="image" ghost="true" size="1 1 100%-1 100%-1"/>
 			<object name="panelEntityImage[n]" size="5 5 100%-5 100%-5" type="image" ghost="true"/>
 			<object name="panelEntityHitOverlay[n]" hidden="true" type="image" ghost="true" size="5 5 100%-5 100%-5"/>
 
 			<!-- Health bar -->
-			<object size="3 100%-7 100%-3 100%-2" name="panelEntityHealthSection[n]" ghost="true">
+			<object size="3 100%-5 100%-3 100%-2" name="panelEntityHealthSection[n]" ghost="true">
 				<object size="0 0 100% 5" name="panelEntityHealth[n]" type="image" ghost="true">
 					<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
 					<object type="image" sprite="healthBackground" ghost="true"/>
@@ -17,6 +22,17 @@
 				</object>
 			</object>
 
+			<!-- Capture bar -->
+			<object size="3 100% 100%-3 100%+5" name="panelEntityCaptureSection[n]" ghost="true">
+				<object size="0 0 100% 5" name="panelEntityCapture[n]" type="image" ghost="true">
+					<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
+					<repeat count="9" var="m">
+						<object type="image" ghost="true" name="panelEntityCaptureBar[n][m]" hidden="true"/>
+					</repeat>
+					<object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
+				</object>
+			</object>
+
 		</object>
 	</repeat>
 </object>
Index: binaries/data/mods/public/gui/session/PanelEntity.js
===================================================================
--- binaries/data/mods/public/gui/session/PanelEntity.js
+++ binaries/data/mods/public/gui/session/PanelEntity.js
@@ -1,6 +1,6 @@
 /**
  * This class sets up a shortcut to a specific entity in the GUI panel.
- * The button shows the portrait a tooltip with state information and a health bar.
+ * The button shows the portrait a tooltip with state information and a health and/or capture bar.
  * Clicking the button selects and jumps to to the entity.
  */
 class PanelEntity
@@ -9,6 +9,7 @@
 	{
 		this.selection = selection;
 		this.hitpoints = undefined;
+		this.capturePoints = undefined;
 
 		/**
 		 * Public property
@@ -22,6 +23,7 @@
 
 		this.overlayName = "panelEntityHitOverlay[" + buttonID + "]";
 		this.panelEntityHealthBar = Engine.GetGUIObjectByName("panelEntityHealthBar[" + buttonID + "]");
+		this.panelEntityCaptureBar = Engine.GetGUIObjectByName("panelEntityCapture[" + buttonID + "]");
 		this.panelEntButton = Engine.GetGUIObjectByName("panelEntityButton[" + buttonID + "]");
 		this.panelEntButton.onPress = this.onPress.bind(this);
 		this.panelEntButton.onDoublePress = this.onDoublePress.bind(this);
@@ -31,6 +33,17 @@
 		let template = GetTemplateData(entityState.template);
 		this.nameTooltip = setStringTags(template.name.specific, this.NameTags) + "\n";
 
+		Engine.GetGUIObjectByName("panelEntityHealthSection[" + buttonID + "]").hidden = !entityState.hitpoints;
+
+		let captureSection = Engine.GetGUIObjectByName("panelEntityCaptureSection[" + buttonID + "]");
+		captureSection.hidden = !entityState.capturePoints;
+		if (entityState.capturePoints)
+		{
+			this.capturePoints = entityState.capturePoints;
+			if (!entityState.hitpoints)
+				captureSection.size = Engine.GetGUIObjectByName("panelEntitySectionPosTop[" + buttonID + "]").size;
+		}
+
 		Engine.GetGUIObjectByName("panelEntityImage[" + buttonID + "]").sprite =
 			"stretched:" + this.PortraitDirectory + template.icon;
 	}
@@ -48,6 +61,18 @@
 			setPanelObjectPosition(this.panelEntButton, i, Infinity);
 
 		let entityState = GetEntityState(this.entityID);
+		this.updateHitpointsBar(entityState);
+		this.updateCapturePointsBar(entityState);
+
+		this.panelEntButton.tooltip =
+			this.nameTooltip +
+			this.Tooltips.map(tooltip => tooltip(entityState)).filter(tip => tip).join("\n");
+	}
+
+	updateHitpointsBar(entityState)
+	{
+		if (!entityState.hitpoints)
+			return;
 
 		if (this.hitpoints != entityState.hitpoints)
 		{
@@ -55,14 +80,42 @@
 			size.rright = 100 * entityState.hitpoints / entityState.maxHitpoints;
 			this.panelEntityHealthBar.size = size;
 		}
+		if (entityState.hitpoints < this.hitpoints)
+			this.onAttacked();
+		this.hitpoints = entityState.hitpoints;
+	}
 
-		this.panelEntButton.tooltip =
-			this.nameTooltip +
-			this.Tooltips.map(tooltip => tooltip(entityState)).filter(tip => tip).join("\n");
+	updateCapturePointsBar(entityState)
+	{
+		if (!entityState.capturePoints)
+			return;
 
-		if (this.hitpoints > entityState.hitpoints)
-			startColorFade(this.overlayName, 100, 0, colorFade_attackUnit, true, smoothColorFadeRestart_attackUnit);
-		this.hitpoints = entityState.hitpoints;
+		let playerParts = this.panelEntityCaptureBar.children;
+		let setCaptureBarPart = function(player, startSize) {
+			let captureBar = playerParts[player];
+			let size = captureBar.size;
+			size.rleft = startSize;
+			size.rright = startSize + 100 * Math.max(0, Math.min(1, entityState.capturePoints[player] / entityState.maxCapturePoints));
+			captureBar.size = size;
+			captureBar.sprite = "color:" + g_DiplomacyColors.getPlayerColor(player, 128);
+			captureBar.hidden = false;
+			return size.rright;
+		};
+
+		let size = setCaptureBarPart(entityState.player, 0);
+		for (let i in entityState.capturePoints)
+			if (i != entityState.player)
+				size = setCaptureBarPart(i, size);
+
+		if (entityState.capturePoints[entityState.player] < this.capturePoints[entityState.player])
+			this.onAttacked();
+
+		this.capturePoints = entityState.capturePoints;
+	}
+
+	onAttacked()
+	{
+		startColorFade(this.overlayName, 100, 0, colorFade_attackUnit, true, smoothColorFadeRestart_attackUnit);
 	}
 
 	onPress()
@@ -85,6 +138,7 @@
 
 PanelEntity.prototype.Tooltips = [
 	getCurrentHealthTooltip,
+	getCurrentCaptureTooltip,
 	getAttackTooltip,
 	getArmorTooltip,
 	getEntityTooltip,
Index: binaries/data/mods/public/gui/session/selection_details.js
===================================================================
--- binaries/data/mods/public/gui/session/selection_details.js
+++ binaries/data/mods/public/gui/session/selection_details.js
@@ -145,11 +145,13 @@
 		captureSection.size = showResource ? sectionPosMiddle.size : sectionPosBottom.size;
 		resourceSection.size = showResource ? sectionPosBottom.size : sectionPosMiddle.size;
 	}
-	else
+	else if (showResource)
 	{
 		captureSection.size = sectionPosBottom.size;
 		resourceSection.size = sectionPosTop.size;
 	}
+	else
+		captureSection.size = sectionPosTop.size;
 
 	// CapturePoints
 	captureSection.hidden = !entState.capturePoints;
Index: binaries/data/mods/public/gui/session/unit_actions.js
===================================================================
--- binaries/data/mods/public/gui/session/unit_actions.js
+++ binaries/data/mods/public/gui/session/unit_actions.js
@@ -155,7 +155,7 @@
 		},
 		"getActionInfo": function(entState, targetState)
 		{
-			if (!entState.attack || !targetState.hitpoints)
+			if (!entState.attack)
 				return false;
 
 			return {
Index: binaries/data/mods/public/simulation/components/Capturable.js
===================================================================
--- binaries/data/mods/public/simulation/components/Capturable.js
+++ binaries/data/mods/public/simulation/components/Capturable.js
@@ -52,13 +52,18 @@
 
 Capturable.prototype.Capture = function(effectData, attacker, attackerOwner, bonusMultiplier)
 {
-	let cmpHealth = Engine.QueryInterface(this.entity, IID_Health);
-
-	if (attackerOwner == INVALID_PLAYER || !this.CanCapture(attackerOwner) ||
-	     !cmpHealth || cmpHealth.GetHitpoints() == 0)
+	if (attackerOwner == INVALID_PLAYER || !this.CanCapture(attackerOwner))
 		return {};
 
-	bonusMultiplier *= cmpHealth.GetMaxHitpoints() / (0.1 * cmpHealth.GetMaxHitpoints() + 0.9 * cmpHealth.GetHitpoints());
+	let cmpHealth = Engine.QueryInterface(this.entity, IID_Health);
+	if (cmpHealth)
+	{
+		if (cmpHealth.GetHitpoints() == 0)
+			return {};
+
+		bonusMultiplier *= cmpHealth.GetMaxHitpoints() /
+			(0.1 * cmpHealth.GetMaxHitpoints() + 0.9 * cmpHealth.GetHitpoints());
+	}
 
 	let total = Attacking.GetTotalAttackEffects({ "Capture": effectData }, "Capture") * bonusMultiplier;
 
Index: binaries/data/mods/public/simulation/components/UnitAI.js
===================================================================
--- binaries/data/mods/public/simulation/components/UnitAI.js
+++ binaries/data/mods/public/simulation/components/UnitAI.js
@@ -405,15 +405,8 @@
 	},
 
 	"Order.Attack": function(msg) {
-		// Check the target is alive
-		if (!this.TargetIsAlive(this.order.data.target))
-		{
-			this.FinishOrder();
-			return;
-		}
-
-		// Work out how to attack the given target
-		var type = this.GetBestAttackAgainst(this.order.data.target, this.order.data.allowCapture);
+		// Work out how to attack the given target (incorporates CanAttack implicitly).
+		let type = this.GetBestAttackAgainst(this.order.data.target, this.order.data.allowCapture);
 		if (!type)
 		{
 			// Oops, we can't attack at all
@@ -764,7 +757,7 @@
 			// Check if we are already in range, otherwise walk there
 			if (!this.CheckFormationTargetAttackRange(target))
 			{
-				if (this.TargetIsAlive(target) && this.CheckTargetVisible(target))
+				if (this.CanAttack(target) && this.CheckTargetVisible(target))
 				{
 					this.SetNextState("COMBAT.APPROACHING");
 					return;
@@ -1171,7 +1164,7 @@
 					// Check if we are already in range, otherwise walk there
 					if (!this.CheckFormationTargetAttackRange(target))
 					{
-						if (this.TargetIsAlive(target) && this.CheckTargetVisible(target))
+						if (this.CanAttack(target) && this.CheckTargetVisible(target))
 						{
 							this.FinishOrder();
 							this.PushOrderFront("Attack", { "target": target, "force": false, "allowCapture": allowCapture });
@@ -1195,7 +1188,7 @@
 					// Check if we are already in range, otherwise walk there
 					if (!this.CheckFormationTargetAttackRange(target))
 					{
-						if (this.TargetIsAlive(target) && this.CheckTargetVisible(target))
+						if (this.CanAttack(target) && this.CheckTargetVisible(target))
 						{
 							this.FinishOrder();
 							this.PushOrderFront("Attack", { "target": target, "force": false, "allowCapture": allowCapture });
@@ -1442,7 +1435,7 @@
 			}
 			// if we already are targeting another unit still alive, finish with it first
 			if (this.order && (this.order.type == "WalkAndFight" || this.order.type == "Attack"))
-				if (this.order.data.target != msg.data.attacker && this.TargetIsAlive(msg.data.attacker))
+				if (this.order.data.target != msg.data.attacker && this.CanAttack(msg.data.attacker))
 					return;
 
 			var cmpIdentity = Engine.QueryInterface(this.entity, IID_Identity);
@@ -1697,8 +1690,9 @@
 				},
 
 				"Timer": function(msg) {
-					// Check the target is alive
-					if (!this.TargetIsAlive(this.isGuardOf))
+					// Check the target is alive or capturable.
+					let cmpCapturable = Engine.QueryInterface(this.isGuardOf, IID_Capturable);
+					if (!this.TargetIsAlive(this.isGuardOf) && !cmpCapturable)
 					{
 						this.FinishOrder();
 						return;
Index: binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml
@@ -10,6 +10,7 @@
     <Height>2.0</Height>
     <Square width="5.0" depth="12.0"/>
   </Footprint>
+  <Health disable=""/>
   <Identity>
     <Classes datatype="tokens">-Organic -ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Relic</VisibleClasses>