diff --git a/templates/zephyr/index.html b/templates/zephyr/index.html
index 3862a41f96..75fdd8adf3 100644
--- a/templates/zephyr/index.html
+++ b/templates/zephyr/index.html
@@ -125,9 +125,7 @@ var people_list = [
                           <li id="filtpers"><a href="#narrow/is/private-message">All private messages</a></li>
                       </div>
                       <hr>
-                      <div id="user_presences_scroll">
-                        <div id="user_presences">
-                        </div>
+                      <div id="user_presences">
                       </div>
                   </ul>
               </div>
diff --git a/zephyr/static/js/ui.js b/zephyr/static/js/ui.js
index 92b3ef6c69..b5a2588fc4 100644
--- a/zephyr/static/js/ui.js
+++ b/zephyr/static/js/ui.js
@@ -924,7 +924,7 @@ exports.set_presence_list = function(users, presence_info) {
                                               e.preventDefault();
                                           });
         if (presence_info[email]) {
-            user.prepend($('<img>').addClass('active-icon').attr('src', '/static/images/green-dot.png'));
+            user.addClass('active-icon');
         }
 
         $('#user_presences').append(user);
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index 42378dd307..f6eb8de7f5 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -80,11 +80,21 @@ a:hover code {
     margin-top: 1em;
     overflow-y: hidden;
 }
-
 .bottom_sidebar:hover {
     overflow-y: auto;
 }
 
+#user_presences li {
+    margin-left: 15px;
+}
+#user_presences li.active-icon {
+    margin-left: 0px;
+}
+#user_presences li.active-icon:before {
+    content: url(/static/images/green-dot.png);
+    margin-right: 6px; /* +9px image = 15px */
+}
+
 ul.filters {
     list-style-type: none;
     padding-right: 1em;
@@ -876,19 +886,3 @@ table.floating_recipient {
     max-height: 400px;
     overflow-y: scroll;
 }
-
-li img.active-icon {
-    margin-left: -14px;
-    margin-right: 4px;
-    margin-bottom: 2px;
-}
-
-#user_presences_scroll {
-    max-height: 20em;
-
-    overflow: auto;
-}
-
-#user_presences {
-    margin-left: 16px;
-}