diff --git a/app/components/icons/alert-circle.js b/app/components/icons/alert-circle.js
new file mode 100644
index 0000000..84d5c17
--- /dev/null
+++ b/app/components/icons/alert-circle.js
@@ -0,0 +1 @@
+export { AlertCircle as default } from 'ember-mdi';
diff --git a/app/components/icons/checkbox-marked-circle.js b/app/components/icons/checkbox-marked-circle.js
new file mode 100644
index 0000000..30c24c6
--- /dev/null
+++ b/app/components/icons/checkbox-marked-circle.js
@@ -0,0 +1 @@
+export { CheckboxMarkedCircle as default } from 'ember-mdi';
diff --git a/app/components/icons/cog-outline.js b/app/components/icons/cog-outline.js
new file mode 100644
index 0000000..ce9975f
--- /dev/null
+++ b/app/components/icons/cog-outline.js
@@ -0,0 +1 @@
+export { CogOutline as default } from 'ember-mdi';
diff --git a/app/components/icons/database-outline.js b/app/components/icons/database-outline.js
new file mode 100644
index 0000000..9b65842
--- /dev/null
+++ b/app/components/icons/database-outline.js
@@ -0,0 +1 @@
+export { DatabaseOutline as default } from 'ember-mdi';
diff --git a/app/components/icons/magnify.js b/app/components/icons/magnify.js
new file mode 100644
index 0000000..cc46d28
--- /dev/null
+++ b/app/components/icons/magnify.js
@@ -0,0 +1 @@
+export { Magnify as default } from 'ember-mdi';
diff --git a/app/controllers/admin.js b/app/controllers/admin.js
index 1bf2b08..aab2058 100644
--- a/app/controllers/admin.js
+++ b/app/controllers/admin.js
@@ -1,14 +1,10 @@
 import Controller from '@ember/controller';
-import { CheckboxMarkedCircle, AlertCircle } from 'ember-mdi';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 
 export default class AdminController extends Controller {
   @service session;
 
-  CheckboxMarkedCircle = CheckboxMarkedCircle;
-  AlertCircle = AlertCircle;
-
   @action
   invalidateSession() {
     this.session.invalidate();
diff --git a/app/controllers/admin/indexes/item.js b/app/controllers/admin/indexes/item.js
index 7706a5c..d902b3b 100644
--- a/app/controllers/admin/indexes/item.js
+++ b/app/controllers/admin/indexes/item.js
@@ -1,7 +1,3 @@
 import Controller from '@ember/controller';
-import { DatabaseOutline, CogOutline } from 'ember-mdi';
 
-export default class AdminIndexesItemController extends Controller {
-  DatabaseOutline = DatabaseOutline;
-  CogOutline = CogOutline;
-}
+export default class AdminIndexesItemController extends Controller {}
diff --git a/app/templates/admin.hbs b/app/templates/admin.hbs
index 03ccc44..40c06c6 100644
--- a/app/templates/admin.hbs
+++ b/app/templates/admin.hbs
@@ -58,13 +58,13 @@
           title='The version of a running Meilisearch instance'
         >v{{@model.version.pkgVersion}}</span>
         {{#if (eq @model.health.status 'available')}}
-          <this.CheckboxMarkedCircle
+          <Icons::CheckboxMarkedCircle
             class='text-green'
             @size={{18}}
             @title={{@model.health.status}}
           />
         {{else}}
-          <this.AlertCircle
+          <Icons::AlertCircle
             class='text-yellow'
             @size={{18}}
             @title={{@model.health.status}}