diff --git a/frontend/src/Search/Mobile/SearchIndexOverview.js b/frontend/src/Search/Mobile/SearchIndexOverview.js
index 235ceb65d..1a14ae66c 100644
--- a/frontend/src/Search/Mobile/SearchIndexOverview.js
+++ b/frontend/src/Search/Mobile/SearchIndexOverview.js
@@ -37,6 +37,18 @@ function getDownloadIcon(isGrabbing, isGrabbed, grabError) {
   return icons.DOWNLOAD;
 }
 
+function getDownloadKind(isGrabbed, grabError) {
+  if (isGrabbed) {
+    return kinds.SUCCESS;
+  }
+
+  if (grabError) {
+    return kinds.DANGER;
+  }
+
+  return kinds.DEFAULT;
+}
+
 function getDownloadTooltip(isGrabbing, isGrabbed, grabError) {
   if (isGrabbing) {
     return '';
@@ -115,7 +127,7 @@ class SearchIndexOverview extends Component {
               <div className={styles.actions}>
                 <SpinnerIconButton
                   name={getDownloadIcon(isGrabbing, isGrabbed, grabError)}
-                  kind={grabError ? kinds.DANGER : kinds.DEFAULT}
+                  kind={getDownloadKind(isGrabbed, grabError)}
                   title={getDownloadTooltip(isGrabbing, isGrabbed, grabError)}
                   isDisabled={isGrabbed}
                   isSpinning={isGrabbing}
diff --git a/frontend/src/Search/Table/SearchIndexRow.js b/frontend/src/Search/Table/SearchIndexRow.js
index 5d1920cc9..67c267696 100644
--- a/frontend/src/Search/Table/SearchIndexRow.js
+++ b/frontend/src/Search/Table/SearchIndexRow.js
@@ -30,6 +30,18 @@ function getDownloadIcon(isGrabbing, isGrabbed, grabError) {
   return icons.DOWNLOAD;
 }
 
+function getDownloadKind(isGrabbed, grabError) {
+  if (isGrabbed) {
+    return kinds.SUCCESS;
+  }
+
+  if (grabError) {
+    return kinds.DANGER;
+  }
+
+  return kinds.DEFAULT;
+}
+
 function getDownloadTooltip(isGrabbing, isGrabbed, grabError) {
   if (isGrabbing) {
     return '';
@@ -303,7 +315,7 @@ class SearchIndexRow extends Component {
                 >
                   <SpinnerIconButton
                     name={getDownloadIcon(isGrabbing, isGrabbed, grabError)}
-                    kind={grabError ? kinds.DANGER : kinds.DEFAULT}
+                    kind={getDownloadKind(isGrabbed, grabError)}
                     title={getDownloadTooltip(isGrabbing, isGrabbed, grabError)}
                     isDisabled={isGrabbed}
                     isSpinning={isGrabbing}