diff --git a/src/panel/graph_panel/partials/analytic_units_5.x.html b/src/panel/graph_panel/partials/analytic_units_5.x.html
index 9979910..54187ad 100644
--- a/src/panel/graph_panel/partials/analytic_units_5.x.html
+++ b/src/panel/graph_panel/partials/analytic_units_5.x.html
@@ -82,17 +82,20 @@
       </a>
     </label>
 
-    <label class="gf-form-label">
+    <label class="gf-form-label" bs-tooltip="'Delete'">
       <a class="pointer" ng-click="ctrl.onRemove(analyticUnit.id)" role="menuitem">
-        <i class="fa fa-trash" bs-tooltip="'Delete'" ></i>
+        <i class="fa fa-trash"></i>
       </a>
     </label>
 
-    <div class="gf-form-label" ng-if="
-      (analyticUnit.detectorType === 'pattern' ||
-      (analyticUnit.detectorType === 'anomaly' && analyticUnit.hasSeasonality)) &&
-      !analyticUnit.selected
-    " bs-tooltip="'Save'" >
+    <div class="gf-form-label"
+      ng-if="
+        (analyticUnit.detectorType === 'pattern' ||
+        (analyticUnit.detectorType === 'anomaly' && analyticUnit.hasSeasonality)) &&
+        !analyticUnit.selected
+      "
+      bs-tooltip="'Label'"
+    >
       <a
         class="pointer"
         ng-style="analyticUnit.status === 'LEARNING' && { 'cursor': 'not-allowed' }"
@@ -112,7 +115,10 @@
       ng-disabled="analyticUnit.status === 'LEARNING'"
     />
 
-    <label class="gf-form-label" ng-if="analyticUnit.selected && !analyticUnit.saving" bs-tooltip="'Learn & Detect'">
+    <label class="gf-form-label"
+      ng-if="analyticUnit.selected && !analyticUnit.saving"
+      bs-tooltip="'Cancel labeling'"
+    >
       <a class="pointer" ng-click="ctrl.onCancelLabeling(analyticUnit.id)">
         <i class="fa fa-ban"></i>
       </a>
@@ -121,6 +127,7 @@
     <label class="gf-form-label"
       ng-click="ctrl.runDetectInCurrentRange(analyticUnit)"
       ng-disabled="analyticUnit.status === 'LEARNING' || analyticUnit.saving"
+      bs-tooltip="'Learn & Detect'"
     >
       <a class="pointer">
         Apply
diff --git a/src/panel/graph_panel/partials/analytic_units_6.x.html b/src/panel/graph_panel/partials/analytic_units_6.x.html
index 7c5133d..de0a8f0 100644
--- a/src/panel/graph_panel/partials/analytic_units_6.x.html
+++ b/src/panel/graph_panel/partials/analytic_units_6.x.html
@@ -71,8 +71,8 @@
       </button>
 
       <button class="query-editor-row__action"
-              ng-click="ctrl.onRemove(analyticUnit.id)"
-              bs-tooltip="'Delete'"
+        ng-click="ctrl.onRemove(analyticUnit.id)"
+        bs-tooltip="'Delete'"
       >
         <a class="pointer">
           <i class="fa fa-fw fa-trash"></i>
@@ -83,7 +83,7 @@
         (analyticUnit.detectorType === 'pattern' ||
         (analyticUnit.detectorType === 'anomaly' && analyticUnit.hasSeasonality)) &&
         !analyticUnit.selected"
-        bs-tooltip="'Save'"
+        bs-tooltip="'Label'"
       >
         <a
           class="pointer"
@@ -105,9 +105,9 @@
       />
 
       <button class="query-editor-row__action"
-              ng-if="analyticUnit.selected && !analyticUnit.saving"
-              bs-tooltip="'Learn & Detect'"
-        >
+        ng-if="analyticUnit.selected && !analyticUnit.saving"
+        bs-tooltip="'Cancel labeling'"
+      >
         <a class="pointer" ng-click="ctrl.onCancelLabeling(analyticUnit.id)">
           <i class="fa fa-fw fa-ban"></i>
         </a>
@@ -116,6 +116,7 @@
       <button class="query-editor-row__action"
         ng-click="ctrl.runDetectInCurrentRange(analyticUnit)"
         ng-disabled="analyticUnit.status === 'LEARNING' || analyticUnit.saving"
+        bs-tooltip="'Learn & Detect'"
       >
         <a class="pointer">
           Apply