diff --git a/stylesheets/_android.scss b/stylesheets/_android.scss
index 162a29864..03824943e 100644
--- a/stylesheets/_android.scss
+++ b/stylesheets/_android.scss
@@ -37,12 +37,8 @@
     @include hourglass(#fff);
   }
 
-  .attachments .fileView {
-    margin-bottom: 0.5em;
-  }
-
   .incoming .bubble {
-    .sender, .content, .body, .meta, a {
+    .sender, .content, .body, .meta, a, .fileView {
       @include invert-text-color;
     }
     .attachments, .content {
@@ -51,6 +47,11 @@
       }
     }
   }
+
+  .incoming .bubble .fileView .icon::before {
+    @include color-svg('/images/file.svg', white);
+  }
+
   button.clock {
     @include header-icon-white('/images/clock.svg');
   }
diff --git a/stylesheets/android-dark.scss b/stylesheets/android-dark.scss
index f7c0b2ea7..85e00b969 100644
--- a/stylesheets/android-dark.scss
+++ b/stylesheets/android-dark.scss
@@ -138,20 +138,25 @@ $text-dark: #CCCCCC;
     @include hourglass(#fff);
   }
 
-  .attachments .fileView {
-    margin-bottom: 0.5em;
-  }
-
   .incoming .bubble {
-    .sender, .content, .body, .meta, a {
+    .sender, .content, .body, .meta, a, .fileView {
       @include invert-text-color;
     }
-    .attachments, .content {
+    .content {
       a {
         color: $grey_l;
       }
     }
   }
+
+  .incoming .bubble .fileView .icon::before {
+    @include color-svg('/images/file.svg', white);
+  }
+
+  .outgoing .bubble .fileView .icon::before {
+    @include color-svg('/images/file.svg', #CCCCCC);
+  }
+
   button.clock {
     @include header-icon-white('/images/clock.svg');
   }
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index 7f60aec2a..bfd594963 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -1735,15 +1735,17 @@ li.entry .error-icon-container {
     -webkit-mask: url("/images/hourglass_empty.svg") no-repeat center;
     -webkit-mask-size: 100%;
     background-color: #fff; }
-.android .attachments .fileView {
-  margin-bottom: 0.5em; }
-.android .incoming .bubble .sender, .android .incoming .bubble .content, .android .incoming .bubble .body, .android .incoming .bubble .meta, .android .incoming .bubble a {
+.android .incoming .bubble .sender, .android .incoming .bubble .content, .android .incoming .bubble .body, .android .incoming .bubble .meta, .android .incoming .bubble a, .android .incoming .bubble .fileView {
   color: white; }
-  .android .incoming .bubble .sender::selection, .android .incoming .bubble .content::selection, .android .incoming .bubble .body::selection, .android .incoming .bubble .meta::selection, .android .incoming .bubble a::selection {
+  .android .incoming .bubble .sender::selection, .android .incoming .bubble .content::selection, .android .incoming .bubble .body::selection, .android .incoming .bubble .meta::selection, .android .incoming .bubble a::selection, .android .incoming .bubble .fileView::selection {
     background: white;
     color: #454545; }
 .android .incoming .bubble .attachments a, .android .incoming .bubble .content a {
   color: #f3f3f3; }
+.android .incoming .bubble .fileView .icon::before {
+  -webkit-mask: url("/images/file.svg") no-repeat center;
+  -webkit-mask-size: 100%;
+  background-color: white; }
 .android button.clock {
   -webkit-mask: url("/images/clock.svg") no-repeat center;
   -webkit-mask-size: 100%;
@@ -1981,15 +1983,21 @@ li.entry .error-icon-container {
       -webkit-mask: url("/images/hourglass_empty.svg") no-repeat center;
       -webkit-mask-size: 100%;
       background-color: #fff; }
-  .android-dark .attachments .fileView {
-    margin-bottom: 0.5em; }
-  .android-dark .incoming .bubble .sender, .android-dark .incoming .bubble .content, .android-dark .incoming .bubble .body, .android-dark .incoming .bubble .meta, .android-dark .incoming .bubble a {
+  .android-dark .incoming .bubble .sender, .android-dark .incoming .bubble .content, .android-dark .incoming .bubble .body, .android-dark .incoming .bubble .meta, .android-dark .incoming .bubble a, .android-dark .incoming .bubble .fileView {
     color: white; }
-    .android-dark .incoming .bubble .sender::selection, .android-dark .incoming .bubble .content::selection, .android-dark .incoming .bubble .body::selection, .android-dark .incoming .bubble .meta::selection, .android-dark .incoming .bubble a::selection {
+    .android-dark .incoming .bubble .sender::selection, .android-dark .incoming .bubble .content::selection, .android-dark .incoming .bubble .body::selection, .android-dark .incoming .bubble .meta::selection, .android-dark .incoming .bubble a::selection, .android-dark .incoming .bubble .fileView::selection {
       background: white;
       color: #454545; }
-  .android-dark .incoming .bubble .attachments a, .android-dark .incoming .bubble .content a {
+  .android-dark .incoming .bubble .content a {
     color: #f3f3f3; }
+  .android-dark .incoming .bubble .fileView .icon::before {
+    -webkit-mask: url("/images/file.svg") no-repeat center;
+    -webkit-mask-size: 100%;
+    background-color: white; }
+  .android-dark .outgoing .bubble .fileView .icon::before {
+    -webkit-mask: url("/images/file.svg") no-repeat center;
+    -webkit-mask-size: 100%;
+    background-color: #CCCCCC; }
   .android-dark button.clock {
     -webkit-mask: url("/images/clock.svg") no-repeat center;
     -webkit-mask-size: 100%;