diff --git a/UI/Contacts/Toolbars/SOGoContactFolder.toolbar b/UI/Contacts/Toolbars/SOGoContactFolder.toolbar
new file mode 100644
index 000000000..fafdca034
--- /dev/null
+++ b/UI/Contacts/Toolbars/SOGoContactFolder.toolbar
@@ -0,0 +1,24 @@
+( /* the toolbar groups -*-cperl-*- */
+  (
+   { link = "new";
+     jsLink="js_card";
+     label="New Card";
+     image="new-card.png"; },
+   { link = "new_list";
+     label="New List";
+     image="new-list.png"; }
+  ),
+  (
+   { link = "properties";
+     label = "Properties";
+     image = "properties.png"; },
+   { link = "write";
+     label="Write";
+     image="write.png"; }
+  ),
+  (
+   { link = "delete";
+     label="Delete";
+     image="delete.png"; }
+  )
+)
diff --git a/UI/MailerUI/Images/tb-ab-delete-flat-24x24.png b/UI/MailerUI/Images/tb-ab-delete-flat-24x24.png
new file mode 100644
index 000000000..cf2908466
Binary files /dev/null and b/UI/MailerUI/Images/tb-ab-delete-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-ab-instantmessage-flat-24x24.png b/UI/MailerUI/Images/tb-ab-instantmessage-flat-24x24.png
new file mode 100644
index 000000000..50ae076bb
Binary files /dev/null and b/UI/MailerUI/Images/tb-ab-instantmessage-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-ab-newcard-flat-24x24.png b/UI/MailerUI/Images/tb-ab-newcard-flat-24x24.png
new file mode 100644
index 000000000..a94ac2c96
Binary files /dev/null and b/UI/MailerUI/Images/tb-ab-newcard-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-ab-newlist-flat-24x24.png b/UI/MailerUI/Images/tb-ab-newlist-flat-24x24.png
new file mode 100644
index 000000000..319696892
Binary files /dev/null and b/UI/MailerUI/Images/tb-ab-newlist-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-ab-properties-flat-24x24.png b/UI/MailerUI/Images/tb-ab-properties-flat-24x24.png
new file mode 100644
index 000000000..72f233c98
Binary files /dev/null and b/UI/MailerUI/Images/tb-ab-properties-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-ab-write-flat-24x24.png b/UI/MailerUI/Images/tb-ab-write-flat-24x24.png
new file mode 100644
index 000000000..dc65f210f
Binary files /dev/null and b/UI/MailerUI/Images/tb-ab-write-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-compose-attach-flat-24x24.png b/UI/MailerUI/Images/tb-compose-attach-flat-24x24.png
new file mode 100644
index 000000000..717a7e6af
Binary files /dev/null and b/UI/MailerUI/Images/tb-compose-attach-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-compose-contacts-flat-24x24.png b/UI/MailerUI/Images/tb-compose-contacts-flat-24x24.png
new file mode 100644
index 000000000..489eadf8d
Binary files /dev/null and b/UI/MailerUI/Images/tb-compose-contacts-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-compose-copy-flat-24x24.png b/UI/MailerUI/Images/tb-compose-copy-flat-24x24.png
new file mode 100644
index 000000000..fc1c5f2aa
Binary files /dev/null and b/UI/MailerUI/Images/tb-compose-copy-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-compose-cut-flat-24x24.png b/UI/MailerUI/Images/tb-compose-cut-flat-24x24.png
new file mode 100644
index 000000000..5b52d3240
Binary files /dev/null and b/UI/MailerUI/Images/tb-compose-cut-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-compose-paste-flat-24x24.png b/UI/MailerUI/Images/tb-compose-paste-flat-24x24.png
new file mode 100644
index 000000000..79a55f382
Binary files /dev/null and b/UI/MailerUI/Images/tb-compose-paste-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-compose-quote-flat-24x24.png b/UI/MailerUI/Images/tb-compose-quote-flat-24x24.png
new file mode 100644
index 000000000..786962650
Binary files /dev/null and b/UI/MailerUI/Images/tb-compose-quote-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-compose-save-flat-24x24.png b/UI/MailerUI/Images/tb-compose-save-flat-24x24.png
new file mode 100644
index 000000000..28d6f178e
Binary files /dev/null and b/UI/MailerUI/Images/tb-compose-save-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-compose-security-flat-24x24.png b/UI/MailerUI/Images/tb-compose-security-flat-24x24.png
new file mode 100644
index 000000000..a6a1fbd9e
Binary files /dev/null and b/UI/MailerUI/Images/tb-compose-security-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-compose-send-flat-24x24.png b/UI/MailerUI/Images/tb-compose-send-flat-24x24.png
new file mode 100644
index 000000000..9c1290700
Binary files /dev/null and b/UI/MailerUI/Images/tb-compose-send-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-compose-spell-flat-24x24.png b/UI/MailerUI/Images/tb-compose-spell-flat-24x24.png
new file mode 100644
index 000000000..44fadc7ad
Binary files /dev/null and b/UI/MailerUI/Images/tb-compose-spell-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-mail-addressbook-flat-24x24.png b/UI/MailerUI/Images/tb-mail-addressbook-flat-24x24.png
new file mode 100644
index 000000000..98473e190
Binary files /dev/null and b/UI/MailerUI/Images/tb-mail-addressbook-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-mail-delete-flat-24x24.png b/UI/MailerUI/Images/tb-mail-delete-flat-24x24.png
new file mode 100644
index 000000000..66e9f236f
Binary files /dev/null and b/UI/MailerUI/Images/tb-mail-delete-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-mail-file-flat-24x24.png b/UI/MailerUI/Images/tb-mail-file-flat-24x24.png
new file mode 100644
index 000000000..59749929e
Binary files /dev/null and b/UI/MailerUI/Images/tb-mail-file-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-mail-forward-flat-24x24.png b/UI/MailerUI/Images/tb-mail-forward-flat-24x24.png
new file mode 100644
index 000000000..40e140231
Binary files /dev/null and b/UI/MailerUI/Images/tb-mail-forward-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-mail-getmail-flat-24x24.png b/UI/MailerUI/Images/tb-mail-getmail-flat-24x24.png
new file mode 100644
index 000000000..4a35c6033
Binary files /dev/null and b/UI/MailerUI/Images/tb-mail-getmail-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-mail-junk-flat-24x24.png b/UI/MailerUI/Images/tb-mail-junk-flat-24x24.png
new file mode 100644
index 000000000..24ace63e8
Binary files /dev/null and b/UI/MailerUI/Images/tb-mail-junk-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-mail-mark-flat-24x24.png b/UI/MailerUI/Images/tb-mail-mark-flat-24x24.png
new file mode 100644
index 000000000..1f009b32b
Binary files /dev/null and b/UI/MailerUI/Images/tb-mail-mark-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-mail-next-flat-24x24.png b/UI/MailerUI/Images/tb-mail-next-flat-24x24.png
new file mode 100644
index 000000000..83a47cb67
Binary files /dev/null and b/UI/MailerUI/Images/tb-mail-next-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-mail-prev-flat-24x24.png b/UI/MailerUI/Images/tb-mail-prev-flat-24x24.png
new file mode 100644
index 000000000..d2a9f725b
Binary files /dev/null and b/UI/MailerUI/Images/tb-mail-prev-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-mail-print-flat-24x24.png b/UI/MailerUI/Images/tb-mail-print-flat-24x24.png
new file mode 100644
index 000000000..5f7d2824d
Binary files /dev/null and b/UI/MailerUI/Images/tb-mail-print-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-mail-reply-flat-24x24.png b/UI/MailerUI/Images/tb-mail-reply-flat-24x24.png
new file mode 100644
index 000000000..ea32a1b90
Binary files /dev/null and b/UI/MailerUI/Images/tb-mail-reply-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-mail-replyall-flat-24x24.png b/UI/MailerUI/Images/tb-mail-replyall-flat-24x24.png
new file mode 100644
index 000000000..d2b49c463
Binary files /dev/null and b/UI/MailerUI/Images/tb-mail-replyall-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-mail-stop-flat-24x24.png b/UI/MailerUI/Images/tb-mail-stop-flat-24x24.png
new file mode 100644
index 000000000..bc6e96b94
Binary files /dev/null and b/UI/MailerUI/Images/tb-mail-stop-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tb-mail-write-flat-24x24.png b/UI/MailerUI/Images/tb-mail-write-flat-24x24.png
new file mode 100644
index 000000000..649ccbc80
Binary files /dev/null and b/UI/MailerUI/Images/tb-mail-write-flat-24x24.png differ
diff --git a/UI/MailerUI/Images/tbtb_anais.png b/UI/MailerUI/Images/tbtb_anais.png
new file mode 100644
index 000000000..96c113c72
Binary files /dev/null and b/UI/MailerUI/Images/tbtb_anais.png differ
diff --git a/UI/MailerUI/Images/tbtb_folderadd.png b/UI/MailerUI/Images/tbtb_folderadd.png
new file mode 100644
index 000000000..3f256e163
Binary files /dev/null and b/UI/MailerUI/Images/tbtb_folderadd.png differ
diff --git a/UI/MailerUI/Images/tbtb_folderdel.png b/UI/MailerUI/Images/tbtb_folderdel.png
new file mode 100644
index 000000000..9eaa44016
Binary files /dev/null and b/UI/MailerUI/Images/tbtb_folderdel.png differ
diff --git a/UI/Scheduler/Toolbars/SOGoAppointmentFolder.toolbar b/UI/Scheduler/Toolbars/SOGoAppointmentFolder.toolbar
new file mode 100644
index 000000000..f377d4215
--- /dev/null
+++ b/UI/Scheduler/Toolbars/SOGoAppointmentFolder.toolbar
@@ -0,0 +1,26 @@
+( /* the toolbar groups -*-cperl-*- */
+  ( { link  = "new";
+      label="New Event";
+      image="new-event.png"; },
+    { link  = "new_task";
+      label="New Task";
+      image = "new-task.png"; },
+    { link  = "edit";
+      label="Edit";
+      image = "edit.png"; },
+    { link  = "delete";
+      label="Delete";
+      image = "delete.png"; } ),
+  ( { link  = "today";
+      label="Go to Today";
+      image = "goto-today.png" } ),
+  ( { link  = "dayoverview";
+      label="Day View";
+      image = "day-view.png"; },
+    { link  = "weekoverview";
+      label="Week View";
+      image = "week-view.png"; },
+    { link  = "monthoverview";
+      label="Month View";
+      image = "month-view.png"; } )
+)