diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index 7cca6c34..90cdb498 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -28,7 +28,7 @@ function Users_view($users, $order_by, $arrived_count, $active_count, $force_act
     $user['Tshirt'] = glyph_bool($user['Tshirt']);
     $user['lastLogIn'] = date(_('m/d/Y h:i a'), $user['lastLogIn']);
     $user['actions'] = table_buttons(array(
-        button_glyph(page_link_to('admin_user') . '&id=' . $user['UID'], 'edit', 'btn-sm') 
+        button_glyph(page_link_to('admin_user') . '&id=' . $user['UID'], 'edit', 'btn-sm')
     ));
   }
   $users[] = array(
@@ -180,12 +180,16 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
               User_groups_render($user_groups)
           ))
       )),
-      buttons(array(
-          $admin_user_privilege ? button(page_link_to('admin_user') . '&id=' . $user_source['UID'], '<span class="glyphicon glyphicon-edit"></span> ' . _("edit")) : '',
-          ! $user_source['Gekommen'] ? button(page_link_to('admin_arrive') . '&arrived=' . $user_source['UID'], _("arrived")) : '',
-          $its_me ? button(page_link_to_absolute('ical') . '&key=' . $user_source['api_key'], glyph('calendar') . _("iCal Export")) : '',
-          $its_me ? button(page_link_to_absolute('shifts_json_export') . '&key=' . $user_source['api_key'], glyph('export') . _("JSON Export")) : '',
-          $its_me ? button(page_link_to_absolute('user_myshifts') . '&reset', glyph('repeat') . _('Reset API key')) : ''
+      div('row space-top', array(
+          div('col-md-12', array(
+              buttons(array(
+                  $admin_user_privilege ? button(page_link_to('admin_user') . '&id=' . $user_source['UID'], glyph("edit") . _("edit")) : '',
+                  ! $user_source['Gekommen'] ? button(page_link_to('admin_arrive') . '&arrived=' . $user_source['UID'], _("arrived")) : '',
+                  $its_me ? button(page_link_to_absolute('ical') . '&key=' . $user_source['api_key'], glyph('calendar') . _("iCal Export")) : '',
+                  $its_me ? button(page_link_to_absolute('shifts_json_export') . '&key=' . $user_source['api_key'], glyph('export') . _("JSON Export")) : '',
+                  $its_me ? button(page_link_to_absolute('user_myshifts') . '&reset', glyph('repeat') . _('Reset API key')) : ''
+              ))
+          ))
       )),
       ($its_me || $admin_user_privilege) ? '<h2>' . _("Shifts") . '</h2>' : '',
       ($its_me || $admin_user_privilege) ? table(array(
diff --git a/public/css/theme0.css b/public/css/theme0.css
index ce759f40..e5cd6ba9 100644
--- a/public/css/theme0.css
+++ b/public/css/theme0.css
@@ -6316,3 +6316,6 @@ td.occupied {
 atd.occupied:hover {
   background-color: #c1e2b3;
 }
+.space-top {
+  margin-top: 15px;
+}
diff --git a/public/css/theme1.css b/public/css/theme1.css
index cfaf0ca4..75293613 100644
--- a/public/css/theme1.css
+++ b/public/css/theme1.css
@@ -6339,6 +6339,9 @@ td.occupied {
 atd.occupied:hover {
   background-color: #449d44;
 }
+.space-top {
+  margin-top: 15px;
+}
 .text-primary,
 .text-primary:hover {
   color: #428bca;
diff --git a/themes/base.less b/themes/base.less
index 29a3796f..cc7956bb 100644
--- a/themes/base.less
+++ b/themes/base.less
@@ -1,5 +1,7 @@
 @import "../vendor/bootstrap/less/bootstrap";
 
+@icon-font-path: "../vendor/bootstrap/fonts/";
+
 body {
   padding-top: 50px;
 }
@@ -14,4 +16,8 @@ td.free {
 
 td.occupied {
 	.bg-success();
-}
\ No newline at end of file
+}
+
+.space-top {
+  margin-top: 15px;
+}