diff --git a/public/js/gcharts.options.js b/public/js/gcharts.options.js
index e93206f858..f3430605ba 100644
--- a/public/js/gcharts.options.js
+++ b/public/js/gcharts.options.js
@@ -90,7 +90,7 @@ var defaultBarChartOptions = {
     colors: ["#4285f4", "#db4437", "#f4b400", "#0f9d58", "#ab47bc", "#00acc1", "#ff7043", "#9e9d24", "#5c6bc0", "#f06292", "#00796b", "#c2185b"],
     vAxis: {
         textStyle: {
-            color: '#838383',
+            color: '#838383'
         },
         textPosition: 'in',
         gridlines: {
@@ -148,7 +148,7 @@ var defaultColumnChartOptions = {
     fontSize: 11,
     hAxis: {
         textStyle: {
-            color: '#838383',
+            color: '#838383'
         },
         gridlines: {
             color: 'transparent'
@@ -159,7 +159,7 @@ var defaultColumnChartOptions = {
     colors: ["#357ca5", "#008d4c", "#db8b0b", "#ca195a", "#555299", "#4285f4", "#db4437", "#f4b400", "#0f9d58", "#ab47bc", "#00acc1", "#ff7043", "#9e9d24", "#5c6bc0", "#f06292", "#00796b", "#c2185b"],
     vAxis: {
         textStyle: {
-            color: '#838383',
+            color: '#838383'
         },
         baselineColor: '#aaaaaa',
         format: '\u20AC #'
diff --git a/resources/twig/budgets/create.twig b/resources/twig/budgets/create.twig
index fec9f883bc..6af4450dfe 100644
--- a/resources/twig/budgets/create.twig
+++ b/resources/twig/budgets/create.twig
@@ -6,44 +6,35 @@
 
 {% block content %}
     {{ Form.open({'class' : 'form-horizontal','id' : 'store','url' : route('budgets.store')}) }}
-<div class="row">
-    <div class="col-lg-6 col-md-6 col-sm-12">
-        <div class="box box-primary">
-            <div class="box-header with-border">
-                <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
-            </div>
-            <div class="box-body">
-                {{ ExpandedForm.text('name') }}
+    <div class="row">
+        <div class="col-lg-6 col-md-6 col-sm-12">
+            <div class="box box-primary">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                </div>
+                <div class="box-body">
+                    {{ ExpandedForm.text('name') }}
+                </div>
             </div>
         </div>
-    </div>
-    <div class="col-lg-6 col-md-6 col-sm-12">
+        <div class="col-lg-6 col-md-6 col-sm-12">
             <!-- panel for options -->
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ 'options'|_ }}</h3>
                 </div>
                 <div class="box-body">
-                    {{ ExpandedForm.optionsList('create','budget')  }}
+                    {{ ExpandedForm.optionsList('create','budget') }}
+                </div>
+                <div class="box-footer">
+                    <button type="submit" class="btn pull-right btn-success">{{ 'store_new_budget'|_ }}</button>
                 </div>
             </div>
 
         </div>
 
-</div>
-<div class="row">
-    <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-        <p>
-            <button type="submit" class="btn btn-lg btn-success">
-                <h3 class="box-title">{{ 'store_new_budget'|_ }}</h3>
-            </button>
-        </p>
     </div>
-</div>
-
-
-
-</form>
+    {{ Form.close|raw }}
 
 
 {% endblock %}
diff --git a/resources/twig/budgets/delete.twig b/resources/twig/budgets/delete.twig
index b4ec7f5dce..9497d1c707 100644
--- a/resources/twig/budgets/delete.twig
+++ b/resources/twig/budgets/delete.twig
@@ -5,45 +5,37 @@
 {% endblock %}
 
 {% block content %}
-    {{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('budgets.destroy',budget.id) })  }}
-        <div class="row">
-    <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
-        <div class="box box-danger">
-            <div class="box-header with-border">
-                <h3 class="box-title">{{ trans('form.delete_budget', {'name': budget.name}) }}</h3>
-            </div>
-            <div class="box-body">
-                <p class="text-danger">
-                    {{ trans('form.permDeleteWarning') }}
-                </p>
-                <p>
-                    {{ trans('form.budget_areYouSure', {'name': budget.name}) }}
-                </p>
+    {{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('budgets.destroy',budget.id) }) }}
+    <div class="row">
+        <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
+            <div class="box box-danger">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ trans('form.delete_budget', {'name': budget.name}) }}</h3>
+                </div>
+                <div class="box-body">
+                    <p class="text-danger">
+                        {{ trans('form.permDeleteWarning') }}
+                    </p>
 
-                <p>
-                    <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger" />
-                    <a href="{{URL.previous()}}" class="btn-default btn">{{ trans('form.cancel') }}</a >
-                </p>
+                    <p>
+                        {{ trans('form.budget_areYouSure', {'name': budget.name}) }}
+                    </p>
 
-                <p class="small">
-                {% if budget.transactionjournals|length > 0 %}
-                    {{ Lang.choice('form.budget_keep_transactions', budget.transactionjournals|length, {count: budget.transactionjournals|length}) }}
-                {% endif %}
-                </p>
-            </div>
-        </div>
-    </div>
-</div>
+                    <p>
+                        {% if budget.transactionjournals|length > 0 %}
+                            {{ Lang.choice('form.budget_keep_transactions', budget.transactionjournals|length, {count: budget.transactionjournals|length}) }}
+                        {% endif %}
+                    </p>
+
+                </div>
+                <div class="box-footer">
+                    <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger pull-right"/>
+                    <a href="{{ URL.previous() }}" class="btn-default btn">{{ trans('form.cancel') }}</a>
+                </div>
 
-<div class="row">
-    <div class="col-lg-6">
-        <div class="form-group">
-            <div class="col-sm-8">
 
             </div>
         </div>
     </div>
-</div>
-
-</form>
+    {{ Form.close|raw }}
 {% endblock %}
diff --git a/resources/twig/budgets/edit.twig b/resources/twig/budgets/edit.twig
index 1fdee3dc46..39611eb75d 100644
--- a/resources/twig/budgets/edit.twig
+++ b/resources/twig/budgets/edit.twig
@@ -6,7 +6,7 @@
 
 {% block content %}
     {{ Form.model(budget, {'class' : 'form-horizontal','id' : 'update','url' : route('budgets.update',budget.id) } ) }}
-    <input type="hidden" name="id" value="{{budget.id}}" />
+    <input type="hidden" name="id" value="{{ budget.id }}"/>
     <div class="row">
         <div class="col-lg-6 col-md-12 col-sm-6">
             <div class="box box-primary">
@@ -27,21 +27,15 @@
                     <h3 class="box-title">{{ 'options'|_ }}</h3>
                 </div>
                 <div class="box-body">
-                    {{ ExpandedForm.optionsList('update','budget')  }}
+                    {{ ExpandedForm.optionsList('update','budget') }}
+                </div>
+                <div class="box-footer">
+                    <button type="submit" class="btn pull-right btn-success">Update budget</button>
                 </div>
             </div>
         </div>
     </div>
-    <div class="row">
-        <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-            <p>
-                <button type="submit" class="btn btn-lg btn-success">
-                    <i class="fa fa-pencil"></i> Update budget
-                </button>
-            </p>
-        </div>
-    </div>
-    </form>
 
+    {{ Form.close|raw }}
 
 {% endblock %}
diff --git a/resources/twig/budgets/index.twig b/resources/twig/budgets/index.twig
index 0d16923359..b5d014eb79 100644
--- a/resources/twig/budgets/index.twig
+++ b/resources/twig/budgets/index.twig
@@ -10,6 +10,12 @@
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ Session.get('start').formatLocalized(monthFormat) }}</h3>
+
+                    <!-- ACTIONS MENU -->
+                    <div class="box-tools pull-right">
+                        <button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+                    </div>
+
                 </div>
                 <div class="box-body">
                     <div class="row">
@@ -18,16 +24,21 @@
                         </div>
                         <div class="col-lg-6 col-md-4 col-sm-3" style="text-align:right;">
                             <small>{{ trans('firefly.availableIn',{date : Session.get('start').formatLocalized(monthFormat) }) }}:
-                                <a href="#" class="updateIncome"><span id="budgetIncomeTotal" data-value="{{ budgetIncomeTotal }}">{{ budgetIncomeTotal|formatAmount }}</span></a></small>
+                                <a href="#" class="updateIncome"><span id="budgetIncomeTotal"
+                                                                       data-value="{{ budgetIncomeTotal }}">{{ budgetIncomeTotal|formatAmount }}</span></a>
+                            </small>
                         </div>
                     </div>
 
                     <div class="row">
                         <div class="col-lg-12 col-md-12 col-sm-12">
-                            <div class="progress progress-striped budgetedBar">
-                                <div class="progress-bar progress-bar-danger" id="progress-bar-danger" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0;"></div>
-                                <div class="progress-bar progress-bar-warning" id="progress-bar-warning" role="progressbar" aria-valuenow="10" aria-valuemin="0" aria-valuemax="100" style="width: 0;"></div>
-                                <div class="progress-bar progress-bar-info" id="progress-bar-default" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0;"></div>
+                            <div class="progress budgetedBar">
+                                <div class="progress-bar progress-bar-danger" id="progress-bar-danger" role="progressbar" aria-valuenow="0" aria-valuemin="0"
+                                     aria-valuemax="100" style="width: 0;"></div>
+                                <div class="progress-bar progress-bar-warning" id="progress-bar-warning" role="progressbar" aria-valuenow="10" aria-valuemin="0"
+                                     aria-valuemax="100" style="width: 0;"></div>
+                                <div class="progress-bar progress-bar-info" id="progress-bar-default" role="progressbar" aria-valuenow="0" aria-valuemin="0"
+                                     aria-valuemax="100" style="width: 0;"></div>
                             </div>
                         </div>
                     </div>
@@ -38,10 +49,13 @@
                     </div>
                     <div class="row">
                         <div class="col-lg-12 col-md-12 col-sm-12">
-                            <div class="progress progress-striped spentBar">
-                                    <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0;"></div>
-                                    <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0;"></div>
-                                    <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0;"></div>
+                            <div class="progress spentBar">
+                                <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"
+                                     style="width: 0;"></div>
+                                <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"
+                                     style="width: 0;"></div>
+                                <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"
+                                     style="width: 0;"></div>
                             </div>
                         </div>
                     </div>
@@ -54,6 +68,11 @@
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ 'transactionsWithoutBudget'|_ }}</h3>
+
+                    <!-- ACTIONS MENU -->
+                    <div class="box-tools pull-right">
+                        <button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+                    </div>
                 </div>
                 <div class="box-body">
                     <p>
@@ -64,7 +83,6 @@
                 </div>
             </div>
         </div>
-
     </div>
 
     <div class="row">
@@ -73,57 +91,64 @@
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">
-                        <!-- link in header -->
-                        {% if budget.currentRep %}
-                            <a href="{{ route('budgets.show', [budget.id, budget.currentRep.id]) }}" class="budget-link" data-id="{{ budget.id }}">{{ budget.name }}</a>
-                        {% else %}
-                            <a href="{{ route('budgets.show',budget.id) }}" class="budget-link" data-id="{{ budget.id }}">{{ budget.name }}</a>
-                        {% endif %}
+                            <!-- link in header -->
+                            {% if budget.currentRep %}
+                                <a href="{{ route('budgets.show', [budget.id, budget.currentRep.id]) }}" class="budget-link"
+                                   data-id="{{ budget.id }}">{{ budget.name }}</a>
+                            {% else %}
+                                <a href="{{ route('budgets.show',budget.id) }}" class="budget-link" data-id="{{ budget.id }}">{{ budget.name }}</a>
+                            {% endif %}
                         </h3>
 
-
                         <!-- ACTIONS MENU -->
-                        <div class="pull-right">
+                        <div class="box-tools pull-right">
+                            <button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
                             <div class="btn-group">
-                                <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
-                                    {{ 'actions'|_ }}
-                                    <span class="caret"></span>
-                                </button>
-                                <ul class="dropdown-menu pull-right" role="menu">
+                                <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
+                                <ul class="dropdown-menu" role="menu">
                                     <li><a href="{{ route('budgets.edit',budget.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ 'edit'|_ }}</a></li>
                                     <li><a href="{{ route('budgets.delete',budget.id) }}"><i class="fa fa-trash fa-fw"></i> {{ 'delete'|_ }}</a></li>
                                 </ul>
                             </div>
                         </div>
                     </div>
-                    <table class="table">
-                        <tr>
-                            <td style="width:40%;">{{ 'budgeted'|_ }}</td>
-                            <td>
-                                <div class="form-group" style="margin-bottom:0;">
-                                    <div class="input-group">
-                                        <div class="input-group-addon">{{ defaultCurrency.symbol|raw }}</div>
-                                        <input type="hidden" name="balance_currency_id" value="1" />
-                                        <input class="form-control budgetAmount" data-original="{{ budget.currentRep.amount|number_format(0,'','') }}" data-id="{{ budget.id }}" value="{{ budget.currentRep.amount|number_format(0,'','') }}" autocomplete="off" step="1" min="0" max="{{ budgetMaximum }}" name="amount" type="number">
+                    <div class="box-body">
+                        <table class="table">
+                            <tr>
+                                <td style="width:40%;">{{ 'budgeted'|_ }}</td>
+                                <td>
+                                    <div class="form-group" style="margin-bottom:0;">
+                                        <div class="input-group">
+                                            <div class="input-group-addon">{{ defaultCurrency.symbol|raw }}</div>
+                                            <input type="hidden" name="balance_currency_id" value="1"/>
+                                            <input class="form-control budgetAmount" data-original="{{ budget.currentRep.amount|number_format(0,'','') }}"
+                                                   data-id="{{ budget.id }}" value="{{ budget.currentRep.amount|number_format(0,'','') }}" autocomplete="off"
+                                                   step="1" min="0" max="{{ budgetMaximum }}" name="amount" type="number">
+                                        </div>
                                     </div>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="width:50%;">{{ 'spent'|_ }}</td>
-                            <td>{{ budget.spent|formatAmount }}</td>
-                        </tr>
-                    </table>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td style="width:50%;">{{ 'spent'|_ }}</td>
+                                <td>{{ budget.spent|formatAmount }}</td>
+                            </tr>
+                        </table>
+                    </div>
                 </div>
-        </div>
+            </div>
         {% endfor %}
         <div class="col-lg-3 col-sm-4 col-md-6">
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ 'createBudget'|_ }}</h3>
+
+                    <!-- ACTIONS MENU -->
+                    <div class="box-tools pull-right">
+                        <button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+                    </div>
                 </div>
                 <div class="box-body">
-                    <a href="{{ route('budgets.create') }}" class="btn btn-success"><i class="fa fa-fw fa-plus"></i> {{ 'createBudget'|_ }}</a>
+                    <a href="{{ route('budgets.create') }}" class="btn btn-success pull-right">{{ 'createBudget'|_ }}</a>
                 </div>
             </div>
         </div>
@@ -132,6 +157,10 @@
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'inactiveBudgets'|_ }}</h3>
+                        <!-- ACTIONS MENU -->
+                        <div class="box-tools pull-right">
+                            <button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+                        </div>
                     </div>
                     <div class="box-body">
                         {% for index,budget in inactive %}
diff --git a/resources/twig/categories/delete.twig b/resources/twig/categories/delete.twig
index 67755118d0..d1124631ad 100644
--- a/resources/twig/categories/delete.twig
+++ b/resources/twig/categories/delete.twig
@@ -5,34 +5,33 @@
 {% endblock %}
 
 {% block content %}
-{{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('categories.destroy',category.id)}) }}
-<div class="row">
-    <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
-        <div class="box box-danger">
-            <div class="box-header with-border">
-                <h3 class="box-title">{{ trans('form.delete_category', {'name': category.name}) }}</h3>
-            </div>
-            <div class="box-body">
-                <p class="text-danger">
-                    {{ trans('form.permDeleteWarning') }}
-                </p>
-                <p>
-                    {{ trans('form.category_areYouSure', {'name': category.name}) }}
-                </p>
-
-                <p>
-                    <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger" />
-                    <a href="{{ URL.previous() }}" class="btn-default btn">{{ trans('form.cancel') }}</a >
-                </p>
-                <p class="small">
-                {% if category.transactionjournals|length > 0 %}
-                    {{ Lang.choice('form.category_keep_transactions', category.transactionjournals|length, {count: category.transactionjournals|length}) }}
-                {% endif %}
-                </p>
+    {{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('categories.destroy',category.id)}) }}
+    <div class="row">
+        <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
+            <div class="box box-danger">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ trans('form.delete_category', {'name': category.name}) }}</h3>
+                </div>
+                <div class="box-body">
+                    <p class="text-danger">
+                        {{ trans('form.permDeleteWarning') }}
+                    </p>
+                    <p>
+                        {{ trans('form.category_areYouSure', {'name': category.name}) }}
+                    </p>
+                    <p>
+                        {% if category.transactionjournals|length > 0 %}
+                            {{ Lang.choice('form.category_keep_transactions', category.transactionjournals|length, {count: category.transactionjournals|length}) }}
+                        {% endif %}
+                    </p>
+                </div>
+                <div class="box-footer">
+                    <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger pull-right"/>
+                    <a href="{{ URL.previous() }}" class="btn-default btn">{{ trans('form.cancel') }}</a>
+                </div>
             </div>
         </div>
     </div>
-</div>
 
-</form>
+    {{ Form.close|raw }}
 {% endblock %}
diff --git a/resources/twig/categories/edit.twig b/resources/twig/categories/edit.twig
index 36469d4b25..5e40a3254e 100644
--- a/resources/twig/categories/edit.twig
+++ b/resources/twig/categories/edit.twig
@@ -5,44 +5,38 @@
 {% endblock %}
 
 {% block content %}
-{{ Form.model(category, {'class' : 'form-horizontal','id' : 'update','url' : route('categories.update',category.id)})  }}
-<input type="hidden" name="id" value="{{ category.id }}" />
-<div class="row">
-    <div class="col-lg-6 col-md-6 col-sm-12">
-        <div class="box box-primary">
-            <div class="box-header with-border">
-                <i class="fa fa-exclamation"></i> {{ 'mandatoryFields'|_ }}
+    {{ Form.model(category, {'class' : 'form-horizontal','id' : 'update','url' : route('categories.update',category.id)}) }}
+    <input type="hidden" name="id" value="{{ category.id }}"/>
+    <div class="row">
+        <div class="col-lg-6 col-md-6 col-sm-12">
+            <div class="box box-primary">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                </div>
+                <div class="box-body">
+                    {{ ExpandedForm.text('name') }}
+                </div>
             </div>
-            <div class="box-body">
-                {{ ExpandedForm.text('name') }}
+
+        </div>
+        <div class="col-lg-6 col-md-6 col-sm-12">
+
+
+            <!-- panel for options -->
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'options'|_ }}</h3>
+                </div>
+                <div class="box-body">
+                    {{ ExpandedForm.optionsList('update','category') }}
+                </div>
+                <div class="box-footer">
+                    <button type="submit" class="btn pull-right btn-success">
+                        {{ 'update_category'|_ }}
+                    </button>
+                </div>
             </div>
         </div>
-
     </div>
-    <div class="col-lg-6 col-md-6 col-sm-12">
-
-
-        <!-- panel for options -->
-        <div class="box">
-            <div class="box-header with-border">
-                <i class="fa fa-bolt"></i> {{ 'options'|_ }}
-            </div>
-            <div class="box-body">
-                {{ ExpandedForm.optionsList('update','category') }}
-            </div>
-        </div>
-
-    </div>
-</div>
-<div class="row">
-    <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-        <p>
-            <button type="submit" class="btn btn-lg btn-success">
-                {{ 'update_category'|_ }}
-            </button>
-        </p>
-    </div>
-</div>
-
-</form>
+    {{ Form.close|raw }}
 {% endblock %}
diff --git a/resources/twig/categories/index.twig b/resources/twig/categories/index.twig
index 7de7d594eb..2ea6311f83 100644
--- a/resources/twig/categories/index.twig
+++ b/resources/twig/categories/index.twig
@@ -9,24 +9,23 @@
     <div class="col-lg-12 col-md-12 col-sm-12">
         <div class="box">
             <div class="box-header with-border">
-                <i class="fa {{ mainTitleIcon }}"></i> {{ 'categories'|_ }}
+                <h3 class="box-title">{{ 'categories'|_ }}</h3>
 
                 <!-- ACTIONS MENU -->
-                <div class="pull-right">
+                <div class="box-tools pull-right">
+                    <button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
                     <div class="btn-group">
-                        <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
-                            {{ 'actions'|_ }}
-                            <span class="caret"></span>
-                        </button>
-                        <ul class="dropdown-menu pull-right" role="menu">
+                        <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
+                        <ul class="dropdown-menu" role="menu">
                             <li><a href="{{ route('categories.create') }}"><i class="fa fa-plus fa-fw"></i> {{ 'new_category'|_ }}</a></li>
                         </ul>
                     </div>
                 </div>
 
-
             </div>
-            {% include 'list/categories.twig' %}
+            <div class="box-body no-padding">
+                {% include 'list/categories.twig' %}
+            </div>
         </div>
     </div>
 </div>
diff --git a/resources/twig/categories/noCategory.twig b/resources/twig/categories/noCategory.twig
index b616b6899d..498a339b79 100644
--- a/resources/twig/categories/noCategory.twig
+++ b/resources/twig/categories/noCategory.twig
@@ -11,7 +11,7 @@
             <div class="box-header with-border">
                 {{ subTitle }}
             </div>
-            <div class="box-body">
+            <div class="box-body no-padding">
                 {% include 'list/journals.twig' with {'journals': list} %}
             </div>
         </div>
diff --git a/resources/twig/categories/show.twig b/resources/twig/categories/show.twig
index c7f3ba4c00..15ae1ebacb 100644
--- a/resources/twig/categories/show.twig
+++ b/resources/twig/categories/show.twig
@@ -9,8 +9,7 @@
     <div class="col-lg-6 col-md-6 col-sm-12">
         <div class="box">
             <div class="box-header with-border">
-                <i class="fa fa-calendar fa-fw"></i>
-                {{ 'overview'|_ }} (month)
+                <h3 class="box-title">{{ 'overview'|_ }} (month)</h3>
             </div>
             <div class="box-body">
                 <div id="month"></div>
@@ -20,8 +19,7 @@
     <div class="col-lg-6 col-md-6 col-sm-12">
         <div class="box">
             <div class="box-header with-border">
-                <i class="fa fa-calendar-o fa-fw"></i>
-                {{ 'overview'|_ }} (all)
+                <h3 class="box-title">{{ 'overview'|_ }} (all)</h3>
             </div>
             <div class="box-body">
                 <div id="all"></div>
@@ -34,10 +32,9 @@
 
          <div class="box">
             <div class="box-header with-border">
-                <i class="fa fa-repeat fa-fw"></i>
-                {{ 'transactions'|_ }}
+                <h3 class="box-title">{{ 'transactions'|_ }}</h3>
             </div>
-            <div class="box-body">
+             <div class="box-body no-padding">
                 {% include 'list/journals' %}
             </div>
         </div>