diff --git a/UI/Contacts/Toolbars/SOGoContactFolder.toolbar b/UI/Contacts/Toolbars/SOGoContactFolder.toolbar
index c73af7c2b..8a3a99286 100644
--- a/UI/Contacts/Toolbars/SOGoContactFolder.toolbar
+++ b/UI/Contacts/Toolbars/SOGoContactFolder.toolbar
@@ -1,4 +1,4 @@
-( /* the toolbar groups -*-cperl-*- */
+( /* the toolbar groups -*-java-*- */
   (
    { link = "#";
      jsLink="js_card";
@@ -6,26 +6,26 @@
      image="new-card.png";
      onclick = "newContact(this); return false;";
      tooltip = "Create a new address book card"; },
-   { link = "new_list";
+   { link = "#";
      label="New List";
      image="new-list.png";
      onclick = "newList(this); return false;";
      tooltip = "Create a new list"; }
   ),
   (
-   { link = "edit";
+   { link = "#";
      label = "Properties";
      onclick = "return onToolbarEditSelectedContacts(this);";
      image = "properties.png";
      tooltip = "Edit the selected card"; },
-   { link = "write";
+   { link = "#";
      label="Write";
      onclick = "return onToolbarWriteToSelectedContacts(this);";
      image="write.png";
      tooltip = "Send a mail message"; }
   ),
   (
-   { link = "delete";
+   { link = "#";
      label="Delete";
      onclick = "return onToolbarDeleteSelectedContacts(this);";
      image="tb-mail-delete-flat-24x24.png";
diff --git a/UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar b/UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar
index 7a11a43f4..8091a7053 100644
--- a/UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar
+++ b/UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar
@@ -1,43 +1,43 @@
-( /* the toolbar groups -*-cperl-*- */
-  ( { link = "new_event";
+( /* the toolbar groups -*-java-*- */
+  ( { link = "#";
       isSafe = NO;
       label = "New Event";
       onclick = "return newEvent('event');";
       image = "new-event.png";
       tooltip = "Create a new event"; },
-    { link  = "new_task";
+    { link = "#";
       label="New Task";
       image = "new-task.png";
       onclick = "return newEvent('task');";
       image = "new-task.png";
       tooltip = "Create a new task"; } ),
-  ( { link  = "today";
+  ( { link = "#";
       label="Go to Today";
       onclick = "return gotoToday();";
       image = "goto-today.png";
       tooltip = "Go to today"; } ),
-  ( { link  = "dayoverview";
+  ( { link = "#";
       label="Day View";
       onclick = "return onDayOverview();";
       image = "day-view.png";
       tooltip = "Switch to day view"; },
-/* disabled until we fix the view */
-/*    { link  = "dayoverview";
-      label="Multicolumn Day View";
-      onclick = "return onMulticolumnDayOverview();";
-      image = "day-view-multicolumn.png";
-      tooltip = ""; }, */
-    { link  = "weekoverview";
+    /* disabled until we fix the view */
+    /*    { link = "#";
+            label="Multicolumn Day View";
+            onclick = "return onMulticolumnDayOverview();";
+            image = "day-view-multicolumn.png";
+            tooltip = ""; }, */
+    { link = "#";
       label="Week View";
       onclick = "return onWeekOverview();";
       image = "week-view.png";
       tooltip = "Switch to week view"; },
-    { link  = "monthoverview";
+    { link = "#";
       label="Month View";
       onclick = "return onMonthOverview();";
       image = "month-view.png";
       tooltip = "Switch to month view"; } ),
-  ( { link  = "delete";
+  ( { link = "#";
       label="Delete";
       onclick = "return deleteEvent(this);";
       image = "tb-mail-delete-flat-24x24.png";