diff --git a/data/i18n/en.yaml b/data/i18n/en.yaml
index 8eff1b43..f6be2f24 100644
--- a/data/i18n/en.yaml
+++ b/data/i18n/en.yaml
@@ -50,7 +50,7 @@ download:
   signup: LBRY is currently in invite only mode. Enter your email to join the waitlist, or your email and invite code for access.
   unavailable: LBRY is not yet out on your platform. You will receive an email as we expand LBRY to your preferred platform.
   verb: Download
-  windows: Arrival is expected this month.
+  windows: Download for Windows
   works: "Works with Ubuntu, Debian, or any distro with <code>apt</code> or <code>dpkg</code>."
 email:
   address: Email
diff --git a/view/template/download/_osx.php b/view/template/download/_osx.php
index 54f1d55e..92123bfc 100644
--- a/view/template/download/_osx.php
+++ b/view/template/download/_osx.php
@@ -11,7 +11,4 @@
            */ ?>
     >{{download.osx2}}</a>
   </p>
-  <p class="meta">{{download.github}}
-    <a href="https://github.com/lbryio/lbry-setup/blob/master/README_OSX.md" class="link-primary">GitHub</a>.
-  </p>
 </div>
\ No newline at end of file
diff --git a/view/template/download/_unavailable.php b/view/template/download/_unavailable.php
index 58ca2427..7bbcf809 100644
--- a/view/template/download/_unavailable.php
+++ b/view/template/download/_unavailable.php
@@ -1,8 +1,3 @@
 <div class="notice notice-info">
   <p>{{download.unavailable}}</p>
-  <?php if ($os == DownloadActions::OS_OSX): ?>
-    <p>{{download.osx}}</p>
-  <?php elseif ($os == DownloadActions::OS_WINDOWS): ?>
-    <p>{{download.windows}}</p>
-  <?php endif ?>
 </div>
\ No newline at end of file
diff --git a/view/template/download/_windows.php b/view/template/download/_windows.php
new file mode 100644
index 00000000..13cfb045
--- /dev/null
+++ b/view/template/download/_windows.php
@@ -0,0 +1,14 @@
+<div class="text-center">
+  <p>
+    <a class="btn-alt" <?php echo $downloadUrl ? 'download' : '' ?>
+       href="<?php echo $downloadUrl ?: 'https://github.com/lbryio/lbry/releases' ?>"
+      <?php /*
+           data-facebook-track-id="XXXXX"
+           data-twitter-track-id="XXXXX"
+           data-analytics-category="Sign Up"
+           data-analytics-action="Download"
+           data-analytics-label="OSX"
+           */ ?>
+    >{{download.windows}}</a>
+  </p>
+</div>
\ No newline at end of file