diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index 6a625b62..28b2595c 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -42,7 +42,7 @@ window.rcmail && window.files_api && rcmail.addEventListener('init', function()
         var link = $('<a href="#" class="button filesaveall">')
           .text(rcmail.gettext('kolab_files.saveall'))
           .click(function() { kolab_directory_selector_dialog(); })
-          .insertAfter(attachment_list);
+          .insertAfter($('.header-content > .header-links').length ? $('.header-links > a:last') : attachment_list);
       }
 
       rcmail.addEventListener('menu-open', kolab_files_attach_menu_open);
@@ -56,7 +56,7 @@ window.rcmail && window.files_api && rcmail.addEventListener('init', function()
     if (!rcmail.env.action || rcmail.env.action == 'show' || rcmail.env.action == 'preview') {
       // add "attach from cloud" button for event/task dialog in mail
       rcmail.addEventListener('plugin.mail2event_dialog', function() {
-        if (!$('#calendar-attachment-form input.fromcloud').length)
+        if (!$('#calendar-attachment-form a.fromcloud').length)
           kolab_files_from_cloud_widget($('#calendar-attachment-form > div.buttons'));
       });
     }
@@ -238,9 +238,9 @@ function kolab_files_token()
 
 function kolab_files_from_cloud_widget(elem)
 {
-  var input = $('<input class="button fromcloud" type="button">')
+  $('<a class="button btn btn-secondary fromcloud">')
       .attr('tabindex', $('input', elem).attr('tabindex') || 0)
-      .val(rcmail.gettext('kolab_files.fromcloud'))
+      .text(rcmail.gettext('kolab_files.fromcloud'))
       .click(function() { kolab_files_selector_dialog(); })
       .appendTo(elem);
 
diff --git a/plugins/libkolab/skins/elastic/include/kolab_files.less b/plugins/libkolab/skins/elastic/include/kolab_files.less
new file mode 100644
index 00000000..c6455642
--- /dev/null
+++ b/plugins/libkolab/skins/elastic/include/kolab_files.less
@@ -0,0 +1,29 @@
+/**
+ * Kolab core library
+ *
+ * This file contains Elastic skin styles for kolab_files plugin.
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+a.btn.fromcloud:before,
+li > a.icon.saveas:before,
+a.button.filesaveall:before {
+    &:extend(.font-icon-class);
+    content: @fa-var-folder;
+}
diff --git a/plugins/libkolab/skins/elastic/include/tasklist.less b/plugins/libkolab/skins/elastic/include/tasklist.less
index fefa5f78..efcc65ca 100644
--- a/plugins/libkolab/skins/elastic/include/tasklist.less
+++ b/plugins/libkolab/skins/elastic/include/tasklist.less
@@ -22,6 +22,7 @@
  */
 
 .toolbarmenu.listing li {
+    a.tasklistlink:before,
     a.taskaddlink:before {
         content: @fa-var-tasks;
     }
diff --git a/plugins/libkolab/skins/elastic/libkolab.less b/plugins/libkolab/skins/elastic/libkolab.less
index 03a57c5e..e5d605d1 100644
--- a/plugins/libkolab/skins/elastic/libkolab.less
+++ b/plugins/libkolab/skins/elastic/libkolab.less
@@ -279,6 +279,7 @@ a.history {
 @import "include/calendar";
 @import "include/kolab_activesync";
 @import "include/kolab_delegation";
+@import "include/kolab_files";
 @import "include/kolab_notes";
 @import "include/kolab_tags";
 @import "include/tasklist";