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 33d430f..9979910 100644
--- a/src/panel/graph_panel/partials/analytic_units_5.x.html
+++ b/src/panel/graph_panel/partials/analytic_units_5.x.html
@@ -84,7 +84,7 @@
 
     <label class="gf-form-label">
       <a class="pointer" ng-click="ctrl.onRemove(analyticUnit.id)" role="menuitem">
-        <i class="fa fa-trash"></i>
+        <i class="fa fa-trash" bs-tooltip="'Delete'" ></i>
       </a>
     </label>
 
@@ -92,7 +92,7 @@
       (analyticUnit.detectorType === 'pattern' ||
       (analyticUnit.detectorType === 'anomaly' && analyticUnit.hasSeasonality)) &&
       !analyticUnit.selected
-    ">
+    " bs-tooltip="'Save'" >
       <a
         class="pointer"
         ng-style="analyticUnit.status === 'LEARNING' && { 'cursor': 'not-allowed' }"
@@ -112,7 +112,7 @@
       ng-disabled="analyticUnit.status === 'LEARNING'"
     />
 
-    <label class="gf-form-label" ng-if="analyticUnit.selected && !analyticUnit.saving">
+    <label class="gf-form-label" ng-if="analyticUnit.selected && !analyticUnit.saving" bs-tooltip="'Learn & Detect'">
       <a class="pointer" ng-click="ctrl.onCancelLabeling(analyticUnit.id)">
         <i class="fa fa-ban"></i>
       </a>
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 14bd65a..7c5133d 100644
--- a/src/panel/graph_panel/partials/analytic_units_6.x.html
+++ b/src/panel/graph_panel/partials/analytic_units_6.x.html
@@ -70,7 +70,10 @@
         </a>
       </button>
 
-      <button class="query-editor-row__action" ng-click="ctrl.onRemove(analyticUnit.id)">
+      <button class="query-editor-row__action"
+              ng-click="ctrl.onRemove(analyticUnit.id)"
+              bs-tooltip="'Delete'"
+      >
         <a class="pointer">
           <i class="fa fa-fw fa-trash"></i>
         </a>
@@ -79,8 +82,9 @@
       <button class="query-editor-row__action" ng-if="
         (analyticUnit.detectorType === 'pattern' ||
         (analyticUnit.detectorType === 'anomaly' && analyticUnit.hasSeasonality)) &&
-        !analyticUnit.selected
-      ">
+        !analyticUnit.selected"
+        bs-tooltip="'Save'"
+      >
         <a
           class="pointer"
           ng-style="analyticUnit.status === 'LEARNING' && { 'cursor': 'not-allowed' }"
@@ -100,7 +104,10 @@
         ng-disabled="analyticUnit.status === 'LEARNING'"
       />
 
-      <button class="query-editor-row__action" ng-if="analyticUnit.selected && !analyticUnit.saving">
+      <button class="query-editor-row__action"
+              ng-if="analyticUnit.selected && !analyticUnit.saving"
+              bs-tooltip="'Learn & Detect'"
+        >
         <a class="pointer" ng-click="ctrl.onCancelLabeling(analyticUnit.id)">
           <i class="fa fa-fw fa-ban"></i>
         </a>