diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css
index ac8471915..e86798a9a 100644
--- a/styles/bootstrap/application.css
+++ b/styles/bootstrap/application.css
@@ -243,6 +243,12 @@ ul.jqtree-tree li.jqtree_common > .jqtree-element:hover {
 	bottom: 270px;
 }
 
+i.initstate {color: #ff9900;}
+i.released {color: #00b000;}
+i.rejected {color: #b00000;}
+i.in-workflow {color: #11479e;}
+i.workflow-action {color: #91479e;}
+
 @media (max-width: 480px) { 
     .nav-tabs > li {
         float:none;
diff --git a/views/bootstrap/class.WorkflowGraph.php b/views/bootstrap/class.WorkflowGraph.php
index 4a7cdb0c5..8fd2645b8 100644
--- a/views/bootstrap/class.WorkflowGraph.php
+++ b/views/bootstrap/class.WorkflowGraph.php
@@ -337,11 +337,11 @@ div.buttons button {margin: 3px; float: right;}
 <div id="preview">
 	<img id="png" />
 	<div id="legend">
-		<i class="icon-circle" style="color: #ff9900;"></i> <?php printMLText("workflow_initstate"); ?><br />
-		<i class="icon-circle" style="color: #00b000;"></i> <?php echo getOverallStatusText(S_RELEASED); ?><br />
-		<i class="icon-circle" style="color: #b00000;"></i> <?php echo getOverallStatusText(S_REJECTED); ?><br />
-		<i class="icon-circle" style="color: #11479e;"></i> <?php echo getOverallStatusText(S_IN_WORKFLOW); ?><br />
-		<i class="icon-sign-blank" style="color: #91479e;"></i> <?php echo printMLText('global_workflow_actions'); ?>
+		<i class="icon-circle initstate"></i> <?php printMLText("workflow_initstate"); ?><br />
+		<i class="icon-circle released"></i> <?php echo getOverallStatusText(S_RELEASED); ?><br />
+		<i class="icon-circle rejected"></i> <?php echo getOverallStatusText(S_REJECTED); ?><br />
+		<i class="icon-circle in-workflow"></i> <?php echo getOverallStatusText(S_IN_WORKFLOW); ?><br />
+		<i class="icon-sign-blank workflow-action"></i> <?php echo printMLText('global_workflow_actions'); ?>
 	</div>
 	<div class="buttons">
 		<button class="btn btn-mini" id="savelayout">Save layout</button>
diff --git a/views/bootstrap/class.WorkflowMgr.php b/views/bootstrap/class.WorkflowMgr.php
index f9c005d56..aab63f1b1 100644
--- a/views/bootstrap/class.WorkflowMgr.php
+++ b/views/bootstrap/class.WorkflowMgr.php
@@ -177,14 +177,14 @@ $(document).ready(function() {
 				if(!$transusers && !$transgroups) {
 					echo " class=\"error\"";
 				}
-				echo "><td>".$state->getName()."<br />";
-				echo $nextstate->getName();
+				echo "><td>".'<i class="icon-circle'.($workflow->getInitState()->getId() == $state->getId() ? ' initstate' : ' in-workflow').'"></i> '.$state->getName()."<br />";
 				$docstatus = $nextstate->getDocumentStatus();
+				echo '<i class="icon-circle'.($docstatus == S_RELEASED ? ' released' : ($docstatus == S_REJECTED ? ' rejected' : ' in-workflow')).'"></i> '.$nextstate->getName();
 				if($docstatus == S_RELEASED || $docstatus == S_REJECTED) {
 					echo "<br /><i class=\"icon-arrow-right\"></i> ".getOverallStatusText($docstatus);
 				}
 				echo "</td>";
-				echo "<td>".$action->getName()."</td>";
+				echo "<td><i class=\"icon-sign-blank workflow-action\"></i> ".$action->getName()."</td>";
 				echo "<td>";
 				foreach($transusers as $transuser) {
 					$u = $transuser->getUser();