diff --git a/_config.yml b/_config.yml
index b8c6e4a1ddf5b6..457902b1243e9b 100644
--- a/_config.yml
+++ b/_config.yml
@@ -158,6 +158,7 @@ icon-tag:
   galaxy-tags: fas fa-tags
   galaxy-toggle: fas fa-toggle-on
   galaxy-upload: fas fa-upload
+  galaxy-download: fas fa-download
   galaxy-wf-connection: fas fa-arrows-alt-h
   galaxy-wf-edit: fa fa-edit
   galaxy-wf-new: fas fa-plus
diff --git a/_layouts/workflow.html b/_layouts/workflow.html
index 59782a676ec2f8..11ead822106762 100644
--- a/_layouts/workflow.html
+++ b/_layouts/workflow.html
@@ -60,7 +60,10 @@ <h1 data-toc-skip>{{ workflow.title }}</h1>
 			{% icon galaxy-tags %}
 			<b>Tags</b>
 			<br/>
-			{{ workflow.tags | join: ", " }}
+
+			{% for tag in workflow.tags %}
+			<div class="label label-default tutorial_tag" style="{{ tag | colour_tag }}">{{ tag }}</div>
+			{% endfor %}
 			</br>
 			{% endif %}
 
@@ -125,9 +128,6 @@ <h1 data-toc-skip>{{ workflow.title }}</h1>
 			<a href="{% link faqs/galaxy/tutorial_mode.md %}" class="show-when-galaxy-proxy-active">{% icon question %}</a>
 			<br/>
 
-			<a class="btn btn-secondary" href="{{ site.url }}{{ site.baseurl }}/{{ workflow.path }}">
-				Download
-			</a>
 			<span class="dropdown">
 				<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
 					<img src="{% link assets/images/galaxylogo.png %}" style="height: 16px" alt="galaxy logo"/> 
@@ -143,6 +143,10 @@ <h1 data-toc-skip>{{ workflow.title }}</h1>
 					</li>
 				</ul>
 			</span>
+			<a class="btn btn-primary" href="{{ site.url }}{{ site.baseurl }}/{{ workflow.path }}">
+				{% icon galaxy-download %}
+				Download
+			</a>
 			<pre class="mermaid">{{ workflow.mermaid }}</pre>
 
 			<p>To use these workflows in Galaxy you can either click the links to download the workflows, or you can right-click and copy the link to the workflow which can be used in the Galaxy form to import workflows.</p>