diff --git a/resources/views/books/create.blade.php b/resources/views/books/create.blade.php
index e33ae2bae..882ce556a 100644
--- a/resources/views/books/create.blade.php
+++ b/resources/views/books/create.blade.php
@@ -3,16 +3,26 @@
 @section('body')
     <div class="container small">
         <div class="my-s">
-            @include('partials.breadcrumbs', ['crumbs' => [
-                '/books' => [
-                    'text' => trans('entities.books'),
-                    'icon' => 'book'
-                ],
-                '/create-book' => [
-                    'text' => trans('entities.books_create'),
-                    'icon' => 'add'
-                ]
-            ]])
+            @if (isset($bookshelf))
+                @include('partials.breadcrumbs', ['crumbs' => [
+                    $bookshelf,
+                    $bookshelf->getUrl('/create-book') => [
+                        'text' => trans('entities.books_create'),
+                        'icon' => 'add'
+                    ]
+                ]])
+            @else
+                @include('partials.breadcrumbs', ['crumbs' => [
+                    '/books' => [
+                        'text' => trans('entities.books'),
+                        'icon' => 'book'
+                    ],
+                    '/create-book' => [
+                        'text' => trans('entities.books_create'),
+                        'icon' => 'add'
+                    ]
+                ]])
+            @endif
         </div>
 
         <div class="content-wrap card">
diff --git a/resources/views/shelves/show.blade.php b/resources/views/shelves/show.blade.php
index 77423c144..a57abecb3 100644
--- a/resources/views/shelves/show.blade.php
+++ b/resources/views/shelves/show.blade.php
@@ -24,7 +24,7 @@
                     <p class="text-muted italic mt-xl mb-m">{{ trans('entities.shelves_empty_contents') }}</p>
                     <div class="icon-list inline block">
                         @if($currentUser->can('book-create-all'))
-                            <a href="{{ $shelf->getUrl('/create-book') }}" class="icon-list-item text-bookshelf">
+                            <a href="{{ $shelf->getUrl('/create-book') }}" class="icon-list-item">
                                 <span class="icon">@icon('add')</span>
                                 <span>{{ trans('entities.books_create') }}</span>
                             </a>
@@ -80,6 +80,13 @@
         <h5>{{ trans('common.actions') }}</h5>
         <div class="icon-list text-primary">
 
+            @if($currentUser->can('book-create-all'))
+                <a href="{{ $shelf->getUrl('/create-book') }}" class="icon-list-item">
+                    <span class="icon">@icon('add')</span>
+                    <span>{{ trans('entities.books_create') }}</span>
+                </a>
+            @endif
+
             @if(userCan('bookshelf-update', $shelf))
                 <a href="{{ $shelf->getUrl('/edit') }}" class="icon-list-item">
                     <span>@icon('edit')</span>