diff --git a/plugins/calendar/lib/calendar_ui.php b/plugins/calendar/lib/calendar_ui.php
index c25f9317..c0a661b6 100644
--- a/plugins/calendar/lib/calendar_ui.php
+++ b/plugins/calendar/lib/calendar_ui.php
@@ -52,9 +52,6 @@ class calendar_ui
     
     $skin = $this->rc->config->get('skin');
     $this->calendar->include_stylesheet('skins/' . $skin . '/calendar.css');
-    
-    // add iehacks to page footer
-    $this->rc->output->add_footer('<!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="'.$this->calendar->urlbase.'skins/'.$skin.'/iehacks.css" /><![endif]-->');
   }
   
   /**
diff --git a/plugins/calendar/skins/default/calendar.css b/plugins/calendar/skins/default/calendar.css
index ff1cb367..42c22a19 100644
--- a/plugins/calendar/skins/default/calendar.css
+++ b/plugins/calendar/skins/default/calendar.css
@@ -8,6 +8,11 @@ body.calendarmain {
 	background: url('images/calendar.png') 0px 1px no-repeat;
 }
 
+/* hack for IE 6/7 */
+* html #taskbar a.button-calendar {
+	background-image: url('images/calendar.gif');
+}
+
 #main {
 	position: absolute;
 	clear: both;
@@ -106,7 +111,7 @@ pre {
 
 #calendarslist li span {
 	cursor: default;
-	background: url('images/calendars.png') 0 -3px no-repeat;
+	background: url('images/calendars.png') 0 -2px no-repeat;
 	padding-left: 18px;
 }
 
@@ -124,23 +129,23 @@ pre {
 }
 
 #calendarslist li.readonly span {
-    background-position: 0 -21px;
+    background-position: 0 -20px;
 }
 
 #calendarslist li.other span {
-    background-position: 0 -39px;
+    background-position: 0 -38px;
 }
 
 #calendarslist li.other.readonly span {
-    background-position: 0 -57px;
+    background-position: 0 -56px;
 }
 
 #calendarslist li.shared span {
-    background-position: 0 -75px;
+    background-position: 0 -74px;
 }
 
 #calendarslist li.shared.readonly span {
-    background-position: 0 -93px;
+    background-position: 0 -92px;
 }
 
 #agendalist {
diff --git a/plugins/calendar/skins/default/iehacks.css b/plugins/calendar/skins/default/iehacks.css
index 55505861..fa282176 100644
--- a/plugins/calendar/skins/default/iehacks.css
+++ b/plugins/calendar/skins/default/iehacks.css
@@ -23,19 +23,19 @@
 	filter: alpha(opacity=35);
 }
 
-html #taskbar a.button-calendar {
-	background-image: url(images/calendar.gif);
-}
-
 html #calendartoolbar a.button,
 html #calendartoolbar a.buttonPas {
 	background-image: url(images/toolbar.gif);
 }
 
-html.ie #datepicker a.ui-priority-secondary {
+#datepicker a.ui-priority-secondary {
 	filter: alpha(opacity=40);
 }
 
+#calendarslist li span {
+	background-image: url(images/calendars.gif);
+}
+
 #datepicker .ui-widget-header {
 	width: 102%;
 }
diff --git a/plugins/calendar/skins/default/images/calendars.gif b/plugins/calendar/skins/default/images/calendars.gif
new file mode 100644
index 00000000..35314095
Binary files /dev/null and b/plugins/calendar/skins/default/images/calendars.gif differ
diff --git a/plugins/calendar/skins/default/images/calendars.png b/plugins/calendar/skins/default/images/calendars.png
index 305daaa0..76005d7f 100644
Binary files a/plugins/calendar/skins/default/images/calendars.png and b/plugins/calendar/skins/default/images/calendars.png differ
diff --git a/plugins/calendar/skins/default/jquery.miniColors.css b/plugins/calendar/skins/default/jquery.miniColors.css
index c6e3e456..6e7b6c22 100644
--- a/plugins/calendar/skins/default/jquery.miniColors.css
+++ b/plugins/calendar/skins/default/jquery.miniColors.css
@@ -62,4 +62,24 @@
 	width: 26px;
 	height: 3px;
 	background: url('images/minicolors-all.png') -170px -24px no-repeat;
-}
\ No newline at end of file
+	overflow: hidden;
+}
+
+/* Hacks for IE6/7 */
+
+* html .miniColors-colors {
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='plugins/calendar/skins/default/images/minicolors-all.png', sizingMethod='crop');
+}
+
+* html .miniColors-colorPicker {
+	background: url('images/minicolors-handles.gif') 0 -28px no-repeat;
+}
+
+* html .miniColors-huePicker {
+	background: url('images/minicolors-handles.gif') 0 -24px no-repeat;
+}
+
+* html .miniColors-trigger {
+	background: url('images/minicolors-handles.gif') 0 0 no-repeat;
+}
diff --git a/plugins/calendar/skins/default/templates/calendar.html b/plugins/calendar/skins/default/templates/calendar.html
index 0922d1d3..d8115f09 100644
--- a/plugins/calendar/skins/default/templates/calendar.html
+++ b/plugins/calendar/skins/default/templates/calendar.html
@@ -4,6 +4,7 @@
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
 <script type="text/javascript" src="/functions.js"></script>
+<!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="./plugins/calendar/skins/default/iehacks.css" /><![endif]-->
 </head>
 <body class="calendarmain">
 
diff --git a/plugins/kolab_addressbook/skins/default/kolab_folders.gif b/plugins/kolab_addressbook/skins/default/kolab_folders.gif
new file mode 100644
index 00000000..3ac6fc48
Binary files /dev/null and b/plugins/kolab_addressbook/skins/default/kolab_folders.gif differ
diff --git a/plugins/kolab_addressbook/skins/default/kolab_folders.png b/plugins/kolab_addressbook/skins/default/kolab_folders.png
index cd6228a7..95a192e5 100644
Binary files a/plugins/kolab_addressbook/skins/default/kolab_folders.png and b/plugins/kolab_addressbook/skins/default/kolab_folders.png differ