diff --git a/screenshots/AgentAliases.png b/screenshots/AgentAliases.png
index 5599d48..5a2794b 100644
Binary files a/screenshots/AgentAliases.png and b/screenshots/AgentAliases.png differ
diff --git a/screenshots/AlternativeAgentOrdering.png b/screenshots/AlternativeAgentOrdering.png
index 36d15e4..2ea78b8 100644
Binary files a/screenshots/AlternativeAgentOrdering.png and b/screenshots/AlternativeAgentOrdering.png differ
diff --git a/screenshots/ConnectionTypes.png b/screenshots/ConnectionTypes.png
index 613312c..ce43139 100644
Binary files a/screenshots/ConnectionTypes.png and b/screenshots/ConnectionTypes.png differ
diff --git a/screenshots/LabelTemplates.png b/screenshots/LabelTemplates.png
index bbcdb6b..b8a28f4 100644
Binary files a/screenshots/LabelTemplates.png and b/screenshots/LabelTemplates.png differ
diff --git a/screenshots/Logic.png b/screenshots/Logic.png
index c68b853..67905ba 100644
Binary files a/screenshots/Logic.png and b/screenshots/Logic.png differ
diff --git a/screenshots/MultilineText.png b/screenshots/MultilineText.png
index d393a8b..4d9590d 100644
Binary files a/screenshots/MultilineText.png and b/screenshots/MultilineText.png differ
diff --git a/screenshots/NotesAndState.png b/screenshots/NotesAndState.png
index 13704b1..0bfa5a3 100644
Binary files a/screenshots/NotesAndState.png and b/screenshots/NotesAndState.png differ
diff --git a/screenshots/ShortLivedAgents.png b/screenshots/ShortLivedAgents.png
index 46f7204..7283517 100644
Binary files a/screenshots/ShortLivedAgents.png and b/screenshots/ShortLivedAgents.png differ
diff --git a/screenshots/SimpleUsage.png b/screenshots/SimpleUsage.png
index c004107..80cded8 100644
Binary files a/screenshots/SimpleUsage.png and b/screenshots/SimpleUsage.png differ
diff --git a/screenshots/SimultaneousActions.png b/screenshots/SimultaneousActions.png
index fe84688..3c9389e 100644
Binary files a/screenshots/SimultaneousActions.png and b/screenshots/SimultaneousActions.png differ
diff --git a/scripts/sequence/components/AgentHighlight.js b/scripts/sequence/components/AgentHighlight.js
index 314fd94..ee77708 100644
--- a/scripts/sequence/components/AgentHighlight.js
+++ b/scripts/sequence/components/AgentHighlight.js
@@ -29,6 +29,7 @@ define(['./BaseComponent'], (BaseComponent) => {
 				env.drawAgentLine(name, env.primaryY);
 				env.agentInfos.get(name).currentRad = r;
 			});
+			return env.primaryY + env.theme.actionMargin;
 		}
 	}
 
diff --git a/scripts/sequence/components/Connect.js b/scripts/sequence/components/Connect.js
index 1805b28..5382696 100644
--- a/scripts/sequence/components/Connect.js
+++ b/scripts/sequence/components/Connect.js
@@ -300,7 +300,10 @@ define([
 				'fill': 'transparent',
 			}), clickable.firstChild);
 
-			return y1 + arrowDip + env.theme.actionMargin;
+			return y1 + Math.max(
+				arrowDip + env.theme.minActionMargin,
+				env.theme.actionMargin
+			);
 		}
 
 		renderSimpleConnect({label, agentNames, options}, env) {
@@ -359,7 +362,10 @@ define([
 				'fill': 'transparent',
 			}), clickable.firstChild);
 
-			return y + arrowSpread + env.theme.actionMargin;
+			return y + Math.max(
+				arrowSpread + env.theme.minActionMargin,
+				env.theme.actionMargin
+			);
 		}
 
 		renderPre({label, agentNames, options}, env) {
diff --git a/scripts/sequence/sequence_integration_spec.js b/scripts/sequence/sequence_integration_spec.js
index a48c721..722bc06 100644
--- a/scripts/sequence/sequence_integration_spec.js
+++ b/scripts/sequence/sequence_integration_spec.js
@@ -93,12 +93,12 @@ defineDescribe('Sequence Integration', [
 
 		const content = getSimplifiedContent(renderer);
 		expect(content).toContain(
-			'<svg viewBox="-5 -5 82 47">'
+			'<svg viewBox="-5 -5 82 56">'
 		);
 
 		// Agent 1
 		expect(content).toContain(
-			'<line x1="20.5" y1="11" x2="20.5" y2="37" class="agent-1-line"'
+			'<line x1="20.5" y1="11" x2="20.5" y2="46" class="agent-1-line"'
 		);
 		expect(content).toContain(
 			'<rect x="10" y="0" width="21" height="11"'
@@ -109,7 +109,7 @@ defineDescribe('Sequence Integration', [
 
 		// Agent 2
 		expect(content).toContain(
-			'<line x1="51.5" y1="11" x2="51.5" y2="37" class="agent-2-line"'
+			'<line x1="51.5" y1="11" x2="51.5" y2="46" class="agent-2-line"'
 		);
 		expect(content).toContain(
 			'<rect x="41" y="0" width="21" height="11"'
@@ -120,10 +120,10 @@ defineDescribe('Sequence Integration', [
 
 		// Arrow
 		expect(content).toContain(
-			'<line x1="20.5" y1="19" x2="48.5" y2="19"'
+			'<line x1="20.5" y1="26" x2="48.5" y2="26"'
 		);
 		expect(content).toContain(
-			'<polygon points="46 14 51 19 46 24"'
+			'<polygon points="46 21 51 26 46 31"'
 		);
 	});
 
diff --git a/scripts/sequence/themes/Basic.js b/scripts/sequence/themes/Basic.js
index fdcbc03..8ccc18b 100644
--- a/scripts/sequence/themes/Basic.js
+++ b/scripts/sequence/themes/Basic.js
@@ -7,7 +7,8 @@ define(['core/ArrayUtilities', 'svg/SVGShapes'], (array, SVGShapes) => {
 		titleMargin: 10,
 		outerMargin: 5,
 		agentMargin: 10,
-		actionMargin: 3,
+		actionMargin: 10,
+		minActionMargin: 3,
 		agentLineHighlightRadius: 4,
 
 		agentCap: {
diff --git a/scripts/sequence/themes/Chunky.js b/scripts/sequence/themes/Chunky.js
index 8486c4d..30c658d 100644
--- a/scripts/sequence/themes/Chunky.js
+++ b/scripts/sequence/themes/Chunky.js
@@ -8,6 +8,7 @@ define(['core/ArrayUtilities', 'svg/SVGShapes'], (array, SVGShapes) => {
 		outerMargin: 5,
 		agentMargin: 8,
 		actionMargin: 5,
+		minActionMargin: 5,
 		agentLineHighlightRadius: 4,
 
 		agentCap: {