diff --git a/admin/themes/default/template/user_list.tpl b/admin/themes/default/template/user_list.tpl
index 2ef8e32ce..9cf9e3ac5 100644
--- a/admin/themes/default/template/user_list.tpl
+++ b/admin/themes/default/template/user_list.tpl
@@ -610,7 +610,7 @@ jQuery(document).ready(function() {
     },
     {
       "mRender": function(data, type, full) {
-        return '<span title="Open user details" class="icon-angle-circled-down openUserDetails"></span> <label><input type="checkbox" data-user_id="'+full[0]+'"> '+data+'</label>';
+        return '<label><input type="checkbox" data-user_id="'+full[0]+'"> '+data+'</label> <a title="Open user details" class="icon-angle-circled-down openUserDetails">{/literal}{'edit'|translate}{literal}</a>';
       }
     }
   ];
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index f8f010e91..5bd413bc1 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -1159,11 +1159,8 @@ a.group_perm {
   right: 5px;
 }
 
-.openUserDetails {
-  font-size:16px;
-  margin-left:-8px;
-  cursor:pointer;
-}
+#userList .openUserDetails {visibility:hidden;}
+#userList tr:hover .openUserDetails {visibility:visible;}
 
 .userProperties {max-width:730px;}
 .userPropertiesContainer {border-top:1px solid #ddd;margin-top:1em;}