diff --git a/assets/download-mac.png b/assets/download-mac.png
new file mode 100644
index 000000000..c26387382
Binary files /dev/null and b/assets/download-mac.png differ
diff --git a/assets/download-win.png b/assets/download-win.png
new file mode 100644
index 000000000..162a581b5
Binary files /dev/null and b/assets/download-win.png differ
diff --git a/pages/downloads.markdown b/pages/downloads.markdown
index 6cd17e519..1609ea6f0 100644
--- a/pages/downloads.markdown
+++ b/pages/downloads.markdown
@@ -13,24 +13,34 @@ tags: [uses_alerts]
 <div class="two-col left-box">
 <h2>Download the latest stable release</h2>
 
-<table class="cta-button">
-	<tr>
-		<td>
-			{% for asset in latest_release.assets %}
-				{% if asset.name contains 'RELEASE.exe' %}
-					<a href="{{ asset.browser_download_url }}" class="cta" title="Download the latest stable version of Greenshot" rel="nofollow" style="display:table-cell">Latest version</a>
-				{% endif %}
-			{% endfor %}
-		</td>
-	</tr>
-	<tr>
-		<td class="cta-description">
-		{% if latest_release %}
-			{{ latest_release.name }}<br>{{ latest_release.created_at | date_to_string }}
-		{% endif %}
-		</td>
-	</tr>
-</table>
+{% if latest_release %}
+	<h3>Latest Windows release version:</h3>
+	{{ latest_release.name }}<br>{{ latest_release.created_at | date_to_string }}
+{% endif %}
+
+<div class="clearfix"></div>
+<br>
+
+{% for asset in latest_release.assets %}
+	{% if asset.name contains 'RELEASE.exe' %}
+		<div class="cta-button-main" style="margin-right: 2em;">
+			<div class="btn-wrapper">
+				<div class="btn"><a href="{{ asset.browser_download_url }}"><img src="../assets/download-win.png"></a></div><br>
+				<div class="description">Greenshot for Windows<br>is free and open source!</div>
+			</div>
+		</div>
+	{% endif %}
+{% endfor %}
+
+<div class="cta-button-main">
+	<div class="btn-wrapper">
+		<div class="btn"><a href="https://itunes.apple.com/us/app/greenshot/id1103915944" target="_blank"><img src="../assets/download-mac.png"></a></div><br>
+		<div class="description">Only $1.99<br>to cover our own costs!</div>
+	</div>
+</div>
+
+<div class="clearfix"></div>
+<br><br>
 
 <p class="alert alert-info">
 	<i class="fa fa-info-circle"></i> In most cases, the latest stable version will be the best choice for you: it has been thoroughly tested by the community and is already used by myriads of people around the world. However, if you are looking for the latest unstable version, need an older version or the ZIP distribution, you will find everything you need in the <a href="/version-history/" title="Download other versions of Greenshot">version history</a>.
@@ -41,7 +51,7 @@ tags: [uses_alerts]
 
 <h2>Source code</h2>
 <p>If you want to have a look at the source code, you can do so in Greenshot's Git repositories at
-<a href="https://github.com/greenshot/greenshot/">GitHub</a> or 
+<a href="https://github.com/greenshot/greenshot/">GitHub</a> or
 <a href="https://bitbucket.org/greenshot/greenshot/">BitBucket</a>.</p>
 </div>