diff --git a/css/styles.css b/css/styles.css
index b737181d01bc695cce88332782984c88d7f84f2c..b53343b0f23eb173bd79bf28e08778c05dcd7124 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -58,12 +58,8 @@ div.controls { width:91%; margin:1em 1em 1em 2em; padding:0.5em 0; background-co
 #plugins { position:fixed; top:7em; float:left; width:15.7em; padding:0; }
 #plugins ul { list-style-type:none; border-top:1px solid #ccc; }
 #plugins a { display:block; padding:0.5em 0.5em 0.5em 3em; background-position:1.5em center; background-repeat:no-repeat; border-bottom:1px solid #ddd; border-top:1px solid #fff; text-decoration:none; font-size:1.2em; color:#666; }
-#plugins a:hover, #plugins a:focus, #plugins a.selected { background-color:#ccc; border-top:1px solid #ccc; border-bottom:1px solid #ccc; color:#000; outline:0; }
+#plugins a.active, #plugins a:hover, #plugins a:focus, #plugins a.selected { background-color:#ccc; border-top:1px solid #ccc; border-bottom:1px solid #ccc; color:#000; outline:0; }
 #plugins a:active { outline:0; }
-#plugins .files { background-image:url('../img/files.png'); }
-#plugins .sharing { background-image:url('../img/sharing.png'); }
-#plugins .galleries { background-image:url('../img/galleries.png'); }
-#plugins .music { background-image:url('../img/music.png'); }
 
 /* CONTENT ------------------------------------------------------------------ */
 #content { margin:7em 0 0 16em; }
diff --git a/templates/layout.admin.php b/templates/layout.admin.php
index efd9a8b6fdb5d2ef71ae7899b158ae0bd405a073..541427f5d5ec1452b766474bccd4c999debc3c8e 100644
--- a/templates/layout.admin.php
+++ b/templates/layout.admin.php
@@ -26,7 +26,7 @@
 			<div id="plugins">
 				<ul>
 					<?php foreach($_['settingsnavigation'] as $entry):?>
-						<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title=""><?php echo $entry['name'] ?><?php if( $entry["active"] ) echo "I AM ACTIVE!!!"; ?></a></li>
+						<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a></li>
 						<?php if( sizeof( $entry["subnavigation"] )): ?>
 							<?php foreach($entry["subnavigation"] as $subentry):?>
 								<li><a style="background-color:#FF8800;" href="<?php echo $subentry['href']; ?>" title=""><?php echo $subentry['name'] ?></a></li>
@@ -34,7 +34,7 @@
 						<?php endif; ?>
 					<?php endforeach; ?>
 					<?php foreach($_['adminnavigation'] as $entry):?>
-						<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title=""><?php echo $entry['name'] ?><?php if( $entry["active"] ) echo "I AM ACTIVE!!!"; ?></a></li>
+						<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a></li>
 						<?php if( sizeof( $entry["subnavigation"] )): ?>
 							<?php foreach($entry["subnavigation"] as $subentry):?>
 								<li><a style="background-color:#FF8800;" href="<?php echo $subentry['href']; ?>" title=""><?php echo $subentry['name'] ?></a></li>
diff --git a/templates/layout.user.php b/templates/layout.user.php
index 23210b6880875153a23bf4428f482def5fc6ba99..da30df294f269a81b07d4dc58a5f9f67c6aa465f 100644
--- a/templates/layout.user.php
+++ b/templates/layout.user.php
@@ -26,7 +26,7 @@
 			<div id="plugins">
 				<ul>
 					<?php foreach($_['navigation'] as $entry): ?>
-						<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title=""><?php echo $entry['name']; ?></a></li>
+						<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>><?php echo $entry['name']; ?></a></li>
 					<?php endforeach; ?>
 				</ul>
 			</div>