diff --git a/bl-kernel/admin/themes/default/css/default.css b/bl-kernel/admin/themes/default/css/default.css
index 7e5aa9a3..b9c18d5f 100644
--- a/bl-kernel/admin/themes/default/css/default.css
+++ b/bl-kernel/admin/themes/default/css/default.css
@@ -591,6 +591,16 @@ tr.theme-installed {
 	background: #F2F7FF !important;
 }
 
+div.plugin-name i.settings-icon {
+	float: right;
+	margin-top: 3px;
+	margin-left: 3px;
+}
+
+i.incompatible-warning {
+	color: #daa520;
+}
+
 div.plugin-links > a {
 	display: inline-block;
 	margin-top: 5px;
diff --git a/bl-kernel/admin/views/plugins.php b/bl-kernel/admin/views/plugins.php
index bdb13af2..b3077f73 100644
--- a/bl-kernel/admin/views/plugins.php
+++ b/bl-kernel/admin/views/plugins.php
@@ -20,37 +20,35 @@ foreach($plugins['all'] as $Plugin)
 	echo '
 	<tr '.($Plugin->installed()?'class="plugin-installed"':'class="plugin-notInstalled"').'>
 	<td>
-	<div class="plugin-name">'.$Plugin->name().'</div>
-	<div class="plugin-links">
+	<div class="plugin-name">
 	';
 
 	if($Plugin->installed()) {
+		echo '<a class="uninstall" href="'.HTML_PATH_ADMIN_ROOT.'uninstall-plugin/'.$Plugin->className().'" title="'.$L->g('Deactivate').'"><i class="uk-icon-check-square-o"></i></a> ';
 		if(method_exists($Plugin, 'form')) {
-			echo '<a class="configure" href="'.HTML_PATH_ADMIN_ROOT.'configure-plugin/'.$Plugin->className().'">'.$L->g('Settings').'</a>';
-			echo '<span class="separator"> | </span>';
+			echo '<a class="configure" href="'.HTML_PATH_ADMIN_ROOT.'configure-plugin/'.$Plugin->className().'" title="'.$L->g('Settings').'"><i class="uk-icon-cog settings-icon"></i></a> ';
 		}
-		echo '<a class="uninstall" href="'.HTML_PATH_ADMIN_ROOT.'uninstall-plugin/'.$Plugin->className().'">'.$L->g('Deactivate').'</a>';
 	}
 	else {
-		echo '<a class="install" href="'.HTML_PATH_ADMIN_ROOT.'install-plugin/'.$Plugin->className().'">'.$L->g('Activate').'</a>';
+		echo '<a class="install" href="'.HTML_PATH_ADMIN_ROOT.'install-plugin/'.$Plugin->className().'" title="'.$L->g('Activate').'"><i class="uk-icon-square-o"></i></a> ';
 	}
 
-
-
 	echo '
-	</div>
+	'.$Plugin->name().'</div>
 	</td>';
 
 	echo '<td>';
 	echo $Plugin->description();
-	if( !$Plugin->isCompatible() ) {
-		echo '<div class="plugin-incompatible">This plugin is incompatible with Bludit v'.BLUDIT_VERSION.'</div>';
-	}
 	echo '</td>';
+	echo '
+	<td class="uk-text-center">';
+	if( !$Plugin->isCompatible() ) {
+		echo '<i class="uk-icon-exclamation-triangle incompatible-warning" title="This plugin is incompatible with Bludit v'.BLUDIT_VERSION.'"></i>';
+	}
+	echo $Plugin->version().'</td>';
 
 	echo '
-	<td class="uk-text-center">'.$Plugin->version().'</td>
-	<td class="uk-text-center"><a targe="_blank" href="'.$Plugin->website().'">'.$Plugin->author().'</a></td>
+	<td class="uk-text-center"><a target="_blank" href="'.$Plugin->website().'">'.$Plugin->author().'</a></td>
 	';
 
 	echo '</tr>';
diff --git a/bl-kernel/admin/views/themes.php b/bl-kernel/admin/views/themes.php
index 56abd3d7..b8565581 100644
--- a/bl-kernel/admin/views/themes.php
+++ b/bl-kernel/admin/views/themes.php
@@ -20,29 +20,33 @@ foreach($themes as $theme)
 	echo '
 	<tr '.($theme['dirname']==$Site->theme()?'class="theme-installed"':'class="theme-notInstalled"').'>
 	<td>
-	<div class="plugin-name">'.$theme['name'].'</div>
-	<div class="plugin-links">
+	<div class="plugin-name">
 	';
 
 	if($theme['dirname']!=$Site->theme()) {
-		echo '<a class="install" href="'.HTML_PATH_ADMIN_ROOT.'install-theme/'.$theme['dirname'].'">'.$L->g('Activate').'</a>';
+		echo '<a class="install" href="'.HTML_PATH_ADMIN_ROOT.'install-theme/'.$theme['dirname'].'" title="'.$L->g('Activate').'"><i class="uk-icon-square-o"></i></a> ';
+	}
+	else {
+		echo '<i class="uk-icon-check-square-o"></i> ';
 	}
 
 	echo '
-	</div>
+	'.$theme['name'].'</div>
 	</td>';
 
 	echo '<td>';
 	echo $theme['description'];
+	echo '</td>';
+	echo '
+	<td class="uk-text-center">';
 
 	if( !$theme['compatible'] ) {
-		echo '<div class="theme-incompatible">This theme is incompatible with Bludit v'.BLUDIT_VERSION.'</div>';
+		echo '<i class="uk-icon-exclamation-triangle incompatible-warning" title="This theme is incompatible with Bludit v'.BLUDIT_VERSION.'"></i>';
 	}
-	echo '</td>';
+	echo $theme['version'].'</td>';
 
 	echo '
-	<td class="uk-text-center">'.$theme['version'].'</td>
-	<td class="uk-text-center"><a targe="_blank" href="'.$theme['website'].'">'.$theme['author'].'</a></td>
+	<td class="uk-text-center"><a target="_blank" href="'.$theme['website'].'">'.$theme['author'].'</a></td>
 	';
 
 	echo '</tr>';