diff --git a/plugins/calendar/localization/en_US.inc b/plugins/calendar/localization/en_US.inc
--- a/plugins/calendar/localization/en_US.inc
+++ b/plugins/calendar/localization/en_US.inc
@@ -239,6 +239,7 @@
 $labels['tabresources'] = 'Resources';
 $labels['tabattachments'] = 'Attachments';
 $labels['tabsharing'] = 'Sharing';
+$labels['tabmore'] = 'More';
 
 // messages
 $labels['deleteobjectconfirm'] = 'Do you really want to delete this event?';
diff --git a/plugins/calendar/skins/elastic/templates/eventedit.html b/plugins/calendar/skins/elastic/templates/eventedit.html
--- a/plugins/calendar/skins/elastic/templates/eventedit.html
+++ b/plugins/calendar/skins/elastic/templates/eventedit.html
@@ -3,17 +3,11 @@
 		<!-- basic info -->
 		<fieldset id="event-panel-summary">
 			<legend><roundcube:label name="calendar.tabsummary" /></legend>
-			<div class="form-group">
-				<label for="edit-title"><roundcube:label name="calendar.title" /></label>
-				<input type="text" class="form-control" name="title" id="edit-title" size="40" required="true" />
-			</div>
-			<div class="form-group">
-				<label for="edit-location"><roundcube:label name="calendar.location" /></label>
-				<input type="text" class="form-control" name="location" id="edit-location" size="40" />
-			</div>
-			<div class="form-group">
-				<label for="edit-description"><roundcube:label name="calendar.description" /></label>
-				<textarea name="description" id="edit-description" class="form-control" rows="5" cols="40"></textarea>
+			<div class="form-group row">
+				<label for="edit-title" class="col-sm-2 col-form-label"><roundcube:label name="calendar.title" /></label>
+				<div class="col-sm-10">
+					<input type="text" class="form-control" name="title" id="edit-title" size="40" required="true" />
+				</div>
 			</div>
 			<div class="form-group row">
 				<label for="edit-startdate" class="col-sm-2 col-form-label"><roundcube:label name="calendar.start" /></label>
@@ -30,6 +24,18 @@
 					<input type="text" name="endtime" size="6" id="edit-endtime" class="form-control" aria-label="<roundcube:label name='calendar.endtime' />" />
 				</div>
 			</div>
+			<div class="form-group row">
+				<label for="edit-location" class="col-sm-2 col-form-label"><roundcube:label name="calendar.location" /></label>
+				<div class="col-sm-10">
+					<input type="text" class="form-control" name="location" id="edit-location" size="40" />
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="edit-description" class="col-sm-2 col-form-label"><roundcube:label name="calendar.description" /></label>
+				<div class="col-sm-10">
+					<textarea name="description" id="edit-description" class="form-control" rows="5" cols="40"></textarea>
+				</div>
+			</div>
 			<div class="form-group row" id="edit-alarms">
 				<label for="edit-alarm-item" class="col-sm-2 col-form-label"><roundcube:label name="calendar.alarms" /></label>
 				<div class="col-sm-10 alarms-input">
@@ -54,36 +60,6 @@
 					<roundcube:object name="plugin.category_select" id="edit-categories" class="form-control" />
 				</div>
 			</div>
-			<div class="form-group row">
-				<label for="edit-event-status" class="col-sm-2 col-form-label"><roundcube:label name="calendar.status" /></label>
-				<div class="col-sm-10">
-					<roundcube:object name="plugin.status_select" id="edit-event-status" class="form-control" />
-				</div>
-			</div>
-			<div class="form-group row">
-				<label for="edit-free-busy" class="col-sm-2 col-form-label"><roundcube:label name="calendar.freebusy" /></label>
-				<div class="col-sm-10">
-					<roundcube:object name="plugin.freebusy_select" id="edit-free-busy" class="form-control" />
-				</div>
-			</div>
-			<div class="form-group row">
-				<label for="edit-priority" class="col-sm-2 col-form-label"><roundcube:label name="calendar.priority" /></label>
-				<div class="col-sm-10">
-					<roundcube:object name="plugin.priority_select" id="edit-priority" class="form-control" />
-				</div>
-			</div>
-			<div class="form-group row">
-				<label for="edit-sensitivity" class="col-sm-2 col-form-label"><roundcube:label name="calendar.sensitivity" /></label>
-				<div class="col-sm-10">
-					<roundcube:object name="plugin.sensitivity_select" id="edit-sensitivity" class="form-control" />
-				</div>
-			</div>
-			<div class="form-group row">
-				<label for="edit-url" class="col-sm-2 col-form-label"><roundcube:label name="calendar.url" /></label>
-				<div class="col-sm-10">
-					<input type="text" class="form-control" name="vurl" id="edit-url" size="40" />
-				</div>
-			</div>
 			<div class="form-group row" id="edit-event-links">
 				<label class="col-sm-2 col-form-label"><roundcube:label name="calendar.links" /></label>
 				<div class="col-sm-10">
@@ -135,8 +111,8 @@
 			<roundcube:include file="/templates/freebusylegend.html" />
 		</fieldset>
 		<!-- attachments list (with upload form) -->
-		<fieldset id="event-panel-attachments" data-navlink-class="nav-icon attachments">
-			<legend><roundcube:label name="calendar.tabattachments" /></legend>
+		<fieldset id="event-panel-attachments" data-navlink-class="nav-icon more">
+			<legend><roundcube:label name="calendar.tabmore" /></legend>
 			<div id="edit-attachments-droparea" class="file-upload">
 				<h3 id="aria-label-attachmentuploadform" class="voice"><roundcube:label name="arialabelattachmentuploadform" /></h3>
 				<div id="edit-attachments-form" class="upload-form" role="region" aria-labelledby="aria-label-attachmentuploadform">
@@ -148,6 +124,37 @@
 				</div>
 			</div>
 			<roundcube:object name="plugin.filedroparea" id="edit-attachments-droparea" />
+			<br>
+			<div class="form-group row">
+				<label for="edit-url" class="col-sm-2 col-form-label"><roundcube:label name="calendar.url" /></label>
+				<div class="col-sm-10">
+					<input type="text" class="form-control" name="vurl" id="edit-url" size="40" />
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="edit-event-status" class="col-sm-2 col-form-label"><roundcube:label name="calendar.status" /></label>
+				<div class="col-sm-10">
+					<roundcube:object name="plugin.status_select" id="edit-event-status" class="form-control" />
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="edit-free-busy" class="col-sm-2 col-form-label"><roundcube:label name="calendar.freebusy" /></label>
+				<div class="col-sm-10">
+					<roundcube:object name="plugin.freebusy_select" id="edit-free-busy" class="form-control" />
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="edit-sensitivity" class="col-sm-2 col-form-label"><roundcube:label name="calendar.sensitivity" /></label>
+				<div class="col-sm-10">
+					<roundcube:object name="plugin.sensitivity_select" id="edit-sensitivity" class="form-control" />
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="edit-priority" class="col-sm-2 col-form-label"><roundcube:label name="calendar.priority" /></label>
+				<div class="col-sm-10">
+					<roundcube:object name="plugin.priority_select" id="edit-priority" class="form-control" />
+				</div>
+			</div>
 		</fieldset>
 	</form>
 	<roundcube:object name="plugin.edit_recurrence_sync" id="edit-recurrence-syncstart" class="dialog-message" style="display:none" />
diff --git a/plugins/libkolab/skins/elastic/include/libcalendaring.less b/plugins/libkolab/skins/elastic/include/libcalendaring.less
--- a/plugins/libkolab/skins/elastic/include/libcalendaring.less
+++ b/plugins/libkolab/skins/elastic/include/libcalendaring.less
@@ -706,8 +706,8 @@
             margin-left: .1rem;
         }
 
-        &.attachments:before {
-            content: @fa-var-paperclip;
+        &.more:before {
+            content: @fa-var-ellipsis-h;
         }
 
         &.attendees:before {