diff --git a/apps/mozorg/templates/mozorg/download_button_base.html b/apps/mozorg/templates/mozorg/download_button_base.html
index c5c139e7ec..c360900ccb 100644
--- a/apps/mozorg/templates/mozorg/download_button_base.html
+++ b/apps/mozorg/templates/mozorg/download_button_base.html
@@ -1,10 +1,4 @@
 <aside id="{{ id }}" class="download-button {% block class %}download-button-large{% endblock %}">
-  {% block noscript %}
-  <noscript>
-    {% include "mozorg/download_button_dumb.html" %}
-  </noscript>
-  {% endblock %}
-
   {% block unsupported %}
   <div class="unsupported-download">
     {% include "mozorg/download_button_dumb.html" %}
diff --git a/media/css/firefox/new.less b/media/css/firefox/new.less
index 0dfe5dc666..00bc5ec147 100644
--- a/media/css/firefox/new.less
+++ b/media/css/firefox/new.less
@@ -16,10 +16,6 @@
     }
 }
 
-.download-button {
-    width: 300px;
-}
-
 ul#benefits {
     padding: 4px 0 24px 12px;
     margin: 0;
@@ -49,12 +45,17 @@ ul#benefits li span {
     display: block;
 }
 
-
-.download-button small.download-other {
-    color: #ffcf72;
-    a:link,
-    a:visited {
+.download-button {
+    width: 300px;
+    small.download-other {
         color: #ffcf72;
+        a:link,
+        a:visited {
+            color: #ffcf72;
+        }
+    }
+    .unsupported-download h4 {
+        color: #fff;
     }
 }
 
diff --git a/media/css/sandstone/buttons.less b/media/css/sandstone/buttons.less
index dc39d23cef..57deafef65 100644
--- a/media/css/sandstone/buttons.less
+++ b/media/css/sandstone/buttons.less
@@ -91,10 +91,6 @@
 
 // Product download buttons
 
-.download-button .unsupported-download {
-    display: none;
-}
-
 .download-button {
     .inline-block;
     ul {
@@ -208,11 +204,17 @@ li.os_android,
     }
 }
 
-.other .download-button .unsupported-download {
-    display: block;
+.download-button .unsupported-download {
+    display: none;
+}
+
+.no-js,
+.other {
+    .download-button .unsupported-download {
+        display: block;
+    }
 }
 
-.download-button noscript,
 .download-button .unsupported-download {
     text-align: right;
     h4 {