Index: binaries/data/mods/public/gui/session/selection_panels.js
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels.js
+++ binaries/data/mods/public/gui/session/selection_panels.js
@@ -320,8 +320,21 @@
 			performFormation(unitIds, data.item);
 		};
 
+		data.button.onMouseRightPress = function() {
+			if (data.item == g_NullFormation)
+				g_DefaultFormation = undefined;
+			else
+				g_DefaultFormation = data.item;
+		};
+
 		let formationInfo = g_FormationsInfo.get(data.item);
 		let tooltip = translate(formationInfo.name);
+		let isDefaultFormation = g_DefaultFormation == data.item || (
+			data.item == g_NullFormation && !g_DefaultFormation);
+		if (isDefaultFormation)
+			tooltip += "\n" + translate("This is the default formation, used for movement orders.");
+		else
+			tooltip += "\n" + translate("Right-click to set this as the default formation.");
 		if (!formationOk && formationInfo.tooltip)
 			tooltip += "\n" + coloredText(translate(formationInfo.tooltip), "red");
 		data.button.tooltip = tooltip;
@@ -329,6 +342,7 @@
 		data.button.enabled = formationOk && controlsPlayer(data.player);
 		let grayscale = formationOk ? "" : "grayscale:";
 		data.guiSelection.hidden = !formationSelected;
+		data.countDisplay.hidden = !isDefaultFormation;
 		data.icon.sprite = "stretched:" + grayscale + "session/icons/" + formationInfo.icon;
 
 		setPanelObjectPosition(data.button, data.i, data.rowLength);
Index: binaries/data/mods/public/gui/session/selection_panels_helpers.js
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_helpers.js
+++ binaries/data/mods/public/gui/session/selection_panels_helpers.js
@@ -272,7 +272,7 @@
 	Engine.PostNetworkCommand({
 		"type": "formation",
 		"entities": entities,
-		"name": formationTemplate
+		"formation": formationTemplate
 	});
 }
 
Index: binaries/data/mods/public/gui/session/selection_panels_left/formation_panel.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_left/formation_panel.xml
+++ binaries/data/mods/public/gui/session/selection_panels_left/formation_panel.xml
@@ -7,6 +7,7 @@
 			<object name="unitFormationButton[n]" hidden="true" style="iconButton" type="button" size="0 0 38 38" tooltip_style="sessionToolTipBottomBold" z="100">
 				<object name="unitFormationIcon[n]" type="image" ghost="true" size="3 3 35 35"/>
 				<object name="unitFormationSelection[n]" hidden="true" type="image" ghost="true" size="3 3 35 35" sprite="stretched:session/icons/corners.png"/>
+				<object name="unitFormationCount[n]" hidden="true" type="image" ghost="true" size="3 3 35 35" sprite="stretched:session/icons/upgrade.png"/>
 			</object>
 		</repeat>
 	</object>
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
@@ -6,6 +6,9 @@
 	"move": "special/target_marker"
 };
 
+var g_DefaultFormation = "special/formations/box";
+var g_NullFormation = "special/formations/null";
+
 /**
  * Which enemy entity types will be attacked on sight when patroling.
  */
@@ -52,7 +55,8 @@
 				"entities": selection,
 				"x": target.x,
 				"z": target.z,
-				"queued": queued
+				"queued": queued,
+				"formation": g_DefaultFormation
 			});
 
 			DrawTargetMarker(target);
@@ -103,7 +107,8 @@
 				"x": target.x,
 				"z": target.z,
 				"targetClasses": targetClasses,
-				"queued": queued
+				"queued": queued,
+				"formation": g_DefaultFormation
 			});
 
 			DrawTargetMarker(target);
@@ -143,7 +148,8 @@
 				"entities": selection,
 				"target": action.target,
 				"allowCapture": true,
-				"queued": queued
+				"queued": queued,
+				"formation": g_DefaultFormation
 			});
 
 			Engine.GuiInterfaceCall("PlaySound", {
@@ -189,7 +195,8 @@
 				"entities": selection,
 				"target": action.target,
 				"queued": queued,
-				"allowCapture": false
+				"allowCapture": false,
+				"formation": g_DefaultFormation
 			});
 
 			Engine.GuiInterfaceCall("PlaySound", {
@@ -250,7 +257,8 @@
 				"target": action.target,
 				"targetClasses": { "attack": g_PatrolTargets },
 				"queued": queued,
-				"allowCapture": false
+				"allowCapture": false,
+				"formation": g_DefaultFormation
 			});
 
 			DrawTargetMarker(target);
@@ -298,7 +306,8 @@
 				"type": "heal",
 				"entities": selection,
 				"target": action.target,
-				"queued": queued
+				"queued": queued,
+				"formation": g_NullFormation
 			});
 
 			Engine.GuiInterfaceCall("PlaySound", {
@@ -364,7 +373,8 @@
 				"entities": selection,
 				"target": action.target,
 				"autocontinue": true,
-				"queued": queued
+				"queued": queued,
+				"formation": g_NullFormation
 			});
 
 			Engine.GuiInterfaceCall("PlaySound", {
@@ -444,7 +454,8 @@
 				"type": "gather",
 				"entities": selection,
 				"target": action.target,
-				"queued": queued
+				"queued": queued,
+				"formation": g_NullFormation
 			});
 
 			Engine.GuiInterfaceCall("PlaySound", {
@@ -492,7 +503,8 @@
 				"type": "returnresource",
 				"entities": selection,
 				"target": action.target,
-				"queued": queued
+				"queued": queued,
+				"formation": g_NullFormation
 			});
 
 			Engine.GuiInterfaceCall("PlaySound", {
@@ -605,7 +617,8 @@
 				"target": action.target,
 				"source": null,
 				"route": null,
-				"queued": queued
+				"queued": queued,
+				"formation": g_NullFormation
 			});
 
 			Engine.GuiInterfaceCall("PlaySound", {
@@ -708,7 +721,8 @@
 				"type": "garrison",
 				"entities": selection,
 				"target": action.target,
-				"queued": queued
+				"queued": queued,
+				"formation": g_NullFormation
 			});
 
 			Engine.GuiInterfaceCall("PlaySound", {
@@ -789,7 +803,8 @@
 				"type": "guard",
 				"entities": selection,
 				"target": action.target,
-				"queued": queued
+				"queued": queued,
+				"formation": g_DefaultFormation
 			});
 
 			Engine.GuiInterfaceCall("PlaySound", {
Index: binaries/data/mods/public/simulation/helpers/Commands.js
===================================================================
--- binaries/data/mods/public/simulation/helpers/Commands.js
+++ binaries/data/mods/public/simulation/helpers/Commands.js
@@ -16,6 +16,9 @@
 	if (cmd.entities)
 		data.entities = FilterEntityList(cmd.entities, player, data.controlAllUnits);
 
+	data.formation = cmd.formation || undefined;
+
+
 	// Allow focusing the camera on recent commands
 	let commandData = {
 		"type": "playercommand",
@@ -137,7 +140,7 @@
 
 	"walk": function(player, cmd, data)
 	{
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.Walk(cmd.x, cmd.z, cmd.queued);
 		});
 	},
@@ -145,7 +148,7 @@
 	"walk-custom": function(player, cmd, data)
 	{
 		for (let ent in data.entities)
-			GetFormationUnitAIs([data.entities[ent]], player).forEach(cmpUnitAI => {
+			GetFormationUnitAIs([data.entities[ent]], player, data.formation).forEach(cmpUnitAI => {
 				cmpUnitAI.Walk(cmd.targetPositions[ent].x, cmd.targetPositions[ent].y, cmd.queued);
 			});
 	},
@@ -165,7 +168,7 @@
 	{
 		let allowCapture = cmd.allowCapture || cmd.allowCapture == null;
 
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.WalkAndFight(cmd.x, cmd.z, cmd.targetClasses, allowCapture, cmd.queued);
 		});
 	},
@@ -187,7 +190,7 @@
 		   !(IsOwnedByEnemyOfPlayer(player, cmd.target) || IsOwnedByNeutralOfPlayer(player, cmd.target)))
 			warn("Invalid command: attack target is not owned by enemy of player "+player+": "+uneval(cmd));
 
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.Attack(cmd.target, allowCapture, cmd.queued);
 		});
 	},
@@ -196,7 +199,7 @@
 	{
 		let allowCapture = cmd.allowCapture || cmd.allowCapture == null;
 
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI =>
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI =>
 			cmpUnitAI.Patrol(cmd.x, cmd.z, cmd.targetClasses, allowCapture, cmd.queued)
 		);
 	},
@@ -206,7 +209,7 @@
 		if (g_DebugCommands && !(IsOwnedByPlayer(player, cmd.target) || IsOwnedByAllyOfPlayer(player, cmd.target)))
 			warn("Invalid command: heal target is not owned by player "+player+" or their ally: "+uneval(cmd));
 
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.Heal(cmd.target, cmd.queued);
 		});
 	},
@@ -217,7 +220,7 @@
 		if (g_DebugCommands && !IsOwnedByAllyOfPlayer(player, cmd.target))
 			warn("Invalid command: repair target is not owned by ally of player "+player+": "+uneval(cmd));
 
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.Repair(cmd.target, cmd.autocontinue, cmd.queued);
 		});
 	},
@@ -227,14 +230,14 @@
 		if (g_DebugCommands && !(IsOwnedByPlayer(player, cmd.target) || IsOwnedByGaia(cmd.target)))
 			warn("Invalid command: resource is not owned by gaia or player "+player+": "+uneval(cmd));
 
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.Gather(cmd.target, cmd.queued);
 		});
 	},
 
 	"gather-near-position": function(player, cmd, data)
 	{
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.GatherNearPosition(cmd.x, cmd.z, cmd.resourceType, cmd.resourceTemplate, cmd.queued);
 		});
 	},
@@ -244,7 +247,7 @@
 		if (g_DebugCommands && !IsOwnedByPlayer(player, cmd.target))
 			warn("Invalid command: dropsite is not owned by player "+player+": "+uneval(cmd));
 
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.ReturnResource(cmd.target, cmd.queued);
 		});
 	},
@@ -451,7 +454,7 @@
 			return;
 		}
 
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.Garrison(cmd.target, cmd.queued);
 		});
 	},
@@ -465,14 +468,14 @@
 			return;
 		}
 
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.Guard(cmd.target, cmd.queued);
 		});
 	},
 
 	"stop": function(player, cmd, data)
 	{
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.Stop(cmd.queued);
 		});
 	},
@@ -564,7 +567,7 @@
 
 	"formation": function(player, cmd, data)
 	{
-		GetFormationUnitAIs(data.entities, player, cmd.name).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation, true).forEach(cmpUnitAI => {
 			cmpUnitAI.MoveIntoFormation(cmd);
 		});
 	},
@@ -617,14 +620,14 @@
 
 	"setup-trade-route": function(player, cmd, data)
 	{
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.SetupTradeRoute(cmd.target, cmd.source, cmd.route, cmd.queued);
 		});
 	},
 
 	"cancel-setup-trade-route": function(player, cmd, data)
 	{
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.CancelSetupTradeRoute(cmd.target);
 		});
 	},
@@ -885,8 +888,9 @@
  */
 function ExtractFormations(ents)
 {
-	var entities = []; // subset of ents that have UnitAI
-	var members = {}; // { formationentity: [ent, ent, ...], ... }
+	let entities = []; // subset of ents that have UnitAI
+	let members = {}; // { formationentity: [ent, ent, ...], ... }
+	let templates = {};  // { formationentity: template }
 	for (let ent of ents)
 	{
 		var cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
@@ -894,13 +898,16 @@
 		if (fid != INVALID_ENTITY)
 		{
 			if (!members[fid])
+			{
 				members[fid] = [];
+				templates[fid] = cmpUnitAI.GetFormationTemplate();
+			}
 			members[fid].push(ent);
 		}
 		entities.push(ent);
 	}
 
-	return { "entities": entities, "members": members };
+	return { "entities": entities, "members": members, "templates": templates };
 }
 
 /**
@@ -1421,7 +1428,7 @@
  * Returns a list of UnitAI components, each belonging either to a
  * selected unit or to a formation entity for groups of the selected units.
  */
-function GetFormationUnitAIs(ents, player, formationTemplate)
+function GetFormationUnitAIs(ents, player, formationTemplate, forceTemplate)
 {
 	// If an individual was selected, remove it from any formation
 	// and command it individually
@@ -1481,16 +1488,33 @@
 		// Check that all its members are selected
 		var fid = formationIds[0];
 		var cmpFormation = Engine.QueryInterface(+fid, IID_Formation);
-		if (cmpFormation && cmpFormation.GetMemberCount() == formation.members[fid].length
-			&& cmpFormation.GetMemberCount() == formation.entities.length)
+		if (cmpFormation && cmpFormation.GetMemberCount() == formation.members[fid].length &&
+		    cmpFormation.GetMemberCount() == formation.entities.length)
 		{
-			cmpFormation.DeleteTwinFormations();
 			// The whole formation was selected, so reuse its controller for this command
-			formationUnitAIs = [Engine.QueryInterface(+fid, IID_UnitAI)];
-			if (formationTemplate && CanMoveEntsIntoFormation(formation.entities, formationTemplate))
-				cmpFormation.LoadFormation(formationTemplate);
+			if (!forceTemplate)
+				formationTemplate = formation.templates[fid];
+
+			if (formationTemplate == formation.templates[fid])
+			{
+				cmpFormation.DeleteTwinFormations();
+				formationUnitAIs = [Engine.QueryInterface(+fid, IID_UnitAI)];
+			}
 		}
 	}
+	else if (!forceTemplate && formationIds.length)
+	{
+		// Check if all entities share a common formation, if so reuse this template.
+		let template = formation.templates[formationIds[0]];
+		for (let i = 1; i < formationIds.length; ++i)
+			if (formation.templates[formationIds[i]] != template)
+			{
+				template = null;
+				break;
+			}
+		if (template)
+			formationTemplate = template;
+	}
 
 	if (!formationUnitAIs.length)
 	{
@@ -1502,36 +1526,9 @@
 		var formationEnts = [];
 		for (let cluster of clusters)
 		{
-			if (!formationTemplate || !CanMoveEntsIntoFormation(cluster, formationTemplate))
-			{
-				// Use the last formation template if everyone was using it
-				var lastFormationTemplate = undefined;
-				for (let ent of cluster)
-				{
-					var cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
-					if (cmpUnitAI)
-					{
-						var template = cmpUnitAI.GetFormationTemplate();
-						if (lastFormationTemplate === undefined)
-						{
-							lastFormationTemplate = template;
-						}
-						else if (lastFormationTemplate != template)
-						{
-							lastFormationTemplate = undefined;
-							break;
-						}
-					}
-				}
-				if (lastFormationTemplate && CanMoveEntsIntoFormation(cluster, lastFormationTemplate))
-					formationTemplate = lastFormationTemplate;
-				else
-					formationTemplate = "special/formations/null";
-			}
-
 			RemoveFromFormation(cluster);
 
-			if (formationTemplate == "special/formations/null")
+			if (!formationTemplate || !CanMoveEntsIntoFormation(cluster, formationTemplate))
 			{
 				for (let ent of cluster)
 					nonformedUnitAIs.push(Engine.QueryInterface(ent, IID_UnitAI));