diff --git a/Widget.html b/Widget.html
index 235f1a7..9145561 100644
--- a/Widget.html
+++ b/Widget.html
@@ -1,12 +1,12 @@
 <div>
     <div class="menu" data-dojo-attach-point="menu">
-        <img title="${nls.addDrawTitle}" data-dojo-attach-point="menuAddButton" class="menu-item-active" src="${folderUrl}images/add.png" data-dojo-attach-event="ondijitclick:menuOnClickAdd" />
+        <img title="${nls.addDrawTitle}" data-dojo-attach-point="menuAddButton" class="menu-item-active" src="${folderUrl}images/add.png" data-dojo-attach-event="onclick:menuOnClickAdd" />
         <img title="${nls.editDrawTitle}" data-dojo-attach-point="menuEditButton" class="menu-item-active hidden" src="${folderUrl}images/edit.png" />
-        <img title="${nls.listDrawTitle}" data-dojo-attach-point="menuListButton" class="menu-item" src="${folderUrl}images/list.png" data-dojo-attach-event="ondijitclick:menuOnClickList" />
+        <img title="${nls.listDrawTitle}" data-dojo-attach-point="menuListButton" class="menu-item" src="${folderUrl}images/list.png" data-dojo-attach-event="onclick:menuOnClickList" />
     </div>
     <span class="hide-box">
         ${nls.hideOption}
-        <input type="checkbox" data-dojo-attach-point="hideCheckbox" data-dojo-attach-event="ondijitclick:onHideCheckboxClick"/>
+        <input type="checkbox" data-dojo-attach-point="hideCheckbox" data-dojo-attach-event="onclick:onHideCheckboxClick"/>
   </span>
     <div data-dojo-attach-point="settingAllContent">
 
@@ -105,12 +105,12 @@ <h2 data-dojo-attach-point="editorTitle">${nls.addDrawTitle}</h2>
             </div>
             <div class="footer">
                 <div data-dojo-attach-point="editorFooterEdit">
-                    <input type="button" class="jimu-input blue-button" value="${nls.saveButton}" data-dojo-attach-event="ondijitclick:editorOnClickEditSaveButon" />
-                    <input type="button" class="jimu-input red-button" value="${nls.cancelButton}" data-dojo-attach-event="ondijitclick:editorOnClickEditCancelButon" />
-                    <input type="button" class="jimu-input grey-button" value="${nls.resetButton}" data-dojo-attach-event="ondijitclick:editorOnClickResetCancelButon" />
+                    <input type="button" class="jimu-input blue-button" value="${nls.saveButton}" data-dojo-attach-event="onclick:editorOnClickEditSaveButon" />
+                    <input type="button" class="jimu-input red-button" value="${nls.cancelButton}" data-dojo-attach-event="onclick:editorOnClickEditCancelButon" />
+                    <input type="button" class="jimu-input grey-button" value="${nls.resetButton}" data-dojo-attach-event="onclick:editorOnClickResetCancelButon" />
                 </div>
                 <div data-dojo-attach-point="editorFooterAdd" style="display:none;">
-                    <input type="button" class="jimu-input red-button" value="${nls.cancelButton}" data-dojo-attach-event="ondijitclick:editorOnClickAddCancelButon" />
+                    <input type="button" class="jimu-input red-button" value="${nls.cancelButton}" data-dojo-attach-event="onclick:editorOnClickAddCancelButon" />
                 </div>
             </div>
         </div>
@@ -121,7 +121,7 @@ <h2>${nls.listDrawTitle}</h2>
                 <table class="jimu-table draw-table">
                     <thead>
                         <tr>
-                            <th><input type="checkbox" data-dojo-attach-event="ondijitclick:listUpdateAllCheckbox" data-dojo-attach-point="listCheckboxAll" /></th>
+                            <th><input type="checkbox" data-dojo-attach-event="onclick:listUpdateAllCheckbox" data-dojo-attach-point="listCheckboxAll" /></th>
                             <th>${nls.nameField}</th>
                             <th>${nls.symbolField}</th>
                             <th data-dojo-attach-point="tableTH"></th>
@@ -134,15 +134,15 @@ <h2>${nls.listDrawTitle}</h2>
                 <div>
                     <div style="width: calc(100% - 35px);" class="list-draw-actions" data-dojo-attach-point="allActionsNode">
                         <!--<span class="text">${nls.all} :</span>-->
-                        <span class="text"><input type="checkbox" data-dojo-attach-event="ondijitclick:listUpdateAllCheckbox" data-dojo-attach-point="listCheckboxAll2" /></span>
-                        <span title="${nls.zoomAllLabel}" class="zoom blue-button" data-dojo-attach-event="ondijitclick:zoomAll">&nbsp;</span>
-                        <span title="${nls.copyLabel}" class="copy blue-button" data-dojo-attach-event="ondijitclick:copy">&nbsp;</span>
-                        <span title="${nls.deleteAllLabel}" class="clear red-button" data-dojo-attach-event="ondijitclick:clear">&nbsp;</span>
-						<a data-dojo-attach-point="exportSelectionButton" data-dojo-attach-event="ondijitclick:exportSelectionInFile">
+                        <span class="text"><input type="checkbox" data-dojo-attach-event="onclick:listUpdateAllCheckbox" data-dojo-attach-point="listCheckboxAll2" /></span>
+                        <span title="${nls.zoomAllLabel}" class="zoom blue-button" data-dojo-attach-event="onclick:zoomAll">&nbsp;</span>
+                        <span title="${nls.copyLabel}" class="copy blue-button" data-dojo-attach-event="onclick:copy">&nbsp;</span>
+                        <span title="${nls.deleteAllLabel}" class="clear red-button" data-dojo-attach-event="onclick:clear">&nbsp;</span>
+						<a data-dojo-attach-point="exportSelectionButton" data-dojo-attach-event="onclick:exportSelectionInFile">
                             <span title="${nls.exportLabel}" class="export blue-button" >&nbsp;</span>
                         </a>
                     </div>
-					<span title="${nls.importTitle}" class="import-button blue-button" data-dojo-attach-event="ondijitclick:launchImportFile">&nbsp;</span>
+					<span title="${nls.importTitle}" class="import-button blue-button" data-dojo-attach-event="onclick:launchImportFile">&nbsp;</span>
                 </div>
             </div>
         </div>
diff --git a/Widget.js b/Widget.js
index 79ff83a..9215611 100644
--- a/Widget.js
+++ b/Widget.js
@@ -754,6 +754,7 @@ define([
 
 			//Set this symbol in symbol chooser
 			this.editorSymbolChooser.showBySymbol(symbol);
+			this.editorSymbolChooser.showByType(this.editorSymbolChooser.type);
 			this._editorConfig['symboltype'] = this.editorSymbolChooser.type;
 
 			var type = symbol.type;
@@ -935,7 +936,7 @@ define([
 				this.drawBox.setPointSymbol(symbol);
 				break;
 			case "textsymbol":
-				this.drawBox.setPointSymbol(symbol);
+				this.drawBox.setTextSymbol(symbol);
 				break;
 			case "simplelinesymbol":
 				this.drawBox.setLineSymbol(symbol);
@@ -1383,7 +1384,7 @@ define([
 
 			//Track mouse on map
 			if (!this._editorConfig["phantom"]["handle"]) {
-				this._editorConfig["phantom"]["handle"] = on(this.map, 'mouse-move, mouse-out, mouse-over', lang.hitch(this, function (evt) {
+				this._editorConfig["phantom"]["handle"] = on(this.map, 'mouse-move, mouse-out', lang.hitch(this, function (evt) {
 							if (this.state === 'opened' || this.state === 'active') {
 								switch (evt.type) {
 								case 'mousemove':