diff --git a/js/models/messages.js b/js/models/messages.js
index 0bc89b8c9..fce803aa4 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -583,7 +583,7 @@
         }
       };
 
-      const firstAttachment = quote.attachments && quote.attachments[1];
+      const firstAttachment = quote.attachments && quote.attachments[0];
 
       return {
         text: this.createNonBreakingLastSeparator(quote.text),
diff --git a/stylesheets/_theme_dark.scss b/stylesheets/_theme_dark.scss
index 4a98d3a8b..fc90e38f7 100644
--- a/stylesheets/_theme_dark.scss
+++ b/stylesheets/_theme_dark.scss
@@ -673,7 +673,7 @@ body.dark-theme {
 
   .module-message__generic-attachment__icon {
     // TODO: this will eventually be a different image
-    background: url('../images/file-gradient.svg') no-repeat center;
+    // background: url('../images/file-gradient.svg') no-repeat center;
   }
 
   .module-message__generic-attachment__icon__extension {
@@ -963,7 +963,7 @@ body.dark-theme {
 
   .module-quote__generic-file__icon {
     // TODO: this will eventually be a different icon
-    background: url('../images/file-gradient.svg');
+    // background: url('../images/file-gradient.svg');
   }
   .module-quote__generic-file__text {
     color: $color-dark-05;