diff --git a/app/breadcrumbs.php b/app/breadcrumbs.php
index 0e7b720ae2..96f56e2138 100644
--- a/app/breadcrumbs.php
+++ b/app/breadcrumbs.php
@@ -44,22 +44,6 @@ Breadcrumbs::register(
 );
 Breadcrumbs::register(
     'accounts.delete', function (Generator $breadcrumbs, \Account $account) {
-        switch ($account->accountType->type) {
-            default:
-                throw new FireflyException('Cannot handle account type "' . e($account->accountType->type) . '"');
-                break;
-            case 'Default account':
-            case 'Asset account':
-                $what = 'asset';
-                break;
-            case 'Expense account':
-            case 'Beneficiary account':
-                $what = 'expense';
-                break;
-            case 'Revenue account':
-                $what = 'revenue';
-                break;
-        }
         $breadcrumbs->parent('accounts.show', $account);
         $breadcrumbs->push('Delete ' . $account->name, route('accounts.delete', $account->id));
     }
@@ -67,23 +51,47 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'accounts.edit', function (Generator $breadcrumbs, \Account $account) {
-        switch ($account->accountType->type) {
-            default:
-                throw new FireflyException('Cannot handle account type "' . e($account->accountType->type) . '"');
-                break;
-            case 'Default account':
-            case 'Asset account':
-                $what = 'asset';
-                break;
-            case 'Expense account':
-            case 'Beneficiary account':
-                $what = 'expense';
-                break;
-            case 'Revenue account':
-                $what = 'revenue';
-                break;
-        }
         $breadcrumbs->parent('accounts.show', $account);
         $breadcrumbs->push('Edit ' . $account->name, route('accounts.edit', $account->id));
     }
+);
+
+// budgets.
+Breadcrumbs::register(
+    'budgets.index', function (Generator $breadcrumbs) {
+        $breadcrumbs->parent('home');
+        $breadcrumbs->push('Budgets', route('budgets.index'));
+    }
+);
+Breadcrumbs::register(
+    'budgets.create', function (Generator $breadcrumbs) {
+        $breadcrumbs->parent('budgets.index');
+        $breadcrumbs->push('Create new budget', route('budgets.create'));
+    }
+);
+
+Breadcrumbs::register(
+    'budgets.edit', function (Generator $breadcrumbs, Budget $budget) {
+        $breadcrumbs->parent('budgets.index');
+        $breadcrumbs->push('Edit '.$budget->name, route('budgets.edit',$budget->id));
+    }
+);
+Breadcrumbs::register(
+    'budgets.delete', function (Generator $breadcrumbs, Budget $budget) {
+        $breadcrumbs->parent('budgets.index');
+        $breadcrumbs->push('Delete '.$budget->name, route('budgets.delete',$budget->id));
+    }
+);
+
+Breadcrumbs::register(
+    'budgets.show', function (Generator $breadcrumbs, Budget $budget, LimitRepetition $repetition = null) {
+        $breadcrumbs->parent('budgets.index');
+        $breadcrumbs->push($budget->name, route('budgets.show', $budget->id));
+        if (!is_null($repetition)) {
+            $breadcrumbs->push(
+                DateKit::periodShow($repetition->startdate, $repetition->limit->repeat_freq), route('budgets.show', $budget->id, $repetition->id)
+            );
+        }
+        //$breadcrumbs->push('Budgets', route('budgets.index'));
+    }
 );
\ No newline at end of file
diff --git a/app/views/budgets/create.blade.php b/app/views/budgets/create.blade.php
index 0b20da4663..28e28e4712 100644
--- a/app/views/budgets/create.blade.php
+++ b/app/views/budgets/create.blade.php
@@ -1,5 +1,6 @@
 @extends('layouts.default')
 @section('content')
+{{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName()) }}
 {{Form::open(['class' => 'form-horizontal','url' => route('budgets.store')])}}
 <div class="row">
     <div class="col-lg-6 col-md-6 col-sm-12">
diff --git a/app/views/budgets/delete.blade.php b/app/views/budgets/delete.blade.php
index 96775a8357..bf16e4881a 100644
--- a/app/views/budgets/delete.blade.php
+++ b/app/views/budgets/delete.blade.php
@@ -1,5 +1,6 @@
 @extends('layouts.default')
 @section('content')
+{{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName(), $budget) }}
 {{Form::open(['class' => 'form-horizontal','url' => route('budgets.destroy',$budget->id)])}}
 <div class="row">
     <div class="col-lg-6 col-md-12 col-sm-12">
diff --git a/app/views/budgets/edit.blade.php b/app/views/budgets/edit.blade.php
index baeeb1cc8c..8fefee9bfd 100644
--- a/app/views/budgets/edit.blade.php
+++ b/app/views/budgets/edit.blade.php
@@ -1,5 +1,6 @@
 @extends('layouts.default')
 @section('content')
+{{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName(), $budget) }}
 <div class="row">
     <div class="col-lg-12 col-md-12 col-sm-12">
         <p class="lead">Use budgets to organize and limit your expenses.</p>
diff --git a/app/views/budgets/index.blade.php b/app/views/budgets/index.blade.php
index 214adc82ec..7963e5bedf 100644
--- a/app/views/budgets/index.blade.php
+++ b/app/views/budgets/index.blade.php
@@ -1,5 +1,6 @@
 @extends('layouts.default')
 @section('content')
+{{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName()) }}
 <div class="row">
     <div class="col-lg-9 col-sm-8 col-md-8">
         <div class="panel panel-default">
diff --git a/app/views/budgets/show.blade.php b/app/views/budgets/show.blade.php
index 3d5b5ec428..80e24ff00a 100644
--- a/app/views/budgets/show.blade.php
+++ b/app/views/budgets/show.blade.php
@@ -1,6 +1,6 @@
 @extends('layouts.default')
 @section('content')
-
+{{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName(), $budget, $repetition) }}
 <div class="row">
     <div class="col-lg-9 col-md-9 col-sm-7">
         <div class="panel panel-default">