diff --git a/content/en/_index.md b/content/en/_index.md
index 36a9dd78be448ccb6779182a8380cb1eb63a3936..99884868f9d279dc20901b3b7b30a1d8d04a0e9e 100644
--- a/content/en/_index.md
+++ b/content/en/_index.md
@@ -4,7 +4,7 @@ subtitle: Gajim, a fully-featured XMPP chat client
 comments: false
 ---
 
-{{< start_block label="Download" >}}
+{{< start_block label_win="Download for Windows" label_mac="Install on MacOS" label_linux="Install on Linux" label_other="Other platforms" >}}
 
 {{< row >}}
 {{< feature_item icon="fa-project-diagram" header="Decentralized Messaging" text="Connect to your contacts using a server of your choice. Gajim works well with other [chat clients](https://xmpp.org/software/clients.html) and supports multiple accounts.">}}
diff --git a/themes/beautifulhugo/layouts/shortcodes/start_block.html b/themes/beautifulhugo/layouts/shortcodes/start_block.html
index 6a1b51436dbdc9a8e6902dcdd1865b34fddc1c9c..20ec07f067712770cedb9d9598972201e8b52259 100644
--- a/themes/beautifulhugo/layouts/shortcodes/start_block.html
+++ b/themes/beautifulhugo/layouts/shortcodes/start_block.html
@@ -4,14 +4,24 @@
         <img src="/img/gajim-logo.png"/>
       </td>
       <td>
-        <div class="dropdown show">
-          <a class="btn btn-success dropdown-toggle" href="#" role="button" id="downloadDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{ .Get "label" }}</a>
-          <div class="dropdown-menu" aria-labelledby="downloadDropdown">
-            <a class="dropdown-item" href="{{ .Site.LanguagePrefix }}/download#windows">Windows</a>
-            <a class="dropdown-item" href="{{ .Site.LanguagePrefix }}/download#macos">MacOS</a>
-            <a class="dropdown-item" href="{{ .Site.LanguagePrefix }}/download#linux">Linux</a>
-          </div>
+        <div>
+          <a id="download_btn" href="{{ .Site.Data.Gajim.WinSetup64 }}" class="btn btn-success" role="button"><i class="fas fa-download"></i>&nbsp;&nbsp;&nbsp;{{ .Get "label_win" }}</a>
         </div>
+          <p class="download-other">
+            <span>Gajim {{ .Site.Data.Gajim.StableVersion }} · </span>
+            <a href="{{ .Site.LanguagePrefix }}/download">{{ .Get "label_other" }}</a>
+          </p>
       </td>
     </tr>
 </table>
+<script>
+  var btn = document.getElementById("download_btn")
+  if (navigator.appVersion.indexOf("Mac") != -1) {
+      btn.href = "{{ .Site.LanguagePrefix }}/download#macos"
+      btn.innerHTML = '{{ .Get "label_mac" }}'
+  }
+  if (navigator.appVersion.indexOf("Linux") != -1) {
+      btn.href = "{{ .Site.LanguagePrefix }}/download#linux"
+      btn.innerHTML = '{{ .Get "label_linux" }}'
+  }
+</script>
diff --git a/themes/beautifulhugo/static/css/main.css b/themes/beautifulhugo/static/css/main.css
index 0df0462f8b3dc9e9b644a1bb1c38cf290fb66393..af5924658c8415dd84da3c83e827577e861cf37a 100644
--- a/themes/beautifulhugo/static/css/main.css
+++ b/themes/beautifulhugo/static/css/main.css
@@ -884,6 +884,10 @@ input.gsc-input, .gsc-input-box, .gsc-input-box-hover, .gsc-input-box-focus, .gs
 .startpage-download tr td img {
   float: right;
 }
+.download-other {
+  margin-top: 0.4rem;
+  font-size: 14px !important;
+}
 .d-flex {
   display: -webkit-box!important;
   display: flex!important;