diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index d6f877e1d..a62167009 100755
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -24,7 +24,7 @@ $e_sub_cat = 'plug_manage';
 
 define('PLUGIN_SHOW_REFRESH', FALSE);
 define('PLUGIN_SCAN_INTERVAL', !empty($_SERVER['E_DEV']) ? 0 : 360);
-define("ADMIN_GITSYNC_ICON", e107::getParser()->toGlyph('fa-refresh', array('size'=>'2x', 'fw'=>1)));
+define("ADMIN_GITSYNC_ICON", e107::getParser()->toGlyph('fa-refresh', array('class'=>'admin-ui-option', 'size'=>'2x', 'fw'=>1)));
 
 
 global $user_pref;
diff --git a/e107_core/templates/admin_icons_template.php b/e107_core/templates/admin_icons_template.php
index 8229011e8..7b0d69cce 100644
--- a/e107_core/templates/admin_icons_template.php
+++ b/e107_core/templates/admin_icons_template.php
@@ -129,15 +129,15 @@ $ADMIN_ICONS_TEMPLATE['ADMIN_GRID_ICON']            = "<i class='fa fa-th'></i>"
 $ADMIN_ICONS_TEMPLATE['ADMIN_LIST_ICON']            = "<i class='fas fa-list'></i>";
 $ADMIN_ICONS_TEMPLATE['ADMIN_ADD_ICON']             = "<i class='S32 e-add-32'></i>";
 $ADMIN_ICONS_TEMPLATE['ADMIN_INFO_ICON']            = "<i class='fa fa-question-circle'></i>";
-$ADMIN_ICONS_TEMPLATE['ADMIN_CONFIGURE_ICON']       = "<i class='S32 e-settings-32'></i>";
-$ADMIN_ICONS_TEMPLATE['ADMIN_VIEW_ICON']            = "<i class='S32 e-search-32'></i>";
+$ADMIN_ICONS_TEMPLATE['ADMIN_CONFIGURE_ICON']       = "<i class='admin-ui-option fa fa-cog fa-2x fa-fw'></i>"; //"<i class='S32 e-settings-32'></i>";
+$ADMIN_ICONS_TEMPLATE['ADMIN_VIEW_ICON']            = "<i class='admin-ui-option fa fa-search fa-2x fa-fw'></i>"; //"<i class='S32 e-search-32'></i>";
 $ADMIN_ICONS_TEMPLATE['ADMIN_URL_ICON']             = "<i class='S16 e-forums-16'></i>";
 $ADMIN_ICONS_TEMPLATE['ADMIN_INSTALLPLUGIN_ICON']   = "<i class='S32 e-plugin_install-32'></i>";
-$ADMIN_ICONS_TEMPLATE['ADMIN_UNINSTALLPLUGIN_ICON'] = "<i class='S32 e-plugin_uninstall-32'></i>";
-$ADMIN_ICONS_TEMPLATE['ADMIN_UPGRADEPLUGIN_ICON']   = "<i class='S32 e-up-32'></i>";
-$ADMIN_ICONS_TEMPLATE['ADMIN_REPAIRPLUGIN_ICON']    = "<i class='S32 e-configure-32'></i>";
-$ADMIN_ICONS_TEMPLATE['ADMIN_UP_ICON']              = "<i class='S32 e-up-32'></i>";
-$ADMIN_ICONS_TEMPLATE['ADMIN_DOWN_ICON']            = "<i class='S32 e-down-32'></i>";
+$ADMIN_ICONS_TEMPLATE['ADMIN_UNINSTALLPLUGIN_ICON'] = "<i class='admin-ui-option fa fa-trash fa-2x fa-fw'></i>"; // "<i class='S32 e-plugin_uninstall-32'></i>";
+$ADMIN_ICONS_TEMPLATE['ADMIN_UPGRADEPLUGIN_ICON']   = "<i class='admin-ui-option fa fa-arrow-up fa-2x fa-fw'></i>";
+$ADMIN_ICONS_TEMPLATE['ADMIN_REPAIRPLUGIN_ICON']    = "<i class='admin-ui-option fa fa-wrench fa-2x fa-fw'></i>";
+$ADMIN_ICONS_TEMPLATE['ADMIN_UP_ICON']              = "<i class='admin-ui-option fa fa-chevron-up fa-2x fa-fw'></i>";
+$ADMIN_ICONS_TEMPLATE['ADMIN_DOWN_ICON']            = "<i class='admin-ui-option fa fa-chevron-down fa-2x fa-fw'></i>";
 
 // FOR BC
 $ADMIN_ICONS_TEMPLATE['ADMIN_EDIT_ICON_PATH']       = e_IMAGE_ABS . "admin_images/edit_32.png";
@@ -145,11 +145,11 @@ $ADMIN_ICONS_TEMPLATE['ADMIN_DELETE_ICON_PATH']     = e_IMAGE_ABS . "admin_image
 $ADMIN_ICONS_TEMPLATE['ADMIN_WARNING_ICON_PATH']    = e_IMAGE_ABS . "admin_images/warning_32.png";
 
 
-$ADMIN_ICONS_TEMPLATE['ADMIN_EDIT_ICON']            = "<i class='S32 e-edit-32'></i>";
-$ADMIN_ICONS_TEMPLATE['ADMIN_DELETE_ICON']          = "<i class='S32 e-delete-32'></i>";
-$ADMIN_ICONS_TEMPLATE['ADMIN_SORT_ICON']            = "<i class='S32 e-sort-32'></i>";
-$ADMIN_ICONS_TEMPLATE['ADMIN_EXECUTE_ICON']         = "<i class='S32 e-execute-32'></i>";
-$ADMIN_ICONS_TEMPLATE['ADMIN_PAGES_ICON']           = "<i class='S32 e-custom-32'></i>";
+$ADMIN_ICONS_TEMPLATE['ADMIN_EDIT_ICON']            = "<i class='admin-ui-option fa fa-edit fa-2x fa-fw' style='font-size: 24px; line-height: 32px;'></i>"; // "<i class='S32 e-edit-32'></i>";
+$ADMIN_ICONS_TEMPLATE['ADMIN_DELETE_ICON']          = "<i class='admin-ui-option fa fa-trash fa-2x fa-fw' style='font-size: 24px; line-height: 32px;'></i>"; // "<i class='S32 e-delete-32'></i>";
+$ADMIN_ICONS_TEMPLATE['ADMIN_SORT_ICON']            = "<i class='admin-ui-option fa fa-sort fa-2x fa-fw' style='font-size: 24px; line-height: 32px;'></i>"; //
+$ADMIN_ICONS_TEMPLATE['ADMIN_EXECUTE_ICON']         = "<i class='admin-ui-option fa fa-play fa-2x fa-fw' style='font-size: 24px; line-height: 32px;'></i>"; // "<i class='S32 e-execute-32'></i>";
+$ADMIN_ICONS_TEMPLATE['ADMIN_PAGES_ICON']           = "<i class='admin-ui-option fa fa-file fa-2x fa-fw' style='font-size: 24px; line-height: 32px;'></i>"; //"<i class='S32 e-custom-32'></i>";
 
 $ADMIN_ICONS_TEMPLATE['E_32_TRUE']                  = "<i class='S32 e-true-32'></i>";
 
diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css
index 7d02f9e19..1c67fd6e4 100644
--- a/e107_themes/bootstrap3/admin_style.css
+++ b/e107_themes/bootstrap3/admin_style.css
@@ -1138,7 +1138,7 @@ i.e-safari-32{ background-position: -427px 0; width: 32px; height: 32px; }
 i.e-seamonkey-16{ background-position: -464px 0; width: 16px; height: 16px; } 
 i.e-seamonkey-32{ background-position: -485px 0; width: 32px; height: 32px; } 
 
-
+i.admin-ui-option { font-size:24px; line-height:32px }
 
 /* NEw */