diff --git a/web/styles/popovers.css b/web/styles/popovers.css
index ec2517abca..928193044c 100644
--- a/web/styles/popovers.css
+++ b/web/styles/popovers.css
@@ -429,11 +429,18 @@ ul {
     }
 
     .user_profile_edit_button {
-        margin-left: 10px;
         width: 25px;
         text-align: center;
     }
 
+    .user_profile_name {
+        margin-right: 10px;
+    }
+
+    .zulip-icon.zulip-icon-bot {
+        padding: 3px 0 0;
+    }
+
     #user_profile_edit_button_icon {
         font-size: 18px;
     }
diff --git a/web/templates/user_profile_modal.hbs b/web/templates/user_profile_modal.hbs
index 8da4d6151c..d5c7e9d197 100644
--- a/web/templates/user_profile_modal.hbs
+++ b/web/templates/user_profile_modal.hbs
@@ -2,9 +2,11 @@
     <div class="modal__overlay" tabindex="-1">
         <div class="modal__container new-style" role="dialog" aria-modal="true" aria-labelledby="dialog_title">
             <div class="modal__header">
+                {{#unless is_bot}}
                 <div class="tippy-zulip-tooltip" data-tippy-content="{{last_seen}}">
                     <span class="{{user_circle_class}} user_circle user_profile_presence"></span>
                 </div>
+                {{/unless}}
                 <h1 class="modal__title user_profile_name_heading" id="name">
                     <span class="user_profile_name">{{full_name}}</span>
                     {{#if is_bot}}