fixes issue 1973 and 1911

Remove previous icon class name before adding the new class name

platform/commonUI/general/src/ui/TreeLabelView.js

@@ -40,10 +40,18 @@ define([
         return type.getCssClass();
     }
 
+    function removePreviousIconClass(el) {
+        $(el).removeClass(function (index, className) {
+            return (className.match (/\bicon-\S+/g) || []).join(' ');
+        });
+    }
+
     TreeLabelView.prototype.updateView = function (domainObject) {
         var titleEl = this.el.find('.t-title-label'),
             iconEl = this.el.find('.t-item-icon');
 
+        removePreviousIconClass(iconEl);
+
         titleEl.text(domainObject ? domainObject.getModel().name : "");
         iconEl.addClass(domainObject ? getClass(domainObject) : "");