diff --git a/resources/views/budgets/index.blade.php b/resources/views/budgets/index.blade.php
index 13b9f8439a..6d1642f930 100644
--- a/resources/views/budgets/index.blade.php
+++ b/resources/views/budgets/index.blade.php
@@ -5,12 +5,13 @@
     <div class="col-lg-9 col-sm-8 col-md-8">
         <div class="panel panel-default">
             <div class="panel-heading">
+                <i class="fa fa-calendar fa-fw"></i>
                 {{Session::get('start', \Carbon\Carbon::now()->startOfMonth())->format('F Y')}}
             </div>
             <div class="panel-body">
                 <div class="row">
                     <div class="col-lg-6 col-md-4 col-sm-3">
-                        <small>Budgeted: <span id="budgetedAmount" data-value="300">{{Amount::format(300)}}</span></small>
+                        <small>Budgeted: <span id="budgetedAmount" data-value="300"></span></small>
                     </div>
                     <div class="col-lg-6 col-md-4 col-sm-3" style="text-align:right;">
                         <small>Available in {{Session::get('start', \Carbon\Carbon::now()->startOfMonth())->format('F Y')}}:
@@ -49,11 +50,10 @@
         </div>
     </div>
     <div class="col-lg-3 col-sm-4 col-md-4">
-        <!-- time based navigation -->
-        @include('partials.date_nav')
 
         <div class="panel panel-default">
             <div class="panel-heading">
+                <i class="fa fa-fw fa-tags"></i>
                 Transactions without a budget
             </div>
             <div class="panel-body">
@@ -71,6 +71,7 @@
     <div class="col-lg-3 col-sm-4 col-md-6" style="height:180px;">
         <div class="panel panel-default">
             <div class="panel-heading">
+                <i class="fa fa-fw fa-tasks"></i>
                 @if(isset($budget->currentRep))
                     <a href="{{route('budgets.show',[$budget->id,$budget->currentRep->id])}}" id="budget-link-{{$budget->id}}">{{{$budget->name}}}</a>
                 @else
@@ -135,10 +136,11 @@
     <div class="col-lg-3 col-sm-4 col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading">
+                <i class="fa fa-fw fa-plus-circle"></i>
                 Create budget
             </div>
             <div class="panel-body">
-                <a href="{{route('budgets.create')}}" class="btn btn-success">Create new budget</a>
+                <a href="{{route('budgets.create')}}" class="btn btn-success"><i class="fa fa-fw fa-plus"></i> Create new budget</a>
             </div>
     </div>
 </div>
diff --git a/resources/views/budgets/noBudget.blade.php b/resources/views/budgets/noBudget.blade.php
index cda701ca37..d7653b58a0 100644
--- a/resources/views/budgets/noBudget.blade.php
+++ b/resources/views/budgets/noBudget.blade.php
@@ -1,12 +1,6 @@
 @extends('layouts.default')
 @section('content')
 {!! Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName()) !!}
-<div class="row">
-    <div class="col-lg-4 col-md-4 col-sm-12 ">
-        <!-- time based navigation -->
-        @include('partials.date_nav')
-    </div>
-</div>
 <div class="row">
     <div class="col-lg-12 col-md-12 col-sm-12">
         <div class="panel panel-default">
diff --git a/resources/views/categories/noCategory.blade.php b/resources/views/categories/noCategory.blade.php
index dea483315f..b256c60423 100644
--- a/resources/views/categories/noCategory.blade.php
+++ b/resources/views/categories/noCategory.blade.php
@@ -1,12 +1,6 @@
 @extends('layouts.default')
 @section('content')
 {{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName()) }}
-<div class="row">
-    <div class="col-lg-4 col-md-4 col-sm-12 ">
-        <!-- time based navigation -->
-        @include('partials.date_nav')
-    </div>
-</div>
 <div class="row">
     <div class="col-lg-12 col-md-12 col-sm-12">
         <div class="panel panel-default">
diff --git a/resources/views/categories/show.blade.php b/resources/views/categories/show.blade.php
index b99ffb9cc5..627976e872 100644
--- a/resources/views/categories/show.blade.php
+++ b/resources/views/categories/show.blade.php
@@ -5,6 +5,7 @@
     <div class="col-lg-6 col-md-6 col-sm-12">
         <div class="panel panel-default">
             <div class="panel-heading">
+                <i class="fa fa-calendar fa-fw"></i>
                 Overview
             </div>
             <div class="panel-body">
@@ -15,6 +16,7 @@
     <div class="col-lg-6 col-md-6 col-sm-12">
         <div class="panel panel-default">
             <div class="panel-heading">
+                <i class="fa fa-calendar-o fa-fw"></i>
                 Overview
             </div>
             <div class="panel-body">
@@ -28,6 +30,7 @@
 
          <div class="panel panel-default">
             <div class="panel-heading">
+                <i class="fa fa-repeat fa-fw"></i>
                 Transactions
             </div>
             <div class="panel-body">
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index dc7ac7fb86..332ae5fb30 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -65,8 +65,6 @@
 
     </div>
     <div class="col-lg-4 col-md-6 col-sm-12">
-        <!-- time based navigation -->
-        @include('partials.date_nav')
 
         <!-- REMINDERS -->
         <div class="panel panel-default">
diff --git a/resources/views/reports/budget.blade.php b/resources/views/reports/budget.blade.php
index b4116b1f72..55e9ae73db 100644
--- a/resources/views/reports/budget.blade.php
+++ b/resources/views/reports/budget.blade.php
@@ -14,6 +14,7 @@
     <div class="col-lg-6 col-md-6 col-sm-12">
         <div class="panel panel-default">
             <div class="panel-heading">
+                <i class="fa fa-fw fa-credit-card"></i>
                 Accounts
             </div>
             <table class="table table-bordered table-striped">
@@ -49,6 +50,7 @@
     <div class="col-lg-12 col-md-12 col-sm-12">
         <div class="panel panel-default">
             <div class="panel-heading">
+                <i class="fa fa-tasks fa-fw"></i>
                 Budgets
             </div>
             <table class="table table-bordered table-striped">
diff --git a/resources/views/reports/index.blade.php b/resources/views/reports/index.blade.php
index 15aa572bab..b90f7289c6 100644
--- a/resources/views/reports/index.blade.php
+++ b/resources/views/reports/index.blade.php
@@ -14,6 +14,7 @@
  <div class="col-lg-4 col-md-4 col-sm-4">
     <div class="panel panel-default">
         <div class="panel-heading">
+            <i class="fa fa-calendar fa-fw"></i>
             Yearly reports
         </div>
         <div class="panel-body">
@@ -29,6 +30,7 @@
     <div class="col-lg-4 col-md-4 col-sm-4">
         <div class="panel panel-default">
             <div class="panel-heading">
+                <i class="fa fa-calendar fa-fw"></i>
                 Monthly reports
             </div>
             <div class="panel-body">
@@ -49,6 +51,7 @@
     <div class="col-lg-4 col-md-4 col-sm-4">
         <div class="panel panel-default">
             <div class="panel-heading">
+                <i class="fa fa-calendar fa-fw"></i>
                 Budget reports
             </div>
             <div class="panel-body">
diff --git a/resources/views/reports/month.blade.php b/resources/views/reports/month.blade.php
index b2da3d069f..7b5c81a716 100644
--- a/resources/views/reports/month.blade.php
+++ b/resources/views/reports/month.blade.php
@@ -13,7 +13,10 @@
 <div class="row">
     <div class="col-lg-5 col-md-5 col-sm-12">
         <div class="panel panel-default">
-            <div class="panel-heading">Income</div>
+            <div class="panel-heading">
+                <i class="fa fa-long-arrow-right fa-fw"></i>
+                Income
+            </div>
                 <table class="table table-bordered">
                     <?php $tableSum = 0;?>
                     @foreach($income as $entry)
@@ -57,7 +60,10 @@
     </div>
     <div class="col-lg-4 col-md-4 col-sm-12">
         <div class="panel panel-default">
-            <div class="panel-heading">Expenses (top 10)</div>
+            <div class="panel-heading">
+                <i class="fa fa-long-arrow-left fa-fw"></i>
+                Expenses (top 10)
+            </div>
             <table class="table table-bordered">
                 <?php $sum = 0;?>
                 @foreach($expenses as $id => $expense)
@@ -80,7 +86,10 @@
     </div>
     <div class="col-lg-3 col-md-4 col-sm-12">
         <div class="panel panel-default">
-            <div class="panel-heading">Sums</div>
+            <div class="panel-heading">
+                <i class="fa fa-exchange fa-fw"></i>
+                Sums
+            </div>
             <?php
                 $in = 0;
                 foreach($income as $entry) {
@@ -107,7 +116,10 @@
 <div class="row">
     <div class="col-lg-6 col-md-6 col-sm-12">
         <div class="panel panel-default">
-            <div class="panel-heading">Budgets</div>
+            <div class="panel-heading">
+                <i class="fa fa-tasks fa-fw"></i>
+                Budgets
+            </div>
                 <table class="table table-bordered">
                     <tr>
                         <th>Budget</th>
@@ -150,7 +162,10 @@
     </div>
     <div class="col-lg-6 col-md-6 col-sm-12">
         <div class="panel panel-default">
-            <div class="panel-heading">Categories</div>
+            <div class="panel-heading">
+                <i class="fa fa-bar-chart fa-fw"></i>
+                Categories
+            </div>
             <table class="table table-bordered">
                 <tr>
                     <th>Category</th>
@@ -181,7 +196,10 @@
 <div class="row">
     <div class="col-lg-12 col-md-12 col-sm-12">
         <div class="panel panel-default">
-            <div class="panel-heading">Accounts</div>
+            <div class="panel-heading">
+                <i class="fa fa-credit-card fa-fw"></i>
+                Accounts
+            </div>
             <table class="table table-bordered">
                 <?php
                     $sumStart = 0;
@@ -214,13 +232,19 @@
 <div class="row">
     <div class="col-lg-6 col-md-6 col-sm-12">
         <div class="panel panel-default">
-            <div class="panel-heading">Piggy banks</div>
+            <div class="panel-heading">
+                <i class="fa fa-sort-amount-asc fa-fw"></i>
+                Piggy banks
+            </div>
             <div class="panel-body">Body</div>
         </div>
     </div>
     <div class="col-lg-6 col-md-6 col-sm-12">
         <div class="panel panel-default">
-            <div class="panel-heading">Repeated expenses</div>
+            <div class="panel-heading">
+                <i class="fa fa-rotate-left fa-fw"></i>
+                Repeated expenses
+            </div>
             <div class="panel-body">Body</div>
         </div>
     </div>
@@ -228,7 +252,10 @@
 <div class="row">
     <div class="col-lg-12 col-md-12 col-sm-12">
         <div class="panel panel-default">
-            <div class="panel-heading">Bills</div>
+            <div class="panel-heading">
+                <i class="fa fa-calendar-o fa-fw"></i>
+                Bills
+            </div>
             <div class="panel-body">Body</div>
         </div>
     </div>
@@ -236,7 +263,10 @@
 <div class="row">
     <div class="col-lg-12 col-md-12 col-sm-12">
         <div class="panel panel-default">
-            <div class="panel-heading">Outside of budgets</div>
+            <div class="panel-heading">
+                <i class="fa fa-fw fa-folder-o"></i>
+                Outside of budgets
+            </div>
             <div class="panel-body">Body</div>
         </div>
     </div>
diff --git a/resources/views/reports/year.blade.php b/resources/views/reports/year.blade.php
index 35955bcd70..8f4ae376da 100644
--- a/resources/views/reports/year.blade.php
+++ b/resources/views/reports/year.blade.php
@@ -14,6 +14,7 @@
  <div class="col-lg-10 col-md-8 col-sm-12">
     <div class="panel panel-default">
         <div class="panel-heading">
+            <i class="fa fa-line-chart"></i>
             Income vs. expenses
         </div>
         <div class="panel-body">
@@ -24,6 +25,7 @@
  <div class="col-lg-2 col-md-4 col-sm-12">
     <div class="panel panel-default">
         <div class="panel-heading">
+            <i class="fa fa-calendar"></i>
             Income vs. expenses
         </div>
         <div class="panel-body">
@@ -37,6 +39,7 @@
     <div class="col-lg-6 col-md-6 col-sm-6">
         <div class="panel panel-default">
             <div class="panel-heading">
+                <i class="fa fa-credit-card fa-fw"></i>
                 Account balance
             </div>
             <table class="table table-bordered table-striped">
@@ -74,6 +77,7 @@
 
         <div class="panel panel-default">
             <div class="panel-heading">
+                <i class="fa fa-arrows-h fa-fw"></i>
                 Income vs. expense
             </div>
             <?php
@@ -108,6 +112,7 @@
     <div class="col-lg-3 col-md-3 col-sm-3">
         <div class="panel panel-default">
             <div class="panel-heading">
+                <i class="fa fa-long-arrow-right fa-fw"></i>
                 Income
             </div>
             <table class="table">
@@ -129,6 +134,7 @@
     <div class="col-lg-3 col-md-3 col-sm-3">
         <div class="panel panel-default">
             <div class="panel-heading">
+                <i class="fa fa-long-arrow-left fa-fw"></i>
                 Expenses
             </div>
             <table class="table">
@@ -152,6 +158,7 @@
     <div class="col-lg-12 col-md-12 col-sm-12">
         <div class="panel panel-default">
             <div class="panel-heading">
+                <i class="fa fa-tasks fa-fw"></i>
                 Budgets
             </div>
             <div class="panel-body">
diff --git a/resources/views/transactions/show.blade.php b/resources/views/transactions/show.blade.php
index ae4b420027..d8134e8a56 100644
--- a/resources/views/transactions/show.blade.php
+++ b/resources/views/transactions/show.blade.php
@@ -5,6 +5,7 @@
     <div class="col-lg-6 col-md-6 col-sm-12">
         <div class="panel panel-default">
             <div class="panel-heading">
+                <i class="fa fa-info-circle fa-fw"></i>
                 Metadata
             </div>
                 <table class="table table-striped table-bordered">
@@ -54,6 +55,7 @@
         @endif
         <div class="panel panel-default">
             <div class="panel-heading">
+                <i class="fa fa-fw fa-exchange"></i>
                 Related transactions
             </div>
             @if($journal->transactiongroups()->count() == 0)
@@ -85,21 +87,6 @@
                                     </td>
                                 </tr>
                             @endforeach
-                            {{--
-                            <td>
-                                <a href="#" class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-trash"></span></a>
-                                <!--<input type="checkbox" checked="checked" data-relatedto="{{$journal->id}}" data-id="{{$jrnl->id}}" class="unrelate-checkbox" />-->
-                            </td>
-                            <td><a href="{{route('transactions.show',$jrnl->id)}}">{{{$jrnl->description}}}</a></td>
-
-                            <td>
-                                @foreach($jrnl->transactions()->get() as $t)
-                                    @if($t->amount > 0)
-                                        {!! Amount::formatTransaction($t) !!}
-                                    @endif
-                                @endforeach
-                            </td>
-                            --}}
                         </tr>
                     @endforeach
                     </table>
@@ -116,6 +103,15 @@
     @foreach($journal->transactions as $t)
         <div class="panel panel-default">
             <div class="panel-heading">
+                @if($t->account->accounttype->type == 'Asset account')
+                    <i class="fa fa-money fa-fw"></i>
+                @endif
+                @if($t->account->accounttype->type == 'Expense account')
+                    <i class="fa fa-shopping-cart fa-fw"></i>
+                @endif
+                @if($t->account->accounttype->type == 'Revenue account')
+                    <i class="fa fa-download fa-fw"></i>
+                @endif
                 <a href="{{route('accounts.show',$t->account->id)}}">{{{$t->account->name}}}</a><br /><small>{{{$t->account->accounttype->description}}}</small>
             </div>
                 <table class="table table-striped table-bordered">