diff --git a/src/theme.scss b/src/theme.scss
index e5c38b04b..a2d5157bd 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -132,27 +132,13 @@ input[type="checkbox"], input[type="radio"] {
     margin-right: 5px;
 }
 
-.tooltip.long {
-    .tooltip-inner {
-        max-width: 400px;
-        white-space: unset;
-    }
-}
-
-.tooltip.long.nowrap {
-    .tooltip-inner {
-        white-space: nowrap;
-    }
-}
-
-.tooltip-inner {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
 .tooltip {
     pointer-events: none;
+
+    .tooltip-inner {
+        max-width: 800px;
+        white-space: nowrap;
+    }
 }
 
 .btn.pull-right {
diff --git a/src/views/apps.html b/src/views/apps.html
index 0a4c9fa1e..16b497984 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -120,7 +120,7 @@
       <div class="app-grid">
         <div class="grid-item" ng-repeat="app in installedApps | selectedGroupAccessFilter:selectedGroup | selectedStateFilter:selectedState | selectedTagFilter:selectedTags | selectedDomainFilter:selectedDomain | appSearchFilter:appSearch | orderBy:'fqdn'" ng-class="{ 'admin-action': app.manifest.configurePath && (app | applicationLink) }">
           <a ng-href="{{ app | applicationLink }}" ng-click="user.isAtLeastAdmin && (((app | installError) === true || (app | installationActive) === true) && showAppConfigure(app, 'repair')) || ((app | appIsInstalledAndHealthy) && app.pendingPostInstallConfirmation && appPostInstallConfirm.show(app))" target="_blank" ng-class="{ 'hand': (app | appIsInstalledAndHealthy) || (app | installError)  || (app | installationActive)}">
-            <div class="highlight grid-item-content" uib-tooltip="{{ app.fqdn }}" tooltip-class="long nowrap">
+            <div class="highlight grid-item-content" uib-tooltip="{{ app.fqdn }}">
               <div class="grid-item-top">
                 <div class="row">
                   <div class="col-xs-12 text-center" style="padding-left: 5px; padding-right: 5px;">
@@ -132,7 +132,7 @@
                 <div class="row">
                   <div class="col-xs-12 text-center">
                     <div class="grid-item-top-title" data-fittext>{{ app.label || app.location || app.fqdn }}</div>
-                    <div class="text-muted status" style="text-overflow: ellipsis; white-space: nowrap; overflow: hidden" uib-tooltip="{{ app | appProgressMessage }}" tooltip-class="long nowrap">
+                    <div class="text-muted status" style="text-overflow: ellipsis; white-space: nowrap; overflow: hidden" uib-tooltip="{{ app | appProgressMessage }}">
                       {{ app | installationStateLabel }}
                     </div>
                     <div class="status" ng-style="{ 'visibility': user.isAtLeastAdmin && (app | installationActive) ? 'visible' : 'hidden' }">
diff --git a/src/views/email.html b/src/views/email.html
index 2de6d6853..b6d637eda 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -412,8 +412,8 @@
                 <tbody>
                   <tr ng-repeat="list in mailinglists.mailinglists | filter:mailinglists.search | orderBy:'name'">
                     <td>
-                      <i class="fas fa-door-closed" ng-show="list.membersOnly" uib-tooltip="{{ 'email.incoming.mailinglists.membersOnlyTooltip' | tr }}" tooltip-class="long nowrap"></i>
-                      <i class="fas fa-door-open" ng-show="!list.membersOnly" uib-tooltip="{{ 'email.incoming.mailinglists.everyoneTooltip' | tr }}" tooltip-class="long nowrap"></i>
+                      <i class="fas fa-door-closed" ng-show="list.membersOnly" uib-tooltip="{{ 'email.incoming.mailinglists.membersOnlyTooltip' | tr }}"></i>
+                      <i class="fas fa-door-open" ng-show="!list.membersOnly" uib-tooltip="{{ 'email.incoming.mailinglists.everyoneTooltip' | tr }}"></i>
                     </td>
                     <td class="hand" ng-click="mailinglists.edit.show(list)">
                       {{ list.name }}
diff --git a/src/views/users.html b/src/views/users.html
index 5364dea3a..bf74378f6 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -495,9 +495,9 @@
                 </tr>
                 <tr ng-repeat="user in users" ng-class="{'text-muted': !user.active}">
                   <td>
-                    <i class="fas fa-crown arrow" ng-show="user.active && user.role === 'owner'" uib-tooltip="{{ 'users.users.superadminTooltip' | tr }}" tooltip-class="long nowrap"></i>
-                    <i class="fa fa-user-tie arrow" ng-show="user.active && user.role === 'admin'" uib-tooltip="{{ 'users.users.adminTooltip' | tr }}" tooltip-class="long nowrap"></i>
-                    <i class="fas fa-users-cog arrow" ng-show="user.active && user.role === 'usermanager'" uib-tooltip="{{ 'users.users.usermanagerTooltip' | tr }}" tooltip-class="long nowrap"></i>
+                    <i class="fas fa-crown arrow" ng-show="user.active && user.role === 'owner'" uib-tooltip="{{ 'users.users.superadminTooltip' | tr }}"></i>
+                    <i class="fa fa-user-tie arrow" ng-show="user.active && user.role === 'admin'" uib-tooltip="{{ 'users.users.adminTooltip' | tr }}"></i>
+                    <i class="fas fa-users-cog arrow" ng-show="user.active && user.role === 'usermanager'" uib-tooltip="{{ 'users.users.usermanagerTooltip' | tr }}"></i>
                     <i class="fa fa-ban" ng-show="!user.active" uib-tooltip="{{ 'users.users.inactiveTooltip' | tr }}"></i>
                   </td>
                   <td class="hand elide-table-cell" ng-click="canEdit(user) && useredit.show(user)" ng-show="user.username">