diff --git a/sai/modules/saimod_sys_cron/tpl/list_entry.tpl b/sai/modules/saimod_sys_cron/tpl/list_entry.tpl
index 94a5ed4..ad1b2b1 100644
--- a/sai/modules/saimod_sys_cron/tpl/list_entry.tpl
+++ b/sai/modules/saimod_sys_cron/tpl/list_entry.tpl
@@ -16,9 +16,9 @@
         </select>
     </td>
     <td>
-        <button type="button" class="btn-sm btn btn-warning btn_cron_status" _class="${class}" _i="${i}"><span class="fa fa-repeat" aria-hidden="true"></span></button>
-        <button type="button" class="btn-sm btn btn-success btn_cron_edit" _class="${class}" _min="${min}" _hour="${hour}" _day="${day}" _day_week="${day_week}" _month="${month}"><span class="fa fa-pencil" aria-hidden="true"></span></button>
-        <button type="button" class="btn-sm btn btn-success btn_cron_run" _class="${class}"><span class="fa fa-clock-o" aria-hidden="true"></span></button>
+        <button type="button" class="btn-sm btn btn-warning btn_cron_status" _class="${class}" _i="${i}"><span class="fa fa-redo" aria-hidden="true"></span></button>
+        <button type="button" class="btn-sm btn btn-success btn_cron_edit" _class="${class}" _min="${min}" _hour="${hour}" _day="${day}" _day_week="${day_week}" _month="${month}"><span class="fa fa-edit" aria-hidden="true"></span></button>
+        <button type="button" class="btn-sm btn btn-success btn_cron_run" _class="${class}"><span class="fa fa-clock" aria-hidden="true"></span></button>
         <button type="button" class="btn-sm btn btn-danger btn_cron_del" _class="${class}"><span class="fa fa-trash" aria-hidden="true"></span></button>
     </td>
 </tr>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_cron/tpl/saimod_sys_cron.tpl b/sai/modules/saimod_sys_cron/tpl/saimod_sys_cron.tpl
index d801a6e..ec7d1f6 100644
--- a/sai/modules/saimod_sys_cron/tpl/saimod_sys_cron.tpl
+++ b/sai/modules/saimod_sys_cron/tpl/saimod_sys_cron.tpl
@@ -1,6 +1,6 @@
 <div class="row">
     <div class="col-12 sai_padding_10 bg-primary">
-        <h4 class="sai_margin_off">&nbsp;<span class="fa fa-clock-o" aria-hidden="true"></span>&nbsp;&nbsp;${sai_cron_title}</h4>
+        <h4 class="sai_margin_off">&nbsp;<span class="fa fa-clock" aria-hidden="true"></span>&nbsp;&nbsp;${sai_cron_title}</h4>
     </div>
     <div class="col-md-12 sai_padding_off">
         &nbsp;Last Visit: ${last_visit}<br/>
diff --git a/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl b/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl
index d618751..b23c939 100644
--- a/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl
+++ b/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl
@@ -5,7 +5,7 @@
         <a data-toggle="tooltip" title="<img src='${url}'/>" href="${url}" target="_blank" id="tooltip_${cat}_${i}">${url}</a>
     </td>
     <td>
-        <button type="submit" class="btn-warning btn btn-sm imgrnbtn" style="margin: 1px;;" cat="${cat}" id="${name}" textfield="#renametext_${cat}_${i}"><span class="fa fa-pencil" aria-hidden="true"></span></button>
+        <button type="submit" class="btn-warning btn btn-sm imgrnbtn" style="margin: 1px;;" cat="${cat}" id="${name}" textfield="#renametext_${cat}_${i}"><span class="fa fa-edit" aria-hidden="true"></span></button>
     </td>
     <td>
         <input type="text" id="renametext_${cat}_${i}" class="form-control" style="width: 100px; margin:0;" placeholder="new name...">
diff --git a/sai/modules/saimod_sys_security/tpl/right_edit.tpl b/sai/modules/saimod_sys_security/tpl/right_edit.tpl
index 72aa23d..9fdc18c 100644
--- a/sai/modules/saimod_sys_security/tpl/right_edit.tpl
+++ b/sai/modules/saimod_sys_security/tpl/right_edit.tpl
@@ -1,2 +1,2 @@
 <button type="submit" class="btn btn-sm btn-danger right_delete" onClick="system.load('security(delright);id.${id}');"><span class="fa fa-trash" aria-hidden="true"></span> ${basic_delete}</button>
-<button type="submit" class="btn btn-sm btn-default right_edit" right_id="${id}"><span class="fa fa-pencil" aria-hidden="true"></span> ${basic_edit}</button>
\ No newline at end of file
+<button type="submit" class="btn btn-sm btn-default right_edit" right_id="${id}"><span class="fa fa-edit" aria-hidden="true"></span> ${basic_edit}</button>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_view.tpl b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_view.tpl
index aff5a96..4f37a75 100644
--- a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_view.tpl
+++ b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_view.tpl
@@ -47,7 +47,7 @@
                         <input class="input-medium" id="input_pw_new2" type="password" placeholder="${basic_password_new}" size="20"/>
                     </td>
                     <td>
-                        <button style="width: 100%;" type="submit" id="btn_change_password" class="btn-sm btn btn-success" user="${username}" email="${email}"><span class="fa fa-pencil" aria-hidden="true"></span>&nbsp;&nbsp;${basic_change_password}</button>
+                        <button style="width: 100%;" type="submit" id="btn_change_password" class="btn-sm btn btn-success" user="${username}" email="${email}"><span class="fa fa-edit" aria-hidden="true"></span>&nbsp;&nbsp;${basic_change_password}</button>
                     </td>
                 </tr>
                 <tr>
@@ -69,7 +69,7 @@
                         <input class="input-medium" id="input_new_user" type="text" placeholder="${basic_username_new}" size="20"/>
                     </td>
                     <td>
-                        <button style="width: 100%;" type="submit" id="btn_rename_account" class="btn-sm btn btn-danger" user="${username}" email="${email}"><span class="fa fa-pencil" aria-hidden="true"></span>&nbsp;&nbsp;${basic_rename}</button>
+                        <button style="width: 100%;" type="submit" id="btn_rename_account" class="btn-sm btn btn-danger" user="${username}" email="${email}"><span class="fa fa-edit" aria-hidden="true"></span>&nbsp;&nbsp;${basic_rename}</button>
                     </td>
                 </tr>
                 <tr>