diff --git a/class2.php b/class2.php
index 17c3a198f..a23771bde 100644
--- a/class2.php
+++ b/class2.php
@@ -1368,7 +1368,11 @@ if(!defined("THEME_LAYOUT"))
 	}
 	*/
 
-	if(varset($pref['themecss']) && file_exists(THEME.$pref['themecss']))
+	if(deftrue('e_ADMIN_AREA'))
+	{
+		define("THEME_STYLE", $pref['admincss']);
+	}
+	elseif(varset($pref['themecss']) && file_exists(THEME.$pref['themecss']))
 	{
 		define("THEME_STYLE", $pref['themecss']);
 	}
diff --git a/e107_core/templates/admin_icons_template.php b/e107_core/templates/admin_icons_template.php
index 575048a95..c2a0d1d0e 100644
--- a/e107_core/templates/admin_icons_template.php
+++ b/e107_core/templates/admin_icons_template.php
@@ -448,20 +448,32 @@ define("E_32_TRUE", "<i class='S32 e-true-32'></i>");
 	define("ADMIN_GRID_ICON",  "<i class='fa fa-th'></i>");
 	define("ADMIN_LIST_ICON",  "<i class='fa fa-th-list'></i>");
 
-/*
+if(THEME_STYLE === 'css/kadmin.css')
+{
+
 	define("ADMIN_EDIT_ICON", "<i class='fa fa-edit fa-2x fa-fw'></i>");
-	define("ADMIN_DELETE_ICON", "<i class='fa fa-trash fa-2x fa-fw'></i>");
+	define("ADMIN_DELETE_ICON", "<i class='fa fa-trash fa-2x fa-fw text-danger'></i>");
 	define("ADMIN_EXECUTE_ICON", "<i class='fa fa-power-off fa-2x fa-fw'></i>");
 	define("ADMIN_SORT_ICON", "<i class='fa fa-sort fa-2x fa-fw'></i>");
-*/
+
+}
+else
+{
+	define("ADMIN_EDIT_ICON", "<i class='S32 e-edit-32'></i>");
+	define("ADMIN_DELETE_ICON", "<i class='S32 e-delete-32'></i>");
+	define("ADMIN_SORT_ICON", "<i class='S32 e-sort-32'></i>");
+	define("ADMIN_EXECUTE_ICON", "<i class='S32 e-execute-32'></i>");
+
+
+
+}
 
 //	define("ADMIN_TRUE_ICON", "<i class='S16 e-true-16'></i>");
 //	define("ADMIN_FALSE_ICON", "<i class='S16 e-false-16'></i>");
 //	define("ADMIN_WARNING_ICON", "<i class='S16 e-warning-16'></i>");
 
 
-	define("ADMIN_EDIT_ICON", "<i class='S32 e-edit-32'></i>");
-	define("ADMIN_DELETE_ICON", "<i class='S32 e-delete-32'></i>");
+
 
 
 
@@ -476,8 +488,7 @@ define("E_32_TRUE", "<i class='S32 e-true-32'></i>");
 	define("ADMIN_REPAIRPLUGIN_ICON", "<i class='S32 e-configure-32'></i>");
 	define("ADMIN_UP_ICON", "<i class='S32 e-up-32'></i>");
 	define("ADMIN_DOWN_ICON", "<i class='S32 e-down-32'></i>");
-	define("ADMIN_SORT_ICON", "<i class='S32 e-sort-32'></i>");
-	define("ADMIN_EXECUTE_ICON", "<i class='S32 e-execute-32'></i>");
+
 
 
 
diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css
index 75a66c813..f38de5181 100644
--- a/e107_themes/bootstrap3/admin_style.css
+++ b/e107_themes/bootstrap3/admin_style.css
@@ -207,8 +207,9 @@ table  label.checkbox                   { margin-left: 20px }
 
 #admin-ui-edit-db-language span.default,
 #admin-ui-list-db-language span.default  { color: white }
-
+/*
 td.options .btn-group                   {  display: flex; }
+*/
 
 .table .nav-tabs a,
 .table th a, .table td a                { text-decoration: none }
diff --git a/e107_themes/bootstrap3/css/kadmin.css b/e107_themes/bootstrap3/css/kadmin.css
index 080971e60..4e18a5844 100644
--- a/e107_themes/bootstrap3/css/kadmin.css
+++ b/e107_themes/bootstrap3/css/kadmin.css
@@ -14463,6 +14463,9 @@ font-family: 'Oswald';
 margin-bottom: 15px;
   }
 
+.popover {  }
+.popover .popover-title { background-color: #d9534f; color:white; font-weight:bold }
+