diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/action-bar/action-bar.component.html b/zeppelin-web-angular/src/app/pages/workspace/notebook/action-bar/action-bar.component.html
index 1972a1e7dc9..56c52dc6616 100644
--- a/zeppelin-web-angular/src/app/pages/workspace/notebook/action-bar/action-bar.component.html
+++ b/zeppelin-web-angular/src/app/pages/workspace/notebook/action-bar/action-bar.component.html
@@ -22,7 +22,9 @@
     <nz-button-group nzSize="small">
       <button nz-button
               nz-popconfirm
-              nzTitle="Run all paragraphs?"
+              nzPopconfirmTitle="Run all paragraphs?"
+              nz-tooltip
+              nzTooltipTitle="Run all paragraphs"
               (nzOnConfirm)="runAllParagraphs()"
               [disabled]="revisionView || isNoteParagraphRunning">
         <i nz-icon nzType="play-circle" nzTheme="outline"></i>
@@ -45,9 +47,11 @@
       </button>
       <button nz-button
               nz-popconfirm
+              nzPopconfirmTitle="Do you want to clear all output?"
+              nz-tooltip
+              nzTooltipTitle="Clear all output"
               *ngIf="!viewOnly"
               [disabled]="revisionView"
-              nzTitle="Do you want to clear all output?"
               (nzOnConfirm)="clearAllParagraphOutput()">
         <i nz-icon nzType="fire" nzTheme="outline"></i>
       </button>
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/control/control.component.html b/zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/control/control.component.html
index 5ec5f52fccf..b21dc8a49d6 100644
--- a/zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/control/control.component.html
+++ b/zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/control/control.component.html
@@ -28,22 +28,28 @@
        (click)="runParagraph.emit()"
        nzType="play-circle"
        class="run-para"
-       nzTheme="outline"></i>
+       nzTheme="outline"
+       nz-tooltip
+       nzTooltipTitle="Run paragraph"></i>
     <i nz-icon
        *ngIf="status=='RUNNING' || status=='PENDING'"
        (click)="cancelParagraph.emit()"
        class="cancel-para"
        nzType="pause-circle"
-       nzTheme="outline"></i>
+       nzTheme="outline"
+       nz-tooltip
+       nzTooltipTitle="Cancel paragraph"></i>
   </a>
-  <a (click)="toggleEditor()">
+  <a (click)="toggleEditor()" nz-tooltip nzTooltipTitle="Show/hide the code">
     <i nz-icon [nzType]="editorHide ? 'fullscreen' : 'fullscreen-exit'" nzTheme="outline"></i>
   </a>
-  <a (click)="toggleOutput()">
+  <a (click)="toggleOutput()" nz-tooltip nzTooltipTitle="Show/hide the output">
     <i nz-icon [nzType]="tableHide ? 'book' : 'read'" nzTheme="outline"></i>
   </a>
   <a nz-dropdown [nzDropdownMenu]="menu" [nzTrigger]="'click'" [nzClickHide]="false" [(nzVisible)]="dropdownVisible">
-    <i nz-icon nzType="setting" nzTheme="outline"></i>
+    <span nz-tooltip nzTooltipTitle="More">
+      <i nz-icon nzType="setting" nzTheme="outline"></i>
+    </span>
   </a>
   <nz-dropdown-menu #menu="nzDropdownMenu">
     <ul nz-menu class="setting-menu">