diff --git a/app/Resources/views/macros/datatables.html.twig b/app/Resources/views/macros/datatables.html.twig
index b12da79d..80c1c029 100644
--- a/app/Resources/views/macros/datatables.html.twig
+++ b/app/Resources/views/macros/datatables.html.twig
@@ -1,24 +1,33 @@
 
-{% macro data_table_header(entries, form, tools) %}
+{% macro data_table_header(entries, form, tools, toolsRight) %}
 <div class="box data_table">
-    {% if form or tools %}
+    {% if form or tools or toolsRight %}
     <div class="box-header with-border">
-        <div class="box-title toolbar">
-            {% if form %}
+        {% if tools %}
+            <div class="btn-group tools-left">
+                {% for icon,url in tools  %}
+                    <a class="btn btn-default" href="{{ url }}"><i class="fa fa-{{ icon }}"></i></a>
+                {% endfor %}
+            </div>
+        {% endif %}
+
+        {% if form %}
+            <div class="box-title toolbar">
                 {{ form_start(form) }}
                 {{ form_widget(form) }}
                 {{ form_end(form) }}
-            {% endif %}
-        </div>
-        <div class="box-tools">
-            {% if tools %}
+            </div>
+        {% endif %}
+
+        {% if toolsRight %}
+            <div class="box-tools">
                 <div class="btn-group">
                     {% for icon,url in tools  %}
                         <a class="btn btn-default" href="{{ url }}"><i class="fa fa-{{ icon }}"></i></a>
                     {% endfor %}
                 </div>
-            {% endif %}
-        </div>
+            </div>
+        {% endif %}
     </div>
     {% endif %}
     <div class="box-body no-padding">
diff --git a/web/css/kimai.css b/web/css/kimai.css
index 4627c7cc..c1a69336 100644
--- a/web/css/kimai.css
+++ b/web/css/kimai.css
@@ -54,6 +54,10 @@ li.open .ticktac i.running{
     height: 25px;
 }
 
+.box-header .tools-left {
+    margin-right: 10px;
+}
+
 /* ================================ SIDEBAR ================================ */
 
 /* Used for the Sidebar UserPanel (which is deactivated right now) */