diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js
index 7c52029dd..61968da31 100644
--- a/apps/common/main/lib/component/Button.js
+++ b/apps/common/main/lib/component/Button.js
@@ -467,8 +467,10 @@ define([
             var cmpEl = this.cmpEl,
                 modalParents = cmpEl.closest('.asc-window');
 
+            if (cmpEl.data('bs.tooltip'))
+                cmpEl.removeData('bs.tooltip');
             cmpEl.attr('data-toggle', 'tooltip');
-            cmpEl.tooltip('destroy').tooltip({
+            cmpEl.tooltip({
                 title       : hint,
                 placement   : this.options.hintAnchor || 'cursor'
             });
diff --git a/apps/spreadsheeteditor/main/app/controller/RightMenu.js b/apps/spreadsheeteditor/main/app/controller/RightMenu.js
index 403f6f009..a004411b9 100644
--- a/apps/spreadsheeteditor/main/app/controller/RightMenu.js
+++ b/apps/spreadsheeteditor/main/app/controller/RightMenu.js
@@ -150,6 +150,7 @@ define([
                 if (settingsType == Common.Utils.documentSettingsType.Image) {
                     if (value.asc_getChartProperties() !== null) {
                         settingsType = Common.Utils.documentSettingsType.Chart;
+                        this._settings[settingsType].btn.updateHint(this.rightmenu.txtChartSettings);
                     } else if (value.asc_getShapeProperties() !== null) {
                         settingsType = Common.Utils.documentSettingsType.Shape;
                         if (value.asc_getShapeProperties().asc_getTextArtProperties()) {
@@ -177,6 +178,7 @@ define([
                 this._settings[settingsType].props = sparkLineInfo;
                 this._settings[settingsType].locked = isSparkLocked;
                 this._settings[settingsType].hidden = 0;
+                this._settings[settingsType].btn.updateHint(this.rightmenu.txtSparklineSettings);
             }
 
             var lastactive = -1, currentactive, priorityactive = -1,
diff --git a/apps/spreadsheeteditor/main/app/view/RightMenu.js b/apps/spreadsheeteditor/main/app/view/RightMenu.js
index 14cdd13ed..ce4c6d5d2 100644
--- a/apps/spreadsheeteditor/main/app/view/RightMenu.js
+++ b/apps/spreadsheeteditor/main/app/view/RightMenu.js
@@ -255,6 +255,7 @@ define([
         txtShapeSettings:           'Shape Settings',
         txtTextArtSettings:         'Text Art Settings',
         txtChartSettings:           'Chart Settings',
+        txtSparklineSettings:       'Sparkline Settings',
         txtTableSettings:           'Table Settings'
     }, SSE.Views.RightMenu || {}));
 });
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js
index 998503ac3..fd6b26c71 100644
--- a/apps/spreadsheeteditor/main/app/view/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js
@@ -1284,7 +1284,7 @@ define([
             this.btnWrap.updateHint(this.tipWrap);
             this.btnTextOrient.updateHint(this.tipTextOrientation);
             this.btnInsertImage.updateHint(this.tipInsertImage);
-            this.btnInsertChart.updateHint(this.tipInsertChart);
+            this.btnInsertChart.updateHint(this.tipInsertChartSpark);
             this.btnInsertText.updateHint(this.tipInsertText);
             this.btnInsertHyperlink.updateHint(this.tipInsertHyperlink + Common.Utils.String.platformKey('Ctrl+K'));
             this.btnInsertShape.updateHint(this.tipInsertShape);
@@ -2102,6 +2102,7 @@ define([
         textWinLossSpark:   'Win/Loss',
         tipInsertEquation:  'Insert Equation',
         textCharts:         'Charts',
-        textSparks:         'Sparklines'
+        textSparks:         'Sparklines',
+        tipInsertChartSpark: 'Insert Chart or Sparkline'
     }, SSE.Views.Toolbar || {}));
 });
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index cc71ba0be..5c9560616 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -1252,6 +1252,7 @@
   "SSE.Views.RightMenu.txtParagraphSettings": "Text Settings",
   "SSE.Views.RightMenu.txtSettings": "Common Settings",
   "SSE.Views.RightMenu.txtShapeSettings": "Shape Settings",
+  "SSE.Views.RightMenu.txtSparklineSettings": "Sparkline Settings",
   "SSE.Views.RightMenu.txtTableSettings": "Table Settings",
   "SSE.Views.RightMenu.txtTextArtSettings": "Text Art Settings",
   "SSE.Views.SetValueDialog.cancelButtonText": "Cancel",
@@ -1536,6 +1537,7 @@
   "SSE.Views.Toolbar.tipInsertOpt": "Insert Cells",
   "SSE.Views.Toolbar.tipInsertShape": "Insert Autoshape",
   "SSE.Views.Toolbar.tipInsertText": "Insert Text",
+  "SSE.Views.Toolbar.tipInsertChartSpark": "Insert Chart or Sparkline",
   "SSE.Views.Toolbar.tipMerge": "Merge",
   "SSE.Views.Toolbar.tipNewDocument": "New Document",
   "SSE.Views.Toolbar.tipNumFormat": "Number Format",