diff --git a/scm-ui/ui-components/src/Tooltip.tsx b/scm-ui/ui-components/src/Tooltip.tsx
index 5b71f91758..393b2213db 100644
--- a/scm-ui/ui-components/src/Tooltip.tsx
+++ b/scm-ui/ui-components/src/Tooltip.tsx
@@ -15,9 +15,9 @@ class Tooltip extends React.Component<Props> {
 
   render() {
     const { className, message, location, children } = this.props;
-    const multiline = message.length > 60 ? "is-tooltip-multiline" : "";
+    const multiline = message.length > 60 ? "has-tooltip-multiline" : "";
     return (
-      <span className={classNames("tooltip", "is-tooltip-" + location, multiline, className)} data-tooltip={message}>
+      <span className={classNames("tooltip", "has-tooltip-" + location, multiline, className)} data-tooltip={message}>
         {children}
       </span>
     );
diff --git a/scm-ui/ui-styles/public/index.html b/scm-ui/ui-styles/public/index.html
index ce3aaf0ecc..504398bfa1 100644
--- a/scm-ui/ui-styles/public/index.html
+++ b/scm-ui/ui-styles/public/index.html
@@ -627,7 +627,7 @@
                 <div class="field">
                   <label class="label">
                     Realm Description
-                    <span class="tooltip is-tooltip-right t-tooltip-0-1-10" data-tooltip="Enter authentication realm description"><i class="fa fa-question-circle has-text-info t-textinfo-0-1-11">&nbsp</i></span>
+                    <span class="tooltip has-tooltip-right t-tooltip-0-1-10" data-tooltip="Enter authentication realm description"><i class="fa fa-question-circle has-text-info t-textinfo-0-1-11">&nbsp</i></span>
                   </label>
                   <div class="control">
                     <input class="input" type="text" placeholder="" value="SONIA :: SCM Manager">
@@ -638,7 +638,7 @@
                 <div class="field">
                   <label class="label">
                     Date Format
-                    <span class="tooltip is-tooltip-right is-tooltip-multiline t-tooltip-0-1-10" data-tooltip="Moments date format. Please have a look at the momentjs documentation."><i class="fa fa-question-circle has-text-info t-textinfo-0-1-11">&nbsp</i></span>
+                    <span class="tooltip has-tooltip-right has-tooltip-multiline t-tooltip-0-1-10" data-tooltip="Moments date format. Please have a look at the momentjs documentation."><i class="fa fa-question-circle has-text-info t-textinfo-0-1-11">&nbsp</i></span>
                   </label>
                   <div class="control">
                     <input class="input" type="text" placeholder="" value="YYYY-MM-DD HH:mm:ss">
@@ -651,7 +651,7 @@
                 <div class="field">
                   <label class="label">
                     Plugin URL
-                    <span class="tooltip is-tooltip-right is-tooltip-multiline t-tooltip-0-1-10" data-tooltip="The url of the plugin repository. Explanation of the placeholders: version = SCM-Manager Version; os = Operation System; arch = Architecture"><i class="fa fa-question-circle has-text-info t-textinfo-0-1-11">&nbsp</i></span>
+                    <span class="tooltip has-tooltip-right has-tooltip-multiline t-tooltip-0-1-10" data-tooltip="The url of the plugin repository. Explanation of the placeholders: version = SCM-Manager Version; os = Operation System; arch = Architecture"><i class="fa fa-question-circle has-text-info t-textinfo-0-1-11">&nbsp</i></span>
                   </label>
                   <div class="control">
                     <input class="input" type="text" placeholder="" value="http://plugins.scm-manager.org/scm-plugin-backend/api/{version}/plugins?os={os}&amp;arch={arch}&amp;snapshot=false">
@@ -662,7 +662,7 @@
                 <div class="field">
                   <label class="label">
                     Default Namespace Strategy
-                    <span class="tooltip is-tooltip-right t-tooltip-0-1-10" data-tooltip="The default namespace strategy"><i class="fa fa-question-circle has-text-info t-textinfo-0-1-11">&nbsp</i></span>
+                    <span class="tooltip has-tooltip-right t-tooltip-0-1-10" data-tooltip="The default namespace strategy"><i class="fa fa-question-circle has-text-info t-textinfo-0-1-11">&nbsp</i></span>
                   </label>
                   <div class="control">
                     <input class="input" type="text" placeholder="" value="sonia.scm.repository.DefaultNamespaceStrategy">
@@ -677,7 +677,7 @@
                     <label class="checkbox">
                       <input type="checkbox" checked="">
                       Enabled XSRF Protection
-                      <span class="tooltip is-tooltip-right is-tooltip-multiline t-tooltip-0-1-10" data-tooltip="Enable Xsrf Cookie Protection. Note: This feature is still experimental."><i class="fa fa-question-circle has-text-info t-textinfo-0-1-11">&nbsp</i></span>
+                      <span class="tooltip has-tooltip-right has-tooltip-multiline t-tooltip-0-1-10" data-tooltip="Enable Xsrf Cookie Protection. Note: This feature is still experimental."><i class="fa fa-question-circle has-text-info t-textinfo-0-1-11">&nbsp</i></span>
                     </label>
                   </div>
                 </div>
@@ -688,7 +688,7 @@
                     <label class="checkbox">
                       <input type="checkbox">
                       Enable Repository Archive
-                      <span class="tooltip is-tooltip-right is-tooltip-multiline t-tooltip-0-1-10" data-tooltip="Enable repository archives. A complete page reload is required after a change of this value."><i class="fa fa-question-circle has-text-info t-textinfo-0-1-11">&nbsp</i></span>
+                      <span class="tooltip has-tooltip-right has-tooltip-multiline t-tooltip-0-1-10" data-tooltip="Enable repository archives. A complete page reload is required after a change of this value."><i class="fa fa-question-circle has-text-info t-textinfo-0-1-11">&nbsp</i></span>
                     </label>
                   </div>
                 </div>
@@ -701,7 +701,7 @@
                     <label class="checkbox">
                       <input type="checkbox">
                       Disable Grouping Grid
-                      <span class="tooltip is-tooltip-right is-tooltip-multiline t-tooltip-0-1-10" data-tooltip="Disable repository Groups. A complete page reload is required after a change of this value."><i class="fa fa-question-circle has-text-info t-textinfo-0-1-11">&nbsp</i></span>
+                      <span class="tooltip has-tooltip-right has-tooltip-multiline t-tooltip-0-1-10" data-tooltip="Disable repository Groups. A complete page reload is required after a change of this value."><i class="fa fa-question-circle has-text-info t-textinfo-0-1-11">&nbsp</i></span>
                     </label>
                   </div>
                 </div>
@@ -712,7 +712,7 @@
                     <label class="checkbox">
                       <input type="checkbox">
                       Anonymous Access Enabled
-                      <span class="tooltip is-tooltip-right t-tooltip-0-1-10" data-tooltip="Anonymous users have read access on public repositories."><i class="fa fa-question-circle has-text-info t-textinfo-0-1-11">&nbsp</i></span>
+                      <span class="tooltip has-tooltip-right t-tooltip-0-1-10" data-tooltip="Anonymous users have read access on public repositories."><i class="fa fa-question-circle has-text-info t-textinfo-0-1-11">&nbsp</i></span>
                     </label>
                   </div>
                 </div>
@@ -725,7 +725,7 @@
                     <label class="checkbox">
                       <input type="checkbox">
                       Skip Failed Authenticators
-                      <span class="tooltip is-tooltip-right is-tooltip-multiline t-tooltip-0-1-10" data-tooltip="Do not stop the authentication chain, if an authenticator finds the user but fails to authenticate the user."><i class="fa fa-question-circle has-text-info t-textinfo-0-1-11">&nbsp</i></span>
+                      <span class="tooltip has-tooltip-right has-tooltip-multiline t-tooltip-0-1-10" data-tooltip="Do not stop the authentication chain, if an authenticator finds the user but fails to authenticate the user."><i class="fa fa-question-circle has-text-info t-textinfo-0-1-11">&nbsp</i></span>
                     </label>
                   </div>
                 </div>
diff --git a/scm-webapp/src/main/resources/templates/repository-migration.mustache b/scm-webapp/src/main/resources/templates/repository-migration.mustache
index 9c76438667..0845655c90 100644
--- a/scm-webapp/src/main/resources/templates/repository-migration.mustache
+++ b/scm-webapp/src/main/resources/templates/repository-migration.mustache
@@ -36,13 +36,13 @@
         <th>Original name</th>
         <th>Type</th>
         <th>New namespace
-          <span class="tooltip is-tooltip-right is-tooltip-multiline t-tooltip-0-1-38" data-tooltip="The namespace of the repository. This will be part op the url. The new namespace must consist of letters, digits, dots, dashes and underscores (it must not start with a dash or a underscore)."><i class="fa fa-question-circle has-text-info t-textinfo-0-1-10"></i></span>
+          <span class="tooltip has-tooltip-right has-tooltip-multiline t-tooltip-0-1-38" data-tooltip="The namespace of the repository. This will be part op the url. The new namespace must consist of letters, digits, dots, dashes and underscores (it must not start with a dash or a underscore)."><i class="fa fa-question-circle has-text-info t-textinfo-0-1-10"></i></span>
         </th>
         <th>New name
-          <span class="tooltip is-tooltip-right is-tooltip-multiline t-tooltip-0-1-38" data-tooltip="The name of the repository. This will be part op the url. The new name must consist of letters, digits, dots, dashes and underscores (it must not start with a dash or a underscore)."><i class="fa fa-question-circle has-text-info t-textinfo-0-1-10"></i></span>
+          <span class="tooltip has-tooltip-right has-tooltip-multiline t-tooltip-0-1-38" data-tooltip="The name of the repository. This will be part op the url. The new name must consist of letters, digits, dots, dashes and underscores (it must not start with a dash or a underscore)."><i class="fa fa-question-circle has-text-info t-textinfo-0-1-10"></i></span>
         </th>
         <th>Strategy
-          <span class="tooltip is-tooltip-right is-tooltip-multiline t-tooltip-0-1-38" data-tooltip="The strategy used to migrate the data directory of the repository. See above for the means of the different strategies."><i class="fa fa-question-circle has-text-info t-textinfo-0-1-10"></i></span>
+          <span class="tooltip has-tooltip-right has-tooltip-multiline t-tooltip-0-1-38" data-tooltip="The strategy used to migrate the data directory of the repository. See above for the means of the different strategies."><i class="fa fa-question-circle has-text-info t-textinfo-0-1-10"></i></span>
           <br>Change all:
           <div class="field">
             <div class="control select">