diff --git a/app/assets/stylesheets/_work_packages_show_view_overwrite.scss b/app/assets/stylesheets/_work_packages_show_view_overwrite.scss
index ed96cfe8e4..c804b5b31a 100644
--- a/app/assets/stylesheets/_work_packages_show_view_overwrite.scss
+++ b/app/assets/stylesheets/_work_packages_show_view_overwrite.scss
@@ -280,3 +280,7 @@ body.controller-work_packages.action-show {
     margin-left: 0;
   }
 }
+
+.work-packages--page-container {
+  .toolbar { padding-right: 20px; }
+}
diff --git a/app/assets/stylesheets/layout/_toolbar.sass b/app/assets/stylesheets/layout/_toolbar.sass
index e4a2739357..43ea863383 100644
--- a/app/assets/stylesheets/layout/_toolbar.sass
+++ b/app/assets/stylesheets/layout/_toolbar.sass
@@ -40,9 +40,6 @@
   margin: 0.625rem 0 0
   @extend %input--sizing
 
-.toolbar
-  padding: 0 10px 0 0
-
 .toolbar-container
   padding: 0
   margin-bottom: 12px
@@ -74,6 +71,9 @@
     &.toolbar-item
       margin: 0 5px //$drop-nav-spacing // spacing between nav items
 
+      &:last-child
+        margin-right: 0
+
   button, .button, input[type=text], input[type=number], select
     @include toolbar-element-sizing
     border: 1px solid $toolbar-item--border-color