diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 6ec5670483..a2b30bebb4 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -696,9 +696,12 @@ li.entry .error-icon-container {
 }
 
 .message-list .last-seen-indicator-view {
-  // We need this extra layer of DOM nodes because scrollIntoView() doesn't honor margins
-  padding-bottom: 2em;
-  padding-top: 2em;
+  // This padding is large so we clear the avatar circle extending into the conversation
+  // window.scrollIntoView() doesn't honor margins, so we're using padding
+  // padding-top is less to account for the 10px margin at the bottom of messages
+  padding-top: 25px;
+  padding-bottom: 35px;
+
 
   .bar {
     display: flex;
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index 0d38da99a0..1b4c278759 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -1506,8 +1506,8 @@ li.entry .error-icon-container {
     border-radius: 5px; }
 
 .message-list .last-seen-indicator-view {
-  padding-bottom: 2em;
-  padding-top: 2em; }
+  padding-top: 25px;
+  padding-bottom: 35px; }
   .message-list .last-seen-indicator-view .bar {
     display: flex;
     flex-direction: column;