diff --git a/src/views/email.html b/src/views/email.html
index f0f3882bf..bd52b1b0e 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -408,8 +408,8 @@
         <h3 style="margin-bottom: 15px;">{{ 'email.incoming.mailboxes.title' | tr }}
           <button class="btn btn-primary btn-outline pull-right" ng-click="mailboxes.add.show()"  ng-disabled="!domain.mailConfig.enabled" tooltip-enable="!domain.mailConfig.enabled" uib-tooltip="{{ 'email.incoming.mailboxes.disabledTooltip' | tr }}"><i class="fa fa-inbox"></i> {{ 'email.incoming.mailboxes.addAction' | tr }}</button>
           <div class="btn-group pull-right" style="margin-left: 5px;">
-            <button class="btn btn-primary" ng-click="mailboxImport.show()" uib-tooltip="Import Mailboxes" tooltip-append-to-body="true"><i class="fa fa-file-import"></i></button>
-            <button class="btn btn-primary" ng-click="mailboxExport()" uib-tooltip="Export Mailboxes" tooltip-append-to-body="true"><i class="fa fa-file-export"></i></button>
+            <button class="btn btn-default" ng-click="mailboxImport.show()" uib-tooltip="Import Mailboxes" tooltip-append-to-body="true"><i class="fas fa-download"></i></button>
+            <button class="btn btn-default" ng-click="mailboxExport()" uib-tooltip="Export Mailboxes" tooltip-append-to-body="true"><i class="fas fa-upload"></i></button>
           </div>
           <input class="form-control pull-right" style="width: 200px;" placeholder="{{ 'main.searchPlaceholder' | tr }}" type="text" ng-model="mailboxes.search" ng-model-options="{ debounce: 1000 }" ng-change="mailboxes.updateFilter()" />
         </h3>
diff --git a/src/views/users.html b/src/views/users.html
index cc6f4e885..3dacec465 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -597,10 +597,10 @@
         <i class="fa fa-user-plus"></i> {{ 'users.newUserAction' | tr }}
       </button>
       <div class="btn-group pull-right" style="margin-left: 5px;">
-        <button class="btn btn-primary" ng-click="userImport.show()" uib-tooltip="{{ 'users.userImport.tooltip' | tr }}" tooltip-append-to-body="true"><i class="fa fa-file-import"></i></button>
+        <button class="btn btn-default" ng-click="userImport.show()" uib-tooltip="{{ 'users.userImport.tooltip' | tr }}" tooltip-append-to-body="true"><i class="fas fa-download"></i></button>
         <div class="btn-group" role="group">
-          <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" uib-tooltip="{{ 'users.userExport.tooltip' | tr }}" tooltip-append-to-body="true">
-            <i class="fa fa-file-export"></i>
+          <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" uib-tooltip="{{ 'users.userExport.tooltip' | tr }}" tooltip-append-to-body="true">
+            <i class="fas fa-upload"></i>
           </button>
           <ul class="dropdown-menu dropdown-menu-right">
             <li><a href="" ng-click="userExport('csv')">{{ 'users.userExport.csv' | tr }}</a></li>