diff --git a/config/menu.ini b/config/menu.ini
index e2c505e73..73f3ebe40 100755
--- a/config/menu.ini
+++ b/config/menu.ini
@@ -1,22 +1,17 @@
-;[menu]
-;Dashboard.title     = "Dashboard"
-;Dashboard.route     = "/dashboard/index"
-;Dashboard.iconClass = "icinga-icon-dashboard-petrol"
-;
-;Configuration.title     = "Configuration"
-;Configuration.route     = "/config/index"
-;Configuration.iconClass = "icinga-icon-configuration-petrol"
-
 [Home]
-title = "Home"
-url = "/index/welcome"
-priority = "1"
-icon = "/img/icons/down.png" 
- 
+title       = "Home"
+url         = "/index/welcome"
+icon        = "/img/icons/down_petrol.png"
+priority    = 1
+
+[Configuration]
+title       = "Configuration"
+url         = "/config/index"
+icon_class  = "icinga-icon-configuration-petrol"
+priority    = 2
+
 [Dashboard]
-title = "Dashboard"
-url = "/dashboard/index"
-priority = "5"
-icon = "/img/icons/askgoogle.jpg"
-icon_class = "testclass" 
- 
\ No newline at end of file
+title       = "Dashboard"
+url         = "/dashboard/index"
+icon        = "/img/icons/dashboard_petrol.png"
+priority    = 3
diff --git a/config/modules/monitoring/menu.ini b/config/modules/monitoring/menu.ini
index 55813a4b0..0ffe74dc6 100755
--- a/config/modules/monitoring/menu.ini
+++ b/config/modules/monitoring/menu.ini
@@ -1,52 +1,43 @@
-; title
-; url
-; priority
-; icon
-; icon class
-
 [Hosts]
-title = "Hosts"
-url = "/monitoring/index"
-priority = "2"
-icon = "" 
+title       = "Hosts"
+url         = "/monitoring/list/hosts"
+icon_class  = "icinga-icon-host-petrol"
 
-[Hosts.Problems]
-url = "/monitoring/index?grp=probs"
-priority = "1"
-icon = "" 
+[Services]
+title       = "Services"
+url         = "/monitoring/list/services"
+icon_class  = "icinga-icon-service-petrol"
 
-[Hosts.Mail]
-priority = "2"
-icon = "" 
+[Downtimes]
+title       = "Downtimes"
+url         = "/monitoring/list/downtimes"
+icon_class  = "icinga-icon-down-petrol"
 
-[Hosts.Exchange]
-title = "Hosts Exchange"
-url = "/monitoring/index?grp=exchange"
-priority = "5"
-icon = "" 
+[Notifications]
+title       = "Notifications"
+url         = "/monitoring/list/notifications"
+icon_class  = "icinga-icon-notification-petrol"
 
-[Cluster]
-title = "Cluster"
-url = "/monitoring/index?grp=cluster"
-priority = "10"
-icon = "" 
+[Comments]
+title       = "Comments"
+url         = "/monitoring/list/comments"
+icon_class  = "icinga-icon-comment-petrol"
 
-[Cluster.Cluster1]
-title = "Cluster Cluster1"
-url = "#"
-priority = "1"
-icon = "" 
+[Servicegroups]
+title       = "Servicegroups"
+url         = "/monitoring/list/servicegroups"
+icon_class  = "icinga-icon-servicegroup-petrol"
 
-[Cluster.Cluster2]
-title = "Cluster 2"
-url = "#"
-priority = "2"
-icon = "" 
+[Hostgroups]
+title       = "Hostgroups"
+url         = "/monitoring/list/hostgroups"
+icon_class  = "icinga-icon-hostgroup-petrol"
 
+[History]
+title       = "History"
+url         = "/monitoring/list/eventhistory"
+icon_class  = "icinga-icon-history-petrol"
 
-[Hosts.Exchange.Ex1]
-title = "Hosts Exchange Ex1"
-url = "#"
-priority = "2"
-icon = "" 
-
+[Performance]
+title   = "Performance"
+url     = "/monitoring/process/performance"