diff --git a/background.html b/background.html
index ce4387f1e..1ef69859c 100644
--- a/background.html
+++ b/background.html
@@ -78,9 +78,7 @@
           <p class="content">{{ message }}</p>
           <div class='meta'>
             <span class='timestamp'>{{ timestamp }}</span>
-            <span class='sinewave hide'></span>
-            <span class='checkmark hide'></span>
-            <span class='double-checkmark hide'></span>
+            <span class='status hide'></span>
           </div>
       </div>
   </script>
diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index bbc01d49d..ca4f2b3f8 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -189,37 +189,26 @@
   margin-right: 3px;
 }
 
-.sinewave {
-  background: url('/images/sinewave.png') repeat-x;
-  animation: backgroundScroll 0.5s linear infinite;
-}
-
 @keyframes backgroundScroll {
   from {background-position: 0 0;}
   to {background-position: -18px 0;}
 }
-.entry.sent .checkmark {
-  display: inline-block;
-  width: 18px;
-  height: 1em;
-  background: url('/images/check-white.png');
-}
-.entry.delivered {
-  .checkmark { display: none; }
-  .double-checkmark {
+.outgoing.entry {
+  .status {
     display: inline-block;
+    width: 18px;
+    height: 1em;
+  }
+  &.sent .status {
+    background: url('/images/check-white.png');
+  }
+  &.delivered .status {
     background: url('/images/double-check-white.png');
-    width: 18px;
-    height: 1em;
   }
-}
-.entry.pending {
-  .sinewave {
-    display: inline-block;
-    width: 18px;
-    height: 1em;
+  &.pending .status {
+    background: url('/images/sinewave.png') repeat-x;
+    animation: backgroundScroll 0.5s linear infinite;
   }
-  .double-checkmark, .checkmark { display: none; }
 }
 
 .message-list {
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index 59bcd98f3..add5bc8ad 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -673,35 +673,22 @@ input.search {
   font-size: smaller;
   margin-right: 3px; }
 
-.sinewave {
-  background: url("/images/sinewave.png") repeat-x;
-  animation: backgroundScroll 0.5s linear infinite; }
-
 @keyframes backgroundScroll {
   from {
     background-position: 0 0; }
   to {
     background-position: -18px 0; } }
-.entry.sent .checkmark {
+.outgoing.entry .status {
   display: inline-block;
   width: 18px;
-  height: 1em;
+  height: 1em; }
+.outgoing.entry.sent .status {
   background: url("/images/check-white.png"); }
-
-.entry.delivered .checkmark {
-  display: none; }
-.entry.delivered .double-checkmark {
-  display: inline-block;
-  background: url("/images/double-check-white.png");
-  width: 18px;
-  height: 1em; }
-
-.entry.pending .sinewave {
-  display: inline-block;
-  width: 18px;
-  height: 1em; }
-.entry.pending .double-checkmark, .entry.pending .checkmark {
-  display: none; }
+.outgoing.entry.delivered .status {
+  background: url("/images/double-check-white.png"); }
+.outgoing.entry.pending .status {
+  background: url("/images/sinewave.png") repeat-x;
+  animation: backgroundScroll 0.5s linear infinite; }
 
 .message-list {
   margin: 0;