diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css
index 87dd11f208..af3e1baa4f 100644
--- a/platform/commonUI/general/res/css/tree.css
+++ b/platform/commonUI/general/res/css/tree.css
@@ -304,18 +304,20 @@ ul.tree {
       visibility: hidden;
       opacity: 0; }
     /* line 80, ../sass/search/_search.scss */
-    .search-holder .search .search-bar .clear-button {
+    .search-holder .search .search-bar .clear-icon {
       color: #737373;
       font-size: 6px;
       float: right;
-      margin-right: 4px;
-      margin-top: 2px; }
-  /* line 94, ../sass/search/_search.scss */
+      margin-right: 2px;
+      margin-top: -2px;
+      padding: 4px;
+      cursor: crosshair; }
+  /* line 98, ../sass/search/_search.scss */
   .search-holder .search .search-scroll {
     top: 25px;
     overflow-y: auto;
     padding-right: 5px; }
-    /* line 102, ../sass/search/_search.scss */
+    /* line 106, ../sass/search/_search.scss */
     .search-holder .search .search-scroll .results .search-result-item {
       -moz-transition: background-color 0.25s;
       -o-transition: background-color 0.25s;
@@ -325,10 +327,10 @@ ul.tree {
       border-radius: 2px;
       padding-top: 4px;
       padding-bottom: 2px; }
-      /* line 116, ../sass/search/_search.scss */
+      /* line 120, ../sass/search/_search.scss */
       .search-holder .search .search-scroll .results .search-result-item .label {
         margin-left: 6px; }
-        /* line 120, ../sass/search/_search.scss */
+        /* line 124, ../sass/search/_search.scss */
         .search-holder .search .search-scroll .results .search-result-item .label .title-label {
           display: inline-block;
           position: absolute;
@@ -340,47 +342,47 @@ ul.tree {
           overflow: hidden;
           text-overflow: ellipsis;
           white-space: nowrap; }
-      /* line 142, ../sass/search/_search.scss */
+      /* line 146, ../sass/search/_search.scss */
       .search-holder .search .search-scroll .results .search-result-item.selected {
         background: #005177;
         color: #fff; }
-        /* line 146, ../sass/search/_search.scss */
+        /* line 150, ../sass/search/_search.scss */
         .search-holder .search .search-scroll .results .search-result-item.selected .view-control {
           color: #0099cc; }
-        /* line 149, ../sass/search/_search.scss */
+        /* line 153, ../sass/search/_search.scss */
         .search-holder .search .search-scroll .results .search-result-item.selected .label .type-icon {
           color: #fff; }
-      /* line 156, ../sass/search/_search.scss */
+      /* line 160, ../sass/search/_search.scss */
       .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover {
         background: #404040;
         color: #cccccc; }
-        /* line 159, ../sass/search/_search.scss */
+        /* line 163, ../sass/search/_search.scss */
         .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .context-trigger {
           display: block; }
-        /* line 162, ../sass/search/_search.scss */
+        /* line 166, ../sass/search/_search.scss */
         .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .icon {
           color: #33ccff; }
-    /* line 170, ../sass/search/_search.scss */
+    /* line 174, ../sass/search/_search.scss */
     .search-holder .search .search-scroll .load-icon {
       position: relative; }
-      /* line 172, ../sass/search/_search.scss */
+      /* line 176, ../sass/search/_search.scss */
       .search-holder .search .search-scroll .load-icon.loading {
         pointer-events: none;
         margin-left: 6px; }
-        /* line 176, ../sass/search/_search.scss */
+        /* line 180, ../sass/search/_search.scss */
         .search-holder .search .search-scroll .load-icon.loading .title-label {
           font-style: italic;
           font-size: .9em;
           opacity: 0.5;
           margin-left: 26px;
           line-height: 24px; }
-        /* line 186, ../sass/search/_search.scss */
+        /* line 190, ../sass/search/_search.scss */
         .search-holder .search .search-scroll .load-icon.loading .wait-spinner {
           margin-left: 6px; }
-      /* line 191, ../sass/search/_search.scss */
+      /* line 195, ../sass/search/_search.scss */
       .search-holder .search .search-scroll .load-icon:not(.loading) {
         cursor: pointer; }
-    /* line 196, ../sass/search/_search.scss */
+    /* line 200, ../sass/search/_search.scss */
     .search-holder .search .search-scroll .load-more-button {
       margin-top: 5px;
       margin-bottom: 5px;
diff --git a/platform/commonUI/general/res/sass/search/_search.scss b/platform/commonUI/general/res/sass/search/_search.scss
index 38a628d5dd..fda9660b04 100644
--- a/platform/commonUI/general/res/sass/search/_search.scss
+++ b/platform/commonUI/general/res/sass/search/_search.scss
@@ -77,17 +77,21 @@
                 opacity: 0;
             }
             
-            .clear-button {
+            .clear-icon {
                 color: $colorItemFg;
                 font-size: 6px;
                 
                 float: right;
-                margin-right: 4px;
-                margin-top: 2px;
+                margin-right: 2px;
+                margin-top: -2px;
+                padding: 4px;
                 
                 &.content {
                     // Make button visible only when there is text input 
                 }
+                
+                //temp
+                cursor: crosshair;
             }
         }
         
diff --git a/platform/search/res/templates/search.html b/platform/search/res/templates/search.html
index 79ab9098c4..9dc9afa9d2 100644
--- a/platform/search/res/templates/search.html
+++ b/platform/search/res/templates/search.html
@@ -22,40 +22,25 @@
 <div class="search"
      ng-controller="SearchController as controller">
     
-    <!-- Search bar input -->
+    <!-- Search bar -->
     <div class="search-bar">
+        <!-- Input field -->
         <input class="search-input"
                type="text"
                ng-model="ngModel.input"
                ng-keyup="controller.search()"
                id="searchInput" />
+        <!-- Search icon -->
         <!-- ui symbols for search are 'd' and 'M' -->
         <div class="ui-symbol search-icon"
              ng-class="{content: controller.hasInput()}">
             M
         </div>
-        <a class="ui-symbol clear-button"
+        <!-- Clear button/icon 'x' -->
+        <a class="ui-symbol clear-icon"
            ng-class="{content: controller.hasInput()}">
             x
         </a>
-        <!--mct-control key="textfield"
-                     class="search-input"
-                     ng-model="ngModel.input">
-        </mct-control>
-        <!--input type="text"
-                  ng-required="false"
-                  ng-model="ngModel.index"
-                  name="mctControl" /-->
-        <!--mct-form structure="{sections: [rows: {control: 'textfield'}]}" ng-model="ngModle.input">
-        </mct-form>
-        <!--mct-control key="row.control"
-                     ng-model="ngModel"
-                     ng-required="row.required"
-                     ng-pattern="getRegExp(row.pattern)"
-                     options="row.options"
-                     structure="row"
-                     field="row.key">
-        </mct-control-->
     </div>
     
     <!-- This div exists to determine scroll bar location -->