diff --git a/tool/resources/org/antlr/v4/tool/templates/dot/epsilon-edge.st b/tool/resources/org/antlr/v4/tool/templates/dot/epsilon-edge.st
index 54cdc6a9b..1402edfaa 100644
--- a/tool/resources/org/antlr/v4/tool/templates/dot/epsilon-edge.st
+++ b/tool/resources/org/antlr/v4/tool/templates/dot/epsilon-edge.st
@@ -1,3 +1,3 @@
-epsilon-edge(src,label,target,arrowhead) ::= <<
-<src> -> <target> [fontname="Times-Italic", label = "e"];
+epsilon-edge(src,label,target,arrowhead,loopback=false) ::= <<
+<src> -> <target> [fontname="Times-Italic", label="&epsilon;"<if(loopback)>, style="dashed"<endif>];
 >>
diff --git a/tool/resources/org/antlr/v4/tool/templates/dot/state.st b/tool/resources/org/antlr/v4/tool/templates/dot/state.st
index 93951328e..5bb6332b4 100644
--- a/tool/resources/org/antlr/v4/tool/templates/dot/state.st
+++ b/tool/resources/org/antlr/v4/tool/templates/dot/state.st
@@ -1,3 +1,3 @@
 state(state, label, name) ::= <<
-node [fontsize=11, label="<label>", <if(useBox)>shape=box, fixedsize=false<else>shape=circle, fixedsize=true, width=.4<endif>, peripheries=1]; <name>
+<name>[fontsize=11, label="<label>", <if(useBox)>shape=box, fixedsize=false<else>shape=circle, fixedsize=true, width=.55<endif>, peripheries=1];
 >>
\ No newline at end of file
diff --git a/tool/resources/org/antlr/v4/tool/templates/dot/stopstate.st b/tool/resources/org/antlr/v4/tool/templates/dot/stopstate.st
index 69f8c2d1a..fc35e11bc 100644
--- a/tool/resources/org/antlr/v4/tool/templates/dot/stopstate.st
+++ b/tool/resources/org/antlr/v4/tool/templates/dot/stopstate.st
@@ -1,3 +1,3 @@
 stopstate(name,label,actionIndex,useBox) ::= <<
-node [fontsize=11, label="<label><if(actionIndex)>,\naction:<actionIndex><endif>", <if(useBox)>shape=polygon,sides=4,peripheries=2,fixedsize=false<else>shape=doublecircle, fixedsize=true, width=.6<endif>]; <name>
+<name>[fontsize=11, label="<label><if(actionIndex)>,\naction:<actionIndex><endif>", <if(useBox)>shape=polygon,sides=4,peripheries=2,fixedsize=false<else>shape=doublecircle, fixedsize=true, width=.6<endif>];
 >>
diff --git a/tool/src/org/antlr/v4/tool/DOTGenerator.java b/tool/src/org/antlr/v4/tool/DOTGenerator.java
index 7efc1d160..21a042f89 100644
--- a/tool/src/org/antlr/v4/tool/DOTGenerator.java
+++ b/tool/src/org/antlr/v4/tool/DOTGenerator.java
@@ -237,6 +237,14 @@ public class DOTGenerator {
 				else if ( edge.isEpsilon() ) {
 					edgeST = stlib.getInstanceOf("epsilon-edge");
 					edgeST.add("label", getEdgeLabel(edge.toString()));
+					boolean loopback = false;
+					if (edge.target instanceof PlusBlockStartState) {
+						loopback = s.equals(((PlusBlockStartState)edge.target).loopBackState);
+					}
+					else if (edge.target instanceof StarLoopEntryState) {
+						loopback = s.equals(((StarLoopEntryState)edge.target).loopBackState);
+					}
+					edgeST.add("loopback", loopback);
 				}
 				else if ( edge instanceof AtomTransition ) {
 					edgeST = stlib.getInstanceOf("edge");
@@ -410,10 +418,28 @@ public class DOTGenerator {
 
 	protected String getStateLabel(ATNState s) {
 		if ( s==null ) return "null";
-		String stateLabel = String.valueOf(s.stateNumber);
+		String stateLabel = "";
+
+		if (s instanceof BlockStartState) {
+			stateLabel += "&rarr;\\n";
+		}
+		else if (s instanceof BlockEndState) {
+			stateLabel += "&larr;\\n";
+		}
+
+		stateLabel += String.valueOf(s.stateNumber);
+
+		if (s instanceof PlusBlockStartState || s instanceof PlusLoopbackState) {
+			stateLabel += "+";
+		}
+		else if (s instanceof StarBlockStartState || s instanceof StarLoopEntryState || s instanceof StarLoopbackState) {
+			stateLabel += "*";
+		}
+
 		if ( s instanceof DecisionState && ((DecisionState)s).decision>=0 ) {
 			stateLabel = stateLabel+"\\nd="+((DecisionState)s).decision;
 		}
+
 		return stateLabel;
 	}