diff --git a/public/include/admin_checks.php b/public/include/admin_checks.php
index b10e9dfa..7886d325 100644
--- a/public/include/admin_checks.php
+++ b/public/include/admin_checks.php
@@ -125,16 +125,16 @@ if (@$_SESSION['USERDATA']['is_admin'] && $user->isAdmin(@$_SESSION['USERDATA'][
   
   // display the errors
   foreach ($enotice as $en) {
-    $_SESSION['POPUP'][] = array('CONTENT' => $en, 'TYPE' => 'info');
+    $_SESSION['POPUP'][] = array('CONTENT' => $en, 'TYPE' => 'alert alert-info');
   }
   if (!count($notice) && !count($error)) {
-    $_SESSION['POPUP'][] = array('CONTENT' => 'The config options we checked seem OK', 'TYPE' => 'success');
+    $_SESSION['POPUP'][] = array('CONTENT' => 'The config options we checked seem OK', 'TYPE' => 'alert alert-success');
   } else {
     foreach ($notice as $n) {
-      $_SESSION['POPUP'][] = array('CONTENT' => $n, 'TYPE' => 'warning');
+      $_SESSION['POPUP'][] = array('CONTENT' => $n, 'TYPE' => 'alert alert-warning');
     }
     foreach ($error as $e) {
-      $_SESSION['POPUP'][] = array('CONTENT' => $e, 'TYPE' => 'errormsg');
+      $_SESSION['POPUP'][] = array('CONTENT' => $e, 'TYPE' => 'alert alert-danger');
     }
   }
 }
diff --git a/public/include/lib/smarty_plugins/function.acl.php b/public/include/lib/smarty_plugins/function.acl.php
index 56285b40..6a358f15 100644
--- a/public/include/lib/smarty_plugins/function.acl.php
+++ b/public/include/lib/smarty_plugins/function.acl.php
@@ -5,7 +5,12 @@ function check_acl_access($params, $smarty)
 {
   $isAuthenticated = isset($_SESSION['AUTHENTICATED']) ? true : false;
   $iAclSetting = $params['acl'];
-  $sUrl = '<li><a href="'.$_SERVER['SCRIPT_NAME'].'?page='.$params['page'].'&action='.$params['action'].'">'.$params['name'].'</a></li>';
+  // $params['icon'] is deprecated, only needed for mpos compatibility
+  if (isset($params['icon'])) {
+  	$sUrl = '<li class="'.$params['icon'].'"><a href="'.$_SERVER['SCRIPT_NAME'].'?page='.$params['page'].'&action='.$params['action'].'">'.$params['name'].'</a></li>';
+  } else {
+  	$sUrl = '<li><a href="'.$_SERVER['SCRIPT_NAME'].'?page='.$params['page'].'&action='.$params['action'].'">'.$params['name'].'</a></li>';
+  }
   if (isset($params['fallback']))
     $sFallbackUrl = '<li><a href="'.$_SERVER['SCRIPT_NAME'].'?page='.$params['page'].'">'.$params['name'].'</a></li>';
   switch($iAclSetting) {