diff --git a/web/styles/dark_theme.css b/web/styles/dark_theme.css
index 4062a3fa83..2b0a5fcaef 100644
--- a/web/styles/dark_theme.css
+++ b/web/styles/dark_theme.css
@@ -59,6 +59,16 @@
     }
 
     /************************* MODAL DARK THEME *******************/
+    .user_profile_manage_own_edit_button,
+    .user_profile_manage_others_edit_button {
+        color: hsl(200deg 100% 50%);
+        cursor: pointer;
+
+        &:hover {
+            color: hsl(200deg 79% 66%);
+        }
+    }
+
     .dialog_exit_button {
         background-color: hsl(211deg 29% 14%);
         color: hsl(0deg 0% 100%);
diff --git a/web/styles/modal.css b/web/styles/modal.css
index 79c3b2292e..fc4ceb357f 100644
--- a/web/styles/modal.css
+++ b/web/styles/modal.css
@@ -60,12 +60,13 @@
         text-overflow: ellipsis;
     }
 
+    .user_profile_manage_own_edit_button,
     .user_profile_manage_others_edit_button {
         color: hsl(200deg 100% 50%);
         cursor: pointer;
 
         &:hover {
-            color: hsl(200deg 79% 66%);
+            color: hsl(200deg 100% 25%);
         }
     }
 }
diff --git a/web/styles/popovers.css b/web/styles/popovers.css
index 47fc705926..045d3473c4 100644
--- a/web/styles/popovers.css
+++ b/web/styles/popovers.css
@@ -506,10 +506,15 @@ ul {
     .user_profile_manage_own_edit_button,
     .user_profile_manage_others_edit_button {
         width: 25px;
+        height: 14px;
         text-align: center;
         font-size: 18px;
     }
 
+    #user_profile_manage_own_edit_link {
+        height: 25px;
+    }
+
     .deactivated-user-icon {
         margin: -1px;
         vertical-align: middle;
diff --git a/web/templates/user_profile_modal.hbs b/web/templates/user_profile_modal.hbs
index 6cfa6b2ea6..2ae5bf31c7 100644
--- a/web/templates/user_profile_modal.hbs
+++ b/web/templates/user_profile_modal.hbs
@@ -19,7 +19,7 @@
                     {{/if}}
                     <span class="user_profile_name">{{> user_full_name name=full_name}}</span>
                     {{#if is_me}}
-                        <a href="/#settings/profile">
+                        <a id="user_profile_manage_own_edit_link" href="/#settings/profile">
                             <i class="fa fa-edit tippy-zulip-tooltip user_profile_manage_own_edit_button" data-tippy-content="{{t 'Edit profile' }}" aria-hidden="true"></i>
                         </a>
                     {{/if}}