diff --git a/public/main/admin/access_url_edit_course_category_to_url.php b/public/main/admin/access_url_edit_course_category_to_url.php
index 0078cf4a50..84e832740a 100644
--- a/public/main/admin/access_url_edit_course_category_to_url.php
+++ b/public/main/admin/access_url_edit_course_category_to_url.php
@@ -206,11 +206,11 @@ $url_list = UrlManager::get_url_data();
     } else {
         ?>
 	<button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" >
-        <em class="fa fa-arrow-right"></em>
+           <i class="mdi mdi-fast-forward-outline ch-tool-icon"></i>
     </button>
 	<br /><br />
 	<button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))" >
-        <em class="fa fa-arrow-left"></em>
+        <i class="mdi mdi-rewind-outline ch-tool-icon"></i>
     </button>
    <?php
     } ?>
diff --git a/public/main/admin/access_url_edit_courses_to_url.php b/public/main/admin/access_url_edit_courses_to_url.php
index fd88291957..6fcdb2db9f 100644
--- a/public/main/admin/access_url_edit_courses_to_url.php
+++ b/public/main/admin/access_url_edit_courses_to_url.php
@@ -218,17 +218,17 @@ $url_list = UrlManager::get_url_data();
                 if ($ajax_search) {
                     ?>
                     <button class="btn btn--plain" type="button" onclick="remove_item(document.getElementById('destination_users'))" >
-                        <em class="fa fa-arrow-left"></em>
+                        <i class="mdi mdi-rewind-outline ch-tool-icon"></i>
                     </button>
                 <?php
                 } else {
                     ?>
                     <button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" >
-                        <em class="fa fa-arrow-right"></em>
+                        <i class="mdi mdi-fast-forward-outline ch-tool-icon"></i>
                     </button>
                     <br /><br />
                     <button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))" >
-                        <em class="fa fa-arrow-left"></em>
+                        <i class="mdi mdi-rewind-outline ch-tool-icon"></i>
                     </button>
                 <?php
                 }
diff --git a/public/main/admin/access_url_edit_usergroup_to_url.php b/public/main/admin/access_url_edit_usergroup_to_url.php
index 4c6d0ff1cc..99cec2ac6b 100644
--- a/public/main/admin/access_url_edit_usergroup_to_url.php
+++ b/public/main/admin/access_url_edit_usergroup_to_url.php
@@ -231,19 +231,19 @@ $url_list = UrlManager::get_url_data();
             ?>
                     <button class="btn btn--plain" type="button"
                             onclick="remove_item(document.getElementById('destination_users'))">
-                        <em class="fa fa-arrow-left"></em>
+                        <i class="mdi mdi-rewind-outline ch-tool-icon"></i>
                     </button>
                 <?php
         } else {
             ?>
                     <button class="btn btn--plain" type="button"
                             onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))">
-                        <em class="fa fa-arrow-right"></em>
+                        <i class="mdi mdi-fast-forward-outline ch-tool-icon"></i>
                     </button>
                     <br/><br/>
                     <button class="btn btn--plain" type="button"
                             onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))">
-                        <em class="fa fa-arrow-left"></em>
+                        <i class="mdi mdi-rewind-outline ch-tool-icon"></i>
                     </button>
                 <?php
         } ?>
diff --git a/public/main/admin/access_url_edit_users_to_url.php b/public/main/admin/access_url_edit_users_to_url.php
index b295271d3b..0f927eb830 100644
--- a/public/main/admin/access_url_edit_users_to_url.php
+++ b/public/main/admin/access_url_edit_users_to_url.php
@@ -264,17 +264,17 @@ $url_list = UrlManager::get_url_data();
     <?php if ($ajax_search) {
         ?>
         <button class="btn btn--plain" type="button" onclick="remove_item(document.getElementById('destination_users'))">
-            <em class="fa fa-arrow-left"></em>
+            <i class="mdi mdi-rewind-outline ch-tool-icon"></i>
         </button>
     <?php
     } else {
         ?>
         <button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" >
-            <em class="fa fa-arrow-right"></em>
+            <i class="mdi mdi-fast-forward-outline ch-tool-icon"></i>
         </button>
         <br /><br />
         <button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))" >
-            <em class="fa fa-arrow-left"></em>
+            <i class="mdi mdi-rewind-outline ch-tool-icon"></i>
 
         </button>
     <?php
diff --git a/public/main/admin/add_courses_to_usergroup.php b/public/main/admin/add_courses_to_usergroup.php
index 166e9addcf..c5aa3106e7 100644
--- a/public/main/admin/add_courses_to_usergroup.php
+++ b/public/main/admin/add_courses_to_usergroup.php
@@ -257,17 +257,17 @@ echo Display::input('hidden', 'add_type', null);
   if ($ajax_search) {
       ?>
     <button class="btn bt-default" type="button" onclick="remove_item(document.getElementById('elements_in'))" >
-        <em class="fa fa-arrow-left"></em>
+        <i class="mdi mdi-rewind-outline ch-tool-icon"></i>
     </button>
   <?php
   } else {
       ?>
     <button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))">
-        <em class="fa fa-arrow-right"></em>
+        <i class="mdi mdi-fast-forward-outline ch-tool-icon"></i>
     </button>
     <br /><br />
     <button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('elements_in'), document.getElementById('elements_not_in'))" onclick="moveItem(document.getElementById('elements_in'), document.getElementById('elements_not_in'))">
-        <em class="fa fa-arrow-left"></em>
+        <i class="mdi mdi-rewind-outline ch-tool-icon"></i>
     </button>
     <?php
   }
diff --git a/public/main/admin/add_sessions_to_promotion.php b/public/main/admin/add_sessions_to_promotion.php
index 6ec01e31d1..1881e3a80c 100644
--- a/public/main/admin/add_sessions_to_promotion.php
+++ b/public/main/admin/add_sessions_to_promotion.php
@@ -212,17 +212,17 @@ echo Display::input('hidden', 'add_type', null);
   if ($ajax_search) {
       ?>
     <button class="btn btn--plain" type="button" onclick="remove_item(document.getElementById('session_in_promotion'))" >
-        <em class="fa fa-arrow-left"></em>
+        <i class="mdi mdi-rewind-outline ch-tool-icon"></i>
     </button>
   <?php
   } else {
       ?>
     <button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('session_not_in_promotion'), document.getElementById('session_in_promotion'))" onclick="moveItem(document.getElementById('session_not_in_promotion'), document.getElementById('session_in_promotion'))">
-        <em class="fa fa-arrow-right"></em>
+        <i class="mdi mdi-fast-forward-outline ch-tool-icon"></i>
     </button>
     <br /><br />
     <button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('session_in_promotion'), document.getElementById('session_not_in_promotion'))" onclick="moveItem(document.getElementById('session_in_promotion'), document.getElementById('session_not_in_promotion'))">
-        <em class="fa fa-arrow-left"></em>
+        <i class="mdi mdi-rewind-outline ch-tool-icon"></i>
     </button>
     <?php
   }
diff --git a/public/main/admin/add_sessions_to_usergroup.php b/public/main/admin/add_sessions_to_usergroup.php
index ea033afcd7..8060717103 100644
--- a/public/main/admin/add_sessions_to_usergroup.php
+++ b/public/main/admin/add_sessions_to_usergroup.php
@@ -248,17 +248,17 @@ echo Display::input('hidden', 'add_type', null);
   if ($ajax_search) {
       ?>
     <button class="btn btn--plain" type="button" onclick="remove_item(document.getElementById('elements_in'))" >
-        <em class="fa fa-arrow-left"></em>
+        <i class="mdi mdi-rewind-outline ch-tool-icon"></i>
     </button>
   <?php
   } else {
       ?>
     <button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))">
-        <em class="fa fa-arrow-right"></em>
+        <i class="mdi mdi-fast-forward-outline ch-tool-icon"></i>
     </button>
     <br /><br />
     <button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('elements_in'), document.getElementById('elements_not_in'))" onclick="moveItem(document.getElementById('elements_in'), document.getElementById('elements_not_in'))">
-        <em class="fa fa-arrow-left"></em>
+        <i class="mdi mdi-rewind-outline ch-tool-icon"></i>
     </button>
     <?php
   }
diff --git a/public/main/admin/add_users_to_usergroup.php b/public/main/admin/add_users_to_usergroup.php
index ba1fdb589e..96496c7e5a 100644
--- a/public/main/admin/add_users_to_usergroup.php
+++ b/public/main/admin/add_users_to_usergroup.php
@@ -437,11 +437,11 @@ echo Display::input('hidden', 'add_type', null);
     <div class="col-md-2">
         <div style="padding-top:54px;width:auto;text-align: center;">
         <button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))">
-            <em class="fa fa-arrow-right"></em>
+            <i class="mdi mdi-fast-forward-outline ch-tool-icon"></i>
         </button>
         <br /><br />
         <button class="btn btn--plain" type="button" onclick="moveItem(document.getElementById('elements_in'), document.getElementById('elements_not_in'))" onclick="moveItem(document.getElementById('elements_in'), document.getElementById('elements_not_in'))">
-            <em class="fa fa-arrow-left"></em>
+            <i class="mdi mdi-rewind-outline ch-tool-icon"></i>
         </button>
         </div>
     </div>
diff --git a/public/main/admin/dashboard_add_courses_to_user.php b/public/main/admin/dashboard_add_courses_to_user.php
index 68db355852..57ece1d46f 100644
--- a/public/main/admin/dashboard_add_courses_to_user.php
+++ b/public/main/admin/dashboard_add_courses_to_user.php
@@ -262,12 +262,12 @@ if (!empty($msg)) {
         <div class="control-course">
             <div class="separate-action">
                 <button class="btn btn--primary" type="button" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))">
-                    <em class="fa fa-arrow-right"></em>
+                    <i class="mdi mdi-fast-forward-outline ch-tool-icon"></i>
                 </button>
             </div>
             <div class="separate-action">
                 <button class="btn btn--primary" type="button" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))">
-                    <em class="fa fa-arrow-left"></em>
+                    <i class="mdi mdi-rewind-outline ch-tool-icon"></i>
                 </button>
             </div>
             <div class="separate-action">
diff --git a/public/main/admin/dashboard_add_sessions_to_user.php b/public/main/admin/dashboard_add_sessions_to_user.php
index 7484ae8b3c..f3c47eeaf9 100644
--- a/public/main/admin/dashboard_add_sessions_to_user.php
+++ b/public/main/admin/dashboard_add_sessions_to_user.php
@@ -258,7 +258,7 @@ $result = Database::query($sql);
                     ?>
                     <div class="separate-action">
                         <button class="btn btn--primary" type="button" onclick="remove_item(document.getElementById('destination'))">
-                            <em class="fa fa-arrow-left"></em>
+                            <i class="mdi mdi-rewind-outline ch-tool-icon"></i>
                         </button>
                     </div>
                 <?php
@@ -266,12 +266,12 @@ $result = Database::query($sql);
                     ?>
                 <div class="separate-action">
                     <button class="btn btn--primary" type="button" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))">
-                        <em class="fa fa-arrow-right"></em>
+                        <i class="mdi mdi-fast-forward-outline ch-tool-icon"></i>
                     </button>
                 </div>
                 <div class="separate-action">
                     <button class="btn btn--primary" type="button" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))">
-                        <em class="fa fa-arrow-left"></em>
+                        <i class="mdi mdi-rewind-outline ch-tool-icon"></i>
                     </button>
                 </div>