diff --git a/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html b/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
index 908c872cfd7..d0780074d52 100644
--- a/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
+++ b/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
@@ -214,10 +214,10 @@
       </div>
       <div class="gf-form">
         <label class="gf-form-label" ng-if="$first">
-          <a class="pointer" ng-click="addFiltersQuery()"><icon class="'plus'"></icon></a>
+          <a class="pointer" ng-click="addFiltersQuery()"><icon name="'plus'"></icon></a>
         </label>
         <label class="gf-form-label" ng-if="!$first">
-          <a class="pointer" ng-click="removeFiltersQuery(filter)"><icon class="'minus'"></icon></a>
+          <a class="pointer" ng-click="removeFiltersQuery(filter)"><icon name="'minus'"></icon></a>
         </label>
       </div>
     </div>
diff --git a/public/app/plugins/panel/singlestat/mappings.html b/public/app/plugins/panel/singlestat/mappings.html
index ac99879f1a7..717d1ef3f69 100644
--- a/public/app/plugins/panel/singlestat/mappings.html
+++ b/public/app/plugins/panel/singlestat/mappings.html
@@ -20,7 +20,7 @@
   <div class="gf-form-group">
     <div class="gf-form" ng-repeat="map in ctrl.panel.valueMaps">
       <span class="gf-form-label">
-        <icon class="'times'" ng-click="ctrl.removeValueMap(map)"></icon>
+        <icon name="'times'" ng-click="ctrl.removeValueMap(map)"></icon>
       </span>
       <input
         type="text"