diff --git a/src/www/Bongo.rules b/src/www/Bongo.rules
index c68a445..7d50a3b 100644
--- a/src/www/Bongo.rules
+++ b/src/www/Bongo.rules
@@ -215,7 +215,12 @@ dist_img_DATA :=					     \
 	src/www/img/system-users.png \
 	src/www/img/user.png \
 	src/www/img/user-desktop.png    \
-	src/www/img/agent-control.png
+	src/www/img/agent-control.png   \
+	src/www/img/agent-bongoimap.png \
+	src/www/img/agent-bongomailprox.png \
+	src/www/img/agent-bongopluspack.png \
+	src/www/img/agent-bongopop3.png \
+	src/www/img/agent-bongosmtp.png
 
 
 jsdir = $(htdocsdir)/js
diff --git a/src/www/bongo/hawkeye/AgentView.py b/src/www/bongo/hawkeye/AgentView.py
index db4167b..0814b48 100644
--- a/src/www/bongo/hawkeye/AgentView.py
+++ b/src/www/bongo/hawkeye/AgentView.py
@@ -16,7 +16,9 @@ class AgentHandler(HawkeyeHandler):
         # change things which eval. to False to empty elements
         if config != None and config.has_key("agents"):
             for agent in config["agents"]:
-               agent["url"] = "%(url|/)sagents/" + agent["name"]
+               # We can change this if needed?
+               agent["url"] = agent["name"]
+               agent["rname"] = self._humanReadableName(agent["name"])
                agent["img"] = "../img/agent-" + agent["name"] + ".png"
                if not agent["enabled"]:
                    agent["enabled"] = None
@@ -50,6 +52,33 @@ class AgentHandler(HawkeyeHandler):
         # Operation completed OK.
         doneop = 1
         return self.index_GET(req, rp)
+        
+    def _humanReadableName(self, agentname)
+        # TODO: Translation, once we have a system in place.
+        if agentname == "bongoqueue":
+            return "Queue"
+        elif agentname == "bongosmtp":
+            return "SMTP"
+        elif agentname == "bongoantispam":
+            return "Antispam"
+        elif agentname == "bongoavirus":
+            return "Antivirus"
+        elif agentname == "bongocollector":
+            return "Calendar collector"
+        elif agentname == "bongomailprox":
+            return "Mail proxy"
+        elif agentname == "bongopluspack":
+            return "Plus pack"
+        elif agentname == "bongorules":
+            return "Rules"
+        elif agentname == "bongoimap":
+            return "IMAP"
+        elif agentname == "bongopop3":
+            return "POP3"
+        elif agentname == "bongocalcmd":
+            return "iCal"
+        else:
+            return "Unknown agent"
     
     def _getAgents(self, req):
         config = {}
diff --git a/src/www/hawkeye/agents/index.tpl b/src/www/hawkeye/agents/index.tpl
index 672167f..2e21695 100644
--- a/src/www/hawkeye/agents/index.tpl
+++ b/src/www/hawkeye/agents/index.tpl
@@ -19,8 +19,8 @@
 </div>
 
 <div tal:repeat="agent agentlist" style="float: left;">
-    <div class="icon">
-        <a tal:attributes="href agent/url"><img border="0" align="middle" src="../img/agent-unknown.png" tal:attributes="alt agent/name;src agent/img" /><span tal:content="agent/name">Unknown Agent</span></a>
+    <div class="icon" tal:condition="agent/enabled">
+        <a tal:attributes="href agent/url"><img border="0" align="middle" src="../img/agent-unknown.png" tal:attributes="alt agent/name;src agent/img" /><span tal:content="agent/rname">Unknown Agent</span></a>
     </div>
 </div>
 
diff --git a/src/www/img/agent-bongoimap.png b/src/www/img/agent-bongoimap.png
new file mode 100644
index 0000000..57ac1fc
Binary files /dev/null and b/src/www/img/agent-bongoimap.png differ
diff --git a/src/www/img/agent-bongomailprox.png b/src/www/img/agent-bongomailprox.png
new file mode 100644
index 0000000..eec6a3c
Binary files /dev/null and b/src/www/img/agent-bongomailprox.png differ
diff --git a/src/www/img/agent-bongopluspack.png b/src/www/img/agent-bongopluspack.png
new file mode 100644
index 0000000..9e81e94
Binary files /dev/null and b/src/www/img/agent-bongopluspack.png differ
diff --git a/src/www/img/agent-bongopop3.png b/src/www/img/agent-bongopop3.png
new file mode 100644
index 0000000..57ac1fc
Binary files /dev/null and b/src/www/img/agent-bongopop3.png differ
diff --git a/src/www/img/agent-bongosmtp.png b/src/www/img/agent-bongosmtp.png
new file mode 100644
index 0000000..9655f1e
Binary files /dev/null and b/src/www/img/agent-bongosmtp.png differ