diff --git a/resources/frontend_client/app/admin/databases/partials/database_edit_forms.html b/resources/frontend_client/app/admin/databases/partials/database_edit_forms.html
index 81af5b864d228be710a5be59bb5c8d2370dea6c1..3b498823bf6d2ec3da281362622fd435da0d7234 100644
--- a/resources/frontend_client/app/admin/databases/partials/database_edit_forms.html
+++ b/resources/frontend_client/app/admin/databases/partials/database_edit_forms.html
@@ -14,7 +14,7 @@
<div class="DatabaseEngine DatabaseEngine--selected flex align-center">
<mb-icon name="check" class="DatabaseEngine-check" width="16px" height="16px"></mb-icon>
<span class="flex-full">{{database.engine}}</span>
- <cv-close-icon width="16px" height="16px" ng-click="database.engine = null"></cv-close-icon>
+ <mb-icon name="close" width="16px" height="16px" ng-click="database.engine = null"></mb-icon>
</div>
</div>
</div>
diff --git a/resources/frontend_client/app/components/icons/close.html b/resources/frontend_client/app/components/icons/close.html
deleted file mode 100644
index 9f2575dbda5a9a0b4271173f0f30a6a7e452d273..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/components/icons/close.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg id="close" viewBox="0 0 32 32" fill="currentcolor" ng-attr-width="{{width}}" ng-attr-height="{{height}}">
- <path d="M4 8 L8 4 L16 12 L24 4 L28 8 L20 16 L28 24 L24 28 L16 20 L8 28 L4 24 L12 16 z "></path>
-</svg>
diff --git a/resources/frontend_client/app/dashboard/partials/dash_view.html b/resources/frontend_client/app/dashboard/partials/dash_view.html
index c9ebaaa02090d8b306b863da90b5983c1a817602..6010cded49e6cd2063c07a46068d3ec8c0626427 100644
--- a/resources/frontend_client/app/dashboard/partials/dash_view.html
+++ b/resources/frontend_client/app/dashboard/partials/dash_view.html
@@ -39,9 +39,7 @@
<ul id="dashboard_list">
<li class="Dash-card" gridster-item="dashcard" ng-repeat="(index, dashcard) in dashcards">
<a class="DashCard-remove" ng-click="removeCard(index)">
- <span class="DashCard-removeIcon">
- <cv-close-icon width="12px" height="12px"></cv-close-icon>
- </span>
+ <mb-icon name="close" class="DashCard-removeIcon" width="12px" height="12px"></mb-icon>
</a>
<cv-card card="dashcard.card" card-data="dashcard.cardData.data" card-settings="cardSettings" index="index" wait-for-gridster />
</li>
diff --git a/resources/frontend_client/app/dashboard/partials/modal_add_to_dashboard.html b/resources/frontend_client/app/dashboard/partials/modal_add_to_dashboard.html
index 94ec239e84326f93e24cc69ed57b7d6099497f90..9bc0920924fd62563992a3780d41ddcf4eae433d 100644
--- a/resources/frontend_client/app/dashboard/partials/modal_add_to_dashboard.html
+++ b/resources/frontend_client/app/dashboard/partials/modal_add_to_dashboard.html
@@ -1,7 +1,7 @@
<div>
<div class="Form-group border-bottom">
<div class="Button borderless float-right" ng-click='close()'>
- <cv-close-icon width="18px" height="18px"></cv-close-icon>
+ <mb-icon name="close" width="18px" height="18px"></mb-icon>
</div>
<h3 class="text-normal">Add <span class="text-bold">"{{card.name}}"</span> to dashboard</h3>
</div>
diff --git a/resources/frontend_client/app/explore/partials/data_grid.html b/resources/frontend_client/app/explore/partials/data_grid.html
index 3108f4b282ef3d0b98133c4ecc0d5b99531f2c2b..662138248d1d0eb1caf06dac2adbddce3cca5dab 100644
--- a/resources/frontend_client/app/explore/partials/data_grid.html
+++ b/resources/frontend_client/app/explore/partials/data_grid.html
@@ -32,7 +32,7 @@
<li class="Pill Pill--filled mr1 inline-block clearfix" ng-repeat="filter in queryFilters() track by $index">
<span>{{getFilterColumnName(filter)}}: {{filter[2]}}</span>
<a class="Pill-action" href="#" ng-click="removeFilter($index)">
- <cv-close-icon width="12px" height="12px"></cv-close-icon>
+ <mb-icon name="close" width="12px" height="12px"></mb-icon>
</a>
</li>
</ul>
diff --git a/resources/frontend_client/app/explore/partials/widget_advanced_aggregation.html b/resources/frontend_client/app/explore/partials/widget_advanced_aggregation.html
index a45a92f99f5abac6eac698829a2996b7f883c1c1..8bb9f676b74fc840a2315a9912421d02651ac911 100644
--- a/resources/frontend_client/app/explore/partials/widget_advanced_aggregation.html
+++ b/resources/frontend_client/app/explore/partials/widget_advanced_aggregation.html
@@ -21,7 +21,7 @@
<ul id="breakout_list">
<li class="py1 block clearfix" ng-repeat="breakout_field in query.breakout track by $index">
<a class="text-grey-2 float-right" href="#" ng-if="!readonly" ng-click="removeDimension($index)">
- <cv-close-icon class="mt1" width="16px" height="16px"></cv-close-icon>
+ <mb-icon name="close" class="mt1" width="16px" height="16px"></mb-icon>
</a>
<label class="Select">
<select ng-model="query.breakout[$index]" ng-options="br[0] as br[1] for br in table.breakout_options.fields" ng-disabled="readonly">
diff --git a/resources/frontend_client/app/explore/partials/widget_fields.html b/resources/frontend_client/app/explore/partials/widget_fields.html
index 5a4835f29ebd4a17185b6737830f5c1adf8aff37..a0a6060cae42b8d07ad61cf5d8cc9b056d44e913 100644
--- a/resources/frontend_client/app/explore/partials/widget_fields.html
+++ b/resources/frontend_client/app/explore/partials/widget_fields.html
@@ -4,7 +4,7 @@
<ul>
<li class="py1 clearfix" ng-repeat="field in query.fields track by $index">
<a class="text-grey-2 float-right" ng-if="!readonly" href="#" ng-click="removeField($index)">
- <cv-close-icon width="16px" height="16px"></cv-close-icon>
+ <mb-icon name="close" width="16px" height="16px"></mb-icon>
</a>
<label class="Select" for="id_sort_by_field">
<select id="id_sort_by_field" ng-model="field" ng-options="field.id as field.name for field in table.fields"
diff --git a/resources/frontend_client/app/explore/partials/widget_filter.html b/resources/frontend_client/app/explore/partials/widget_filter.html
index eb3d95eb84c701c957529d2183119a799f3cdece..8b6963a965a9d9b8b5ca958c46bfb5291de9b549 100644
--- a/resources/frontend_client/app/explore/partials/widget_filter.html
+++ b/resources/frontend_client/app/explore/partials/widget_filter.html
@@ -5,7 +5,7 @@
<li class="FilterClause py1 clearfix" ng-repeat="table_filter in wrapped_filters()">
<div ng-if="table_filter != 'AND'">
<a class="text-grey-2 float-right" ng-if="!readonly" href="#" ng-click="removeFilter($index)">
- <cv-close-icon width="16px" height="16px"></cv-close-icon>
+ <mb-icon name="close" width="16px" height="16px"></mb-icon>
</a>
<label class="Select" for="id_filtered_field">
<select id="id_filtered_field" ng-model="table_filter[1]" ng-options="field.id as field.name for field in table.fields" ng-disabled="readonly">
diff --git a/resources/frontend_client/app/explore/partials/widget_sort_by.html b/resources/frontend_client/app/explore/partials/widget_sort_by.html
index fcbb0655528d49656b366ba8c60385df831ac2fb..d5523a70e5955987167853edb95b8043dd2b1d88 100644
--- a/resources/frontend_client/app/explore/partials/widget_sort_by.html
+++ b/resources/frontend_client/app/explore/partials/widget_sort_by.html
@@ -4,7 +4,7 @@
<ul>
<li class="py1 clearfix" ng-repeat="sortByColumn in order_by">
<a class="text-grey-2 float-right" ng-if="!readonly" href="#" ng-click="removeSortBy($index)">
- <cv-close-icon width="16px" height="16px"></cv-close-icon>
+ <mb-icon name="close" width="16px" height="16px"></mb-icon>
</a>
<label class="Select" for="id_sort_by_field">
<select id="id_sort_by_field" ng-model="sortByColumn[0]" ng-options="field.id as field.name for field in table.fields"