diff --git a/templates/widgets/navbar.lucius b/templates/widgets/navbar.lucius
index f645d256b..745729208 100644
--- a/templates/widgets/navbar.lucius
+++ b/templates/widgets/navbar.lucius
@@ -31,7 +31,7 @@
   flex-direction: row;
   align-items: center;
   justify-content: flex-start;
-  width: 100%;
+  right: 0;
   top: 0;
   left: var(--asidenav-width-xl);
   height: var(--header-height);
@@ -40,7 +40,6 @@
   background: -webkit-linear-gradient(bottom, var(--color-dark) 0%,var(--color-darker) 100%); /* Chrome10-25,Safari5.1-6 */
   background: linear-gradient(to top, var(--color-dark) 0%,var(--color-darker) 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
   color: white;
-  margin-right: 40px;
   z-index: 20;
   box-shadow: 0 0 4px rgba(0, 0, 0, 0.2);
   overflow: auto;
@@ -115,24 +114,21 @@
   + .navbar__list {
     margin-left: 12px;
   }
+}
 
-  &:last-of-type {
+@media (min-width: 769px) {
+
+  .navbar__list:last-of-type {
     padding-right: 40px;
   }
 }
 
-@media (min-width: 768px) {
-
-  .navbar__list:last-of-type {
-    margin-right: 20px;
-  }
-}
-
-@media (max-width: 425px) {
+@media (max-width: 768px) {
 
   .navbar__list {
     + .navbar__list {
       margin-left: 0;
+      padding-right: 80px;
     }
   }
 }