diff --git a/plugins/calendar/skins/classic/calendar.css b/plugins/calendar/skins/classic/calendar.css
index c646b0d5..ff3357b2 100644
--- a/plugins/calendar/skins/classic/calendar.css
+++ b/plugins/calendar/skins/classic/calendar.css
@@ -253,6 +253,14 @@ pre {
   background-position: -64px -32px;
 }
 
+#calendartoolbar a.import {
+	background-position: -168px 0;
+}
+
+#calendartoolbar a.importSel {
+	background-position: -168px -32px;
+}
+
 #calendartoolbar a.export {
 	background-position: -128px 0;
 }
diff --git a/plugins/calendar/skins/classic/images/toolbar.png b/plugins/calendar/skins/classic/images/toolbar.png
index 94beddb3..d49162af 100644
Binary files a/plugins/calendar/skins/classic/images/toolbar.png and b/plugins/calendar/skins/classic/images/toolbar.png differ
diff --git a/plugins/calendar/skins/classic/templates/calendar.html b/plugins/calendar/skins/classic/templates/calendar.html
index ba80ca3c..bb3e4b19 100644
--- a/plugins/calendar/skins/classic/templates/calendar.html
+++ b/plugins/calendar/skins/classic/templates/calendar.html
@@ -36,7 +36,6 @@
     <li><roundcube:button command="calendar-edit" label="calendar.edit" classAct="active" /></li>
     <li><roundcube:button command="calendar-remove" label="calendar.remove" classAct="active" /></li>
     <li><roundcube:button command="calendar-showurl" label="calendar.showurl" classAct="active" /></li>
-    <li><roundcube:button command="events-import" label="calendar.importevents" classAct="active" /></li>
     <roundcube:if condition="env:calendar_driver == 'kolab'" />
     <li class="separator_above"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
     <roundcube:endif />
@@ -159,6 +158,7 @@
 <div id="calendartoolbar">
   <roundcube:button command="addevent" type="link" class="buttonPas addevent" classAct="button addevent" classSel="button addeventSel" title="calendar.new_event" content=" " />
   <roundcube:button command="print" type="link" class="buttonPas print" classAct="button print" classSel="button printSel" title="calendar.print" content=" " />
+  <roundcube:button command="events-import" type="link" class="buttonPas import" classAct="button import" classSel="button importSel" title="calendar.importevents" content=" " />
   <roundcube:button command="export" type="link" class="buttonPas export" classAct="button export" classSel="button exportSel" title="calendar.export" content=" " />
   <roundcube:container name="toolbar" id="calendartoolbar" />
 </div>
diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css
index 48160ad0..32314368 100644
--- a/plugins/calendar/skins/larry/calendar.css
+++ b/plugins/calendar/skins/larry/calendar.css
@@ -275,6 +275,7 @@ pre {
 	top: -6px;
 	left: 0;
 	height: 40px;
+	white-space: nowrap;
 }
 
 #calendartoolbar a.button {
@@ -286,9 +287,17 @@ pre {
 }
 
 #calendartoolbar a.button.export {
+	min-width: 50px;
+	max-width: 55px;
 	background-position: center -40px;
 }
 
+#calendartoolbar a.button.import {
+	min-width: 50px;
+	max-width: 55px;
+	background-position: center -440px;
+}
+
 #calendartoolbar a.button.print {
 	background-position: center -80px;
 }
diff --git a/plugins/calendar/skins/larry/images/toolbar.png b/plugins/calendar/skins/larry/images/toolbar.png
index 16ce4442..f8298375 100644
Binary files a/plugins/calendar/skins/larry/images/toolbar.png and b/plugins/calendar/skins/larry/images/toolbar.png differ
diff --git a/plugins/calendar/skins/larry/templates/calendar.html b/plugins/calendar/skins/larry/templates/calendar.html
index 79ce5add..341632b8 100644
--- a/plugins/calendar/skins/larry/templates/calendar.html
+++ b/plugins/calendar/skins/larry/templates/calendar.html
@@ -14,6 +14,7 @@
 		<div id="calendartoolbar" class="toolbar">
 			<roundcube:button command="addevent" type="link" class="button addevent disabled" classAct="button addevent" classSel="button addevent pressed" label="calendar.new_event" title="calendar.new_event" />
 			<roundcube:button command="print" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="calendar.print" title="calendar.printtitle" />
+			<roundcube:button command="events-import" type="link" class="button import disabled" classAct="button import" classSel="button import pressed" label="import" title="calendar.importevents" />
 			<roundcube:button command="export" type="link" class="button export disabled" classAct="button export" classSel="button export pressed" label="calendar.export" title="calendar.exporttitle" />
 			<roundcube:container name="toolbar" id="calendartoolbar" />
 		</div>
@@ -50,7 +51,6 @@
 		<li><roundcube:button command="calendar-edit" label="calendar.edit" classAct="active" /></li>
 		<li><roundcube:button command="calendar-remove" label="calendar.remove" classAct="active" /></li>
 		<li><roundcube:button command="calendar-showurl" label="calendar.showurl" classAct="active" /></li>
-		<li><roundcube:button command="events-import" label="calendar.importevents" classAct="active" /></li>
 		<roundcube:if condition="env:calendar_driver == 'kolab'" />
 		<li class="separator_above"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
 		<roundcube:endif />