diff --git a/templates/zephyr/home.html b/templates/zephyr/home.html
index 2c775db15c..b40b16e13b 100644
--- a/templates/zephyr/home.html
+++ b/templates/zephyr/home.html
@@ -41,15 +41,15 @@
                                     <table>
                                         <tbody>
                                           <tr>
-                                            <td colspan="2" class="zephyr_label_clickable zephyr_recipient zephyr_newstyle_class">
+                                            <td colspan="2" class="zephyr_label_clickable zephyr_newstyle_class">
                                               <input type="text" class="zephyr_recipient_box" name="class" id="class" value="" placeholder="Stream" autocomplete="off"/>
                                             </td>
-                                            <td class="zephyr_label_clickable zephyr_recipient zephyr_newstyle_instance">
+                                            <td class="zephyr_label_clickable zephyr_newstyle_instance">
                                               <input type="text" class="zephyr_recipient_box" name="instance" id="instance" value="" placeholder="Topic" autocomplete="off"/>
                                             </td>
                                           </tr>
                                           <tr>
-                                            <td class="zephyr_recipient"></td>
+                                            <td class="zephyr_picture"></td>
                                             <td class="pointer"></td>
                                             <td class="messagebox">
                                               <div class="zephyr_content">
@@ -71,15 +71,15 @@
                                     <table>
                                         <tbody>
                                           <tr>
-                                            <td colspan="2" class="zephyr_label_clickable zephyr_recipient zephyr_newstyle_class">
+                                            <td colspan="2" class="zephyr_label_clickable zephyr_newstyle_class">
                                               Huddle
                                             </td>
-                                            <td class="zephyr_label_clickable zephyr_recipient zephyr_newstyle_instance">
+                                            <td class="zephyr_label_clickable zephyr_newstyle_instance">
                                               <input type="text" class="zephyr_recipient_box" name="recipient" id="recipient" value="" placeholder="with one or more of your friends..." autocomplete="off"/>
                                             </td>
                                           </tr>
                                           <tr>
-                                            <td class="zephyr_recipient"></td>
+                                            <td class="zephyr_picture"></td>
                                             <td class="pointer"></td>
                                             <td class="messagebox">
                                               <div class="zephyr_content">
diff --git a/zephyr/jstemplates/zephyr.html b/zephyr/jstemplates/zephyr.html
index ae51efc885..03d7584adc 100644
--- a/zephyr/jstemplates/zephyr.html
+++ b/zephyr/jstemplates/zephyr.html
@@ -8,19 +8,19 @@
 {{#include_recipient}}
 {{^is_class}}
 <tr>
-    <td colspan="2" class="zephyr_label_clickable zephyr_recipient zephyr_newstyle_class" onclick="select_zephyr_by_id({{id}}); narrow_by_recipient();">Huddle</td>
-    <td class="zephyr_label_clickable zephyr_recipient zephyr_newstyle_instance" onclick="select_zephyr_by_id({{id}}); narrow_by_recipient();">{{display_reply_to}}</td>
+    <td colspan="2" class="zephyr_label_clickable zephyr_newstyle_class" onclick="select_zephyr_by_id({{id}}); narrow_by_recipient();">Huddle</td>
+    <td class="zephyr_label_clickable zephyr_newstyle_instance" onclick="select_zephyr_by_id({{id}}); narrow_by_recipient();">{{display_reply_to}}</td>
 </tr>
 {{/is_class}}
 {{#is_class}}
 <tr>
-    <td colspan="2" class="zephyr_label_clickable zephyr_recipient zephyr_newstyle_class" onclick="select_zephyr_by_id({{id}}); narrow_class();">{{display_recipient}}</td>
-    <td class="zephyr_label_clickable zephyr_recipient zephyr_newstyle_instance" onclick="select_zephyr_by_id({{id}}); narrow_instance();">{{instance}}</td>
+    <td colspan="2" class="zephyr_label_clickable zephyr_newstyle_class" onclick="select_zephyr_by_id({{id}}); narrow_class();">{{display_recipient}}</td>
+    <td class="zephyr_label_clickable zephyr_newstyle_instance" onclick="select_zephyr_by_id({{id}}); narrow_instance();">{{instance}}</td>
 </tr>
 {{/is_class}}
 {{/include_recipient}}
 <tr zid="{{id}}" id="{{dom_id}}" class="zephyr_row" onmouseover="select_zephyr_by_id({{id}});">
-    <td class="zephyr_recipient">
+    <td class="zephyr_picture">
     {{#include_sender}}
         <img class="img-rounded profile_picture" src="https://secure.gravatar.com/avatar/{{gravatar_hash}}?d=identicon&s=30"/>
     {{/include_sender}}
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index 60daa719eb..3b461a078f 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -69,15 +69,11 @@ td.pointer {
     width: 2px;
 }
 
-td.zephyr_recipient {
+.zephyr_picture {
     vertical-align: top;
-    text-align:     right;
-    overflow-x:     hidden;
-    padding-right:   10px;
-    padding-top:      5px;
-    max-width:      80px;
-    min-width:      80px;
-    white-space:    nowrap;
+    text-align: right;
+    padding-right: 10px;
+    padding-top: 5px;
 }
 
 td.zephyr_newstyle_class {