diff --git a/plugins/date/form_date.cs b/plugins/date/form_date.cs
index 0af8a08..71d0d47 100644
--- a/plugins/date/form_date.cs
+++ b/plugins/date/form_date.cs
@@ -2,25 +2,6 @@
 
 <?cs call:handle_messages() ?>
 
-
-<?cs # sort the Plugins - using the most stupid way :) 
- TODO: this is just an example, remove it or put in macros ?>
-<div class="plugin_system_small">
-<?cs loop: order = #0, #100, #1
-	?><?cs # plugins ?><?cs each:x = Settings.PluginList
-		?><?cs if:x.Types.system && x.Visible.preferences && x.Rank == order ?>
-			<a href="<?cs
-				call:link(name(x),'','','','') ?>" title="<?cs
-				var:html_escape(Lang.Plugins[name(x)].Link) ?>"><img src="<?cs
-				call:link('icons/' + name(x), '','','','') ?>" alt="<?cs
-				var:html_escape('icon: ' + x.Name) ?>" />
-			<?cs
-		/if ?><?cs
-	/each ?><?cs
-/loop ?>
-</div>
-
-
 <fieldset>
 	<legend>
 		<?cs call:show_plugin_icon() ?>
diff --git a/plugins/plugin_manager/plugin_list.cs b/plugins/plugin_manager/plugin_list.cs
index 7525b9a..abb5e9c 100644
--- a/plugins/plugin_manager/plugin_list.cs
+++ b/plugins/plugin_manager/plugin_list.cs
@@ -18,7 +18,8 @@
 	</legend>
 	<?cs call:show_help(Lang.Plugins.plugin_manager.Help.VolumePlugins) ?>
 
-	<table class="plugin_list">
+	<table class="plugin_list" id="volume_plugins"><?cs
+			# 'id' is used as a link anchor ?>
 		<tr>
 			<th width="40%"></th>
 			<th colspan="2"><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.WhereVisible) ?></th>
@@ -78,7 +79,8 @@
 		<?cs var:html_escape(Lang.Plugins.plugin_manager.Title.SystemPlugins) ?>
 	</legend>
 	<?cs call:show_help(Lang.Plugins.plugin_manager.Help.SystemPlugins) ?>
-	<table class="plugin_list">
+	<table class="plugin_list" id="system_plugins"><?cs
+			# 'id' is used as a link anchor ?>
 		<tr>
 			<th width="40%"></th>
 			<th colspan="2"><?cs var:html_escape(Lang.Plugins.plugin_manager.Text.WhereVisible) ?></th>
diff --git a/templates/header.cs b/templates/header.cs
index ecb7821..f0814bc 100644
--- a/templates/header.cs
+++ b/templates/header.cs
@@ -105,4 +105,4 @@ if:subcount(Data.StylesheetFiles) > 0
 -->
 		<tr><td><td id="pane_content">
     <div id="words">
-
+	
diff --git a/templates/macros.cs b/templates/macros.cs
index e73a335..2ca3e5a 100644
--- a/templates/macros.cs
+++ b/templates/macros.cs
@@ -240,4 +240,23 @@ def:show_plugin_title() ?>
 def:show_plugin_icon() ?>
 		<img alt="icon: <?cs var:html_escape(Data.ActivePlugin) ?>" src="icons/<?cs
 				var:html_escape(Data.ActivePlugin) ?>" /> <?cs
-/def ?>
+/def ?><?cs
+
+# show the icons of all system plugins ?><?cs
+def:show_system_plugin_overview() ?>
+	<div class="plugin_system_overview">
+	<?cs loop: order = #0, #100, #1
+		?><?cs # plugins ?><?cs each:x = Settings.PluginList
+			?><?cs if:x.Types.system && x.Visible.preferences && x.Rank == order ?>
+				<a href="<?cs
+					call:link(name(x),'','','','') ?>" title="<?cs
+					var:html_escape(Lang.Plugins[name(x)].Link) ?>"><img src="<?cs
+					call:link('icons/' + name(x), '','','','') ?>" alt="<?cs
+					var:html_escape('icon: ' + x.Name) ?>" />
+				<?cs
+			/if ?><?cs
+		/each ?><?cs
+	/loop ?>
+	</div>
+<?cs /def ?>
+
diff --git a/templates/main.cs b/templates/main.cs
index 0c5e3d9..7464a1d 100644
--- a/templates/main.cs
+++ b/templates/main.cs
@@ -10,6 +10,7 @@
 	<?cs include:Settings.TemplateFile ?>
 	<?cs include:Settings.TemplateDir + '/show_volume_footer.cs' ?>
 <?cs else ?>
+	<?cs # remove or enable??? call:show_system_plugin_overview() ?>
 	<?cs include:Settings.TemplateFile ?>
 <?cs /if ?>
 
diff --git a/www-data/cryptobox.css b/www-data/cryptobox.css
index 53c6e55..185acf1 100644
--- a/www-data/cryptobox.css
+++ b/www-data/cryptobox.css
@@ -349,7 +349,7 @@ div.plugin_system_title img {
 	padding-right: 10px;
 }
 
-div.plugin_system_small img {
+div.plugin_system_overview img {
 	float: left;
 	width: 24px;
 	height: 24px;