diff --git a/Netdisco/share/public/css/netdisco.css b/Netdisco/share/public/css/netdisco.css
index 84d8da40..8e616940 100644
--- a/Netdisco/share/public/css/netdisco.css
+++ b/Netdisco/share/public/css/netdisco.css
@@ -200,6 +200,11 @@ td > form.nd_inline-form {
   color: #6D5720;
 }
 
+/* reset to normal weight for the download as CSV icon */
+#nd_csv-download {
+  font-weight: normal;
+}
+
 /* for the job control admin page play/pause links */
 #nd_countdown-refresh:hover, #nd_countdown-control:hover {
   text-decoration: none;
diff --git a/Netdisco/share/views/admintask.tt b/Netdisco/share/views/admintask.tt
index 2baad94e..f3433d0c 100644
--- a/Netdisco/share/views/admintask.tt
+++ b/Netdisco/share/views/admintask.tt
@@ -36,6 +36,12 @@
           <i id="nd_countdown-control-icon" class="text-success icon-play"></i></a>
         <span id="nd_countdown"></span>
       </span>
+      [% ELSIF task.provides_csv %]
+      <span id="nd_device-name">
+        <a id="nd_csv-download" href="#" download="netdisco.csv">
+          <i id="nd_csv-download-icon" class="icon-file-text-alt icon-large"
+            rel="tooltip" data-placement="left" data-offset="5" data-title="Download as CSV"></i></a>
+      </span>
       [% END %]
     </ul>
     <div class="tab-content">
diff --git a/Netdisco/share/views/device.tt b/Netdisco/share/views/device.tt
index bfa27799..067a9978 100644
--- a/Netdisco/share/views/device.tt
+++ b/Netdisco/share/views/device.tt
@@ -45,7 +45,12 @@
       [% FOREACH tab IN settings._device_tabs %]
       <li[% ' class="active"' IF params.tab == tab.tag %]><a id="[% tab.tag %]_link" href="#[% tab.tag %]_pane">[% tab.label %]</a></li>
       [% END %]
-      <span id="nd_device-name">[% d.dns || d.name | html_entity %]</span>
+      <span id="nd_device-name">
+        [% d.dns || d.name | html_entity %] &nbsp;
+        <a id="nd_csv-download" href="#" download="netdisco.csv">
+          <i id="nd_csv-download-icon" class="icon-file-text-alt icon-large"
+            rel="tooltip" data-placement="left" data-offset="5" data-title="Download as CSV"></i></a>
+      </span>
     </ul>
     <div class="tab-content">
       [% FOREACH tab IN settings._device_tabs %]
diff --git a/Netdisco/share/views/report.tt b/Netdisco/share/views/report.tt
index 6db3dce0..a73284b5 100644
--- a/Netdisco/share/views/report.tt
+++ b/Netdisco/share/views/report.tt
@@ -28,10 +28,13 @@
     <ul id="nd_search-results" class="nav nav-tabs">
       <li class="active"><a id="[% report.tag %]_link" class="nd_single-tab"
         href="#[% report.tag %]_pane">[% report.label %]</a></li>
+      [% IF report.provides_csv %]
       <span id="nd_device-name">
-        <a id="nd_csv-download" href="#" download="netdisco_report.csv">
-          <i id="nd_csv-download-icon" class="icon-file-text-alt"></i></a>
+        <a id="nd_csv-download" href="#" download="netdisco.csv">
+          <i id="nd_csv-download-icon" class="icon-file-text-alt icon-large"
+            rel="tooltip" data-placement="left" data-offset="5" data-title="Download as CSV"></i></a>
       </span>
+      [% END %]
     </ul>
     <div class="tab-content">
       <div class="tab-pane active" id="[% report.tag %]_pane"></div>
diff --git a/Netdisco/share/views/search.tt b/Netdisco/share/views/search.tt
index 59d1f584..12bc89f9 100644
--- a/Netdisco/share/views/search.tt
+++ b/Netdisco/share/views/search.tt
@@ -32,6 +32,11 @@
       [% FOREACH tab IN settings._search_tabs %]
       <li[% ' class="active"' IF params.tab == tab.tag %]><a id="[% tab.tag %]_link" href="#[% tab.tag %]_pane">[% tab.label %]</a></li>
       [% END %]
+      <span id="nd_device-name">
+        <a id="nd_csv-download" href="#" download="netdisco.csv">
+          <i id="nd_csv-download-icon" class="icon-file-text-alt icon-large"
+            rel="tooltip" data-placement="left" data-offset="5" data-title="Download as CSV"></i></a>
+      </span>
     </ul>
     <div class="tab-content">
       [% FOREACH tab IN settings._search_tabs %]