diff --git a/src/views/users.html b/src/views/users.html
index 8e4a00920..d777b9cae 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -331,9 +331,9 @@
                               </td>
 
                               <td class="text-right no-wrap" style="vertical-align: bottom">
-                                  <button ng-show="!isMe(user)" class="btn btn-xs btn-default" ng-click="invitation.show(user)" title="Create setup link"><i class="fa fa-paper-plane"></i></button>
-                                  <button class="btn btn-xs btn-default" ng-click="useredit.show(user)" title="Edit User"><i class="fa fa-pencil-alt"></i></button>
-                                  <button ng-show="!isMe(user)" class="btn btn-xs btn-danger" ng-click="userremove.show(user)" title="Remove User"><i class="far fa-trash-alt"></i></button>
+                                  <button ng-show="!isMe(user)" class="btn btn-xs btn-default" ng-click="invitation.show(user)" uib-tooltip="Create setup link"><i class="fa fa-paper-plane"></i></button>
+                                  <button class="btn btn-xs btn-default" ng-click="useredit.show(user)" uib-tooltip="Edit User"><i class="fa fa-pencil-alt"></i></button>
+                                  <button ng-show="!isMe(user)" class="btn btn-xs btn-danger" ng-click="userremove.show(user)" uib-tooltip="Remove User"><i class="far fa-trash-alt"></i></button>
                               </td>
                           </tr>
                       </tbody>
@@ -378,8 +378,8 @@
                                 {{ groupMembers(group) }}
                             </td>
                               <td class="text-right" style="vertical-align: bottom">
-                                    <button class="btn btn-xs btn-default" ng-click="groupEdit.show(group)" title="Edit Group"><i class="fa fa-pencil-alt"></i></button>
-                                  <button class="btn btn-xs btn-danger" ng-click="groupRemove.show(group)" title="Remove Group"><i class="far fa-trash-alt"></i></button>
+                                    <button class="btn btn-xs btn-default" ng-click="groupEdit.show(group)" uib-tooltip="Edit Group"><i class="fa fa-pencil-alt"></i></button>
+                                  <button class="btn btn-xs btn-danger" ng-click="groupRemove.show(group)" uib-tooltip="Remove Group"><i class="far fa-trash-alt"></i></button>
                               </td>
                           </tr>
                       </tbody>