diff --git a/_includes/download.html b/_includes/download.html
index d18fe6fb..9187412c 100644
--- a/_includes/download.html
+++ b/_includes/download.html
@@ -24,7 +24,11 @@
 					<p>Latest update: {{ release_nightly.created_at | date: "%Y-%m-%d" }}</p>
 					<p>Read our release notes on <a href="{{ release_nightly.html_url }}">GitHub</a>.</p>
 					{% for asset in release_nightly.assets %}
-					<a class="btn" href="{{ asset.browser_download_url }}">{{ asset.name }}</a>
+                        {% assign currentReleaseData = asset.name | split:".zip" | first | split:"_" %}
+                        {% assign currentReleaseTitle = 'Vocaluxe ' | append: currentReleaseData[1] %}
+                        {% assign currentReleaseOs = currentReleaseData[2] %}
+                        {% assign currentReleaseArch = currentReleaseData[3] %}
+                        {% include downloadButton.html title=currentReleaseTitle os=currentReleaseOs arch=currentReleaseArch %}
 					{% endfor %}
 				</span>
 				{% else %}
@@ -39,7 +43,11 @@
 					<p>Latest version: {{release_pre.name}} ({{ release_pre.created_at | date: "%Y-%m-%d" }})</p>
 					<p>Read our release notes on <a href="{{ release_pre.html_url }}">GitHub</a>.</p>
 					{% for asset in release_pre.assets %}
-					<a class="btn" href="{{ asset.browser_download_url }}">{{ asset.name }}</a>
+                        {% assign currentReleaseData = asset.name | split:".zip" | first | split:"_" %}
+                        {% assign currentReleaseTitle = 'Vocaluxe ' | append: release_pre.name %}
+                        {% assign currentReleaseOs = currentReleaseData[2] %}
+                        {% assign currentReleaseArch = currentReleaseData[3] %}
+                        {% include downloadButton.html title=currentReleaseTitle os=currentReleaseOs arch=currentReleaseArch %}
 					{% endfor %}
 				</span>
 				{% else %}
@@ -54,7 +62,11 @@
 					<p>Latest version: {{release_stable.name}} ({{ release_stable.created_at | date: "%Y-%m-%d" }})</p>
 					<p>Read our release notes on <a href="{{ release_stable.html_url }}">GitHub</a>.</p>
 					{% for asset in release_stable.assets %}
-						<a class="btn" href="{{ asset.browser_download_url }}">{{ asset.name }}</a>
+						{% assign currentReleaseData = asset.name | split:".zip" | first | split:"_" %}
+                        {% assign currentReleaseTitle = 'Vocaluxe ' | append: release_stable.name %}
+                        {% assign currentReleaseOs = currentReleaseData[2] | downcase %}
+                        {% assign currentReleaseArch = currentReleaseData[3] %}
+                        {% include downloadButton.html title=currentReleaseTitle os=currentReleaseOs arch=currentReleaseArch %}
 					{% endfor %}
 				</span>	
 				{% else %}
diff --git a/_includes/downloadButton.html b/_includes/downloadButton.html
new file mode 100644
index 00000000..686a85ae
--- /dev/null
+++ b/_includes/downloadButton.html
@@ -0,0 +1,8 @@
+<a href="#" class="btn btn-primary btn-lg btnDownload">
+    {% if include.os == "linux" %}
+    <span class="fa fa-linux btnDownloadIcon" aria-hidden="true"></span>
+    {% else %}
+    <span class="fa fa-windows btnDownloadIcon" aria-hidden="true"></span>
+    {% endif %}
+    <span>{{include.title}} ({{include.arch}})</span>
+</a>    
\ No newline at end of file